Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


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

2894 files changed, 23574 insertions, 22486 deletions

diff --git a/NewsLog.txt b/NewsLog.txt
index 10034235..7a71dd3a 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -66,7 +66,7 @@ Problems addressed
 ------------------
 
 * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
-* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
+* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
 * kolab/issue4455: calendar activate/deactivate handling broken
 * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
                    dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
 * kolab/issue3902: Delete a folder while syncing leads to crash
 * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
 * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
-* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
+* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
 * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
 
 
@@ -551,7 +551,7 @@ Problems addressed
 
 * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
 * kolab/issue3930: time on the Marcus Bains line doesn't change
-* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
 * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
 * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
 * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
 * kolab/issue3065: Crash in KOAgendaItem::paintEvent
 * kolab/issue3902: Delete a folder while syncing leads to crash
 * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
-* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
 * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
 * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
 * kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -593,7 +593,7 @@ Friday, October 2th 2009
 Problems addressed
 ------------------
 
-* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
+* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
 * kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
 * kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
 * kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
 Problems addressed
 ------------------
 
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
 * kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
 * kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
 
@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
 Problems addressed
 ------------------
 
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
 *Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
 * Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
  
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
 Problems addressed
 -------------------
 
-* Prevent crash after changing the layout and replying then. (778728)
+* Prevent crash after changing the tqlayout and replying then. (778728)
 * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -1696,10 +1696,10 @@ Problems addressed
 * kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
 * crash when there is no smime backend, and the protocol can't be determined.(733049 )
 * kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
-* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
+* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
 * kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 )
 * kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
-* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
+* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
 
 New functionality
 -------------------
@@ -2063,7 +2063,7 @@ Bugfixes
 
 Korganizer
 -----------
-- proko35 W1-9 icon alignment was improved.
+- proko35 W1-9 icon tqalignment was improved.
 
 Additional Fixes
 ================
diff --git a/README.Kolab b/README.Kolab
index 46fc111b..455e5448 100644
--- a/README.Kolab
+++ b/README.Kolab
@@ -39,7 +39,7 @@ KAddressBook:
    The scheme for the base DN is to take the parts of the fully
    qualified hostname of the kolab server and put ",dc=" between
    the parts and "dc=" in front of it. Or in Qt code:
-      baseDN = "dc=" + hostname.replace( '.', ",dc=" );
+      baseDN = "dc=" + hostname.tqreplace( '.', ",dc=" );
    Finally check the checkbox to activate the LDAP server. Now
    you can search the Kolab LDAP server and get all users on the
    system.
diff --git a/akregator/COPYING b/akregator/COPYING
index c13faf0d..2ad70b8b 100644
--- a/akregator/COPYING
+++ b/akregator/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/akregator/HACKING b/akregator/HACKING
index 6e5c1b97..4567e4d4 100644
--- a/akregator/HACKING
+++ b/akregator/HACKING
@@ -66,7 +66,7 @@ Spaces
 ================================================================================
 
 Spaces should be used between the conditional / loop type and the
-conditional statement.  They should not be used after parenthesis.  However
+conditional statement.  They should not be used after tqparenthesis.  However
 the should be to mark of mathematical or comparative operators.
 
 if ( foo == bar )
@@ -87,17 +87,17 @@ class should be roughly as follows:
 public typedefs:
 public ctors:
 public methods:
-public slots:
-signals:
+public Q_SLOTS:
+Q_SIGNALS:
 protected methods:
-protected slots:
+protected Q_SLOTS:
 protected fields:
 private methods:
-private slots:
+private Q_SLOTS:
 private fields:
 private ctors: // if you define ctors/dtor as private, put them at end
 
-If there are no private slots there is no need for two private sections, however
+If there are no private Q_SLOTS there is no need for two private sections, however
 private functions and private variables should be clearly separated.
 
 The implementations files -- .cpp files -- should follow (when possible) the
@@ -163,10 +163,10 @@ class Test : public QObject
 
         static Test *instance() { return m_instance; }
 
-    public slots:
+    public Q_SLOTS:
         void receive(QSomething &);
 
-    signals:
+    Q_SIGNALS:
         void send(QSomething &);
 
     protected:
@@ -174,7 +174,7 @@ class Test : public QObject
 
         static void someProtectedStaticFunc();
 
-    protected slots:
+    protected Q_SLOTS:
         void protectedSlot();
 
     protected:
@@ -185,7 +185,7 @@ class Test : public QObject
 
         static int staticPrivateMethod();
 
-    private slots:
+    private Q_SLOTS:
         void privateSlotIndeed(int youWonder);
 
     private:
diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp
index a2a74754..438f81a6 100644
--- a/akregator/src/aboutdata.cpp
+++ b/akregator/src/aboutdata.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index 56223d15..8f88079e 100644
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ABOUTDATA_H
diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp
index 225f85d7..5598457a 100644
--- a/akregator/src/actionmanager.cpp
+++ b/akregator/src/actionmanager.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
 }
 
 
-ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
+ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
 {}
 
 ActionManager::~ActionManager()
diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h
index 17dae1fa..bcdba56b 100644
--- a/akregator/src/actionmanager.h
+++ b/akregator/src/actionmanager.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_ACTIONMANAGER_H
@@ -36,14 +36,14 @@ namespace Akregator {
 /** interface for accessing actions, popup menus etc. from widgets.
     (Extracted from the implementation to avoid dependencies between widgets and  Akregator::Part).
  */
-class ActionManager : public QObject
+class ActionManager : public TQObject
 {
     public:
 
         static ActionManager* getInstance();
         static void setInstance(ActionManager* manager);
 
-        ActionManager(TQObject* parent=0, const char* name=0);
+        ActionManager(TQObject* tqparent=0, const char* name=0);
         virtual ~ActionManager();
 
         virtual KAction* action(const char* name, const char* classname=0) = 0;
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 18523993..bb4741ed 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
@@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
     {
         KAction* remove = m_manager->action("feed_remove");
         if (remove)
-            remove->setEnabled(node->parent()); // root nodes must not be deleted
+            remove->setEnabled(node->tqparent()); // root nodes must not be deleted
         KAction* hp = m_manager->action("feed_homepage");
         if (hp)
             hp->setEnabled(false);
@@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
         d->nodeSelectVisitor->visit(node);
 }
 
-ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
+ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
 {
     d->nodeSelectVisitor = new NodeSelectVisitor(this);
     d->part = part;
@@ -314,13 +314,13 @@ void ActionManagerImpl::initView(View* view)
     new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
 
     // Settings menu
-    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
+    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
     sqf->setChecked( Settings::showQuickFilter() );
 
     new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
-    new KAction( i18n("Open in Background Tab"), TQString::null, "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
+    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
     new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
-    new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
 
     new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
     new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
@@ -364,10 +364,10 @@ void ActionManagerImpl::initView(View* view)
     connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
 
 
-    new KAction( i18n("Move Node Up"), TQString::null, "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
-    new KAction( i18n("Move Node Down"), TQString::null,  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
-    new KAction( i18n("Move Node Left"), TQString::null, "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
-    new KAction( i18n("Move Node Right"), TQString::null, "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
+    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
+    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
+    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
+    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
 }
 
 void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
     else
         d->articleList = articleList;
 
-    new KAction( i18n("&Previous Article"), TQString::null, "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
-    new KAction( i18n("&Next Article"), TQString::null, "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
+    new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
+    new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
 }
 
 void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -401,12 +401,12 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
     new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
     new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
 
-    new KAction( i18n("Go to Top of Tree"), TQString::null, "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
-    new KAction( i18n("Go to Bottom of Tree"), TQString::null, "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
-    new KAction( i18n("Go Left in Tree"), TQString::null, "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
-    new KAction( i18n("Go Right in Tree"), TQString::null, "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
-    new KAction( i18n("Go Up in Tree"), TQString::null, "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
-    new KAction( i18n("Go Down in Tree"), TQString::null, "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
+    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
+    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
+    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
+    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
+    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
+    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
 }
 
 void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -419,7 +419,7 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
     new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
     new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
     new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
-    new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
     new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
 }
 
diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index 871edc94..398135c6 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_ACTIONMANAGERIMPL_H
@@ -50,9 +50,10 @@ class TabWidget;
 class ActionManagerImpl : public ActionManager
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
+        ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
         virtual ~ActionManagerImpl();
 
         virtual KAction* action(const char* name, const char* classname=0);
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index cc10844b..78a80103 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feed.h"
@@ -39,18 +39,18 @@
 
 namespace Akregator {
 
-AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
-   : AddFeedWidgetBase(parent, name)
+AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
+   : AddFeedWidgetBase(tqparent, name)
 {
     pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
-    statusLabel->setText(TQString::null);
+    statusLabel->setText(TQString());
 }
 
 AddFeedWidget::~AddFeedWidget()
 {}
 
-AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
-   : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
+AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name)
+   : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
 {
     widget = new AddFeedWidget(this);
     connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
@@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
     if (feedURL.startsWith("feed:"))
         feedURL = feedURL.right( feedURL.length() - 5 );
 
-    if (feedURL.find(":/") == -1)
+    if (feedURL.tqfind(":/") == -1)
         feedURL.prepend("http://");
     f->setXmlUrl(feedURL);
 
diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h
index fc38e617..1152f3d0 100644
--- a/akregator/src/addfeeddialog.h
+++ b/akregator/src/addfeeddialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORADDFEEDDIALOG_H
@@ -41,16 +41,18 @@ namespace Akregator
    class AddFeedWidget : public AddFeedWidgetBase
    {
       Q_OBJECT
+  TQ_OBJECT
       public:
-         AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
+         AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
          ~AddFeedWidget();
    };
 
    class AddFeedDialog : public KDialogBase
    {
       Q_OBJECT
+  TQ_OBJECT
       public:
-         AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
+         AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
          ~AddFeedDialog();
 
          void setURL(const TQString& t);
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 09c10fa4..5bdcfdc7 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Akregator::AddFeedWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AddFeedWidget</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout16</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>pixmapLabel1</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout15</cstring>
                     </property>
@@ -82,7 +82,7 @@
                                 </size>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+                        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -95,7 +95,7 @@
                                 <string>Add New Source</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -115,7 +115,7 @@
                 <cstring>statusLabel</cstring>
             </property>
             <property name="text">
-                <string>Status</string>
+                <string>tqStatus</string>
             </property>
         </widget>
         <spacer>
diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 2b4334ba..3d2c2005 100644
--- a/akregator/src/akregator_options.h
+++ b/akregator/src/akregator_options.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_OPTIONS_H
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index aafb17be..2b0f73e7 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <dcopclient.h>
 #include <kaboutdata.h>
@@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
 };
 
 Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
-                              TQObject *parent, const char *name, const TQStringList& )
+                              TQObject *tqparent, const char *name, const TQStringList& )
     : DCOPObject("AkregatorIface")
-       , MyBasePart(parent, name)
+       , MyBasePart(tqparent, name)
        , m_standardListLoaded(false)
        , m_shuttingDown(false)
        , m_mergedPart(0)
@@ -416,7 +416,7 @@ bool Part::openFile()
     {
         if (file.open(IO_ReadOnly))
         {
-            // Read OPML feeds list and build QDom tree.
+            // Read OPML feeds list and build TQDom tree.
             TQTextStream stream(&file);
             stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
             str = stream.read();
@@ -452,7 +452,7 @@ bool Part::openFile()
         m_view->loadFeeds(createDefaultFeedList());
     }
 
-    emit setStatusBarText(TQString::null);
+    emit setStatusBarText(TQString());
     
 
     if( Settings::markAllFeedsReadOnStartup() )
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
         {
           if (m_mergedPart) {
             factory()->removeClient(m_mergedPart);
-            if (childClients()->tqcontainsRef(m_mergedPart))
+            if (childClients()->containsRef(m_mergedPart))
               removeChildClient(m_mergedPart);
           }
           if (part)
@@ -634,7 +634,7 @@ void Part::importFile(const KURL& url)
     TQFile file(filename);
     if (file.open(IO_ReadOnly))
     {
-        // Read OPML feeds list and build QDom tree.
+        // Read OPML feeds list and build TQDom tree.
         TQDomDocument doc;
         if (doc.setContent(file.readAll()))
             m_view->importFeeds(doc);
@@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url)
 
 void Part::fileImport()
 {
-    KURL url = KFileDialog::getOpenURL( TQString::null,
+    KURL url = KFileDialog::getOpenURL( TQString(),
                         "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
                         +"\n*|" + i18n("All Files") );
 
@@ -702,7 +702,7 @@ void Part::fileImport()
 
     void Part::fileExport()
 {
-    KURL url= KFileDialog::getSaveURL( TQString::null,
+    KURL url= KFileDialog::getSaveURL( TQString(),
                         "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
                         +"\n*|" + i18n("All Files") );
 
@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
                         .arg( programName, programName, backendName );
-              // TQString::arg( st ) only tqreplaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
+              // TQString::arg( st ) only replaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) replacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
             else
@@ -1014,7 +1014,7 @@ bool Part::tryToLock(const TQString& backendName)
 
         KCursorSaver idle( KBusyPtr::idle() );
         if ( KMessageBox::No ==
-             KMessageBox::warningYesNo( 0, msg, TQString::null,
+             KMessageBox::warningYesNo( 0, msg, TQString(),
                                         i18n("Force Access"),
                                         i18n("Disable Archive")) )
                                         {
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 487b001d..43404a17 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _AKREGATORPART_H_
@@ -60,6 +60,7 @@ namespace Akregator
     class BrowserExtension : public KParts::BrowserExtension
     {
         Q_OBJECT
+  TQ_OBJECT
 
         public:
             BrowserExtension(Part *p, const char *name );
@@ -76,12 +77,13 @@ namespace Akregator
     class Part : public MyBasePart, virtual public AkregatorPartIface
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
            typedef MyBasePart inherited;
 
             /** Default constructor.*/
             Part(TQWidget *tqparentWidget, const char *widgetName,
-                          TQObject *parent, const char *name, const TQStringList&);
+                          TQObject *tqparent, const char *name, const TQStringList&);
 
 	        /** Destructor. */
             virtual ~Part();
diff --git a/akregator/src/akregator_partiface.h b/akregator/src/akregator_partiface.h
index 5bb51075..28fed0d0 100644
--- a/akregator/src/akregator_partiface.h
+++ b/akregator/src/akregator_partiface.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORPARTIFACE_H
diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp
index 4b67113c..84fd6572 100644
--- a/akregator/src/akregator_run.cpp
+++ b/akregator/src/akregator_run.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kdebug.h>
diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h
index db257fed..35e80e4c 100644
--- a/akregator/src/akregator_run.h
+++ b/akregator/src/akregator_run.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_RUN_H 
@@ -35,6 +35,7 @@ class Viewer;
 class BrowserRun : public KParts::BrowserRun
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum  */
         enum OpeningMode 
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 59457286..0d9b56af 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanagerimpl.h"
@@ -210,8 +210,8 @@ View::~View()
     kdDebug() << "View::~View(): leaving" << endl;
 }
 
-View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
- : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
+View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
+ : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
 {
     m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
     m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
 
     if (!Settings::resetQuickFilterOnNodeChange())
     {
-        m_searchBar->slotSeStatus(Settings::statusFilter());
+        m_searchBar->slotSetqStatus(Settings::statusFilter());
         m_searchBar->slotSetText(Settings::textFilter());
     }
 
@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
     return true;
 }
 
-bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
+bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
 {
     FeedList* feedList = new FeedList();
     bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
     }
     m_feedListView->setUpdatesEnabled(false);
     m_tagNodeListView->setUpdatesEnabled(false);
-    if (!parent)
+    if (!tqparent)
     {
         TagSet* tagSet = Kernel::self()->tagSet();
 
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
             // create a tag for every tag ID in the archive that is not part of the tagset
             // this is a fallback in case the tagset was corrupted,
             // so the tagging information from archive does not get lost.
-            if (!tagSet->tqcontainsID(*it))
+            if (!tagSet->containsID(*it))
             {
                 Tag tag(*it, *it);
                 tagSet->insert(tag);
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
         }
     }
     else
-        m_feedList->append(feedList, parent);
+        m_feedList->append(feedList, tqparent);
 
     m_feedListView->setUpdatesEnabled(true);
     m_feedListView->triggerUpdate();
@@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f)
             emit signalStarted(0);
             break;
         case Frame::Canceled:
-            emit signalCanceled(TQString::null);
+            emit signalCanceled(TQString());
             break;
         case Frame::Idle:
         case Frame::Completed:
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
     if (!current)
         return;
     TreeNode* prev = current->prevSibling();
-    Folder* parent = current->parent();
+    Folder* tqparent = current->tqparent();
 
-    if (!prev || !parent)
+    if (!prev || !tqparent)
         return;
 
-    parent->removeChild(prev);
-    parent->insertChild(prev, current);
+    tqparent->removeChild(prev);
+    tqparent->insertChild(prev, current);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
     if (!current)
         return;
     TreeNode* next = current->nextSibling();
-    Folder* parent = current->parent();
+    Folder* tqparent = current->tqparent();
 
-    if (!next || !parent)
+    if (!next || !tqparent)
         return;
 
-    parent->removeChild(current);
-    parent->insertChild(current, next);
+    tqparent->removeChild(current);
+    tqparent->insertChild(current, next);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeLeft()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->parent() || !current->parent()->parent())
+    if (!current || !current->tqparent() || !current->tqparent()->tqparent())
         return;
 
-    Folder* parent = current->parent();
-    Folder* grandparent = current->parent()->parent();
+    Folder* tqparent = current->tqparent();
+    Folder* grandtqparent = current->tqparent()->tqparent();
 
-    parent->removeChild(current);
-    grandparent->insertChild(current, parent);
+    tqparent->removeChild(current);
+    grandtqparent->insertChild(current, tqparent);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeRight()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->parent())
+    if (!current || !current->tqparent())
         return;
     TreeNode* prev = current->prevSibling();
 
     if ( prev && prev->isGroup() )
     {
         Folder* fg = static_cast<Folder*>(prev);
-        current->parent()->removeChild(current);
+        current->tqparent()->removeChild(current);
         fg->appendChild(current);
         m_listTabWidget->activeView()->ensureNodeVisible(current);
     }
@@ -880,16 +880,16 @@ void View::slotFeedAdd()
         if ( m_feedListView->selectedNode()->isGroup())
             group = static_cast<Folder*>(m_feedListView->selectedNode());
         else
-            group= m_feedListView->selectedNode()->parent();
+            group= m_feedListView->selectedNode()->tqparent();
 
     }
 
-    TreeNode* lastChild = group->children().last();
+    TreeNode* lastChild = group->tqchildren().last();
 
-    addFeed(TQString::null, lastChild, group, false);
+    addFeed(TQString(), lastChild, group, false);
 }
 
-void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
+void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
 {
 
     AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au
             return;
         }
 
-    if (!parent)
-        parent = m_feedList->rootNode();
+    if (!tqparent)
+        tqparent = m_feedList->rootNode();
 
-    parent->insertChild(feed, after);
+    tqparent->insertChild(feed, after);
 
     m_feedListView->ensureNodeVisible(feed);
 
@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
     if (!node->isGroup())
     {
         after = node;
-        node = node->parent();
+        node = node->tqparent();
     }
 
     Folder* currentGroup = static_cast<Folder*> (node);
@@ -1077,7 +1077,7 @@ void View::slotFetchingStopped()
 {
     m_mainFrame->setState(Frame::Completed);
     m_actionManager->action("feed_stop")->setEnabled(false);
-    m_mainFrame->seStatusText(TQString::null);
+    m_mainFrame->seStatusText(TQString());
 }
 
 void View::slotFeedFetched(Feed *feed)
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
 
 void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
 {
-    if (button == Qt::MidButton)
+    if (button == TQt::MidButton)
     {
         KURL link = article.link();
         switch (Settings::mMBBehaviour())
@@ -1152,7 +1152,7 @@ void View::slotNewTag()
 
 void View::slotTagCreated(const Tag& tag)
 {
-    if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
+    if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
     {
         TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
         m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
             if (delay > 0)
                 m_markReadTimer->start( delay*1000, true );
             else
-                a.seStatus(Article::Read);
+                a.setqStatus(Article::Read);
         }
     }
 
@@ -1266,18 +1266,18 @@ void View::slotCopyLinkAddress()
             link = article.link().url();
         else
             link = article.guid();
-        QClipboard *cb = TQApplication::clipboard();
-        cb->setText(link, QClipboard::Clipboard);
-        cb->setText(link, QClipboard::Selection);
+        TQClipboard *cb = TQApplication::clipboard();
+        cb->setText(link, TQClipboard::Clipboard);
+        cb->setText(link, TQClipboard::Selection);
     }
 }
 
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
 {
     KURL::List::iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it )
     {
-        addFeed((*it).prettyURL(), after, parent, false);
+        addFeed((*it).prettyURL(), after, tqparent, false);
     }
 }
 
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::Read);
+        (*it).setqStatus(Article::Read);
 }
 
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::Unread);
+        (*it).setqStatus(Article::Unread);
 }
 
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::New);
+        (*it).setqStatus(Article::New);
 }
 
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
     if (article.isNull())
         return;
 
-    article.seStatus(Article::Read);
+    article.setqStatus(Article::Read);
 }
 
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1441,7 +1441,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
     }
     else
     {
-        m_mainFrame->seStatusText(TQString::null);
+        m_mainFrame->seStatusText(TQString());
     }
 }
 
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
         m_searchBar->slotSetText(config->readEntry("searchLine"));
         int statusfilter = config->readNumEntry("searchCombo", -1);
         if (statusfilter != -1)
-            m_searchBar->slotSeStatus(statusfilter);
+            m_searchBar->slotSetqStatus(statusfilter);
     }
 
     int selectedID = config->readNumEntry("selectedNodeID", -1);
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 4b9dcd13..66796d42 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _AKREGATORVIEW_H_
@@ -77,18 +77,19 @@ namespace Akregator {
     /**
      * This is the main widget of the view, containing tree view, article list, viewer etc.
      */
-    class View : public QWidget
+    class View : public TQWidget
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
 
             /** constructor
-            @param part the Akregator::Part which tqcontains this widget
-            @param parent parent widget
+            @param part the Akregator::Part which contains this widget
+            @param tqparent tqparent widget
             @param Actionmanager for this view
             @param name the name of the widget (@ref TQWidget )
             */
-            View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name);
+            View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name);
 
             /** destructor.  Note that cleanups should be done in
             slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */
@@ -103,11 +104,11 @@ namespace Akregator {
             @param doc the DOM tree (OPML) of the feeds to import */
             bool importFeeds(const TQDomDocument& doc);
 
-            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
-            feed list is tqreplaced by the parsed one
+            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current
+            feed list is replaced by the parsed one
              @param doc TQDomDocument generated from OPML
-             @param parent The parent group the new nodes */
-            bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
+             @param tqparent The tqparent group the new nodes */
+            bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0);
 
             /**
              @return the displayed Feed List in OPML format
@@ -189,7 +190,7 @@ namespace Akregator {
             void slotCaptionChanged(const TQString &);
 
             /** called when URLs are dropped into the tree view */
-            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent);
+            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent);
 
             /** displays a URL in the status bar when the user moves the mouse over a link */
             void slotMouseOverInfo(const KFileItem *kifi);
@@ -271,7 +272,7 @@ namespace Akregator {
 
         protected:
 
-            void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true);
+            void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true);
 
             void connectToFeedList(FeedList* feedList);
             void disconnectFromFeedList(FeedList* feedList);
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 09f631a0..c0151af3 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "article.h"
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
         0001 0000 Keep
      */
 
-    enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
+    enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
 
     TQString guid;
     Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
         if (article.meta("deleted") == "true") 
         { // if article is in deleted state, we just add the status and omit the rest
             d->status = Private::Read | Private::Deleted;
-            d->archive->seStatus(d->guid, d->status);
+            d->archive->setqStatus(d->guid, d->status);
         }
         else
         { // article is not deleted, let's add it to the archive
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
                 int statusInt = status.toInt();
                 if (statusInt == New)
                     statusInt = Unread;
-                seStatus(statusInt);
+                setqStatus(statusInt);
             }
             setKeep(article.meta("keep") == "true");
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
     if (isDeleted())
         return;
   
-    seStatus(Read);
+    setqStatus(Read);
     d->status = Private::Deleted | Private::Read;
-    d->archive->seStatus(d->guid, d->status);
+    d->archive->setqStatus(d->guid, d->status);
     d->archive->setDeleted(d->guid);
 
     if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
         return Unread;
 }
 
-void Article::seStatus(int stat)
+void Article::setqStatus(int stat)
 {
     // use status() rather than statusBits() here to filter out status flags that we are not
     // interested in
-    int oldStatus = status();
+    int oldtqStatus = status();
 
-    if (oldStatus != stat)
+    if (oldtqStatus != stat)
     {
         switch (stat)
         {
@@ -319,9 +319,9 @@ void Article::seStatus(int stat)
                 d->status = ( d->status | Private::New) & ~Private::Read;
                 break;
         }
-        d->archive->seStatus(d->guid, d->status);
+        d->archive->setqStatus(d->guid, d->status);
         if (d->feed)
-            d->feed->setArticleChanged(*this, oldStatus);
+            d->feed->setArticleChanged(*this, oldtqStatus);
      }
 }
 
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
 void Article::setKeep(bool keep)
 {
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
-    d->archive->seStatus(d->guid, d->status);
+    d->archive->setqStatus(d->guid, d->status);
     if (d->feed)
         d->feed->setArticleChanged(*this);
 }
@@ -453,11 +453,11 @@ TQString Article::buildTitle(const TQString& description)
     if (description.stripWhiteSpace().isEmpty())
         return "";
         
-    int i = s.find('>',500); /*avoid processing too much */
+    int i = s.tqfind('>',500); /*avoid processing too much */
     if (i != -1)
         s = s.left(i+1);
     TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
-    TQString tagName, toReplace, tqreplaceWith;
+    TQString tagName, toReplace, replaceWith;
     while (rx.search(s) != -1 )
     {
         tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
         else if (tagName.startsWith("br") || tagName.startsWith("BR"))
         {
             toReplace=rx.cap(1);
-            tqreplaceWith=" ";
+            replaceWith=" ";
         }
         else
             toReplace=rx.cap(1);  // strip just tag
-        s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
+        s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed
     }
     if (s.length()> 90)
         s=s.left(90)+"...";
diff --git a/akregator/src/article.h b/akregator/src/article.h
index 4b4d480e..8d1baa2a 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_ARTICLE_H
@@ -57,7 +57,7 @@ namespace Akregator
     class Article
     {
         public:
-            enum Status { Unread=0, Read, New };
+            enum tqStatus { Unread=0, Read, New };
             typedef TQValueList<Article> List;
 
             Article();
@@ -80,7 +80,7 @@ namespace Akregator
             bool isNull() const;
             
             int status() const;
-            void seStatus(int s);
+            void setqStatus(int s);
 
             void offsetPubDate(int secs);
 
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 065a421a..e8e36f07 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -50,8 +50,8 @@ TQString Criterion::subjectToString(Subject subj)
             return TQString::tqfromLatin1("Author");
         case Description:
             return TQString::tqfromLatin1("Description");
-        case Status:
-            return TQString::tqfromLatin1("Status");
+        case tqStatus:
+            return TQString::tqfromLatin1("tqStatus");
         case KeepFlag:
             return TQString::tqfromLatin1("KeepFlag");
         default: // should never happen (TM)
@@ -69,8 +69,8 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
         return Description;
     else if (subjStr == TQString::tqfromLatin1("Author"))
         return Author;
-    else if (subjStr == TQString::tqfromLatin1("Status"))
-        return Status;
+    else if (subjStr == TQString::tqfromLatin1("tqStatus"))
+        return tqStatus;
     else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
         return KeepFlag;
 
@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
             // ### Maybe use prettyURL here?
             concreteSubject = TQVariant(article.link().url());
             break;
-        case Status:
+        case tqStatus:
             concreteSubject = TQVariant(article.status());
             break;
         case KeepFlag:
@@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
 
     switch ( predicateType ) {
         case Contains:
-            satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1;
+            satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1;
             break;
         case Equals:
             if (subjectType=="int")
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
 void SeStatusAction::exec(Article& article)
 {
     if (!article.isNull())
-        article.seStatus(m_status);
+        article.setqStatus(m_status);
 }
 
 int SeStatusAction::status() const
@@ -457,7 +457,7 @@ int SeStatusAction::status() const
     return m_status;
 }
 
-void SeStatusAction::seStatus(int status)
+void SeStatusAction::setqStatus(int status)
 {
     m_status = status;
 }
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index dee27da5..c39d72e8 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
         virtual void exec(Article& article);
         
         int status() const;
-        void seStatus(int status);
+        void setqStatus(int status);
 
         virtual void writeConfig(KConfig* config) const;
         virtual void readConfig(KConfig* config);
@@ -190,7 +190,7 @@ class AssignTagAction : public AbstractAction
 {
     public:
 
-        AssignTagAction(const TQString& tagID=TQString::null);
+        AssignTagAction(const TQString& tagID=TQString());
         virtual void exec(Article& article);
                 
         const TQString& tagID() const;
@@ -259,7 +259,7 @@ class Criterion
     public:
 
         enum Subject {
-            Title, Description, Author, Link, Status, KeepFlag
+            Title, Description, Author, Link, tqStatus, KeepFlag
         };
 
         static TQString subjectToString(Subject subj);
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index c9df8963..68e41730 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "akregatorconfig.h"
@@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate
 {
     public:
 
-    ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
+    ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { }
 
     void ensureCurrentItemVisible()
     {
-        if (m_parent->currentItem())
+        if (m_tqparent->currentItem())
         {
-            m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
+            m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 );
         }
     }
 
-    ArticleListView* m_parent;
+    ArticleListView* m_tqparent;
 
     /** maps article to article item */
     TQMap<Article, ArticleItem*> articleMap;
@@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem
         friend class ArticleListView;
 
         public:
-            ArticleItem( TQListView *parent, const Article& a);
+            ArticleItem( TQListView *tqparent, const Article& a);
             ~ArticleItem();
 
             Article& article();
@@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem
 };
 
 // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser
-ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a)
-    : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
+ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a)
+    : KListViewItem( tqparent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
 {
     if (a.keep())
         setPixmap(0, keepFlag());
@@ -182,9 +182,9 @@ void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup
         TQColorGroup cg2(cg);
     
         if (article().status() == Article::Unread)
-            cg2.setColor(TQColorGroup::Text, Qt::blue);
+            cg2.setColor(TQColorGroup::Text, TQt::blue);
         else // New
-            cg2.setColor(TQColorGroup::Text, Qt::red);
+            cg2.setColor(TQColorGroup::Text, TQt::red);
     
         KListViewItem::paintCell( p, cg2, column, width, align );
     }
@@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen
 
 /* ==================================================================================== */
 
-ArticleListView::ArticleListView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+ArticleListView::ArticleListView(TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
     d = new ArticleListViewPrivate(this);
     d->noneSelected = true;
@@ -577,7 +577,7 @@ void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
     if(!e)
         return;
         
-    TQString message = TQString::null;
+    TQString message = TQString();
     
     //kdDebug() << "visible articles: " << visibleArticles() << endl;
     
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index d38f9026..5dbc0804 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATORARTICLELISTVIEW_H
 #define AKREGATORARTICLELISTVIEW_H
@@ -43,8 +43,9 @@ namespace Akregator
     class ArticleListView : public KListView
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
-            ArticleListView(TQWidget *parent = 0, const char *name = 0);
+            ArticleListView(TQWidget *tqparent = 0, const char *name = 0);
             virtual ~ArticleListView();
             
             /** returns the current article, or a null article if there is none */
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index d456a415..608e2a8d 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqdatetime.h>
@@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
     ArticleViewer* m_view;
 };
 
-ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
-    : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
+ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name)
+    : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
 {
     setJScriptEnabled(false);
     setJavaEnabled(false);
@@ -169,8 +169,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
 
     generateNormalModeCSS();
     generateCombinedModeCSS();
-    new KAction( i18n("&Scroll Up"), TQString::null, "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
-    new KAction( i18n("&Scroll Down"), TQString::null, "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
+    new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
+    new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
     
     connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
 
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index 0839c446..7d756262 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ARTICLEVIEWER_H
@@ -48,9 +48,10 @@ namespace Akregator
      class ArticleViewer : public Viewer
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
             /** Constructor */
-            ArticleViewer(TQWidget* parent, const char* name);
+            ArticleViewer(TQWidget* tqparent, const char* name);
             virtual ~ArticleViewer();
             
             virtual bool openURL(const KURL &url);
diff --git a/akregator/src/articleviewer.rc b/akregator/src/articleviewer.rc
index 5b61457b..a74bdf5c 100644
--- a/akregator/src/articleviewer.rc
+++ b/akregator/src/articleviewer.rc
@@ -11,7 +11,7 @@
   <Action name="viewer_copy"/>
   <Action name="selectAll"/>
   <Separator/> 
-  <Action name="find"/>
+  <Action name="tqfind"/>
   <Action name="findNext"/>
 </Menu> 
 <Menu noMerge="1" name="view">
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index 52e26548..76fd06c5 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstringlist.h>
@@ -41,7 +41,7 @@
 namespace Akregator
 {
 
-ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
+ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(tqparent, name, config, dialogType, dialogButtons, defaultButton, modal)
 {
     addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
     addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index 78136e32..670742a9 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_CONFIGDIALOG_H
@@ -35,9 +35,10 @@ class SettingsAppearance;
 class ConfigDialog : public KConfigDialog
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
     
-        ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
+        ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
         
         virtual ~ConfigDialog();
 
diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp
index 02074891..5f48d5be 100644
--- a/akregator/src/dragobjects.cpp
+++ b/akregator/src/dragobjects.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "dragobjects.h"
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index 88531d36..5a232c09 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_DRAGOBJECTS_H
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index edf1a790..8e0c4c90 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtimer.h>
@@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; }
 bool Feed::isArticlesLoaded() const { return d->articlesLoaded; }
 
 
-TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
+TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
 {
     TQDomElement el = document.createElement( "outline" );
     el.setAttribute( "text", title() );
@@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
     el.setAttribute( "maxArticleNumber", d->maxArticleNumber );
     el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML
     el.setAttribute( "version", "RSS" );
-    parent.appendChild( el );
+    tqparent.appendChild( el );
     return el;
 }
 
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
         TQValueList<Article>::Iterator en = tarticles.end();
 
         for (it = tarticles.begin(); it != en; ++it)
-            (*it).seStatus(Article::Read);
+            (*it).setqStatus(Article::Read);
         setNotificationMode(true, true);
     }
 }
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
             d->addedArticlesNotify.append(mya);
             
             if (!mya.isDeleted() && !markImmediatelyAsRead())
-                mya.seStatus(Article::New);
+                mya.setqStatus(Article::New);
             else
-                mya.seStatus(Article::Read);
+                mya.setqStatus(Article::Read);
                 
             changed = true;
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
             {
                 mya.setKeep(old.keep());
                 int oldstatus = old.status();
-                old.seStatus(Article::Read);
+                old.setqStatus(Article::Read);
 
                 d->articles.remove(old.guid());
                 appendArticle(mya);
 
-                mya.seStatus(oldstatus);
+                mya.setqStatus(oldstatus);
 
                 d->updatedArticlesNotify.append(mya);
                 changed = true;
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
     {
         if ((*it).status() == Article::New)
         {
-            (*it).seStatus(Article::Unread);
+            (*it).setqStatus(Article::Unread);
         }
     }
 
@@ -579,7 +579,7 @@ void Feed::tryFetch()
 {
     d->fetchError = false;
 
-    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
+    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
     //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
     d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
 }
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
     nodeModified();
 }
 
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
 {
     // Note that loader instances delete themselves
     d->loader = 0;
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
     articlesModified();
 }
 
-void Feed::setArticleChanged(Article& a, int oldStatus)
+void Feed::setArticleChanged(Article& a, int oldtqStatus)
 {
-    if (oldStatus != -1)
+    if (oldtqStatus != -1)
     {
-        int newStatus = a.status();
-        if (oldStatus == Article::Read && newStatus != Article::Read)
+        int newtqStatus = a.status();
+        if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
             setUnread(unread()+1);
-        else if (oldStatus != Article::Read && newStatus == Article::Read)
+        else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
             setUnread(unread()-1);
     }
     d->updatedArticlesNotify.append(a);
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
     if ( nextSibling() )
         return nextSibling();
 
-    Folder* p = parent();
+    Folder* p = tqparent();
     while (p)
     {
         if ( p->nextSibling() )
             return p->nextSibling();
         else
-            p = p->parent();
+            p = p->tqparent();
     }
     return 0;
 }
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index d94eecac..c9590365 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORFEED_H
@@ -43,7 +43,7 @@ namespace KPIM {
 // needed for slot fetchCompleted()
 using RSS::Document;
 using RSS::Loader;
-using RSS::Status;
+using RSS::tqStatus;
 
 namespace Akregator
 {
@@ -64,6 +64,7 @@ namespace Akregator
         friend class Article;
         
         Q_OBJECT
+  TQ_OBJECT
         public:
             /** the archiving modes:
                 - globalDefault: use default from Settings (default)
@@ -94,7 +95,7 @@ namespace Akregator
             virtual bool accept(TreeNodeVisitor* visitor);
 
             /** exports the feed settings to OPML */
-            virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
+            virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
 
             /**
               returns whether this feed uses its own fetch interval or the global setting
@@ -177,7 +178,7 @@ namespace Akregator
             /** sets the description of this feed */
             void setDescription(const TQString& s);
 
-            virtual TQValueList<Article> articles(const TQString& tag=TQString::null);
+            virtual TQValueList<Article> articles(const TQString& tag=TQString());
 
             /** returns the article with the given @c guid, or a null article if it not exists */
             virtual Article findArticle(const TQString& guid) const;
@@ -253,7 +254,7 @@ namespace Akregator
             
         private slots:
 
-            void fetchCompleted(Loader *loader, Document doc, Status status);
+            void fetchCompleted(Loader *loader, Document doc, tqStatus status);
             void slotImageFetched(const TQPixmap& image);
 
         private:
@@ -264,10 +265,10 @@ namespace Akregator
             void setArticleDeleted(Article& a);
 
             /** notifies that article @c mya was changed
-                @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise
+                @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
                 To be called by @ref Article
              */
-            void setArticleChanged(Article& a, int oldStatus=-1);
+            void setArticleChanged(Article& a, int oldtqStatus=-1);
             
             void enforceLimitArticleNumber();
 
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index 88433706..adc3fce4 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feed.h"
@@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed)
     loadIcon(iconURL);
 }
 
-FeedIconManager::FeedIconManager(TQObject * parent, const char *name)
-:  TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
+FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name)
+:  TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
 {
     connectDCOPSignal("kded",
                       "favicons", "iconChanged(bool, TQString, TQString)",
@@ -119,14 +119,14 @@ TQString FeedIconManager::iconLocation(const KURL & url) const
     kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
                              replyType, reply);
 
-    if (replyType == "TQString") {
+    if (replyType == TQSTRING_OBJECT_NAME_STRING) {
         TQDataStream replyStream(reply, IO_ReadOnly);
         TQString result;
         replyStream >> result;
         return result;
     }
 
-    return TQString::null;
+    return TQString();
 }
 
 void FeedIconManager::slotFeedDestroyed(TreeNode* node)
@@ -134,7 +134,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
     Feed* feed = dynamic_cast<Feed*>(node);
     if (feed)
         while (d->registeredFeeds.tqcontains(feed))
-            d->registeredFeeds.remove(d->registeredFeeds.find(feed));
+            d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed));
 }
 
 void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL,
diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h
index af4d5828..b7bee57f 100644
--- a/akregator/src/feediconmanager.h
+++ b/akregator/src/feediconmanager.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FEEDICONMGR_H
@@ -45,6 +45,7 @@ namespace Akregator
     class FeedIconManager:public TQObject, public DCOPObject
     {
         Q_OBJECT
+//        TQ_OBJECT
         K_DCOP
         
         public:
diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp
index cb00e5c0..8cdafead 100644
--- a/akregator/src/feeditem.cpp
+++ b/akregator/src/feeditem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -34,23 +34,23 @@
 
 namespace Akregator {
 
-FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
+FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
+FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
+FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
 
 
-FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
+FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h
index cc3c7efb..4f716a62 100644
--- a/akregator/src/feeditem.h
+++ b/akregator/src/feeditem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORFEEDITEM_H
@@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem
 {
  public:
     
-    FeedItem(FolderItem* parent, Feed* node);
-    FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node);
-    FeedItem(KListView* parent, Feed* node);
-    FeedItem(KListView* parent, TreeNodeItem* after, Feed* node);
+    FeedItem(FolderItem* tqparent, Feed* node);
+    FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node);
+    FeedItem(KListView* tqparent, Feed* node);
+    FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node);
 
     virtual ~FeedItem();
     virtual Feed* node();
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 1195b5dd..50496d8b 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "feedlist.h"
 
@@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor
         FeedList* m_list;
 };
 
-FeedList::FeedList(TQObject *parent, const char *name)
-    : NodeList(parent, name), d(new FeedListPrivate)
+FeedList::FeedList(TQObject *tqparent, const char *name)
+    : NodeList(tqparent, name), d(new FeedListPrivate)
 {
     d->addNodeVisitor = new AddNodeVisitor(this);
     d->removeNodeVisitor = new RemoveNodeVisitor(this);
@@ -104,7 +104,7 @@ void FeedList::removeNode(TreeNode* node)
    d->removeNodeVisitor->visit(node);
 }
 
-void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
+void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
 {
     TQDomElement e = node.toElement(); // try to convert the node to an element.
 
@@ -119,13 +119,13 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
             {
                 if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
                     d->urlMap[feed->xmlUrl()].append(feed);
-                parent->appendChild(feed);
+                tqparent->appendChild(feed);
             }
         }
         else
         {
             Folder* fg = Folder::fromOPML(e);
-            parent->appendChild(fg);
+            tqparent->appendChild(fg);
 
             if (e.hasChildNodes())
             {
@@ -214,21 +214,21 @@ Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) con
     return feed ? feed->findArticle(guid) : Article();
 }
 
-void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
+void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
 {
     if ( list == this )
         return;
 
-    if ( !flatList()->tqcontains(parent) )
-        parent = rootNode();
+    if ( !flatList()->tqcontains(tqparent) )
+        tqparent = rootNode();
 
-    TQValueList<TreeNode*> children = list->rootNode()->children();
+    TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
 
-    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
-    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
+    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
+    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
     {
         list->rootNode()->removeChild(*it);
-        parent->insertChild(*it, after);
+        tqparent->insertChild(*it, after);
         after = *it;
     }
 }
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
     TQDomElement body = doc.createElement( "body" );
     root.appendChild( body );
 
-    TQValueList<TreeNode*> children = rootNode()->children();
+    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
 
-    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
+    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
 
-    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
         body.appendChild( (*it)->toOPML(body, doc) );
 
     return doc;
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index c0ba14cc..4e630ea7 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORFEEDLIST_H
@@ -44,16 +44,17 @@ class TreeNode;
 class FeedList : public NodeList
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 
-    FeedList(TQObject *parent = 0, const char *name = 0);
+    FeedList(TQObject *tqparent = 0, const char *name = 0);
 
     /** Destructor. Contained nodes are deleted! */
     ~FeedList();
 
     /** appends another feed list as sub tree. The root node of @c list is ignored. NOTE: nodes are _moved_ from @c list to this feed list, not copied */
     
-    void append(FeedList* list, Folder* parent=0, TreeNode* after=0);
+    void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0);
 
     /** reads an OPML document and appends the items to this list
         @param doc the OPML document to parse
@@ -64,7 +65,7 @@ public:
     /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */
     virtual TQDomDocument toXML() const;
 
-    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */
+    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */
     Feed* findByURL(const TQString& feedURL) const;
 
     Article findArticle(const TQString& feedURL, const TQString& guid) const;
@@ -81,7 +82,7 @@ protected:
 public:         // compat with KDE-3.x assertions, remove for KDE 4
 // private:
 
-    void parseChildNodes(TQDomNode &node, Folder* parent);
+    void parseChildNodes(TQDomNode &node, Folder* tqparent);
 
     // never call these
     FeedList(const FeedList&) : NodeList() {}
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index b680c7c5..0ca068fd 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "dragobjects.h"
@@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate
     bool showTagFolders;
 
     // Drag and Drop variables
-    TQListViewItem *parent;
+    TQListViewItem *tqparent;
     TQListViewItem *afterme;
     TQTimer autoopentimer;
     ConnectNodeVisitor* connectNodeVisitor;
@@ -179,9 +179,9 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
         
         virtual bool visitFolder(Folder* node)
         {
-            // delete child items recursively before deleting parent
-            TQValueList<TreeNode*> children = node->children();
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
+            // delete child items recursively before deleting tqparent
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
                 visit(*it);
             
             visitTreeNode(node);
@@ -212,15 +212,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             
             TagNodeItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
-            if (parentItem)
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (tqparentItem)
             {
                 if (prev)
                 {
-                    item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node);
+                    item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new TagNodeItem( parentItem, node);
+                    item = new TagNodeItem( tqparentItem, node);
             }
             else
             {
@@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             item->nodeChanged();     
             m_view->d->itemDict.insert(node, item);
             m_view->connectToNode(node);
-            if (parentItem)
-                parentItem->sortChildItems(0, true);
+            if (tqparentItem)
+                tqparentItem->sortChildItems(0, true);
             return true;
         }
 
@@ -246,15 +246,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             TagFolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
-            if (parentItem)
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (tqparentItem)
             {
                 if (prev)
                 {
-                    item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node);
+                    item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new TagFolderItem(parentItem, node);
+                    item = new TagFolderItem(tqparentItem, node);
             }
             else
             {
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
 
             }
             m_view->d->itemDict.insert(node, item);
-            TQValueList<TreeNode*> children = node->children();
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
 
-            // add children recursively
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
+            // add tqchildren recursively
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
                 visit(*it);
 
             m_view->connectToNode(node);
@@ -284,15 +284,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
                      
             FolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
-            if (parentItem)
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (tqparentItem)
             {
                 if (prev)
                 {
-                    item = new FolderItem( parentItem, m_view->findNodeItem(prev), node);
+                    item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new FolderItem(parentItem, node);
+                    item = new FolderItem(tqparentItem, node);
             }
             else
             {
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             }
             m_view->d->itemDict.insert(node, item);
             
-            // add children recursively
-            TQValueList<TreeNode*> children = node->children();
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
+            // add tqchildren recursively
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
                 visit(*it);
 
             m_view->connectToNode(node);
@@ -321,16 +321,16 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             FeedItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
             
-            if (parentItem)
+            if (tqparentItem)
             {
                 if (prev)
                 {
-                    item = new FeedItem( parentItem, m_view->findNodeItem(prev), node);
+                    item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new FeedItem( parentItem, node);
+                    item = new FeedItem( tqparentItem, node);
             }
             else
             {
@@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
         NodeListView* m_view;
 };
 
-NodeListView::NodeListView( TQWidget *parent, const char *name)
-        : KListView(parent, name), d(new NodeListViewPrivate)
+NodeListView::NodeListView( TQWidget *tqparent, const char *name)
+        : KListView(tqparent, name), d(new NodeListViewPrivate)
 {
     d->showTagFolders = true;
     d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -457,7 +457,7 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title)
 
 TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
 {
-    return d->itemDict.find(node);
+    return d->itemDict.tqfind(node);
 }
 
 TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
@@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
 
         if (KURLDrag::canDecode(e))
         {
-            FolderItem* parent = dynamic_cast<FolderItem*> (d->parent);
+            FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent);
             TreeNodeItem* afterMe = 0;
             
             if(d->afterme)
@@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
             KURL::List urls;
             KURLDrag::decode( e, urls );
             e->accept();
-            emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0);
+            emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0);
         }
     }
     else
@@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
     }
 }
 
-void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/)
+void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/)
 {
 	d->autoopentimer.stop();
-    if (d->parent)
+    if (d->tqparent)
     {    
         openFolder();
 
-        Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node();
+        Folder* tqparentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
         TreeNode* afterMeNode = 0; 
         TreeNode* current = selectedNode();
 
         if (d->afterme)
             afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();
 
-        current->parent()->removeChild(current);
-        parentNode->insertChild(current, afterMeNode);
-        KListView::movableDropEvent(d->parent, d->afterme);
+        current->tqparent()->removeChild(current);
+        tqparentNode->insertChild(current, afterMeNode);
+        KListView::movableDropEvent(d->tqparent, d->afterme);
     }    
 }
 
@@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
     TQPoint vp = contentsToViewport(event->pos());
     TQListViewItem *i = itemAt(vp);
 
-    TQListViewItem *qiparent;
+    TQListViewItem *qitqparent;
     TQListViewItem *qiafterme;
-    findDrop( event->pos(), qiparent, qiafterme );
+    findDrop( event->pos(), qitqparent, qiafterme );
 
     if (event->source() == viewport()) {
         // disable any drops where the result would be top level nodes 
-        if (i && !i->parent())
+        if (i && !i->tqparent())
         {
             event->ignore();
             d->autoopentimer.stop();
@@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
 
         // prevent dragging nodes from All Feeds to My Tags or vice versa
         TQListViewItem* root1 = i;
-        while (root1 && root1->parent())
-            root1 = root1->parent();
+        while (root1 && root1->tqparent())
+            root1 = root1->tqparent();
 
         TQListViewItem* root2 = selectedItem();
-        while (root2 && root2->parent())
-            root2 = root2->parent();
+        while (root2 && root2->tqparent())
+            root2 = root2->tqparent();
 
         if (root1 != root2)
         {
@@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         }
 
         // don't drop node into own subtree
-        TQListViewItem* p = qiparent;
+        TQListViewItem* p = qitqparent;
         while (p)
             if (p == selectedItem())
             {
@@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
             }
             else
             {
-                p = p->parent();
+                p = p->tqparent();
             }
 
         // disable drags onto the item itself
@@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
     //            event->pos().x() < header()->cellPos(header()->mapToIndex(0)))
     //   {} else
  
-    // do we want to move inside the old parent or do we want to move to a new parent
+    // do we want to move inside the old tqparent or do we want to move to a new tqparent
     if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i))
     {
         setDropVisualizer(false);
@@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node();
         if (iNode->isGroup())
         {
-            if (i != d->parent)
+            if (i != d->tqparent)
                 d->autoopentimer.start(750);
 
-            d->parent = i;
+            d->tqparent = i;
             d->afterme = 0;
         }
         else
@@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         setDropVisualizer(true);
         setDropHighlighter(false);
         cleanItemHighlighter();
-        d->parent = qiparent;
+        d->tqparent = qitqparent;
         d->afterme = qiafterme;
         d->autoopentimer.stop();
     }
@@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const
     else
     {
         // disable dragging of top-level nodes (All Feeds, My Tags)
-        if (selectedItem() && !selectedItem()->parent())
+        if (selectedItem() && !selectedItem()->tqparent())
             return false;
         else
             return true;
@@ -719,8 +719,8 @@ void NodeListView::slotItemLeft()
         sel->setOpen(false);
     else
     {
-        if (sel->parent())
-            setSelected( sel->parent(), true );
+        if (sel->tqparent())
+            setSelected( sel->tqparent(), true );
     }
         
     ensureItemVisible( selectedItem() );    
@@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node)
         d->createItemVisitor->visit(node);
 }
 
-void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
+void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
 {
     if (node)
         d->deleteItemVisitor->deleteItem(node, false);
@@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject()
 
 void NodeListView::openFolder() {
     d->autoopentimer.stop();
-    if (d->parent && !d->parent->isOpen())
+    if (d->tqparent && !d->tqparent->isOpen())
     {
-        d->parent->setOpen(true);
+        d->tqparent->setOpen(true);
     }
 }
 
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index efa84392..1a5111f4 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATORFEEDLISTVIEW_H
 #define AKREGATORFEEDLISTVIEW_H
@@ -39,8 +39,9 @@ class TagNodeList;
 class NodeListView : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    NodeListView( TQWidget *parent = 0, const char *name = 0 );
+    NodeListView( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~NodeListView();
     
     /** sets the feed list to show. Disconnects from the old feed list, if there is any. */
@@ -91,7 +92,7 @@ public slots:
     void slotItemBegin();
     /** select last item in the list */
     void slotItemEnd();
-    /** go to parent item */
+    /** go to tqparent item */
     void slotItemLeft();
     /** go to first child */
     void slotItemRight();
@@ -132,7 +133,7 @@ public:         // compat with KDE-3.x assertions, remove for KDE 4
                                         int cx, int cy, int cw, int ch );
     virtual void contentsDragMoveEvent(TQDragMoveEvent* event);
     virtual bool acceptDrag(TQDropEvent *event) const;
-    virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
+    virtual void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
 
     virtual TQDragObject *dragObject();
             
@@ -154,10 +155,10 @@ protected slots:
     /** called when a node is added to the tree. If no item for the node exists, it will be created */
     virtual void slotNodeAdded(TreeNode* node);
     
-    /** Called when a node in the tree is taken out of the tree (parent->removeChild()) 
+    /** Called when a node in the tree is taken out of the tree (tqparent->removeChild()) 
     
-    Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
-    virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
+    Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
+    virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
     
     /** deletes the item belonging to the deleted node */
     virtual void slotNodeDestroyed(TreeNode* node);
@@ -192,8 +193,9 @@ public:         // compat with KDE-3.x assertions, remove for KDE 4
 class TagNodeListView : public NodeListView
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} 
+        TagNodeListView(TQWidget *tqparent = 0, const char *name = 0) {} 
         virtual ~TagNodeListView() {}
 
     private:
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index bbf36207..c0685695 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_BACKEND_FEEDSTORAGE_H
 #define AKREGATOR_BACKEND_FEEDSTORAGE_H
@@ -55,7 +55,7 @@ class AKREGATOR_EXPORT Category
     { 
         return !operator==(other); 
     }
-    /** we need this for QMaps */
+    /** we need this for TQMaps */
     bool operator<(const Category& other) const
     {
         return other.scheme < other.scheme || (other.scheme == other.scheme && term < other.term);
@@ -64,7 +64,7 @@ class AKREGATOR_EXPORT Category
 
 class Storage;
 
-class AKREGATOR_EXPORT FeedStorage : public QObject
+class AKREGATOR_EXPORT FeedStorage : public TQObject
 {
     public:
     
@@ -75,12 +75,12 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual void setLastFetch(int lastFetch) = 0;
         
         /** returns the guids of all articles in this storage. If a tagID is given, only articles with this tag are returned */
-        virtual TQStringList articles(const TQString& tagID=TQString::null) = 0;
+        virtual TQStringList articles(const TQString& tagID=TQString()) = 0;
 
         /** returns the guid of the articles in a given category */
         virtual TQStringList articles(const Category& cat) = 0;
 
-        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source
+        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source
         @param source the archive which articles should be appended
         */
         virtual void add(FeedStorage* source) = 0;
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual uint pubDate(const TQString& guid) = 0;
         virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
         virtual int status(const TQString& guid) = 0;
-        virtual void seStatus(const TQString& guid, int status) = 0;
+        virtual void setqStatus(const TQString& guid, int status) = 0;
         virtual TQString title(const TQString& guid) = 0;
         virtual void setTitle(const TQString& guid, const TQString& title) = 0;
         virtual TQString description(const TQString& guid) = 0;
@@ -121,10 +121,10 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual void removeTag(const TQString& guid, const TQString& tag) = 0;
 
         /** returns the tags of a given article. If @c guid is null, it returns all tags used in this feed */
-        virtual TQStringList tags(const TQString& guid=TQString::null) = 0;
+        virtual TQStringList tags(const TQString& guid=TQString()) = 0;
 
         virtual void addCategory(const TQString& guid, const Category& category) = 0;
-        virtual TQValueList<Category> categories(const TQString& guid=TQString::null) = 0;
+        virtual TQValueList<Category> categories(const TQString& guid=TQString()) = 0;
 
         virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) = 0;
         virtual void removeEnclosure(const TQString& guid) = 0;
diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp
index b7200b0e..9d7b8e12 100644
--- a/akregator/src/feedstoragedummyimpl.cpp
+++ b/akregator/src/feedstoragedummyimpl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedstoragedummyimpl.h"
@@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid)
     return tqcontains(guid) ? d->entries[guid].status : 0;
 }
 
-void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
+void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
 {
     if (tqcontains(guid))
         d->entries[guid].status = status;
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    seStatus(guid, source->status(guid));
+    setqStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     TQStringList tags = source->tags(guid);
     
@@ -440,8 +440,8 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         entry.hasEnclosure = false;
-        entry.enclosureUrl = TQString::null;
-        entry.enclosureType = TQString::null;
+        entry.enclosureUrl = TQString();
+        entry.enclosureType = TQString();
         entry.enclosureLength = -1;
     }
 }
@@ -459,8 +459,8 @@ void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, T
     else
     {
         hasEnclosure = false;
-        url = TQString::null;
-        type = TQString::null;
+        url = TQString();
+        type = TQString();
         length = -1;
     }
 }
diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h
index d15f45bd..4ba4a460 100644
--- a/akregator/src/feedstoragedummyimpl.h
+++ b/akregator/src/feedstoragedummyimpl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_BACKEND_FEEDSTORAGEDUMMYIMPL_H
 #define AKREGATOR_BACKEND_FEEDSTORAGEDUMMYIMPL_H
@@ -45,7 +45,7 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual int lastFetch();
         virtual void setLastFetch(int lastFetch);
       
-        virtual TQStringList articles(const TQString& tag=TQString::null);
+        virtual TQStringList articles(const TQString& tag=TQString());
 
         virtual TQStringList articles(const Category& cat);
 
@@ -69,21 +69,21 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void seStatus(const TQString& guid, int status);
+        virtual void setqStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
         virtual void setDescription(const TQString& guid, const TQString& description);
         virtual void addTag(const TQString& guid, const TQString& tag);
         virtual void removeTag(const TQString& guid, const TQString& tag);
-        virtual TQStringList tags(const TQString& guid=TQString::null);
+        virtual TQStringList tags(const TQString& guid=TQString());
 
         virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length);
         virtual void removeEnclosure(const TQString& guid);
         virtual void enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length);
 
         virtual void addCategory(const TQString& guid, const Category& category);
-        virtual TQValueList<Category> categories(const TQString& guid=TQString::null);
+        virtual TQValueList<Category> categories(const TQString& guid=TQString());
 
         virtual void setAuthor(const TQString& guid, const TQString& author);
         virtual TQString author(const TQString& guid);
diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp
index 6093cb51..d171d25e 100644
--- a/akregator/src/fetchqueue.cpp
+++ b/akregator/src/fetchqueue.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqvaluelist.h>
@@ -42,7 +42,7 @@ class FetchQueue::FetchQueuePrivate
 };
 
 
-FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {}
+FetchQueue::FetchQueue(TQObject* tqparent, const char* name): TQObject(tqparent, name), d(new FetchQueuePrivate) {}
 
 
 FetchQueue::~FetchQueue()
diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h
index 873fde6f..9e92bb16 100644
--- a/akregator/src/fetchqueue.h
+++ b/akregator/src/fetchqueue.h
@@ -19,12 +19,12 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
-#ifndef AKREGATOR_FETCHQUEUE_H
-#define AKREGATOR_FETCHQUEUE_H
+#ifndef AKREGATOR_FETCHTQUEUE_H
+#define AKREGATOR_FETCHTQUEUE_H
 
 #include <tqobject.h>
 
@@ -33,13 +33,14 @@ namespace Akregator {
 class Feed;
 class TreeNode;
 
-class FetchQueue : public QObject
+class FetchQueue : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-        FetchQueue(TQObject* parent=0, const char* name=0);
+        FetchQueue(TQObject* tqparent=0, const char* name=0);
         virtual ~FetchQueue();
 
         /** returns true when no feeds are neither fetching nor queued */
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index fac9bd2e..78612ec7 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "article.h"
 #include "folder.h"
@@ -39,9 +39,9 @@ namespace Akregator {
 class Folder::FolderPrivate
 {
     public:
-        /** List of children */
-        TQValueList<TreeNode*> children;
-        /** caching unread count of children */
+        /** List of tqchildren */
+        TQValueList<TreeNode*> tqchildren;
+        /** caching unread count of tqchildren */
         int unread;
         /** whether or not the folder is expanded */
         bool open;
@@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate)
 Folder::~Folder()
 {
     TreeNode* tmp = 0;
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it)
     {
         delete tmp;
         tmp = *it;
@@ -93,10 +93,10 @@ Folder::~Folder()
 TQStringList Folder::tags() const
 {
     TQStringList t;
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
     {
-        // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now.
+        // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
         TQStringList t2 = (*it)->tags();
         for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
             if (!t.tqcontains(*it2))
@@ -108,36 +108,36 @@ TQStringList Folder::tags() const
 TQValueList<Article> Folder::articles(const TQString& tag)
 {
     TQValueList<Article> seq;
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         seq += (*it)->articles(tag);
      
     return seq;
 }
 
-TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
+TQDomElement Folder::toOPML( TQDomElement tqparent, TQDomDocument document ) const
 {
     TQDomElement el = document.createElement( "outline" );
     el.setAttribute( "text", title() );
-    parent.appendChild( el );
+    tqparent.appendChild( el );
     el.setAttribute("isOpen", d->open ? "true" : "false");
     el.setAttribute( "id", TQString::number(id()) );
 
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         el.appendChild( (*it)->toOPML(el, document) );
         
     return el;
 }
 
-TQValueList<TreeNode*> Folder::children() const
+TQValueList<TreeNode*> Folder::tqchildren() const
 {
-    return d->children;
+    return d->tqchildren;
 }
 
 void Folder::insertChild(TreeNode* node, TreeNode* after)
 {
-    int pos = d->children.findIndex(after);
+    int pos = d->tqchildren.findIndex(after);
     
     if (pos < 0)
         prependChild(node);
@@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node)
 //    kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl;
     if (node)
     {
-        if (index >= d->children.size())
-            d->children.append(node);
+        if (index >= d->tqchildren.size())
+            d->tqchildren.append(node);
         else
-            d->children.insert(d->children.at(index), node);
+            d->tqchildren.insert(d->tqchildren.at(index), node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node)
 //    kdDebug() << "enter Folder::appendChild() " << node->title() << endl;
     if (node)
     {
-        d->children.append(node);
+        d->tqchildren.append(node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node)
 //    kdDebug() << "enter Folder::prependChild() " << node->title() << endl;
     if (node)
     {
-        d->children.prepend(node);
+        d->tqchildren.prepend(node);
         node->setParent(this);
         connectToNode(node);
         updateUnreadCount();
@@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node)
 void Folder::removeChild(TreeNode* node)
 {
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
-    if (node && d->children.tqcontains(node))
+    if (node && d->tqchildren.tqcontains(node))
     {    
         node->setParent(0);
-        d->children.remove(node);
+        d->tqchildren.remove(node);
         disconnectFromNode(node);
         updateUnreadCount();    
         emit signalChildRemoved(this, node);
@@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node)
 
 TreeNode* Folder::firstChild()
 {
-    return d->children.isEmpty() ? 0 : d->children.first();
+    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first();
 }            
 
 TreeNode* Folder::lastChild()
 {
-    return d->children.isEmpty() ? 0 : d->children.last();
+    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last();
 }
             
 bool Folder::isOpen() const
@@ -246,8 +246,8 @@ int Folder::totalCount() const
 {
     int totalCount = 0;
 
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         totalCount += (*it)->totalCount();
     
     return totalCount;
@@ -257,8 +257,8 @@ void Folder::updateUnreadCount()
 {
     int unread = 0;
 
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         unread += (*it)->unread();
     
     d->unread = unread;
@@ -267,8 +267,8 @@ void Folder::updateUnreadCount()
 void Folder::slotMarkAllArticlesAsRead() 
 {
     setNotificationMode(false);
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         (*it)->slotMarkAllArticlesAsRead();
     setNotificationMode(true, true);
 }
@@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/)
 
 void Folder::slotChildDestroyed(TreeNode* node)
 {
-    d->children.remove(node);
+    d->tqchildren.remove(node);
     updateUnreadCount();    
     nodeModified();
 }
@@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node)
 void Folder::slotDeleteExpiredArticles()
 {
     setNotificationMode(false);
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         (*it)->slotDeleteExpiredArticles();
     setNotificationMode(true, true);
 }
 
 void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
 {
-    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
-    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
+    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
+    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
         (*it)->slotAddToFetchQueue(queue, intervalFetchOnly);
 }
 
@@ -332,13 +332,13 @@ TreeNode* Folder::next()
     if ( nextSibling() )
         return nextSibling();
     
-    Folder* p = parent();
+    Folder* p = tqparent();
     while (p)
     {
         if ( p->nextSibling() )
             return p->nextSibling();
         else
-            p = p->parent();
+            p = p->tqparent();
     }
     return 0;
 }
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index bb5529bc..32811f67 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_FOLDER_H
@@ -44,6 +44,7 @@ namespace Akregator
     class Folder : public TreeNode
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
             /** creates a feed group parsed from a XML dom element.
             Child nodes are not inserted or parsed. 
@@ -54,41 +55,41 @@ namespace Akregator
             /** Creates a new folder with a given title
             @param title The title of the feed group
              */          
-            Folder(const TQString& title = TQString::null);
+            Folder(const TQString& title = TQString());
             
             virtual ~Folder();
 
             virtual bool accept(TreeNodeVisitor* visitor);
             
-            /** returns recursively concatenated articles of children  
-            @return an article sequence containing articles of children */
-            virtual TQValueList<Article> articles(const TQString& tag=TQString::null);
+            /** returns recursively concatenated articles of tqchildren  
+            @return an article sequence containing articles of tqchildren */
+            virtual TQValueList<Article> articles(const TQString& tag=TQString());
 
             /** returns a list of all tags occurring in the subtree of this folder */
             virtual TQStringList tags() const;
             
-            /** returns the number of unread articles in all children    
+            /** returns the number of unread articles in all tqchildren    
             @return number of unread articles */
             virtual int unread() const;
             
-            /** returns the number of articles in all children
+            /** returns the number of articles in all tqchildren
             @return number of articles */
             virtual int totalCount() const;
             
             /** Helps the rest of the app to decide if node should be handled as group or not. Use only where necessary, use polymorphism where possible. */
             virtual bool isGroup() const { return true; }
 
-            /** converts the feed group into OPML format for save and export and appends it to node @c parent in document @document.
+            /** converts the feed group into OPML format for save and export and appends it to node @c tqparent in document @document.
             Children are processed and appended recursively.
-            @param parent The parent element 
+            @param tqparent The tqparent element 
             @param document The DOM document 
             @return The newly created element representing this feed group */
-            virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
+            virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
             
-            /** returns the (direct) children of this node.
+            /** returns the (direct) tqchildren of this node.
             @return a list of pointers to the child nodes
              */
-            virtual TQValueList<TreeNode*> children() const;
+            virtual TQValueList<TreeNode*> tqchildren() const;
             
             /** inserts @c node as child after child node @c after.
             if @c after is not a child of this group, @c node will be inserted as first child
@@ -104,7 +105,7 @@ namespace Akregator
             @param node the tree node to insert */
             virtual void appendChild(TreeNode* node);
 
-            /** remove @c node from children. Note that @c node will not be deleted
+            /** remove @c node from tqchildren. Note that @c node will not be deleted
             @param node the child node to remove  */
             virtual void removeChild(TreeNode* node);
 
@@ -133,7 +134,7 @@ namespace Akregator
             /** Delete expired articles recursively. */
             virtual void slotDeleteExpiredArticles();
             
-            /** Mark articles of children recursively as read. */
+            /** Mark articles of tqchildren recursively as read. */
             virtual void slotMarkAllArticlesAsRead();
  
             /** Called when a child was modified. 
@@ -146,7 +147,7 @@ namespace Akregator
             */
             virtual void slotChildDestroyed(TreeNode* node);
 
-            /** enqueues children recursively for fetching
+            /** enqueues tqchildren recursively for fetching
             @param queue a fetch queue 
             @param internvalFetchesOnly */
             virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false);
diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp
index 6a3c0c05..baab25f3 100644
--- a/akregator/src/folderitem.cpp
+++ b/akregator/src/folderitem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -33,22 +33,22 @@
 
 namespace Akregator {
 
-FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node)
+FolderItem::FolderItem(FolderItem* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
+FolderItem::FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
 
-FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node)
+FolderItem::FolderItem(KListView* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
+FolderItem::FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h
index 9f8dcec5..02516e03 100644
--- a/akregator/src/folderitem.h
+++ b/akregator/src/folderitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_FOLDERITEM_H
 #define AKREGATOR_FOLDERITEM_H
@@ -41,10 +41,10 @@ class FolderItem : public TreeNodeItem
 {
 
 public:
-    FolderItem(FolderItem* parent, Folder* node);
-    FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node);
-    FolderItem(KListView* parent, Folder* node);
-    FolderItem(KListView* parent, TreeNodeItem* after, Folder* node);
+    FolderItem(FolderItem* tqparent, Folder* node);
+    FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node);
+    FolderItem(KListView* tqparent, Folder* node);
+    FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node);
     virtual ~FolderItem();
     
     virtual Folder* node();
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 85419931..55fac570 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqregexp.h>
@@ -37,8 +37,8 @@
 
 namespace Akregator {
 
-Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
-   :TQObject(parent, "aKregatorFrame")
+Frame::Frame(TQObject * tqparent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
+   :TQObject(tqparent, "aKregatorFrame")
 {
     m_autoDeletePart = false;
     m_part=p;
@@ -146,7 +146,7 @@ void Frame::setState(int a)
             emit started();
             break;
         case Frame::Canceled:
-            emit canceled(TQString::null);
+            emit canceled(TQString());
             break;
         case Frame::Idle:
         case Frame::Completed:
@@ -174,8 +174,8 @@ const TQString& Frame::statusText() const
 void Frame::setStarted()
 {
     if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
-    m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false);
-    m_progressItem->seStatus(i18n("Loading..."));
+    m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false);
+    m_progressItem->setqStatus(i18n("Loading..."));
     //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
     m_state=Started;
     emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
 void Frame::setCanceled(const TQString &s)
 {
     if(m_progressItem) {
-        m_progressItem->seStatus(i18n("Loading canceled"));
+        m_progressItem->setqStatus(i18n("Loading canceled"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
 void Frame::setCompleted()
 {
     if(m_progressItem) {
-        m_progressItem->seStatus(i18n("Loading completed"));
+        m_progressItem->setqStatus(i18n("Loading completed"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index 27418402..b504cc44 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FRAME_H
@@ -40,12 +40,13 @@ namespace KPIM
 namespace Akregator
 {
 
-    class Frame : public QObject
+    class Frame : public TQObject
     {
         Q_OBJECT
+  TQ_OBJECT
 
         public:
-            Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
+            Frame(TQObject *tqparent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
             virtual ~Frame();
 
             enum {Idle, Started, Completed, Canceled};
diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h
index da38eec5..e12d6e8d 100644
--- a/akregator/src/kcursorsaver.h
+++ b/akregator/src/kcursorsaver.h
@@ -14,11 +14,11 @@ namespace Akregator {
  * As soon as it gets out of scope, it will restore the original
  * cursor.
  */
-class KCursorSaver : public Qt
+class KCursorSaver : public TQt
 {
 public:
     /// constructor taking TQCursor tqshapes
-    KCursorSaver(Qt::tqCursorShape tqshape) {
+    KCursorSaver(TQt::tqCursorShape tqshape) {
         TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
diff --git a/akregator/src/kernel.cpp b/akregator/src/kernel.cpp
index 19733366..b5b45a4f 100644
--- a/akregator/src/kernel.cpp
+++ b/akregator/src/kernel.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kernel.h"
diff --git a/akregator/src/kernel.h b/akregator/src/kernel.h
index 51204cd7..6e2adbf8 100644
--- a/akregator/src/kernel.h
+++ b/akregator/src/kernel.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_KERNEL_H
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 59949244..14e0bb12 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -261,9 +261,9 @@ TQString Article::meta(const TQString &key) const
     return d->meta[key];
 }
 
-KURLLabel *Article::widget(TQWidget *parent, const char *name) const
+KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const
 {
-	KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name);
+	KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name);
 	label->setUseTips(true);
 	if (!d->description.isNull())
 		label->setTipText(d->description);
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 611dd408..833b224a 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -90,7 +90,7 @@ namespace RSS
 
          /**
           * RSS 0.90 and upwards
-          * @return The headline of this article, or TQString::null if
+          * @return The headline of this article, or TQString() if
           * no headline was available.
           */
          TQString title() const;
@@ -106,7 +106,7 @@ namespace RSS
 
          /**
           * RSS 0.91 and upwards
-          * @return A story synopsis, or TQString::null if no description
+          * @return A story synopsis, or TQString() if no description
           * was available.
           */
          TQString description() const;
@@ -124,7 +124,7 @@ namespace RSS
 
          /**
           * RSS 2.0 and upwards
-          * @return If this article GUID is permalink. Has no meaning when guid() is TQString::null.
+          * @return If this article GUID is permalink. Has no meaning when guid() is TQString().
           */
          bool guidIsPermaLink() const;
 
@@ -145,10 +145,10 @@ namespace RSS
          TQString meta(const TQString &key) const;
          
          /**
-          * @param parent The parent widget for the KURLLabel.
+          * @param tqparent The tqparent widget for the KURLLabel.
           * @param name A name for the widget which will be used internally.
           * @return a widget (a KURLLabel in this case) for the Article.
-          * This makes building a user-interface which tqcontains the
+          * This makes building a user-interface which contains the
           * information in this Article object more convenient.
           * The returned KURLLabel's caption will be the title(), clicking
           * on it will emit the URL link(), and it has a TQToolTip attached
@@ -158,7 +158,7 @@ namespace RSS
           * Note that you have to delete the KURLLabel object returned by
           * this method yourself.
           */
-         KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const;
+         KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const;
          
          typedef TQMap<TQString, TQString> MetaInfoMap;
          
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index 6dc63d3b..c020655c 100644
--- a/akregator/src/librss/category.cpp
+++ b/akregator/src/librss/category.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "category.h"
@@ -116,12 +116,12 @@ bool Category::operator==(const Category &other) const
 
 TQString Category::category() const
 {
-    return !d->isNull ? d->category : TQString::null;
+    return !d->isNull ? d->category : TQString();
 }
 
 TQString Category::domain() const
 {
-    return !d->isNull ? d->domain : TQString::null;
+    return !d->isNull ? d->domain : TQString();
 }
 
 } // namespace RSS
diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h
index 9baec64e..0c40e418 100644
--- a/akregator/src/librss/category.h
+++ b/akregator/src/librss/category.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LIBRSS_RSS_CATEGORY_H
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index 170ceaa7..696802ec 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -105,7 +105,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
         d->valid=true;
     
-    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null);
+    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
     if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
     {
         d->format=AtomFeed;
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     
     if (d->format==UnknownFormat)
     {
-        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null);
+        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString());
         if (!attr.isNull()) {
         /*
          * Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -183,27 +183,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     d->link = extractLink(channelNode, d->format);
 
     
-    /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent
+    /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent
      * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0.
      */
-    TQDomNode parentNode;
+    TQDomNode tqparentNode;
     if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed)
-        parentNode = rootNode;
+        tqparentNode = rootNode;
     else
     {
 	// following is a HACK for broken 0.91 feeds like xanga.com's
 	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
-	    parentNode = rootNode;
+	    tqparentNode = rootNode;
 	else
-            parentNode = channelNode;
+            tqparentNode = channelNode;
     }
     
     // image and textinput aren't supported by Atom.. handle in case feed provides
-    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
+    TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image"));
     if (!n.isNull())
         d->image = new Image(n);
 
-    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
+    n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput"));
     if (!n.isNull())
         d->textInput = new TextInput(n);
 
@@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
         tagName=TQString::tqfromLatin1("item");
 
-    for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
         const TQDomElement e = n.toElement();
         if (e.tagName() == tagName)
             d->articles.append(Article(e, d->format, d->version));
@@ -224,7 +224,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
         d->copyright = elemText;
 
     if (d->format == AtomFeed)
-        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null);
+        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
     else
         elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
 
@@ -541,7 +541,7 @@ TQString Document::verbVersion() const
         case vAtom_0_1: return TQString::tqfromLatin1("0.1");
         case vAtom_1_0: return TQString::tqfromLatin1("1.0");
     }
-    return TQString::null;
+    return TQString();
 }
 
 TQString Document::title() const
diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h
index 55ac264c..7a94e59d 100644
--- a/akregator/src/librss/document.h
+++ b/akregator/src/librss/document.h
@@ -83,7 +83,7 @@ namespace RSS
 
 			/**
 			 * RSS 0.90 and upwards
-			 * @return The title of the RSS document, or TQString::null if no
+			 * @return The title of the RSS document, or TQString() if no
 			 * title was available. This is often the name of the news source
 			 * from which the RSS document was retrieved.
 			 */
@@ -91,7 +91,7 @@ namespace RSS
 
 			/**
 			 * RSS 0.90 and upwards
-			 * @return The description of the RSS document, or TQString::null
+			 * @return The description of the RSS document, or TQString()
 			 * if no description was available. This is usually a short slogan
 			 * or description of the news source from which the RSS document
 			 * was retrieved.
@@ -158,7 +158,7 @@ namespace RSS
 			/**
 			 * RSS 0.91 and upwards
 			 * @return A copyright of the information contained in the RSS
-			 * document, or TQString::null if no copyright is available.
+			 * document, or TQString() if no copyright is available.
 			 */
 			TQString copyright() const;
 
@@ -203,7 +203,7 @@ namespace RSS
 			 * RSS 0.91 and upwards
 			 * @return The email address of the webmaster for the site, the
 			 * person to contact if there are technical problems with the
-			 * channel, or TQString::null if this information isn't available.
+			 * channel, or TQString() if this information isn't available.
 			 * @see managingEditor()
 			 */
 			TQString webMaster() const;
diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp
index 864c19fc..66616268 100644
--- a/akregator/src/librss/enclosure.cpp
+++ b/akregator/src/librss/enclosure.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "enclosure.h"
diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h
index e15c8678..154f8bc0 100644
--- a/akregator/src/librss/enclosure.h
+++ b/akregator/src/librss/enclosure.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LIBRSS_RSS_ENCLOSURE_H
diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp
index 4407ff09..099cc2a7 100644
--- a/akregator/src/librss/feeddetector.cpp
+++ b/akregator/src/librss/feeddetector.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
  
 #include <tqregexp.h>
diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h
index 94eab63b..e5a03690 100644
--- a/akregator/src/librss/feeddetector.h
+++ b/akregator/src/librss/feeddetector.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
  
 #ifndef LIBRSS_FEEDDETECTOR_H
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index 33c7a03b..397a4aac 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -42,7 +42,7 @@ namespace RSS
 	 * Possible status values returned by the signal
 	 * Loader::loadingComplete().
 	 */
-	enum Status {
+	enum tqStatus {
 		Success,	   /**
 						* Nothing went wrong so far, but you still have to check
 						* what values are returned by the classes since it's not
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 41f7a33d..1df799ff 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -31,9 +31,10 @@ namespace RSS
     * is via Document::image().
     * @see Document::image()
     */
-   class KDE_EXPORT Image : public QObject
+   class KDE_EXPORT Image : public TQObject
    {
       Q_OBJECT
+  TQ_OBJECT
       public:
          /**
           * Default constructor.
@@ -83,7 +84,7 @@ namespace RSS
 
          /**
           * RSS 0.90 and upwards
-          * @return The 'caption' of this image, or TQString::null if no
+          * @return The 'caption' of this image, or TQString() if no
           * caption is available.
           */
          TQString title() const;
@@ -112,7 +113,7 @@ namespace RSS
          /**
           * RSS 0.91 and upwards
           * @return A description of what this picture shows, or
-          * TQString::null if no description is available. Useful for
+          * TQString() if no description is available. Useful for
           * people who deactivated images but want or need to know what is
           * shown.
           */
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 74467d01..edc38432 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -268,7 +268,7 @@ Loader *Loader::create()
 Loader *Loader::create(TQObject *object, const char *slot)
 {
    Loader *loader = create();
-   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
            object, slot);
    return loader;
 }
@@ -326,13 +326,13 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
    d->retriever = NULL;
 
    Document rssDoc;
-   Status status = Success;
+   tqStatus status = Success;
 
    if (success) {
       TQDomDocument doc;
 
       /* Some servers insert whitespace before the <?xml...?> declaration.
-       * QDom doesn't tolerate that (and it's right, that's invalid XML),
+       * TQDom doesn't tolerate that (and it's right, that's invalid XML),
        * so we strip that.
        */
 
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index e958239f..2129bc79 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -32,9 +32,10 @@ namespace RSS
 	 * a new retrieval algorithm which can then be plugged into the RSS loader.
 	 * @see Loader, FileRetriever, OutputRetriever
 	 */
-	class KDE_EXPORT DataRetriever : public QObject
+	class KDE_EXPORT DataRetriever : public TQObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		public:
 			/**
 			 * Default constructor.
@@ -89,6 +90,7 @@ namespace RSS
 	class KDE_EXPORT FileRetriever : public DataRetriever
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		public:
 			/**
 			 * Default constructor.
@@ -160,6 +162,7 @@ namespace RSS
 	class OutputRetriever : public DataRetriever
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		public:
 			/**
 			 * Default constructor.
@@ -208,8 +211,8 @@ namespace RSS
 	 *
 	 * \code
 	 * Loader *loader = Loader::create();
-	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
+	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
+	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus)));
 	 * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
 	 * \endcode
 	 *
@@ -233,7 +236,7 @@ namespace RSS
 	 * 'slotLoadingComplete' method might look like this:
 	 *
 	 * \code
-	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
+	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status)
 	 * {
 	 *     // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
 	 *     // You don't need to do that anyway since Loader instances delete themselves.
@@ -251,9 +254,10 @@ namespace RSS
 	 * loadingComplete signal goes out of scope. This is e.g. the case if you
 	 * intend to call getPixmap() on Document::image()!
 	 */
-	class KDE_EXPORT Loader : public QObject
+	class KDE_EXPORT Loader : public TQObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		friend class someClassWhichDoesNotExist;
 		public:
 			/**
@@ -318,9 +322,9 @@ namespace RSS
 			 * the case if you intend to call getPixmap() on Document::image()!
 			 * @param status A status byte telling whether there were any problems
 			 * while retrieving or parsing the data.
-			 * @see Document, Status
+			 * @see Document, tqStatus
 			 */
-			void loadingComplete(Loader *loader, Document doc, Status status);
+			void loadingComplete(Loader *loader, Document doc, tqStatus status);
 
 		private slots:
 			void slotRetrieverDone(const TQByteArray &data, bool success);
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 7d88c3d1..571717ae 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
 void Tester::test( const TQString &url )
 {
 	Loader *loader = Loader::create();
-	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
+	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
+	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) );
 	loader->loadFrom( url, new FileRetriever );
 }
 
-void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
+void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status )
 {
 	if ( status == Success )
 	{
diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h
index b84a0ab5..18e18327 100644
--- a/akregator/src/librss/testlibrss.h
+++ b/akregator/src/librss/testlibrss.h
@@ -10,16 +10,17 @@
 
 using RSS::Loader;
 using RSS::Document;
-using RSS::Status;
+using RSS::tqStatus;
 
-class Tester : public QObject
+class Tester : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		void test( const TQString &url );
 
 	private slots:
-		void slotLoadingComplete( Loader *loader, Document doc, Status status );
+		void slotLoadingComplete( Loader *loader, Document doc, tqStatus status );
 };
 
 #endif
diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h
index 9cc873cf..cbf5bdb6 100644
--- a/akregator/src/librss/textinput.h
+++ b/akregator/src/librss/textinput.h
@@ -79,7 +79,7 @@ namespace RSS
 			/**
 			 * RSS 0.90 and upwards
 			 * @return The title (often a label to be used for the input field)
-			 * of the text input, or TQString::null if no title is available.
+			 * of the text input, or TQString() if no title is available.
 			 */
 			TQString title() const;
 
@@ -87,7 +87,7 @@ namespace RSS
 			 * RSS 0.90 and upwards
 			 * @return The description (usually used as a tooltip which appears
 			 * if the mouse hovers above the input field for a short time) of
-			 * the text input, or TQString::null if no description is
+			 * the text input, or TQString() if no description is
 			 * available.
 			 */
 			TQString description() const;
@@ -95,7 +95,7 @@ namespace RSS
 			/**
 			 * RSS 0.90 and upwards
 			 * @return The name of the text input (what's this for?) of the
-			 * text input, or TQString::null, if no name is available.
+			 * text input, or TQString(), if no name is available.
 			 */
 			TQString name() const;
 
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index e12bea88..48b4a52a 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -24,15 +24,15 @@ time_t parseISO8601Date(const TQString &s)
         return 0; // error
 
     // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo
-	if (s.find('T') != -1)
+	if (s.tqfind('T') != -1)
 		return KRFCDate::parseDateISO8601(s);
     else
         return KRFCDate::parseDateISO8601(s + "T12:00:00");
 }
 
-TQString childNodesAsXML(const TQDomNode& parent)
+TQString childNodesAsXML(const TQDomNode& tqparent)
 {
-	TQDomNodeList list = parent.childNodes();
+	TQDomNodeList list = tqparent.childNodes();
 	TQString str;
 	TQTextStream ts( &str, IO_WriteOnly );
 	for (uint i = 0; i < list.count(); ++i)
@@ -117,11 +117,11 @@ static TQString extractAtomContent(const TQDomElement& e)
     return TQString();
 }
 
-TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined)
+TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined)
 {
-	TQDomNode node = parent.namedItem(elemName);
+	TQDomNode node = tqparent.namedItem(elemName);
 	if (node.isNull())
-		return TQString::null;
+		return TQString();
 
 	TQDomElement e = node.toElement();
         TQString result = e.text().stripWhiteSpace(); // let's assume plain text
@@ -140,14 +140,14 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
                     result = result.simplifyWhiteSpace();
         }
         
-        return result.isEmpty() ? TQString::null : result;
+        return result.isEmpty() ? TQString() : result;
 }
 
-TQString extractTitle(const TQDomNode & parent)
+TQString extractTitle(const TQDomNode & tqparent)
 {
-    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
+    TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title"));
     if (node.isNull())
-        return TQString::null;
+        return TQString();
 
     TQString result = node.toElement().text();
 
@@ -155,7 +155,7 @@ TQString extractTitle(const TQDomNode & parent)
 	result = result.simplifyWhiteSpace();
 
     if (result.isEmpty())
-        return TQString::null;
+        return TQString();
 
     return result;
 }
@@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     
     // after removing the email, str might have 
     // the format "(Foo M. Bar)". We cut off 
-    // parentheses if there are any. However, if
+    // tqparentheses if there are any. However, if
     // str is of the format "Foo M. Bar (President)",
     // we should not cut anything.
 
diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h
index 47be905d..900baa22 100644
--- a/akregator/src/librss/tools_p.h
+++ b/akregator/src/librss/tools_p.h
@@ -29,9 +29,9 @@ namespace RSS
 		unsigned int count;
 	};
 
-	TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true);
-	TQString extractTitle(const TQDomNode &parent);
-	TQString childNodesAsXML(const TQDomNode& parent);
+	TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true);
+	TQString extractTitle(const TQDomNode &tqparent);
+	TQString childNodesAsXML(const TQDomNode& tqparent);
 	time_t parseISO8601Date(const TQString &s);
         TQString parseItemAuthor(const TQDomElement& element, Format format, Version version);
 }
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 608d36a0..a5b28662 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "listtabwidget.h"
@@ -152,7 +152,7 @@ void ListTabWidget::slotTabClicked(int id)
     }
 }
 
-ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate)
+ListTabWidget::ListTabWidget(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new ListTabWidgetPrivate)
 {
     d->idCounter = 0;
     d->current = 0;
diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h
index 86c14891..f720d36f 100644
--- a/akregator/src/listtabwidget.h
+++ b/akregator/src/listtabwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_LISTTABWIDGET_H
@@ -42,14 +42,15 @@ class TreeNode;
 
     @author Frank Osterfeld
  */
-class ListTabWidget : public QWidget
+class ListTabWidget : public TQWidget
 {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ListTabWidget(TQWidget* parent=0, const char* name=0);
+    ListTabWidget(TQWidget* tqparent=0, const char* name=0);
     virtual ~ListTabWidget();
 
     enum ViewMode { single, /* horizontalTabs, */  verticalTabs };
@@ -71,7 +72,7 @@ public slots:
     void slotItemBegin();
     /** select last item in the list */
     void slotItemEnd();
-    /** go to parent item */
+    /** go to tqparent item */
     void slotItemLeft();
     /** go to first child */
     void slotItemRight();
diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp
index f6a3976c..bfbb942f 100644
--- a/akregator/src/main.cpp
+++ b/akregator/src/main.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstringlist.h>
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 255309ff..c6e8d09b 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "mainwindow.h"
@@ -84,7 +84,7 @@ MainWindow::MainWindow()
 
     int statH=fontMetrics().height()+2;
     m_statusLabel = new KSqueezedTextLabel(this);
-    m_statusLabel->setTextFormat(Qt::RichText);
+    m_statusLabel->setTextFormat(TQt::RichText);
     m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
     m_statusLabel->setMinimumWidth( 0 );
     m_statusLabel->setFixedHeight( statH );
@@ -265,7 +265,7 @@ bool MainWindow::queryClose()
 
         // Associate source to image and show the dialog:
         TQMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", shot);
-        KMessageBox::information(this, i18n( "<qt><p>Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.</p><p><center><img source=\"systray_shot\"></center></p></qt>" ), i18n( "Docking in System Tray" ), "hideOnCloseInfo");
+        KMessageBox::information(this, i18n( "<qt><p>Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.</p><p><center><img source=\"systray_shot\"></center></p></qt>" ), i18n( "TQt::Docking in System Tray" ), "hideOnCloseInfo");
         hide();
         return false;
     }
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 84306282..e21e330f 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _AKREGATOR_H_
@@ -54,6 +54,7 @@ class MainWindow;
 class BrowserInterface : public KParts::BrowserInterface
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     BrowserInterface(Akregator::MainWindow *shell, const char *name );
@@ -72,6 +73,7 @@ private:
 class MainWindow : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     MainWindow();
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index a535197f..ec0fe7b6 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedstoragemk4impl.h"
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::setqStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    seStatus(guid, source->status(guid));
+    setqStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     setAuthor(guid, source->author(guid));
 
@@ -846,8 +846,8 @@ void FeedStorageMK4Impl::enclosure(const TQString& guid, bool& hasEnclosure, TQS
     if (findidx == -1)
     {
         hasEnclosure = false;
-        url = TQString::null;
-        type = TQString::null;
+        url = TQString();
+        type = TQString();
         length = -1;
         return;
     }
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index df60b29c..d13f04de 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef FEEDSTORAGEMK4IMPL_H
 #define FEEDSTORAGEMK4IMPL_H
@@ -46,7 +46,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual int lastFetch();
         virtual void setLastFetch(int lastFetch);
 
-        virtual TQStringList articles(const TQString& tag=TQString::null);
+        virtual TQStringList articles(const TQString& tag=TQString());
 
         virtual TQStringList articles(const Category& cat);
 
@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void seStatus(const TQString& guid, int status);
+        virtual void setqStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
@@ -80,10 +80,10 @@ class FeedStorageMK4Impl : public FeedStorage
         
         virtual void addTag(const TQString& guid, const TQString& tag);
         virtual void removeTag(const TQString& guid, const TQString& tag);
-        virtual TQStringList tags(const TQString& guid=TQString::null);
+        virtual TQStringList tags(const TQString& guid=TQString());
 
         virtual void addCategory(const TQString& guid, const Category& category);
-        virtual TQValueList<Category> categories(const TQString& guid=TQString::null);
+        virtual TQValueList<Category> categories(const TQString& guid=TQString());
 
         virtual void setAuthor(const TQString& guid, const TQString& author);
         virtual TQString author(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 160c4bad..1729b493 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -203,7 +203,7 @@
 
     Modify some recent patches that were Python 2.2 only so they would
     still work with 2.1. Add a view.properties() method (returning a
-    dict of propname -> Property) for cases where a property is masked
+    dict of propname -> Property) for cases where a property is tqmasked
     by a method name.
 
 2003-03-01    Reverted changes in Mk4py/scxx, avoid Mk4tcl warning
@@ -211,9 +211,9 @@
    One was in SCXX, PWONumber.h - ouch and apologies (jcw).  Changed
    comparison logic in mk4too.cpp (64-bit ints, new code).
 
-2003-02-28    Fixed relaxed layout in Mk4tcl, several Mk4py fixes
+2003-02-28    Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
 
-   Use list operators to convert a Tcl layout to MK format.  This used
+   Use list operators to convert a Tcl tqlayout to MK format.  This used
    to crash, Tcl test 6.7 added to verify the fix.  Changed test 3.1 to
    use a different notation for nested defs (^).
 
@@ -298,7 +298,7 @@
 2003-01-24    Fixed cleanup order bug in Mk4tcl
 
    There was a long-standing bug in Mk4tcl, in which cleanup order of
-   MkPath objects caused them to access their MkWorkspace parent even
+   MkPath objects caused them to access their MkWorkspace tqparent even
    though it was already deleted.  This may have caused some of the
    crash-on-exit bugs in the past.
 
@@ -605,13 +605,13 @@
    c4_Storage::SaveTo function, memo's would sometimes not be written,
    leading to a *damaged* datafile (and incorrect free-space tracking).
 
-2002-03-15    Better configure logic, "mk::view layout" fix
+2002-03-15    Better configure logic, "mk::view tqlayout" fix
 
    Many tweaks to configures, makes, and libtool setup.  Get rid of the
    library version numbers and the special Mk4*.so targets.  Instead of
    Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
 
-   Fixed "mk::view layout", it was broken by the 10-2-2002 change.
+   Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
 
 2002-03-13    Extend partial access 'B' usage
 
@@ -658,9 +658,9 @@
    causing it to detach empty top-level views, even when in use.  Fixed,
    added s39 to test for this case.
 
-2002-02-10    Improve Mk4tcl's "mk::view layout"
+2002-02-10    Improve Mk4tcl's "mk::view tqlayout"
 
-   Avoid crash when asking for the layout of a non-existent view.  Now
+   Avoid crash when asking for the tqlayout of a non-existent view.  Now
    returns an error instead.
 
 2002-02-07    Fast commit with many empty subviews
@@ -996,9 +996,9 @@
     M-solaris.sh and M-dyn.sh scripts need to be manually edited when
     choosing between CC and gcc.
 
-2001-03-27    Double-alignment bug on Solaris
+2001-03-27    Double-tqalignment bug on Solaris
 
-    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
+    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
     problem for 8-byte doubles on Solaris.  This caused tests b17, b23,
     b24, s22, and s28 to fail.
 
@@ -1084,7 +1084,7 @@
 
 2000-10-03    Fixes for Alpha Unix
 
-    Moved _item in column.h up to fix alignment sensitivity.  Config.h
+    Moved _item in column.h up to fix tqalignment sensitivity.  Config.h
     did not get SIZE_LONG right on Alpha Unix (0?).
 
 2000-09-27    Contributed fixes and Python 2.0b2
@@ -1198,7 +1198,7 @@
 
     Moved C++ member documentation out of "mk4.h" header.  Added
     examples/ directory, with a find.py timing example.  Fixed bugs in
-    new Mk4tcl: "$vw find" and "$vw delete end".  Added tests for new
+    new Mk4tcl: "$vw tqfind" and "$vw delete end".  Added tests for new
     Mk4tcl OO interface: ":mk5object.test".
 
 2000-06-16    Improved modifiable custom viewers
@@ -1614,7 +1614,7 @@
     new version in c4_Sequence allocate the c4_Bytes object lazily.
     Faster, and decreases sequence object size (for lots of subviews).
 
-    Mk4tcl, mk::layout now returns the proper layout even if the views
+    Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
     are empty.  Solved by adding extra arg to c4_Storage::Description,
     to return structure of a single top-level view.  Fixes "mk8basic.1",
     and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 21edd0fc..314c956b 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
     License info:   http://www.equi4.com/mklicense.html
     Contact info:   http://www.equi4.com/contact.html
 
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
     including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
     Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
     Nicholas Riley, Brian Kelley, and many more people who have reported bugs
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h
index 88b7a39d..7124a29e 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.h
+++ b/akregator/src/mk4storage/metakit/include/mk4str.h
@@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2);
 d4_inline bool operator!= (const c4_String& s1, const char* s2);
 d4_inline bool operator!= (const char* s1, const c4_String& s2);
 
-#else                           // Universal tqreplacement classes
+#else                           // Universal replacement classes
 
     /// An efficient string class, modeled after the MFC version
 class c4_String
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl
index 4f95fa51..eddbefb8 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.inl
+++ b/akregator/src/mk4storage/metakit/include/mk4str.inl
@@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const
 
 d4_inline int c4_String::Find(char ch_) const
 {
-    return find(ch_);
+    return tqfind(ch_);
 }
 
 d4_inline int c4_String::ReverseFind(char ch_) const
 {
-    return rfind(ch_);
+    return rtqfind(ch_);
 }
 
 d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const
 
 d4_inline int c4_String::Find(const char* sub_) const
 {
-    return find(sub_);
+    return tqfind(sub_);
 }
 
 d4_inline c4_String c4_String::SpanIncluding(const char* set_) const
diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp
index a6275cea..6ed1d5ab 100644
--- a/akregator/src/mk4storage/metakit/src/custom.cpp
+++ b/akregator/src/mk4storage/metakit/src/custom.cpp
@@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int)
 
 class c4_SliceViewer : public c4_CustomViewer
 {
-  c4_View _parent;
+  c4_View _tqparent;
   int _first, _limit, _step;
 
 public: 
@@ -249,7 +249,7 @@ public:
 };
 
 c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_)
-  : _parent (&seq_), _first (first_), _limit (limit_), _step (step_)
+  : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_)
 {
   d4_assert(_step != 0);
 }
@@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer ()
 
 c4_View c4_SliceViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_SliceViewer::GetSize()
 {
-  int n = _limit >= 0 ? _limit : _parent.GetSize();
+  int n = _limit >= 0 ? _limit : _tqparent.GetSize();
   if (n < _first)
     n = _first;
 
@@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
 
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
 
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   if (_limit >= 0)
   _limit += count_;
 
-  _parent.InsertAt(pos_, *value_, count_);
+  _tqparent.InsertAt(pos_, *value_, count_);
   return true;
 }
 
@@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_)
   if (_limit >= 0)
   _limit -= count_;
 
-  _parent.RemoveAt(pos_, count_);
+  _tqparent.RemoveAt(pos_, count_);
   return true;
 }
 
@@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste
 
 class c4_ProductViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
 
 public: 
   c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -335,7 +335,7 @@ public:
 };
 
 c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
+  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
 {
   for (int i = 0; i < _argView.NumProperties(); ++i)
     _template.AddProperty(_argView.NthProperty(i));
@@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate()
 
 int c4_ProductViewer::GetSize()
 {
-  return _parent.GetSize() * _argView.GetSize();
+  return _tqparent.GetSize() * _argView.GetSize();
 }
 
 bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ < v.NumProperties())
   {
@@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_RemapWithViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView;
+  c4_View _tqparent, _argView;
 
 public: 
   c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -397,7 +397,7 @@ public:
 };
 
 c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_)
+  : _tqparent (&seq_), _argView (view_)
 {
 }
 
@@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer ()
 
 c4_View c4_RemapWithViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_RemapWithViewer::GetSize()
@@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
 
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
@@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
 
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_PairViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
 
 public: 
   c4_PairViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -460,7 +460,7 @@ public:
 };
 
 c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
+  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
 {
   for (int i = 0; i < _argView.NumProperties(); ++i)
     _template.AddProperty(_argView.NthProperty(i));
@@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate()
 
 int c4_PairViewer::GetSize()
 {
-  return _parent.GetSize();
+  return _tqparent.GetSize();
 }
 
 bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ >= v.NumProperties())
   {
@@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
 bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ >= v.NumProperties())
   {
@@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 
 bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
 {
-  _parent.InsertAt(pos_, *value_, count_);
+  _tqparent.InsertAt(pos_, *value_, count_);
   _argView.InsertAt(pos_, *value_, count_);
   return true;
 }
 
 bool c4_PairViewer::RemoveRows(int pos_, int count_)
 {
-  _parent.RemoveAt(pos_, count_);
+  _tqparent.RemoveAt(pos_, count_);
   _argView.RemoveAt(pos_, count_);
   return true;
 }
@@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_ConcatViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView;
+  c4_View _tqparent, _argView;
 
 public: 
   c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -545,7 +545,7 @@ public:
 };
 
 c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_)
+  : _tqparent (&seq_), _argView (view_)
 {
 }
 
@@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer ()
 
 c4_View c4_ConcatViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_ConcatViewer::GetSize()
 {
-  return _parent.GetSize() + _argView.GetSize();
+  return _tqparent.GetSize() + _argView.GetSize();
 }
 
 bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
-  if (row_ >= _parent.GetSize())
+  if (row_ >= _tqparent.GetSize())
   {
     v = _argView;
-    row_ -= _parent.GetSize();
-    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
+    row_ -= _tqparent.GetSize();
+    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
     
     if (col_ < 0)
       return false;
@@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
 bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
-  if (row_ >= _parent.GetSize())
+  if (row_ >= _tqparent.GetSize())
   {
     v = _argView;
-    row_ -= _parent.GetSize();
-    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
+    row_ -= _tqparent.GetSize();
+    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
     d4_assert(col_ >= 0);
   }
 
@@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_RenameViewer : public c4_CustomViewer
 {
-  c4_View _parent, _template;
+  c4_View _tqparent, _template;
 
 public: 
   c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
@@ -622,11 +622,11 @@ public:
 
 c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
                            const c4_Property& new_)
-  : _parent (&seq_)
+  : _tqparent (&seq_)
 {
-  for (int i = 0; i < _parent.NumProperties(); ++i)
+  for (int i = 0; i < _tqparent.NumProperties(); ++i)
   {
-    const c4_Property& prop = _parent.NthProperty(i);
+    const c4_Property& prop = _tqparent.NthProperty(i);
     _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop);
   }
 }
@@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate()
 
 int c4_RenameViewer::GetSize()
 {
-  return _parent.GetSize();
+  return _tqparent.GetSize();
 }
 
 bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_,
 
 class c4_GroupByViewer : public c4_CustomViewer
 {
-  c4_View _parent, _keys, _sorted, _temp;
+  c4_View _tqparent, _keys, _sorted, _temp;
   c4_Property _result;
   c4_DWordArray _map;
 
@@ -685,9 +685,9 @@ public:
 
 c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_,
                            const c4_Property& result_)
-  : _parent (&seq_), _keys (keys_), _result (result_)
+  : _tqparent (&seq_), _keys (keys_), _result (result_)
 {
-  _sorted = _parent.SortOn(_keys);
+  _sorted = _tqparent.SortOn(_keys);
   int n = _sorted.GetSize();
 
   c4_Bytes temp;
@@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_,
 
 class c4_JoinPropViewer : public c4_CustomViewer
 {
-  c4_View _parent, _template;
+  c4_View _tqparent, _template;
   c4_ViewProp _sub;
   int _subPos, _subWidth;
   c4_DWordArray _base, _offset;
@@ -820,20 +820,20 @@ public:
 
 c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
                     const c4_ViewProp& sub_, bool outer_)
-  : _parent (&seq_),
-    _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0)
+  : _tqparent (&seq_),
+    _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0)
 {
   d4_assert(_subPos >= 0);
 
-  for (int k = 0; k < _parent.NumProperties(); ++k)
+  for (int k = 0; k < _tqparent.NumProperties(); ++k)
   {
     if (k != _subPos)
-      _template.AddProperty(_parent.NthProperty(k));
+      _template.AddProperty(_tqparent.NthProperty(k));
     else  // if there are no rows, then this join does very little anyway
         //! OOPS: if this is an unattached view, then the subviews can differ
-      if (_parent.GetSize() > 0)
+      if (_tqparent.GetSize() > 0)
       {
-        c4_View view = sub_ (_parent[0]);
+        c4_View view = sub_ (_tqparent[0]);
         for (int l = 0; l < view.NumProperties(); ++l)
         {
           _template.AddProperty(view.NthProperty(l));
@@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
   _base.SetSize(0, 5);
   _offset.SetSize(0, 5);
 
-  for (int i = 0; i < _parent.GetSize(); ++i)
+  for (int i = 0; i < _tqparent.GetSize(); ++i)
   {
-    c4_View v = _sub (_parent[i]);
+    c4_View v = _sub (_tqparent[i]);
 
     int n = v.GetSize();
     if (n == 0 && outer_)
@@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize()
 
 bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
   int r = _base.GetAt(row_);
 
   if (col_ >= _subPos)
@@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
     }
     else
     {
-      v = _sub (_parent[r]);
+      v = _sub (_tqparent[r]);
       r = _offset.GetAt(row_);
       if (r < 0)
         return false; // if this is a null row in an outer join
@@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_,
 
 class c4_JoinViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
   c4_DWordArray _base, _offset;
 
 public: 
@@ -928,14 +928,14 @@ public:
 
 c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
                 const c4_View& view_, bool outer_)
-  : _parent (&seq_), _argView (view_.SortOn(keys_))
+  : _tqparent (&seq_), _argView (view_.SortOn(keys_))
 {
     // why not in GetTemplate, since we don't need to know this...
-  _template = _parent.Clone();
+  _template = _tqparent.Clone();
   for (int l = 0; l < _argView.NumProperties(); ++l)
     _template.AddProperty(_argView.NthProperty(l));
 
-  c4_View sorted = _parent.SortOn(keys_).Project(keys_);
+  c4_View sorted = _tqparent.SortOn(keys_).Project(keys_);
   c4_View temp = _argView.Project(keys_);
 
   _base.SetSize(0, 5);
@@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
 
   for (int i = 0; i < sorted.GetSize(); ++i)
   {
-    int orig = _parent.GetIndexOf(sorted[i]);
+    int orig = _tqparent.GetIndexOf(sorted[i]);
     d4_assert(orig >= 0);
 
     if (i > 0 && sorted[i] == sorted[i-1])
@@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize()
 
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
   int r = _base.GetAt(row_);
 
   if (col_ >= v.NumProperties())
@@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 #if 0
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   int o = 0;
   int r = _offset.GetAt(row_);
diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp
index 3867d6b5..ed5a4573 100644
--- a/akregator/src/mk4storage/metakit/src/field.cpp
+++ b/akregator/src/mk4storage/metakit/src/field.cpp
@@ -23,7 +23,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // c4_Field
 
-c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
+c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)
   : _type (0)
 {
   _indirect = this;
@@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
 
     if (*description_ == '^') {
       ++description_;
-      _indirect = parent_;
+      _indirect = tqparent_;
       d4_assert(*description_ == ']');
     }
 
diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h
index 8bf3dc8c..5dfc2573 100644
--- a/akregator/src/mk4storage/metakit/src/field.h
+++ b/akregator/src/mk4storage/metakit/src/field.h
@@ -34,7 +34,7 @@ public:
   c4_Field& SubField(int) const;
     //: Returns the description of each subfield.
   bool IsRepeating() const;
-    //: Returns true if this field tqcontains subtables.
+    //: Returns true if this field contains subtables.
   
 /* Field name and description */
   const c4_String& Name() const;
diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp
index 49c45bce..aa23e739 100644
--- a/akregator/src/mk4storage/metakit/src/format.cpp
+++ b/akregator/src/mk4storage/metakit/src/format.cpp
@@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews()
 void c4_FormatV::Define(int rows_, const t4_byte** ptr_)
 {
   if (_inited) {
-    // big oops: a root handler already tqcontains data
+    // big oops: a root handler already contains data
     
     for (int i = 0; i < _subSeqs.GetSize(); ++i)
       ForgetSubview(i);
diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp
index 6c68c5c3..fab47372 100644
--- a/akregator/src/mk4storage/metakit/src/handler.cpp
+++ b/akregator/src/mk4storage/metakit/src/handler.cpp
@@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_)
 // c4_HandlerSeq
 
 c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_)
-  : _persist (persist_), _field (0), _parent (0), _numRows (0)
+  : _persist (persist_), _field (0), _tqparent (0), _numRows (0)
 { 
 }
 
 c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
   : _persist (owner_.Persist()), _field (owner_.FindField(handler_)),
-    _parent (&owner_), _numRows (0)
+    _tqparent (&owner_), _numRows (0)
 { 
   for (int i = 0; i < NumFields(); ++i) {
     c4_Field& field = Field(i);
@@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
 
 c4_HandlerSeq::~c4_HandlerSeq ()
 {
-  const bool rootLevel = _parent == this;
+  const bool rootLevel = _tqparent == this;
   c4_Persist* pers = _persist;
 
   if (rootLevel && pers != 0)
@@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const
 void c4_HandlerSeq::DefineRoot()
 { 
   d4_assert(_field == 0);
-  d4_assert(_parent == 0);
+  d4_assert(_tqparent == 0);
 
   SetNumRows(1);
 
@@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot()
   _field = d4_new c4_Field (desc);
   d4_assert(!*desc);
 
-  _parent = this;
+  _tqparent = this;
 }
 
 c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_)
@@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent()
     _field = 0;
   }
 
-  _parent = 0;
+  _tqparent = 0;
 }
 
 void c4_HandlerSeq::DetachFromStorage(bool full_)
@@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_)
 	}
     }
 
-  if (_parent == this)
+  if (_tqparent == this)
     delete ofld;  // the root table owns its field structure tree
 }
 
@@ -397,9 +397,9 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
       c4_HandlerSeq& t1 = SubEntry(col, srcPos_);
       c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);
 
-        // adjust the parents
-      t1._parent = this;
-      t2._parent = &dst_;
+        // adjust the tqparents
+      t1._tqparent = this;
+      t2._tqparent = &dst_;
 
         // reattach the proper field structures
       t1.Restructure(Field(col), false);
@@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll()
 
   // construct meta view from a pre-parsed field tree structure
   // this will one day be converted to directly parse the description string
-void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_,
+void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_,
     					const c4_Field& field_)
 {
   c4_IntProp pP ("P"), pC ("C");
   c4_ViewProp pF ("F");
   c4_StringProp pN ("N"), pT ("T");
 
-  int n = meta_.Add(pP [parent_] + pC [colnum_]);
+  int n = meta_.Add(pP [tqparent_] + pC [colnum_]);
   c4_View fields = pF (meta_[n]);
 
   for (int i = 0; i < field_.NumSubFields(); ++i) {
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 353d0517..7cf2efdf 100644
--- a/akregator/src/mk4storage/metakit/src/handler.h
+++ b/akregator/src/mk4storage/metakit/src/handler.h
@@ -52,7 +52,7 @@ public:
   virtual int ItemSize(int index_) = 0;
     //: Return width of specified data item.
   void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false);
-    //: Used for backward compatibility, should probably be tqreplaced.
+    //: Used for backward compatibility, should probably be replaced.
   virtual const void* Get(int index_, int& length_) = 0;
     //: Retrieves the data item at the specified index.
   virtual void Set(int index_, const c4_Bytes& buf_) = 0;
@@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence
   c4_PtrArray _handlers;
   c4_Persist* _persist;
   c4_Field* _field; 
-  c4_HandlerSeq* _parent;
+  c4_HandlerSeq* _tqparent;
   int _numRows;
 
 public:
diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl
index 75321f9c..10d45f3c 100644
--- a/akregator/src/mk4storage/metakit/src/handler.inl
+++ b/akregator/src/mk4storage/metakit/src/handler.inl
@@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const
 
 d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const
 {
-  return *_parent;
+  return *_tqparent;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp
index 743f4757..65a9e94e 100644
--- a/akregator/src/mk4storage/metakit/src/persist.cpp
+++ b/akregator/src/mk4storage/metakit/src/persist.cpp
@@ -144,7 +144,7 @@ private:
 //      other hand, the allocator does not know the size of used slots.
 //    * Alternate function allows marking a specific range as occupied.
 //    * Allocator can be initialized as either all free or all in-use.
-//    * Allocation info tqcontains only integers, it could be stored.
+//    * Allocation info contains only integers, it could be stored.
 //    * To extend allocated slots: "occupy" extra bytes at the end.
 //    * Generic: can be used for memory, disk files, and array entries.
 
@@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_,
 
   * write new skip + commit "tails" at limit (no visible effect on file)
   * overwrite commit tail at end  with a skip to this new one (equivalent)
-  * tqreplace header with one pointing to that internal new one (equivalent)
+  * replace header with one pointing to that internal new one (equivalent)
   * flush (now the file is valid both truncated and not-yet-truncated
 
       end = limit;
diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp
index 243eca04..9bc9b440 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -79,7 +79,7 @@ public:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-// The following tqcontains code derived froms Python's dictionaries, hence:
+// The following contains code derived froms Python's dictionaries, hence:
 //  Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
 //  The Netherlands.
 // Reduced and turned into a fast C++ class by Christian Tismer, hence:
@@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   int i = Lookup(value_, n);
   if (i >= 0 && n > 0)
   {
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
     return true;
   }
 
@@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
   }
 
   return true;
@@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
   }
 
   return true;
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index f43bc0e3..3a458337 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_)
 {
   c4_Persist* pers = Persist();
   bool f = pers->SetAside(aside_);
-  // adjust our copy when the root view has been tqreplaced
+  // adjust our copy when the root view has been replaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
@@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_)
 {
   c4_Persist* pers = Persist();
   bool f = Strategy().IsValid() && pers->Rollback(full_);
-  // adjust our copy when the root view has been tqreplaced
+  // adjust our copy when the root view has been replaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp
index 11e384ee..af2fc9fa 100644
--- a/akregator/src/mk4storage/metakit/src/view.cpp
+++ b/akregator/src/mk4storage/metakit/src/view.cpp
@@ -44,7 +44,7 @@ public:
  *  On Win32, use a critical section to protect the global symbol table.
  *  Also uses special thread-safe calls to inc/dec all reference counts.
  *
- *  This implementation tqreplaces the previous use of TLS, which cannot
+ *  This implementation replaces the previous use of TLS, which cannot
  *  be used without special tricks in dynamically loaded DLL's, as is
  *  required for OCX/ActiveX use (which uses LoadLibrary).
  *
diff --git a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
index 79963d7b..8f3ed207 100644
--- a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
+++ b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
@@ -1,3 +1,3 @@
  VIEW     1 rows = dict:V
     0: subview 'dict'
-   VIEW     0 rows = parent:I index:I view:V
+   VIEW     0 rows = tqparent:I index:I view:V
diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h
index f317bcb2..b5611e57 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.h
+++ b/akregator/src/mk4storage/metakit/tests/regress.h
@@ -24,7 +24,7 @@ int remove(const char*);
 #pragma warning (disable: 4703) // function too large for global optimizations
 
 // also no exceptions in MSVC 1.52 when used with a QuickWin target
-#if defined (_QWINVER) && !defined (q4_NOTHROW)
+#if defined (_TQWINVER) && !defined (q4_NOTHROW)
 #define q4_NOTHROW 1    
 #endif
 #endif
diff --git a/akregator/src/mk4storage/metakit/tests/tformat.cpp b/akregator/src/mk4storage/metakit/tests/tformat.cpp
index ba6e9254..67530b7f 100644
--- a/akregator/src/mk4storage/metakit/tests/tformat.cpp
+++ b/akregator/src/mk4storage/metakit/tests/tformat.cpp
@@ -207,7 +207,7 @@ void TestFormat()
     c4_View v3 = pView (v2[0]);
       A(v3.GetSize() == 2);
 */
-    #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]"
+    #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]"
     c4_Storage s1 ("f07a", 1);
     s1.SetStructure(FORMAT07);
 
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index fce69720..788087f8 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "mk4config.h"
diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h
index e697c21b..3fd71eba 100644
--- a/akregator/src/mk4storage/mk4confwidget.h
+++ b/akregator/src/mk4storage/mk4confwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_MK4CONFWIDGET_H
@@ -33,6 +33,7 @@ namespace Backend {
 class MK4ConfWidget : public MK4ConfWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         
         MK4ConfWidget();
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index c8960237..cfa37def 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::Backend::MK4ConfWidgetBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MK4ConfWidgetBase</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout4</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cbUseDefault</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout3</cstring>
                     </property>
@@ -52,7 +52,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>label</cstring>
                             </property>
@@ -72,7 +72,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>tqlayout4</cstring>
             </property>
@@ -97,7 +97,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp
index a475a226..b3493be3 100644
--- a/akregator/src/mk4storage/mk4plugin.cpp
+++ b/akregator/src/mk4storage/mk4plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "mk4plugin.h"
diff --git a/akregator/src/mk4storage/mk4plugin.h b/akregator/src/mk4storage/mk4plugin.h
index b512a809..fc9935a1 100644
--- a/akregator/src/mk4storage/mk4plugin.h
+++ b/akregator/src/mk4storage/mk4plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_MK4PLUGIN_H
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp
index 09cacc9d..7a9cd065 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.cpp
+++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagefactorymk4impl.h"
 #include "storagemk4impl.h"
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.h b/akregator/src/mk4storage/storagefactorymk4impl.h
index 85afb48e..799e72ac 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.h
+++ b/akregator/src/mk4storage/storagefactorymk4impl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef STORAGEFACTORYMK4IMPL_H
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 8fd93c55..af71d97b 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagemk4impl.h"
 #include "feedstoragemk4impl.h"
@@ -85,7 +85,7 @@ TQString StorageMK4Impl::archivePath() const
 
 StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate)
 {
-    setArchivePath(TQString::null); // set path to default
+    setArchivePath(TQString()); // set path to default
 }
 
 TQString StorageMK4Impl::defaultArchivePath()
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index 37e31764..aa0a92ee 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef STORAGEMK4IMPL_H
@@ -37,6 +37,7 @@ namespace Backend {
 class StorageMK4Impl : public Storage
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
         StorageMK4Impl();     
@@ -50,7 +51,7 @@ class StorageMK4Impl : public Storage
         
         /** sets the directory where the metakit files will be stored.
             
-            @param archivePath the path to the archive, or TQString::null to reset it to the default.
+            @param archivePath the path to the archive, or TQString() to reset it to the default.
          */   
         void setArchivePath(const TQString& archivePath);
 
@@ -105,7 +106,7 @@ class StorageMK4Impl : public Storage
         virtual TQString restoreTagSet() const; 
   
         /** adds all feed storages from a source to this storage
-            existing articles are tqreplaced
+            existing articles are replaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index fd49c060..edea9c6e 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "folder.h"
@@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor
         NodeList* m_list;
 };
 
-NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate)
+NodeList::NodeList(TQObject *tqparent, const char *name) : d(new NodeListPrivate)
 {
     d->rootNode = 0;
     d->addNodeVisitor = new AddNodeVisitor(this);
@@ -165,9 +165,9 @@ void NodeList::clear()
 {
     Q_ASSERT(rootNode());
     
-    TQValueList<TreeNode*> children = rootNode()->children();
+    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
 
-    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
+    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
         delete *it; // emits signal "emitSignalDestroyed"
 }
 
@@ -215,8 +215,8 @@ int NodeList::generateID()
 
 void NodeList::slotNodeAdded(TreeNode* node)
 {
-    Folder* parent = node->parent();
-    if ( !node || !d->flatList.tqcontains(parent) || d->flatList.tqcontains(node) )
+    Folder* tqparent = node->tqparent();
+    if ( !node || !d->flatList.tqcontains(tqparent) || d->flatList.tqcontains(node) )
         return;
 
     addNode(node, false);
@@ -230,7 +230,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
     removeNode(node);
 }
 
-void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
+void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
 {
     if ( !node || !d->flatList.tqcontains(node) )
         return;
diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h
index b65078cc..3d628ec7 100644
--- a/akregator/src/nodelist.h
+++ b/akregator/src/nodelist.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_NODELIST_H
@@ -45,13 +45,14 @@ namespace Akregator {
 class Folder;
 class TreeNode;
 
-class NodeList : public QObject
+class NodeList : public TQObject
 {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    NodeList(TQObject *parent=0, const char *name=0);
+    NodeList(TQObject *tqparent=0, const char *name=0);
     virtual ~NodeList();
 
     virtual Folder* rootNode() const;
@@ -103,7 +104,7 @@ public slots:         // compat with KDE-3.x assertions, remove for KDE 4
 
     virtual void slotNodeDestroyed(TreeNode* node);
     virtual void slotNodeAdded(TreeNode* node);
-    virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
+    virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
 
 public:         // compat with KDE-3.x assertions, remove for KDE 4
 // private:
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index b505b2b8..6220e97c 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <klocale.h>
diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h
index 9a543034..96d898a0 100644
--- a/akregator/src/notificationmanager.h
+++ b/akregator/src/notificationmanager.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORNOTIFICATIONMANAGER_H
@@ -33,9 +33,10 @@ namespace Akregator
 {
 
     /** this class collects notification requests (new articles etc.) and processes them using KNotify.  */
-class NotificationManager : public QObject
+class NotificationManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         /** singleton instance of notification manager */
         static NotificationManager* self();
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 90bf6008..64169225 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "akregatorconfig.h"
@@ -72,7 +72,7 @@ class PageViewer::HistoryEntry
     int id;
 
     HistoryEntry() {}
-    HistoryEntry(const KURL& u, const TQString& t=TQString::null): url(u), title(t)   
+    HistoryEntry(const KURL& u, const TQString& t=TQString()): url(u), title(t)   
     {
         id = abs( TQTime::currentTime().msecsTo( TQTime() ) );    // nasty, but should provide a reasonably unique number
     }
@@ -95,8 +95,8 @@ class PageViewer::PageViewerPrivate
 };           
 
  
-PageViewer::PageViewer(TQWidget *parent, const char *name)
-    : Viewer(parent, name), d(new PageViewerPrivate)
+PageViewer::PageViewer(TQWidget *tqparent, const char *name)
+    : Viewer(tqparent, name), d(new PageViewerPrivate)
 {
     // this hack is necessary since the part looks for []HTML Settings] in
     // KGlobal::config() by default, which is wrong when running in Kontact
@@ -105,7 +105,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
     
     setXMLFile(locate("data", "akregator/pageviewer.rc"), true);
 
-    QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
+    TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
 
     d->backAction = new KToolBarPopupAction(backForward.first, 
                                 KStdAccel::shortcut(KStdAccel::Back), this, 
@@ -393,7 +393,7 @@ void PageViewer::slotPaletteOrFontChanged()
     int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
-    QUObject o[1];
+    TQUObject o[1];
 
     obj->qt_invoke(id, o);
     
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index a07fd2a9..2fb3a155 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PAGEVIEWER_H
@@ -40,8 +40,9 @@ namespace Akregator
     class PageViewer : public Viewer
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
-            PageViewer(TQWidget* parent, const char* name);
+            PageViewer(TQWidget* tqparent, const char* name);
             virtual ~PageViewer();
             virtual bool openURL(const KURL &url);
 
diff --git a/akregator/src/pageviewer.rc b/akregator/src/pageviewer.rc
index dd44ee36..a7b98fee 100644
--- a/akregator/src/pageviewer.rc
+++ b/akregator/src/pageviewer.rc
@@ -17,7 +17,7 @@
   <Action name="viewer_copy"/>
   <Action name="selectAll"/>
   <Separator/>
-  <Action name="find"/>
+  <Action name="tqfind"/>
   <Action name="findNext"/>
   <Merge/>
 </Menu>
diff --git a/akregator/src/plugin.cpp b/akregator/src/plugin.cpp
index 9b413f5c..599d3972 100644
--- a/akregator/src/plugin.cpp
+++ b/akregator/src/plugin.cpp
@@ -22,10 +22,10 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value )
 }
 
 
-QString
+TQString
 Plugin::pluginProperty( const TQString& key )
 {
-    if ( m_properties.find( key.lower() ) == m_properties.end() )
+    if ( m_properties.tqfind( key.lower() ) == m_properties.end() )
         return "false";
 
     return m_properties[key.lower()];
@@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key )
 bool
 Plugin::hasPluginProperty( const TQString& key )
 {
-    return m_properties.find( key.lower() ) != m_properties.end();
+    return m_properties.tqfind( key.lower() ) != m_properties.end();
 }
 
 }
diff --git a/akregator/src/plugin.h b/akregator/src/plugin.h
index 650a4a92..2d615ccb 100644
--- a/akregator/src/plugin.h
+++ b/akregator/src/plugin.h
@@ -26,10 +26,10 @@ namespace Akregator
 
             virtual bool init() = 0;
             /**
-             * TODO @param parent you must parent the widget to parent
+             * TODO @param tqparent you must tqparent the widget to tqparent
              * @return the configure widget for your plugin, create it on the heap!
              */
-             //TODO rename configureWidget( TQWidget *parent )
+             //TODO rename configureWidget( TQWidget *tqparent )
             // virtual PluginConfig* configure() const { return 0; }
 
             void addPluginProperty( const TQString& key, const TQString& value );
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index 83e746f8..d12016d4 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -43,7 +43,7 @@ KTrader::OfferList
 PluginManager::query( const TQString& constraint )
 {
     // Add versioning constraint
-    QString
+    TQString
     str  = "[X-KDE-akregator-framework-version] == ";
     str += TQString::number( FrameworkVersion );
     str += " and ";
diff --git a/akregator/src/pluginmanager.h b/akregator/src/pluginmanager.h
index ca97753f..3121bbc0 100644
--- a/akregator/src/pluginmanager.h
+++ b/akregator/src/pluginmanager.h
@@ -49,22 +49,22 @@ class PluginManager
          * The keys used in the query (Type, ServiceType, Exec) are all
          * fields found in the .desktop files.
          *
-         * @param constraint  A constraint to limit the choices returned, TQString::null to
+         * @param constraint  A constraint to limit the choices returned, TQString() to
          *                    get all services of the given @p servicetype
          *
          * @return            A list of services that satisfy the query
          * @see               http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
          */
-        static KTrader::OfferList query( const TQString& constraint = TQString::null );
+        static KTrader::OfferList query( const TQString& constraint = TQString() );
 
         /**
          * Load and instantiate plugin from query
-         * @param constraint  A constraint to limit the choices returned, TQString::null to
+         * @param constraint  A constraint to limit the choices returned, TQString() to
          *                    get all services of the given @p servicetype
          * @return            Pointer to Plugin, or NULL if error
          * @see               http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
          */
-        static Akregator::Plugin* createFromQuery( const TQString& constraint = TQString::null );
+        static Akregator::Plugin* createFromQuery( const TQString& constraint = TQString() );
 
         /**
          * Load and instantiate plugin from service
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 6535896b..6ef94f4c 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqmap.h>
@@ -168,7 +168,7 @@ void ProgressItemHandler::slotFetchStarted()
         d->progressItem = 0;
     }
     
-    d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString::null, true);
+    d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true);
 
     connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch()));
 }
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
 {
     if (d->progressItem)
     {
-        d->progressItem->seStatus(i18n("Fetch completed"));
+        d->progressItem->setqStatus(i18n("Fetch completed"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
 {
     if (d->progressItem)
     {
-        d->progressItem->seStatus(i18n("Fetch error"));
+        d->progressItem->setqStatus(i18n("Fetch error"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
 {
     if (d->progressItem)
     {
-        d->progressItem->seStatus(i18n("Fetch aborted"));
+        d->progressItem->setqStatus(i18n("Fetch aborted"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
diff --git a/akregator/src/progressmanager.h b/akregator/src/progressmanager.h
index c348becc..5b31bbf2 100644
--- a/akregator/src/progressmanager.h
+++ b/akregator/src/progressmanager.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_PROGRESSMANAGER_H
@@ -33,9 +33,10 @@ class TreeNode;
 class ProgressItemHandler;
 /** This class manages the progress items for all feeds */
 
-class ProgressManager : public QObject
+class ProgressManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         
         static ProgressManager* self();
@@ -63,9 +64,10 @@ class ProgressManager : public QObject
 /** this class handles the creation and deletion of progress items for one feed.
     This is an internal class intended to be used in ProgressManager only */
 
-class ProgressItemHandler : public QObject
+class ProgressItemHandler : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         ProgressItemHandler(Feed* feed);
         virtual ~ProgressItemHandler();
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index 28ee7858..658051f9 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "akregatorconfig.h"
@@ -38,8 +38,8 @@
 
 namespace Akregator {
 
-FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name)
-        : FeedPropertiesWidgetBase(parent, name)
+FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *tqparent, const char *name)
+        : FeedPropertiesWidgetBase(tqparent, name)
 {
 }
 
@@ -65,8 +65,8 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled )
 }
 
 
-FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name)
-        : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
+FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *tqparent, const char *name)
+        : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
 {
     widget=new FeedPropertiesWidget(this);
     setMainWidget(widget);
diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h
index f6f85376..0c854c36 100644
--- a/akregator/src/propertiesdialog.h
+++ b/akregator/src/propertiesdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATORPROPDIALOG_H
 #define AKREGATORPROPDIALOG_H
@@ -33,8 +33,9 @@ namespace Akregator
    class FeedPropertiesWidget : public FeedPropertiesWidgetBase
    {
       Q_OBJECT
+  TQ_OBJECT
       public:
-         FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
+         FeedPropertiesWidget(TQWidget *tqparent = 0, const char *name = 0);
          ~FeedPropertiesWidget();
          virtual void slotUpdateComboBoxActivated(int index);
          virtual void slotUpdateCheckBoxToggled(bool enabled);
@@ -44,8 +45,9 @@ namespace Akregator
    class FeedPropertiesDialog : public KDialogBase
    {
       Q_OBJECT
+  TQ_OBJECT
       public:
-         FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
+         FeedPropertiesDialog(TQWidget *tqparent = 0, const char *name = 0);
          ~FeedPropertiesDialog();
 
          void setFeed(Feed* feed);
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index 3e94c7ed..038d1b26 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::FeedPropertiesWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FeedPropertiesWidget</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
                             <cstring>tqlayout8</cstring>
                         </property>
@@ -45,7 +45,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel3</cstring>
                                 </property>
@@ -56,7 +56,7 @@
                                     <cstring>urlEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -90,7 +90,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0">
+                    <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>upChkbox</cstring>
                         </property>
@@ -98,7 +98,7 @@
                             <string>U&amp;se a custom update interval</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="0">
+                    <widget class="TQLayoutWidget" row="2" column="0">
                         <property name="name">
                             <cstring>tqlayout9</cstring>
                         </property>
@@ -123,7 +123,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -154,7 +154,7 @@
                                     <number>1</number>
                                 </property>
                             </widget>
-                            <widget class="QComboBox">
+                            <widget class="TQComboBox">
                                 <item>
                                     <property name="text">
                                         <string>Minutes</string>
@@ -184,7 +184,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QCheckBox" row="3" column="0">
+                    <widget class="TQCheckBox" row="3" column="0">
                         <property name="name">
                             <cstring>checkBox_useNotification</cstring>
                         </property>
@@ -194,7 +194,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -205,7 +205,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>bg_feedArchive</cstring>
                         </property>
@@ -225,7 +225,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="4">
+                            <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>rb_keepAllArticles</cstring>
                                 </property>
@@ -233,7 +233,7 @@
                                     <string>&amp;Keep all articles</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="0">
+                            <widget class="TQRadioButton" row="2" column="0">
                                 <property name="name">
                                     <cstring>rb_limitArticleNumber</cstring>
                                 </property>
@@ -241,7 +241,7 @@
                                     <string>Limit archi&amp;ve to:</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>rb_limitArticleAge</cstring>
                                 </property>
@@ -326,7 +326,7 @@
                                     <number>1</number>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="4">
+                            <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>rb_disableArchiving</cstring>
                                 </property>
@@ -334,7 +334,7 @@
                                     <string>Di&amp;sable archiving</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4">
+                            <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4">
                                 <property name="name">
                                     <cstring>rb_globalDefault</cstring>
                                 </property>
@@ -349,7 +349,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -360,7 +360,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
                             <cstring>tqlayout4</cstring>
                         </property>
@@ -368,7 +368,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBox_loadWebsite</cstring>
                                 </property>
@@ -376,7 +376,7 @@
                                     <string>Load the &amp;full website when reading articles</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBox_markRead</cstring>
                                 </property>
@@ -452,10 +452,10 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
     <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index f2dd33e7..abb319af 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "akregatorconfig.h"
@@ -60,7 +60,7 @@ public:
     int delay;
 };
 
-SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate)
+SearchBar::SearchBar(TQWidget* tqparent, const char* name) : TQHBox(tqparent, name), d(new SearchBar::SearchBarPrivate)
 {
     d->delay = 400;
     setMargin(2);
@@ -81,7 +81,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
     searchLabel->setBuddy(d->searchLine);
 
     TQLabel* statusLabel = new TQLabel(this);
-    statusLabel->setText( i18n("Status:") );
+    statusLabel->setText( i18n("tqStatus:") );
 
     d->searchCombo = new KComboBox(this, "searchcombo");
     TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
@@ -144,7 +144,7 @@ void SearchBar::slotClearSearch()
     }
 }
 
-void SearchBar::slotSeStatus(int status)
+void SearchBar::slotSetqStatus(int status)
 {
      d->searchCombo->setCurrentItem(status);
      slotSearchComboChanged(status);
@@ -194,15 +194,15 @@ void SearchBar::slotActivateSearch()
         {
             case 1: // Unread
             {
-                Criterion crit1( Criterion::Status, Criterion::Equals, Article::New);
-                Criterion crit2( Criterion::Status, Criterion::Equals, Article::Unread);
+                Criterion crit1( Criterion::tqStatus, Criterion::Equals, Article::New);
+                Criterion crit2( Criterion::tqStatus, Criterion::Equals, Article::Unread);
                 statusCriteria << crit1;
                 statusCriteria << crit2;
                 break;
             }
             case 2: // New
             {
-                Criterion crit( Criterion::Status, Criterion::Equals, Article::New);
+                Criterion crit( Criterion::tqStatus, Criterion::Equals, Article::New);
                 statusCriteria << crit;
                 break;
             }
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 8227f83f..18cb5d07 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_SEARCHBAR_H
@@ -37,13 +37,14 @@ namespace Filters
     class ArticleMatcher;
 }
 
-class SearchBar : public QHBox
+class SearchBar : public TQHBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-        SearchBar(TQWidget* parent=0, const char* name=0);
+        SearchBar(TQWidget* tqparent=0, const char* name=0);
         virtual ~SearchBar();
 
         TQString text() const;
@@ -58,7 +59,7 @@ class SearchBar : public QHBox
 
     public slots:
         void slotClearSearch();
-        void slotSeStatus(int status);
+        void slotSetqStatus(int status);
         void slotSetText(const TQString& text);
 
     private slots:
diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp
index 7a849ff9..0aea7367 100644
--- a/akregator/src/settings_advanced.cpp
+++ b/akregator/src/settings_advanced.cpp
@@ -11,7 +11,7 @@
 
 namespace Akregator {
 
-SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name)
+SettingsAdvanced::SettingsAdvanced(TQWidget* tqparent, const char* name) : SettingsAdvancedBase(tqparent, name)
 {
 
     TQStringList backends = Backend::StorageFactoryRegistry::self()->list();
diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h
index 2bca6614..2186645d 100644
--- a/akregator/src/settings_advanced.h
+++ b/akregator/src/settings_advanced.h
@@ -17,10 +17,11 @@ namespace Backend
 
 class SettingsAdvanced : public SettingsAdvancedBase
 {
-    Q_OBJECT	
+    Q_OBJECT
+    TQ_OBJECT
 
     public:
-        SettingsAdvanced(TQWidget* parent=0, const char* name=0);
+        SettingsAdvanced(TQWidget* tqparent=0, const char* name=0);
 
         /** returns the key of the currently selected factory */
         TQString selectedFactory() const;
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 3cb48868..b80b85a4 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::SettingsAdvancedBase</class>
 <author>Frank Osterfeld</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsAdvanced</cstring>
     </property>
@@ -20,7 +20,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox3_3_2</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <cstring>cbBackend</cstring>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbBackendConfigure</cstring>
                     </property>
@@ -54,7 +54,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox3_3</cstring>
             </property>
@@ -65,7 +65,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QSpinBox" row="0" column="1">
+                <widget class="TQSpinBox" row="0" column="1">
                     <property name="name">
                         <cstring>kcfg_MarkReadDelay</cstring>
                     </property>
@@ -96,7 +96,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_ResetQuickFilterOnNodeChange</cstring>
                     </property>
@@ -110,7 +110,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>kcfg_UseMarkReadDelay</cstring>
                     </property>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 2f40bcd5..242d61cb 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::SettingsAppearance</class>
 <author>Frank Osterfeld</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsAppearance</cstring>
     </property>
@@ -23,7 +23,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -34,7 +34,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>lbl_MinimumFontSize</cstring>
                     </property>
@@ -42,7 +42,7 @@
                         <string>Minimum font size:</string>
                     </property>
                 </widget>
-                <widget class="QSlider" row="1" column="0">
+                <widget class="TQSlider" row="1" column="0">
                     <property name="name">
                         <cstring>slider_minimumFontSize</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         <number>8</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>lbl_MediumFontSize</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <string>Medium font size:</string>
                     </property>
                 </widget>
-                <widget class="QSlider" row="3" column="0">
+                <widget class="TQSlider" row="3" column="0">
                     <property name="name">
                         <cstring>slider_mediumFontSize</cstring>
                     </property>
@@ -114,7 +114,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>FontsGroupBox</cstring>
             </property>
@@ -125,7 +125,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -138,7 +138,7 @@
                         <cstring>kcfg_StandardFont</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -151,7 +151,7 @@
                         <cstring>kcfg_FixedFont</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -164,7 +164,7 @@
                         <cstring>kcfg_SerifFont</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
@@ -179,7 +179,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>kcfg_UnderlineLinks</cstring>
             </property>
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 86e0a303..fbfcea0c 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::SettingsArchive</class>
 <author>Frank Osterfeld</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsArchive</cstring>
     </property>
@@ -23,7 +23,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout1</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>kcfg_ArchiveMode</cstring>
                     </property>
@@ -42,7 +42,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>rb_KeepAllArticles</cstring>
                             </property>
@@ -50,7 +50,7 @@
                                 <string>Keep all articles</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>rb_LimitArticleNumber</cstring>
                             </property>
@@ -58,7 +58,7 @@
                                 <string>Limit feed archive size to:</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="2" column="0">
+                        <widget class="TQRadioButton" row="2" column="0">
                             <property name="name">
                                 <cstring>rb_LimitArticleAge</cstring>
                             </property>
@@ -66,7 +66,7 @@
                                 <string>Delete articles older than: </string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>rb_DisableArchiving</cstring>
                             </property>
@@ -125,7 +125,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_DoNotExpireImportantArticles</cstring>
                     </property>
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index af9798e3..4318f4cc 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::SettingsBrowser</class>
 <author>Gary Cramblitt</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsBrowser</cstring>
     </property>
@@ -23,7 +23,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -37,7 +37,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_ExternalBrowserUseKdeDefault</cstring>
                     </property>
@@ -48,7 +48,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>kcfg_ExternalBrowserUseCustomCommand</cstring>
                     </property>
@@ -56,7 +56,7 @@
                         <string>Use this command:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>kcfg_ExternalBrowserCustomCommand</cstring>
                     </property>
@@ -69,7 +69,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>kcfg_CloseButtonOnTabs</cstring>
             </property>
@@ -94,7 +94,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout2</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <item>
                         <property name="text">
                             <string>Open in Tab</string>
@@ -130,7 +130,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <string>Middle mouse click:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_3</cstring>
                     </property>
@@ -162,7 +162,7 @@
                         <string>Left mouse click:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>Open in Tab</string>
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index 26ef9299..27af880a 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::SettingsGeneral</class>
 <author>Teemu Rytilahti</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsGeneral</cstring>
     </property>
@@ -23,7 +23,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox3_2</cstring>
             </property>
@@ -34,7 +34,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_UseIntervalFetch</cstring>
                     </property>
@@ -42,7 +42,7 @@
                         <string>&amp;Use interval fetching</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_UseNotifications</cstring>
                     </property>
@@ -56,7 +56,7 @@
                         <string>Select this if you want to get notified when there are new articles.</string>
                     </property>
                 </widget>
-                <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>kcfg_ShowTrayIcon</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <string>Show tra&amp;y icon</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>Fetch feeds every:</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="3" column="1">
+                <widget class="TQSpinBox" row="3" column="1">
                     <property name="name">
                         <cstring>kcfg_AutoFetchInterval</cstring>
                     </property>
@@ -100,7 +100,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -111,7 +111,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>kcfg_MarkAllFeedsReadOnStartup</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <string>Mark &amp;all feeds as read on startup</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>kcfg_FetchOnStartup</cstring>
                     </property>
@@ -146,7 +146,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>groupBox3_3</cstring>
             </property>
@@ -157,7 +157,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>kcfg_UseHTMLCache</cstring>
                     </property>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index cd991a49..57612bd4 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedlist.h"
@@ -44,8 +44,8 @@ class SelectNodeDialog::SelectNodeDialogPrivate
     SimpleNodeSelector* widget;
 };
 
-SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) : 
- KDialogBase(parent, name, true, i18n("Select Feed or Folder"),
+SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* tqparent, char* name) : 
+ KDialogBase(tqparent, name, true, i18n("Select Feed or Folder"),
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate)
 {
     d->widget = new SimpleNodeSelector(feedList, this);
@@ -102,16 +102,16 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
     virtual bool visitFolder(Folder* node)
     {
         visitTreeNode(node);
-        TQValueList<TreeNode*> children = node->children();
+        TQValueList<TreeNode*> tqchildren = node->tqchildren();
         m_view->d->nodeToItem[node]->setExpandable(true);
-        for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
+        for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
              createItems(*it);
         return true;
     }
 
     virtual bool visitTreeNode(TreeNode* node)
     {
-        TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0;
+        TQListViewItem* pi = node->tqparent() ? m_view->d->nodeToItem[node->tqparent()] : 0;
          
         KListViewItem* item = 0;
         if (pi != 0)
@@ -131,7 +131,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
 };
 
 
-SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate)
+SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new SimpleNodeSelectorPrivate)
 {
     d->list = feedList;
     connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*)));
diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h
index ba9ddda2..97e87fda 100644
--- a/akregator/src/simplenodeselector.h
+++ b/akregator/src/simplenodeselector.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_SIMPLENODESELECTOR_H
@@ -44,8 +44,9 @@ class SimpleNodeSelector;
 class SelectNodeDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
+        SelectNodeDialog(FeedList* feedList, TQWidget* tqparent=0, char* name=0);
         virtual ~SelectNodeDialog();
         
         TreeNode* selectedNode() const;
@@ -63,12 +64,13 @@ class SelectNodeDialog : public KDialogBase
        SelectNodeDialogPrivate* d;
 };
 
-class SimpleNodeSelector : public QWidget
+class SimpleNodeSelector : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0);
+        SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent=0, const char* name=0);
         virtual ~SimpleNodeSelector();
 
         TreeNode* selectedNode() const;
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 6263c11f..b0fc92c9 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "article.h"
diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h
index 8a564cd8..5172130b 100644
--- a/akregator/src/speechclient.h
+++ b/akregator/src/speechclient.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_SPEECHCLIENT_H
@@ -42,6 +42,7 @@ class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeec
 {
 
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/akregator/src/storage.cpp b/akregator/src/storage.cpp
index b2fbf895..09d4d396 100644
--- a/akregator/src/storage.cpp
+++ b/akregator/src/storage.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storage.h"
 
diff --git a/akregator/src/storage.h b/akregator/src/storage.h
index 2c6a9ceb..1899cd14 100644
--- a/akregator/src/storage.h
+++ b/akregator/src/storage.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_STORAGE_H
@@ -41,7 +41,7 @@ class FeedStorage;
     
     An archive implementation must implement Storage, FeedStorage and StorageFactory. See mk4storage for an example.
 */
-class AKREGATOR_EXPORT Storage : public QObject
+class AKREGATOR_EXPORT Storage : public TQObject
 {
     public:
 
@@ -105,7 +105,7 @@ class AKREGATOR_EXPORT Storage : public QObject
         virtual TQStringList feeds() const = 0;
 
         /** adds all feed storages from a source to this storage
-            existing articles are tqreplaced
+            existing articles are replaced
         */
         virtual void add(Storage* source) = 0;
         
diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp
index 43b8788d..e8d5c4c0 100644
--- a/akregator/src/storagedummyimpl.cpp
+++ b/akregator/src/storagedummyimpl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagedummyimpl.h"
 #include "feedstoragedummyimpl.h"
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index 35cbdda4..05961ffc 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_STORAGEDUMMYIMPL_H
@@ -37,6 +37,7 @@ namespace Backend {
 class StorageDummyImpl : public Storage
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
         StorageDummyImpl();     
@@ -88,7 +89,7 @@ class StorageDummyImpl : public Storage
         virtual TQString restoreTagSet() const;
 
         /** adds all feed storages from a source to this storage
-            existing articles are tqreplaced
+            existing articles are replaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/storagefactory.h b/akregator/src/storagefactory.h
index 12f18a0b..93ab7f75 100644
--- a/akregator/src/storagefactory.h
+++ b/akregator/src/storagefactory.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_STORAGEFACTORY_H
diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp
index 70f5a956..45f9fc0a 100644
--- a/akregator/src/storagefactorydummyimpl.cpp
+++ b/akregator/src/storagefactorydummyimpl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagefactorydummyimpl.h"
 #include "storagedummyimpl.h"
diff --git a/akregator/src/storagefactorydummyimpl.h b/akregator/src/storagefactorydummyimpl.h
index 0e8d2d44..bc1a2d43 100644
--- a/akregator/src/storagefactorydummyimpl.h
+++ b/akregator/src/storagefactorydummyimpl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_STORAGEFACTORYDUMMYIMPL_H
diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp
index f6162ef9..608c05b1 100644
--- a/akregator/src/storagefactoryregistry.cpp
+++ b/akregator/src/storagefactoryregistry.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "storagefactory.h"
@@ -52,7 +52,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self()
 	
 bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr)
 {
-    if (tqcontainsFactory(typestr))
+    if (containsFactory(typestr))
         return false;
     d->map[typestr] = factory;
     return true; 
@@ -68,7 +68,7 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)
     return d->map[typestr];
 }
 
-bool StorageFactoryRegistry::tqcontainsFactory(const TQString& typestr) const
+bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
 {
     return d->map.tqcontains(typestr);
 }
diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h
index 64567840..d47c42c8 100644
--- a/akregator/src/storagefactoryregistry.h
+++ b/akregator/src/storagefactoryregistry.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H
@@ -45,7 +45,7 @@ class AKREGATOR_EXPORT StorageFactoryRegistry
         bool registerFactory(StorageFactory* factory, const TQString& typestr);
         void unregisterFactory(const TQString& typestr);
         StorageFactory* getFactory(const TQString& typestr);
-        bool tqcontainsFactory(const TQString& typestr) const;
+        bool containsFactory(const TQString& typestr) const;
         TQStringList list() const;
         
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 3f86fa1d..7ae02ba9 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "tabwidget.h"
@@ -63,8 +63,8 @@ class TabWidget::TabWidgetPrivate
     TQToolButton* tabsClose;
 };
 
-TabWidget::TabWidget(TQWidget * parent, const char *name)
-        :KTabWidget(parent, name), d(new TabWidgetPrivate)
+TabWidget::TabWidget(TQWidget * tqparent, const char *name)
+        :KTabWidget(tqparent, name), d(new TabWidgetPrivate)
 {
     d->CurrentMaxLength = 30;
     d->currentItem = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
         if ( tab->iconSet() )
             iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
 
-        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
+        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
     }
     return x;
 }
@@ -200,9 +200,9 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
     uint lcw=0, rcw=0;
     int tabBarHeight = tabBar()->tqsizeHint().height();
     if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
-        lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
+        lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
     if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
-        rcw = QMAX( cornerWidget( TopRight )->width(), tabBarHeight );
+        rcw = TQMAX( cornerWidget( TopRight )->width(), tabBarHeight );
     uint maxTabBarWidth = width() - lcw - rcw;
 
     uint newMaxLength=30;
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
 
     url = view->part()->url();
     
-    kapp->clipboard()->setText(url.prettyURL(), QClipboard::Selection);
-    kapp->clipboard()->setText(url.prettyURL(), QClipboard::Clipboard);
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
 }
 
 void TabWidget::slotCloseTab()
@@ -298,8 +298,8 @@ void TabWidget::slotCloseTab()
         d->currentItem = currentPage();
     if (indexOf(d->currentItem) == 0) 
         return;
-    if (d->frames.find(d->currentItem) != NULL)
-        removeFrame(d->frames.find(d->currentItem));
+    if (d->frames.tqfind(d->currentItem) != NULL)
+        removeFrame(d->frames.tqfind(d->currentItem));
     delete d->currentItem;
     d->currentItem = 0;
 }
@@ -323,8 +323,8 @@ void TabWidget::initiateDrag(int tab)
 
 void TabWidget::slotCloseRequest(TQWidget* widget)
 {
-    if (d->frames.find(widget) != NULL)
-        removeFrame(d->frames.find(widget));
+    if (d->frames.tqfind(widget) != NULL)
+        removeFrame(d->frames.tqfind(widget));
 }
 } // namespace Akregator
 
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index b4e3722f..bd357ad0 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef TABWIDGET_H
@@ -38,9 +38,10 @@ class Frame;
 class TabWidget : public KTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        TabWidget(TQWidget * parent = 0, const char *name = 0);
+        TabWidget(TQWidget * tqparent = 0, const char *name = 0);
         virtual ~TabWidget();
 
         void addFrame(Frame *f);
diff --git a/akregator/src/tag.cpp b/akregator/src/tag.cpp
index 12cc7a7f..f42724b3 100644
--- a/akregator/src/tag.cpp
+++ b/akregator/src/tag.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "shared.h"
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index a865b6ec..d215eb8f 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAG_H
@@ -47,8 +47,8 @@ class Tag
     
     public:
 
-    /** creates a tag with given id, name and scheme. If name is TQString::null, the id is used as name. If id is TQString::null, the object is considered as NULL object (see isNull())*/
-    Tag(const TQString& id, const TQString& name=TQString::null, const TQString& scheme=TQString::null);
+    /** creates a tag with given id, name and scheme. If name is TQString(), the id is used as name. If id is TQString(), the object is considered as NULL object (see isNull())*/
+    Tag(const TQString& id, const TQString& name=TQString(), const TQString& scheme=TQString());
 
     /** creates a null tag (isNull() is @c true) */
     Tag();
@@ -73,7 +73,7 @@ class Tag
       The @c id is built using 'scheme + "/" + term': The example gets id = "http://del.icio.us/tag/foo"
       @encode
     */
-    static Tag fromCategory(const TQString& term, const TQString& scheme=TQString::null, const TQString& name=TQString::null);
+    static Tag fromCategory(const TQString& term, const TQString& scheme=TQString(), const TQString& name=TQString());
 
     virtual ~Tag();
 
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index 20a68eb4..75ce305e 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 //#include "menuitems.h"
@@ -44,9 +44,9 @@ class TagAction::TagActionPrivate
     //TQMap<TQPopupMenu*, int> popupToId;
 };
  
-TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent)
-//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0)
-       : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate)
+TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent)
+//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name=0)
+       : KToggleAction(tag.name(), KShortcut(), 0, 0, tqparent), d(new TagActionPrivate)
 {
      d->tag = tag;
      connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot);
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index 7225f2ce..f8760639 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAGACTION_H
@@ -38,10 +38,11 @@ class Tag;
 class TagAction : public KToggleAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-        TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0);
+        TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent=0);
         virtual ~TagAction();
         
         //virtual int plug(TQWidget *widget, int index=-1);
diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp
index cc958307..bb361fce 100644
--- a/akregator/src/tagfolder.cpp
+++ b/akregator/src/tagfolder.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "tagfolder.h"
@@ -52,7 +52,7 @@ bool TagFolder::accept(TreeNodeVisitor* visitor)
         return visitor->visitFolder(this);
 }
 
-TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const
+TQDomElement TagFolder::toOPML( TQDomElement /*tqparent*/, TQDomDocument /*document*/ ) const
 {
     return TQDomElement();
 }
diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h
index 6e416e54..1c883ff0 100644
--- a/akregator/src/tagfolder.h
+++ b/akregator/src/tagfolder.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAGFOLDER_H
@@ -38,12 +38,12 @@ class TagFolder : public Folder
 {
     public:
 
-        TagFolder(const TQString& title = TQString::null);
+        TagFolder(const TQString& title = TQString());
 
         virtual ~TagFolder();
         virtual bool accept(TreeNodeVisitor* visitor);
 
-        virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
+        virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
 
     private:
         class TagFolderPrivate;
diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp
index 920827af..fe57de4a 100644
--- a/akregator/src/tagfolderitem.cpp
+++ b/akregator/src/tagfolderitem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -33,19 +33,19 @@
 
 namespace Akregator {
 
-TagFolderItem::TagFolderItem(FolderItem* parent, TagFolder* node) : FolderItem(parent, node)
+TagFolderItem::TagFolderItem(FolderItem* tqparent, TagFolder* node) : FolderItem(tqparent, node)
 {
 }
 
-TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
+TagFolderItem::TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
 {
 }
 
-TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node)
+TagFolderItem::TagFolderItem(KListView* tqparent, TagFolder* node) : FolderItem(tqparent, node)
 {
 }
 
-TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
+TagFolderItem::TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
 {
 }
 
diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h
index ac339aec..6cdefa3d 100644
--- a/akregator/src/tagfolderitem.h
+++ b/akregator/src/tagfolderitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_TAGFOLDERITEM_H
 #define AKREGATOR_TAGFOLDERITEM_H
@@ -40,10 +40,10 @@ class TagFolderItem : public FolderItem
 {
 
 public:
-    TagFolderItem(FolderItem* parent, TagFolder* node);
-    TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node);
-    TagFolderItem(KListView* parent, TagFolder* node);
-    TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node);
+    TagFolderItem(FolderItem* tqparent, TagFolder* node);
+    TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node);
+    TagFolderItem(KListView* tqparent, TagFolder* node);
+    TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node);
     virtual ~TagFolderItem();
     
     virtual TagFolder* node();
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index 3b4939cd..35c72072 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "article.h"
@@ -131,7 +131,7 @@ TQStringList TagNode::tags() const
    return TQStringList();
 }
 
-TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const
+TQDomElement TagNode::toOPML( TQDomElement tqparent, TQDomDocument document ) const
 {
     return TQDomElement();
 }    
@@ -141,13 +141,13 @@ TreeNode* TagNode::next()
     if ( nextSibling() )
         return nextSibling();
 
-    Folder* p = parent();
+    Folder* p = tqparent();
     while (p)
     {
         if ( p->nextSibling() )
             return p->nextSibling();
         else
-            p = p->parent();
+            p = p->tqparent();
     }
     return 0;
 }
@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
     setNotificationMode(false);
     TQValueList<Article>::Iterator en = d->articles.end();
     for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it)
-        (*it).seStatus(Article::Read);
+        (*it).setqStatus(Article::Read);
     setNotificationMode(true);
 }
     
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index 30630f86..8598a8a2 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -18,8 +18,8 @@
         Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
         As a special exception, permission is given to link this program
-        with any edition of Qt, and distribute the resulting executable,
-        without including the source code for Qt in the source distribution.
+        with any edition of TQt, and distribute the resulting executable,
+        without including the source code for TQt in the source distribution.
     */
 
 #ifndef AKREGATOR_TAGNODE_H
@@ -45,6 +45,7 @@ class TreeNodeVisitor;
 class TagNode : public TreeNode
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -79,7 +80,7 @@ public:
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
-    virtual TQValueList<Article> articles(const TQString& tag=TQString::null);
+    virtual TQValueList<Article> articles(const TQString& tag=TQString());
 
     /** returns a list of all tags occurring in this node (sub tree for folders) */
 
@@ -92,7 +93,7 @@ public:
 
     /** reimplemented to return an invalid element */
     
-    virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
+    virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
     
     /** returns the next node in the tree.
         Calling next() unless it returns 0 iterates through the tree in pre-order
diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp
index 265ec5f7..ec083145 100644
--- a/akregator/src/tagnodeitem.cpp
+++ b/akregator/src/tagnodeitem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -35,22 +35,22 @@
 
 namespace Akregator {
 
-TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node)
+TagNodeItem::TagNodeItem(FolderItem* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
+TagNodeItem::TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
 
-TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node)
+TagNodeItem::TagNodeItem(KListView* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
 {
     initialize(node);
 }
 
-TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
+TagNodeItem::TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
 {
     initialize(node);
 }
diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h
index f9ef1b1b..f5ea5edf 100644
--- a/akregator/src/tagnodeitem.h
+++ b/akregator/src/tagnodeitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_TAGNODEITEM_H
 #define AKREGATOR_TAGNODEITEM_H
@@ -37,10 +37,10 @@ class TagNodeItem : public TreeNodeItem
 {
 
 public:
-    TagNodeItem(FolderItem* parent, TagNode* node);
-    TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node);
-    TagNodeItem(KListView* parent, TagNode* node);
-    TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node);
+    TagNodeItem(FolderItem* tqparent, TagNode* node);
+    TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node);
+    TagNodeItem(KListView* tqparent, TagNode* node);
+    TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node);
     virtual ~TagNodeItem();
     virtual void nodeChanged();
     
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index f1a98b62..ba531d03 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedlist.h"
@@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 {
     tagNode->setId(KApplication::random());
     TQString id = tagNode->tag().id();
-    if (!tqcontainsTagId(id))
+    if (!containsTagId(id))
     {
         rootNode()->appendChild(tagNode); // TODO: maintain sorting
         d->tagIdToNodeMap[id] = tagNode;
@@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 bool TagNodeList::remove(TagNode* tagNode)
 {
     TQString id = tagNode->tag().id();
-    if (tqcontainsTagId(id))
+    if (containsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -118,9 +118,9 @@ bool TagNodeList::remove(TagNode* tagNode)
 void TagNodeList::slotNodeDestroyed(TreeNode* node)
 {
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (tagNode != 0 && tqcontainsTagId(id))
+    if (tagNode != 0 && containsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -133,30 +133,30 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
     NodeList::slotNodeAdded(node);
 
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (tagNode != 0L && !tqcontainsTagId(id))
+    if (tagNode != 0L && !containsTagId(id))
     {
        d->tagIdToNodeMap[id] = tagNode;
        emit signalTagNodeAdded(tagNode);
     }
 }
 
-void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
+void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)
 {
-    NodeList::slotNodeRemoved(parent, node);
+    NodeList::slotNodeRemoved(tqparent, node);
 
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id))
+    if (tqparent == rootNode() && tagNode != 0L && containsTagId(id))
     {
         d->tagIdToNodeMap.remove(id);
         emit signalTagNodeRemoved(tagNode);
     }
 }
 
-bool TagNodeList::tqcontainsTagId(const TQString& tagId)
+bool TagNodeList::containsTagId(const TQString& tagId)
 {
     return d->tagIdToNodeMap.tqcontains(tagId);
 }
@@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const
 
 void TagNodeList::slotTagAdded(const Tag& tag)
 {
-    if (!tqcontainsTagId(tag.id()))
+    if (!containsTagId(tag.id()))
     {
         insert(new TagNode(tag, d->feedList->rootNode()));
     }
@@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag)
 
 void TagNodeList::slotTagUpdated(const Tag& tag)
 {
-    if (tqcontainsTagId(tag.id()))
+    if (containsTagId(tag.id()))
     {
         d->tagIdToNodeMap[tag.id()]->tagChanged();
     }
 }
 void TagNodeList::slotTagRemoved(const Tag& tag)
 {
-    if (tqcontainsTagId(tag.id()))
+    if (containsTagId(tag.id()))
     {
         delete d->tagIdToNodeMap[tag.id()];
         d->tagIdToNodeMap[tag.id()] = 0;
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index 9e67b197..02d1bf8b 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAGNODELIST_H
@@ -44,6 +44,7 @@ namespace Akregator {
    class TagNodeList : public NodeList
    {
        Q_OBJECT
+  TQ_OBJECT
        public:
 
 
@@ -53,7 +54,7 @@ namespace Akregator {
        FeedList* feedList() const;
        bool insert(TagNode* tagNode);
        bool remove(TagNode* tagNode);
-       bool tqcontainsTagId(const TQString& tagId);
+       bool containsTagId(const TQString& tagId);
        TQValueList<TagNode*> toList() const;
        
        TagNode* findByTagID(const TQString& tagID);
@@ -79,7 +80,7 @@ namespace Akregator {
 
        virtual void slotNodeDestroyed(TreeNode* node);
        virtual void slotNodeAdded(TreeNode* node);
-       virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
+       virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
 
        private:
        
diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp
index ea4848c4..f14b7494 100644
--- a/akregator/src/tagpropertiesdialog.cpp
+++ b/akregator/src/tagpropertiesdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kicondialog.h>
@@ -40,7 +40,7 @@ class TagPropertiesDialog::TagPropertiesDialogPrivate
     TagPropertiesWidgetBase* widget;
 };
 
-TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate)
+TagPropertiesDialog::TagPropertiesDialog(TQWidget *tqparent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate)
 {
     d->widget = new TagPropertiesWidgetBase(this);
     setMainWidget(d->widget);
diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h
index 503b6f0e..3665bbe4 100644
--- a/akregator/src/tagpropertiesdialog.h
+++ b/akregator/src/tagpropertiesdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAGPROPERTIESDIALOG_H
@@ -34,10 +34,11 @@ class Tag;
 class TagPropertiesDialog : public KDialogBase 
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-        TagPropertiesDialog(TQWidget *parent=0, const char *name=0);
+        TagPropertiesDialog(TQWidget *tqparent=0, const char *name=0);
         virtual ~TagPropertiesDialog();
 
         void setTag(const Tag& tag);
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index d96744bb..7109b061 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TagPropertiesWidgetBase</class>
 <author>Frank Osterfeld</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -20,7 +20,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout1</cstring>
             </property>
@@ -28,7 +28,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -36,7 +36,7 @@
                         <string>Title:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>le_title</cstring>
                     </property>
@@ -60,7 +60,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>tqlayout9</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index 4cfb787a..1be7f952 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "tag.h"
@@ -38,7 +38,7 @@ class TagSet::TagSetPrivate
     TQMap<TQString,Tag> map;
 };
 
-TagSet::TagSet(TQObject* parent) : TQObject(parent), d(new TagSetPrivate)
+TagSet::TagSet(TQObject* tqparent) : TQObject(tqparent), d(new TagSetPrivate)
 {
 }
 
@@ -72,7 +72,7 @@ void TagSet::remove(const Tag& tag)
     }
 }
 
-bool TagSet::tqcontainsID(const TQString& id) const
+bool TagSet::containsID(const TQString& id) const
 {
     return d->map.tqcontains(id);
 }
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index febb47d3..637fce50 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_TAGSET_H
@@ -44,13 +44,14 @@ class Tag;
     @author Frank Osterfeld
 */
 
-class TagSet : public QObject
+class TagSet : public TQObject
 {
     friend class Tag;
     Q_OBJECT
+  TQ_OBJECT
     public:
 
-        TagSet(TQObject* parent=0);
+        TagSet(TQObject* tqparent=0);
         virtual ~TagSet();
 
         /** adds a tag to the tag set. The tag set will emit signalTagAdded */
@@ -65,8 +66,8 @@ class TagSet : public QObject
         /** returns @c true if this set tqcontains @c tag */
         bool tqcontains(const Tag& tag) const;
 
-        /** returns @c true if this set tqcontains a tag with a given ID */
-        bool tqcontainsID(const TQString& id) const;
+        /** returns @c true if this set contains a tag with a given ID */
+        bool containsID(const TQString& id) const;
 
         /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */
         Tag findByID(const TQString& id) const;
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 680f88ca..963e6029 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "akregatorconfig.h"
@@ -57,8 +57,8 @@ void TrayIcon::setInstance(TrayIcon* trayIcon)
 }
 
 
-TrayIcon::TrayIcon(TQWidget *parent, const char *name)
-        : KSystemTray(parent, name), m_unread(0)
+TrayIcon::TrayIcon(TQWidget *tqparent, const char *name)
+        : KSystemTray(tqparent, name), m_unread(0)
 {
     m_defaultIcon=KSystemTray::loadIcon("akregator");
     TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty");
@@ -109,7 +109,7 @@ TQPixmap TrayIcon::takeScreenshot() const
     const int WIDTH   = 3;
     int ax = g.x() - x - MARGINS -1;
     int ay = g.y() - y - MARGINS -1;
-    painter.setPen( TQPen(Qt::red/*KApplication::palette().active().highlight()*/, WIDTH) );
+    painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, WIDTH) );
     painter.drawArc(ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360);
     painter.end();
 
@@ -156,11 +156,11 @@ void TrayIcon::slotSetUnread(int unread)
         }
 
         TQPixmap pix(oldW, oldH);
-        pix.fill(Qt::white);
+        pix.fill(TQt::white);
         TQPainter p(&pix);
         p.setFont(f);
-        p.setPen(Qt::blue);
-        p.drawText(pix.rect(), Qt::AlignCenter, uStr);
+        p.setPen(TQt::blue);
+        p.drawText(pix.rect(), TQt::AlignCenter, uStr);
 
         pix.setMask(pix.createHeuristicMask());
         TQImage img=pix.convertToImage();
@@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread)
 
 void TrayIcon::viewButtonClicked()
 {
-	TQWidget *p=static_cast<TQWidget*>(parent());
+	TQWidget *p=static_cast<TQWidget*>(tqparent());
 	KWin::forceActiveWindow(p->winId());
 }
 
diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h
index ac742ae6..316d938b 100644
--- a/akregator/src/trayicon.h
+++ b/akregator/src/trayicon.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORTRAYICON_H
@@ -35,11 +35,12 @@ namespace Akregator
     class TrayIcon : public KSystemTray
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
             static TrayIcon* getInstance();
             static void setInstance(TrayIcon* trayIcon);
             
-            TrayIcon(TQWidget *parent = 0, const char *name = 0);
+            TrayIcon(TQWidget *tqparent = 0, const char *name = 0);
             ~TrayIcon();
             
             TQPixmap takeScreenshot() const;
diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp
index 5aa31686..58e4ae8e 100644
--- a/akregator/src/treenode.cpp
+++ b/akregator/src/treenode.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "folder.h"
@@ -40,7 +40,7 @@ class TreeNode::TreeNodePrivate
     bool nodeChangeOccurred;
     bool articleChangeOccurred;
     TQString title;
-    Folder* parent;
+    Folder* tqparent;
     uint id;
     bool signalDestroyedEmitted;
 };
@@ -52,7 +52,7 @@ TreeNode::TreeNode()
     d->nodeChangeOccurred = false;
     d->articleChangeOccurred = false;
     d->title = "";
-    d->parent = 0;
+    d->tqparent = 0;
     d->id = 0;
     d->signalDestroyedEmitted = false;
     
@@ -91,35 +91,35 @@ void TreeNode::setTitle(const TQString& title)
 
 TreeNode* TreeNode::nextSibling() const
 {
-    if (!d->parent)
+    if (!d->tqparent)
         return 0;
-    TQValueList<TreeNode*> children = d->parent->children();
+    TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
     TreeNode* me = (TreeNode*)this;
         
-    int idx = children.findIndex(me);
+    int idx = tqchildren.findIndex(me);
     
-    return idx+1 < children.size() ? *(children.at(idx+1)) : 0L;
+    return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
 }
 
 TreeNode* TreeNode::prevSibling() const
 {
-    if (!d->parent)
+    if (!d->tqparent)
         return 0;
-    TQValueList<TreeNode*> children = d->parent->children();
+    TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
     TreeNode* me = (TreeNode*)this;
     
-    int idx = children.findIndex(me);
-    return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L;
+    int idx = tqchildren.findIndex(me);
+    return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L;
 }
 
-Folder* TreeNode::parent() const
+Folder* TreeNode::tqparent() const
 {
-    return d->parent;
+    return d->tqparent;
 }
 
-void TreeNode::setParent(Folder* parent)
+void TreeNode::setParent(Folder* tqparent)
 {
-    d->parent = parent;
+    d->tqparent = tqparent;
 }
 
 void TreeNode::setNotificationMode(bool doNotify, bool notifyOccurredChanges)
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 366677d3..d6c6f860 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORTREENODE_H
@@ -48,9 +48,10 @@ class FetchQueue;
                    
     TODO: detailed description goes here
 */
-class TreeNode : public QObject
+class TreeNode : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
         
@@ -99,23 +100,23 @@ public:
     virtual TreeNode* prevSibling() const;
     
     
-    /** Returns the parent node.
-    @return the parent feed group, 0 if there is none */
+    /** Returns the tqparent node.
+    @return the tqparent feed group, 0 if there is none */
     
-    virtual Folder* parent() const;
+    virtual Folder* tqparent() const;
     
     
-    /** Sets parent node; Don't call this directly, is done automatically by 
+    /** Sets tqparent node; Don't call this directly, is done automatically by 
     insertChild-methods in @ref Folder. */
     
-    virtual void setParent(Folder* parent);
+    virtual void setParent(Folder* tqparent);
     
     
     /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
-    virtual TQValueList<Article> articles(const TQString& tag=TQString::null) = 0;
+    virtual TQValueList<Article> articles(const TQString& tag=TQString()) = 0;
 
     /** returns a list of all tags occurring in this node (sub tree for folders) */
 
@@ -127,10 +128,10 @@ public:
     virtual bool isGroup() const = 0;
 
     /** exports node and child nodes to OPML (with akregator settings)
-        @param parent the dom element the child node will be attached to
+        @param tqparent the dom element the child node will be attached to
         @param document the opml document */
     
-    virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const = 0;
+    virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const = 0;
     
     /** 
     @param doNotify notification on changes on/off flag
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 02361f37..a5955a9f 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "treenode.h"
@@ -36,25 +36,25 @@
 
 namespace Akregator {
 
-TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node)
-    : KListViewItem(parent), m_node(node)
+TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNode* node)
+    : KListViewItem(tqparent), m_node(node)
 {
     initialize(node);
 }
 
-TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node) 
-    : KListViewItem(parent), m_node(node)
+TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNode* node) 
+    : KListViewItem(tqparent), m_node(node)
 {
     initialize(node);
 }
 
-TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node)
+TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node) : KListViewItem(tqparent, after), m_node(node)
 {
     initialize(node);
 }
 
-TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node)
-    : KListViewItem(parent, after), m_node(node)
+TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node)
+    : KListViewItem(tqparent, after), m_node(node)
 {
     initialize(node);
 }
@@ -71,7 +71,7 @@ TreeNodeItem::~TreeNodeItem()
 
 TQString TreeNodeItem::toolTip() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 TreeNode* TreeNodeItem::node()
@@ -99,9 +99,9 @@ TreeNodeItem* TreeNodeItem::nextSibling() const
     return static_cast<TreeNodeItem*>(KListViewItem::nextSibling()); 
 } 
 
-FolderItem* TreeNodeItem::parent() const 
+FolderItem* TreeNodeItem::tqparent() const 
 { 
-    return static_cast<FolderItem*>(KListViewItem::parent()); 
+    return static_cast<FolderItem*>(KListViewItem::tqparent()); 
 } 
     
 
@@ -151,7 +151,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
     p->drawText( x, 0, width-m-x, height(), align | AlignVCenter, oldText, -1, &br );
 
     if ( !isSelected() )
-        p->setPen( Qt::blue ); // TODO: configurable
+        p->setPen( TQt::blue ); // TODO: configurable
 
     p->drawText( br.right(), 0, width-m-br.right(), height(),
                  align | AlignVCenter, txt );
diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h
index b4bae964..3b263d73 100644
--- a/akregator/src/treenodeitem.h
+++ b/akregator/src/treenodeitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATORTREENODEITEM_H
@@ -43,10 +43,10 @@ class TreeNodeItem : public KListViewItem
     
 public:
      
-    TreeNodeItem(FolderItem* parent, TreeNode* node);
-    TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node);
-    TreeNodeItem(KListView* parent, TreeNode* node);
-    TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node);
+    TreeNodeItem(FolderItem* tqparent, TreeNode* node);
+    TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node);
+    TreeNodeItem(KListView* tqparent, TreeNode* node);
+    TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node);
     virtual ~TreeNodeItem();
     virtual TreeNode* node();
     
@@ -55,7 +55,7 @@ public:
     virtual TQString toolTip() const;
     virtual TreeNodeItem* firstChild() const;
     virtual TreeNodeItem* nextSibling() const;
-    virtual FolderItem* parent() const;
+    virtual FolderItem* tqparent() const;
 
     virtual void showContextMenu(const TQPoint& p) = 0;
 
diff --git a/akregator/src/treenodevisitor.cpp b/akregator/src/treenodevisitor.cpp
index b35d3113..375fd379 100644
--- a/akregator/src/treenodevisitor.cpp
+++ b/akregator/src/treenodevisitor.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "treenode.h"
diff --git a/akregator/src/treenodevisitor.h b/akregator/src/treenodevisitor.h
index 5b3149b3..b7affcf2 100644
--- a/akregator/src/treenodevisitor.h
+++ b/akregator/src/treenodevisitor.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef AKREGATOR_TREENODEVISITOR_H
 #define AKREGATOR_TREENODEVISITOR_H
diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp
index eb555a75..fb7b0186 100644
--- a/akregator/src/utils.cpp
+++ b/akregator/src/utils.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "utils.h"
diff --git a/akregator/src/utils.h b/akregator/src/utils.h
index 7a65915b..4a6e05ec 100644
--- a/akregator/src/utils.h
+++ b/akregator/src/utils.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_UTILS_H
@@ -46,7 +46,7 @@ class Utils
     
     /**
      * returns a file name for a URL, with chars like "/" ":"
-     * tqreplaced by "_". Too long URLs (>255 chars) are shortened and
+     * replaced by "_". Too long URLs (>255 chars) are shortened and
      * appended with a hash value.
      * 
      */
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 6926a151..2c52cf43 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kaction.h>
@@ -47,8 +47,8 @@
 
 namespace Akregator {
 
-Viewer::Viewer(TQWidget *parent, const char *name)
-    : KHTMLPart(parent, name), m_url(0)
+Viewer::Viewer(TQWidget *tqparent, const char *name)
+    : KHTMLPart(tqparent, name), m_url(0)
 {
     setZoomFactor(100);
     setMetaRefreshEnabled(true);
@@ -88,7 +88,7 @@ Viewer::~Viewer()
 bool Viewer::closeURL()
 {
     emit browserExtension()->loadingProgress(-1);
-    emit canceled(TQString::null);
+    emit canceled(TQString());
     return KHTMLPart::closeURL();
 }
 
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
 {
     TQString text = selectedText();
     text.tqreplace( TQChar( 0xa0 ), ' ' );
-    QClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,9 +212,9 @@ void Viewer::slotCopy()
 void Viewer::slotCopyLinkAddress()
 {
    if(m_url.isEmpty()) return;
-   QClipboard *cb = TQApplication::clipboard();
-   cb->setText(m_url.prettyURL(), QClipboard::Clipboard);
-   cb->setText(m_url.prettyURL(), QClipboard::Selection);
+   TQClipboard *cb = TQApplication::clipboard();
+   cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
+   cb->setText(m_url.prettyURL(), TQClipboard::Selection);
 }
 
 void Viewer::slotSelectionChanged()
@@ -244,7 +244,7 @@ void Viewer::slotOpenLinkInThisTab()
 
 void Viewer::slotOpenLinkInBrowser()
 {
-    displayInExternalBrowser(m_url, TQString::null);
+    displayInExternalBrowser(m_url, TQString());
 }
 
 void Viewer::slotSaveLinkAs()
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index 95924e82..c6e2c443 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWER_H
@@ -39,14 +39,15 @@ namespace Akregator
     class Viewer : public KHTMLPart
     {
         Q_OBJECT
+  TQ_OBJECT
         public:
 
            /**
             * Display article in external browser.
             */
-            static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString::null);    
+            static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString());    
 
-            Viewer(TQWidget* parent, const char* name);
+            Viewer(TQWidget* tqparent, const char* name);
             virtual ~Viewer();
 
             virtual bool closeURL();
diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp
index fb5813ec..6e1ac8f2 100644
--- a/certmanager/aboutdata.cpp
+++ b/certmanager/aboutdata.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/aboutdata.h b/certmanager/aboutdata.h
index 29e516f5..ca96f684 100644
--- a/certmanager/aboutdata.h
+++ b/certmanager/aboutdata.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui
index f907e37d..54f5a358 100644
--- a/certmanager/certificateinfowidget.ui
+++ b/certmanager/certificateinfowidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CertificateInfoWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CertificateInfoWidget</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QFrame" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Frame3</cstring>
             </property>
@@ -33,11 +33,11 @@
                 <enum>Sunken</enum>
             </property>
         </widget>
-        <widget class="QTabWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQTabWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -51,7 +51,7 @@
                     <property name="margin">
                         <number>6</number>
                     </property>
-                    <widget class="QListView" row="0" column="0">
+                    <widget class="TQListView" row="0" column="0">
                         <column>
                             <property name="text">
                                 <string>Description</string>
@@ -84,7 +84,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QTextEdit" row="1" column="0">
+                    <widget class="TQTextEdit" row="1" column="0">
                         <property name="name">
                             <cstring>textView</cstring>
                         </property>
@@ -97,7 +97,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -111,7 +111,7 @@
                     <property name="margin">
                         <number>6</number>
                     </property>
-                    <widget class="QListView" row="0" column="0">
+                    <widget class="TQListView" row="0" column="0">
                         <column>
                             <property name="text">
                                 <string>Path</string>
@@ -132,7 +132,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>dump</cstring>
                 </property>
@@ -146,7 +146,7 @@
                     <property name="margin">
                         <number>6</number>
                     </property>
-                    <widget class="QTextEdit">
+                    <widget class="TQTextEdit">
                         <property name="name">
                             <cstring>dumpView</cstring>
                         </property>
@@ -163,7 +163,7 @@
                 </vbox>
             </widget>
         </widget>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>importButton</cstring>
             </property>
@@ -188,7 +188,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 4932b6bd..8ce43aa5 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,7 +54,7 @@
 #include <kprocio.h>
 #include <kglobalsettings.h>
 
-// Qt
+// TQt
 #include <tqlistview.h>
 #include <tqtextedit.h>
 #include <tqheader.h>
@@ -69,8 +69,8 @@
 #include <assert.h>
 
 CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
-						      TQWidget * parent, const char * name )
-  : CertificateInfoWidget( parent, name ),
+						      TQWidget * tqparent, const char * name )
+  : CertificateInfoWidget( tqparent, name ),
     mExternal( external ),
     mFoundIssuer( true ),
     mHaveKeyLocally( false )
@@ -182,14 +182,14 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
   startCertificateDump();
 }
 
-static void showChainListError( TQWidget * parent, const GpgME::Error & err, const char * subject ) {
+static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, const char * subject ) {
   assert( err );
   const TQString msg = i18n("<qt><p>An error occurred while fetching "
 			   "the certificate <b>%1</b> from the backend:</p>"
 			   "<p><b>%2</b></p></qt>")
-    .arg( subject ? TQString::fromUtf8( subject ) : TQString::null,
+    .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
 	  TQString::fromLocal8Bit( err.asString() ) );
-  KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) );
 }
 
 void CertificateInfoWidgetImpl::startCertificateChainListing() {
@@ -329,7 +329,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
   else {
     item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
 			      .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
-    item->setOpen( true ); // Qt bug: doesn't open after setEnabled( false ) :/
+    item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
     item->setEnabled( false );
   }
   item->setOpen( true );
@@ -358,7 +358,7 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item )
 
   // find the key corresponding to "item". This hack would not be
   // necessary if pathView was a Kleo::KeyListView, but it's
-  // Qt-Designer-generated and I don't feel like creating a custom
+  // TQt-Designer-generated and I don't feel like creating a custom
   // widget spec for Kleo::KeyListView.
   unsigned int totalCount = 0;
   int itemIndex = -1;
diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h
index 53950e3b..d7e2f315 100644
--- a/certmanager/certificateinfowidgetimpl.h
+++ b/certmanager/certificateinfowidgetimpl.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,9 +48,10 @@ namespace GpgME {
 
 class CertificateInfoWidgetImpl : public CertificateInfoWidget {
   Q_OBJECT
+  TQ_OBJECT
 public:
   CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
-			     TQWidget * parent=0, const char * name=0);
+			     TQWidget * tqparent=0, const char * name=0);
 
   void setKey( const GpgME::Key & key );
 
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index 3cf42adb..11bb1aa8 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CertificateWizard</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>CertificateWizard</cstring>
     </property>
@@ -21,7 +21,7 @@
             <bold>1</bold>
         </font>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>introPage</cstring>
         </property>
@@ -32,7 +32,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>TextLabel1</cstring>
                 </property>
@@ -64,7 +64,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             </spacer>
         </vbox>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -75,7 +75,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>TextLabel2_2</cstring>
                 </property>
@@ -103,7 +103,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     </size>
                 </property>
             </spacer>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>groupBox1</cstring>
                 </property>
@@ -114,7 +114,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
@@ -125,7 +125,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                             <cstring>keyLengthCB</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox">
+                    <widget class="TQComboBox">
                         <property name="name">
                             <cstring>keyLengthCB</cstring>
                         </property>
@@ -149,7 +149,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     </spacer>
                 </hbox>
             </widget>
-            <widget class="QButtonGroup">
+            <widget class="TQButtonGroup">
                 <property name="name">
                     <cstring>certTypeBG</cstring>
                 </property>
@@ -160,7 +160,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QRadioButton">
+                    <widget class="TQRadioButton">
                         <property name="name">
                             <cstring>signOnlyCB</cstring>
                         </property>
@@ -168,7 +168,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                             <string>For &amp;signing only</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton">
+                    <widget class="TQRadioButton">
                         <property name="name">
                             <cstring>encryptOnlyCB</cstring>
                         </property>
@@ -176,7 +176,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                             <string>For &amp;encrypting only</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton">
+                    <widget class="TQRadioButton">
                         <property name="name">
                             <cstring>bothCB</cstring>
                         </property>
@@ -208,7 +208,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             </spacer>
         </vbox>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>personalDataPage</cstring>
         </property>
@@ -219,7 +219,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>TextLabel2</cstring>
                 </property>
@@ -247,7 +247,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     </size>
                 </property>
             </spacer>
-            <widget class="QPushButton" row="4" column="1">
+            <widget class="TQPushButton" row="4" column="1">
                 <property name="name">
                     <cstring>insertAddressButton</cstring>
                 </property>
@@ -275,7 +275,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                     </size>
                 </property>
             </spacer>
-            <widget class="QFrame" row="2" column="0" rowspan="1" colspan="2">
+            <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>edContainer</cstring>
                 </property>
@@ -296,7 +296,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>generatePage</cstring>
         </property>
@@ -307,7 +307,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>TextLabel4</cstring>
                 </property>
@@ -343,7 +343,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                     </size>
                 </property>
             </spacer>
-            <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3">
+            <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>ButtonGroup7</cstring>
                 </property>
@@ -373,7 +373,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                             <cstring>storeUR</cstring>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="0" column="0">
+                    <widget class="TQRadioButton" row="0" column="0">
                         <property name="name">
                             <cstring>storeInFileRB</cstring>
                         </property>
@@ -381,7 +381,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                             <string>&amp;Store in a file:</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="1" column="0">
+                    <widget class="TQRadioButton" row="1" column="0">
                         <property name="name">
                             <cstring>sendToCARB</cstring>
                         </property>
@@ -392,12 +392,12 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="1" column="1">
+                    <widget class="TQLineEdit" row="1" column="1">
                         <property name="name">
                             <cstring>caEmailED</cstring>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                    <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>brokenCA</cstring>
                         </property>
@@ -407,7 +407,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QPushButton" row="3" column="1">
+            <widget class="TQPushButton" row="3" column="1">
                 <property name="name">
                     <cstring>generatePB</cstring>
                 </property>
@@ -457,7 +457,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
             </spacer>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>finishPage</cstring>
         </property>
@@ -474,7 +474,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>TextLabel7</cstring>
                 </property>
@@ -489,7 +489,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
-            <widget class="QTextEdit">
+            <widget class="TQTextEdit">
                 <property name="name">
                     <cstring>certificateTE</cstring>
                 </property>
@@ -546,10 +546,10 @@ If you want to change anything, press Back and make your changes; otherwise, pre
     <tabstop>certificateTE</tabstop>
     <tabstop>generatePB</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotEmailAddressChanged(const QString&amp;)</slot>
     <slot access="protected">slotGenerateCertificate()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 7127b3c2..3c618e73 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -63,7 +63,7 @@
 #include <kio/job.h>
 #include <kio/netaccess.h>
 
-// Qt
+// TQt
 #include <tqlineedit.h>
 #include <tqtextedit.h>
 #include <tqpushbutton.h>
@@ -83,7 +83,7 @@ static const unsigned int numKeyLengths = sizeof keyLengths / sizeof *keyLengths
 
 static TQString attributeLabel( const TQString & attr, bool required ) {
   if ( attr.isEmpty() )
-    return TQString::null;
+    return TQString();
   const TQString label = Kleo::DNAttributeMapper::instance()->name2label( attr );
   if ( !label.isEmpty() )
     if ( required )
@@ -108,14 +108,14 @@ static bool availForMod( const TQLineEdit * le ) {
 }
 
 /*
- *  Constructs a CertificateWizardImpl which is a child of 'parent', with the
+ *  Constructs a CertificateWizardImpl which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The wizard will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal wizard.
  */
-CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : CertificateWizard( parent, name, modal, fl )
+CertificateWizardImpl::CertificateWizardImpl( TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : CertificateWizard( tqparent, name, modal, fl )
 {
     // don't allow to go to last page until a key has been generated
     setNextEnabled( generatePage, false );
@@ -176,7 +176,7 @@ void CertificateWizardImpl::slotEnablePersonalDataPageExit() {
  */
 CertificateWizardImpl::~CertificateWizardImpl()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 static const char * oidForAttributeName( const TQString & attr ) {
@@ -429,8 +429,8 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQString error;
   TQCString dcopService;
   int result = KDCOPServiceStarter::self()->
-    tqfindServiceFor( "DCOP/Mailer", TQString::null,
-                    TQString::null, &error, &dcopService );
+    findServiceFor( "DCOP/Mailer", TQString(),
+                    TQString(), &error, &dcopService );
   if ( result != 0 ) {
     kdDebug() << "Couldn't connect to KMail\n";
     KMessageBox::error( this,
@@ -441,11 +441,11 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQCString dummy;
   // OK, so kmail (or kontact) is running. Now ensure the object we want is available.
   // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
-  if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+  if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
     DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
     DCOPReply reply = ref.call( "load()" );
     if ( reply.isValid() && (bool)reply ) {
-      Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+      Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
     } else
       kdWarning() << "Error loading " << dcopService << endl;
   }
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index 98327e81..18aa5f68 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,16 +49,17 @@ namespace KIO {
 class CertificateWizardImpl : public CertificateWizard
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    CertificateWizardImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~CertificateWizardImpl();
 
     bool sendToCA() const;
     TQString caEMailAddress() const;
     KURL saveFileUrl() const;
 
-    typedef QPair<TQString, TQLineEdit*> StringLEPair;
+    typedef TQPair<TQString, TQLineEdit*> StringLEPair;
     typedef TQValueVector< StringLEPair > AttrPairList;
 
 public:
diff --git a/certmanager/certlistview.cpp b/certmanager/certlistview.cpp
index f26ba17f..73f3ecdd 100644
--- a/certmanager/certlistview.cpp
+++ b/certmanager/certlistview.cpp
@@ -5,8 +5,8 @@
 
 CertKeyListView::CertKeyListView( const ColumnStrategy * strategy,
                                   const DisplayStrategy * display,
-                                  TQWidget * parent, const char * name, WFlags f )
-  : Kleo::KeyListView( strategy, display, parent, name, f )
+                                  TQWidget * tqparent, const char * name, WFlags f )
+  : Kleo::KeyListView( strategy, display, tqparent, name, f )
 {
   viewport()->setAcceptDrops( true );
 }
diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h
index d06caf99..3434fc47 100644
--- a/certmanager/certlistview.h
+++ b/certmanager/certlistview.h
@@ -7,11 +7,12 @@
 /// We need to derive from Kleo::KeyListView simply to add support for drop events
 class CertKeyListView : public Kleo::KeyListView {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   CertKeyListView( const ColumnStrategy * strategy,
                    const DisplayStrategy * display=0,
-                   TQWidget * parent=0, const char * name=0, WFlags f=0 );
+                   TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
 
 signals:
   void dropped( const KURL::List& urls );
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index aebfa366..59fc7376 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -89,7 +89,7 @@
 #include <kio/netaccess.h>
 #include <kstdaccel.h>
 
-// Qt
+// TQt
 #include <tqfontmetrics.h>
 #include <tqpopupmenu.h>
 
@@ -136,7 +136,7 @@ namespace {
     case 0: return i18n("Subject");
     case 1: return i18n("Issuer");
     case 2: return i18n("Serial");
-    default: return TQString::null;
+    default: return TQString();
     }
   }
 
@@ -144,8 +144,8 @@ namespace {
     switch ( col ) {
     case 0: return Kleo::DN( key.userID(0).id() ).prettyDN();
     case 1: return Kleo::DN( key.issuerName() ).prettyDN();
-    case 2: return key.issuerSerial() ? TQString::fromUtf8( key.issuerSerial() ) : TQString::null ;
-    default: return TQString::null;
+    case 2: return key.issuerSerial() ? TQString::fromUtf8( key.issuerSerial() ) : TQString() ;
+    default: return TQString();
     }
   }
 
@@ -161,8 +161,8 @@ namespace {
 } // anon namespace
 
 CertManager::CertManager( bool remote, const TQString& query, const TQString & import,
-			  TQWidget* parent, const char* name, WFlags f )
-  : KMainWindow( parent, name, f|WDestructiveClose ),
+			  TQWidget* tqparent, const char* name, WFlags f )
+  : KMainWindow( tqparent, name, f|WDestructiveClose ),
     mCrlView( 0 ),
     mDirmngrProc( 0 ),
     mHierarchyAnalyser( 0 ),
@@ -354,7 +354,7 @@ void CertManager::createActions() {
 
   (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
 
-  mLineEditAction = new LineEditAction( TQString::null, actionCollection(), this,
+  mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
 					TQT_SLOT(slotSearch()),
 					"query_lineedit_action");
 
@@ -363,8 +363,8 @@ void CertManager::createActions() {
   mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
 
-  mFindAction = new KAction( i18n("Find"), "find", 0, this, TQT_SLOT(slotSearch()),
-			     actionCollection(), "find" );
+  mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()),
+			     actionCollection(), "tqfind" );
 
   KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
   KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
@@ -496,10 +496,10 @@ static std::set<std::string> extractKeyFingerprints( const TQPtrList<Kleo::KeyLi
 }
 
 static TQStringList stringlistFromSet( const std::set<std::string> & set ) {
-  // ARGH. This is madness. Shitty Qt containers don't support TQStringList( patterns.begin(), patterns.end() ) :/
+  // ARGH. This is madness. Shitty TQt containers don't support TQStringList( patterns.begin(), patterns.end() ) :/
   TQStringList sl;
   for ( std::set<std::string>::const_iterator it = set.begin() ; it != set.end() ; ++it )
-    // let's make extra sure, maybe someone tries to make Qt not support std::string->TQString conversion
+    // let's make extra sure, maybe someone tries to make TQt not support std::string->TQString conversion
     sl.push_back( TQString::tqfromLatin1( it->c_str() ) );
   return sl;
 }
@@ -527,14 +527,14 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
 			i18n("Refreshing Keys Failed") );
 }
 
-static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
+static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the certificates from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
     .arg( TQString::fromLocal8Bit( err.asString() ) );
 
-  KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) );
 }
 
 void CertManager::slotSearch() {
@@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set<std::string> & fp
   for  ( TQListViewItemIterator it( lv ) ; it.current() ; ++it )
     if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast<Kleo::KeyListViewItem>( it.current() ) ) {
       const char * fpr = item->key().primaryFingerprint();
-      item->setSelected( fpr && fprs.find( fpr ) != fprs.end() );
+      item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() );
     }
 }
 
@@ -668,7 +668,7 @@ void CertManager::slotImportCertFromFile()
 {
   const TQString filter = "application/x-x509-ca-cert application/x-pkcs12 application/pkcs7-mime";
   //const TQString filter = TQString("*.pem *.der *.p7c *.p12|") + i18n("Certificates (*.pem *.der *.p7c *.p12)");
-  slotImportCertFromFile( KFileDialog::getOpenURL( TQString::null, filter, this,
+  slotImportCertFromFile( KFileDialog::getOpenURL( TQString(), filter, this,
                                                    i18n( "Select Certificate File" ) ) );
 }
 
@@ -700,7 +700,7 @@ void CertManager::slotImportResult( KIO::Job* job )
   updateImportActions( true );
 }
 
-static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) {
+static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) {
   assert( err );
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
 			    "to download the certificate %1:</p>"
@@ -708,7 +708,7 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error
                       .arg( certDisplayName )
                       .arg( TQString::fromLocal8Bit( err.asString() ) );
 
-  KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) );
 }
 
 void CertManager::slotDownloadCertificate() {
@@ -745,7 +745,7 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con
 
 TQString CertManager::displayNameForJob( const Kleo::Job *job )
 {
-  JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.find( job );
+  JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.tqfind( job );
   TQString displayName;
   if ( it != mJobsDisplayNameMap.end() ) {
     displayName = *it;
@@ -768,14 +768,14 @@ void CertManager::slotCertificateDownloadResult( const GpgME::Error & err, const
   disconnectJobFromStatusBarProgress( err );
 }
 
-static void showCertificateImportError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) {
+static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) {
   assert( err );
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
 			    "to import the certificate %1:</p>"
 			    "<p><b>%2</b></p></qt>" )
                       .arg( certDisplayName )
                       .arg( TQString::fromLocal8Bit( err.asString() ) );
-  KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) );
 }
 
 void CertManager::startCertificateImport( const TQByteArray & keyData, const TQString& certDisplayName ) {
@@ -853,7 +853,7 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
     KMessageBox::information( this,
 			      i18n( "<qt><p>Detailed results of importing %1:</p>"
 				    "<table>%2</table></qt>" )
-			      .arg( displayName ).arg( lines.join( TQString::null ) ),
+			      .arg( displayName ).arg( lines.join( TQString() ) ),
 			      i18n( "Certificate Import Result" ) );
 
     disconnectJobFromStatusBarProgress( res.error() );
@@ -891,7 +891,7 @@ void CertManager::slotDirmngrExited() {
 void CertManager::importCRLFromFile() {
   // loadcrl can only work with DER encoded files (verified with dirmngr 1.0.3)
   TQString filter = TQString("*.crl *.arl *-crl.der *-arl.der|") + i18n("Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)");
-  KURL url = KFileDialog::getOpenURL( TQString::null,
+  KURL url = KFileDialog::getOpenURL( TQString(),
                                       filter,
                                       this,
                                       i18n( "Select CRL File" ) );
@@ -929,7 +929,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
   assert( slot );
   assert( processname );
   assert( mDirmngrProc );
-  mErrorbuffer = TQString::null;
+  mErrorbuffer = TQString();
   connect( mDirmngrProc, TQT_SIGNAL(processExited(KProcess*)), slot );
   connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int) ),
            this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
@@ -944,7 +944,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
 void CertManager::startImportCRL( const TQString& filename, bool isTempFile )
 {
   assert( !mDirmngrProc );
-  mImportCRLTempFile = isTempFile ? filename : TQString::null;
+  mImportCRLTempFile = isTempFile ? filename : TQString();
   mDirmngrProc = new KProcess();
   *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename;
   if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) {
@@ -998,13 +998,13 @@ void CertManager::slotClearCRLsResult() {
   delete mDirmngrProc; mDirmngrProc = 0;
 }
 
-static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) {
+static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n("<qt><p>An error occurred while trying to delete "
 			   "the certificates:</p>"
 			   "<p><b>%1</b></p></qt>")
     .arg( TQString::fromLocal8Bit( err.asString() ) );
-  KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") );
+  KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") );
 }
 
 static bool ByFingerprint( const GpgME::Key & left, const GpgME::Key & right ) {
@@ -1201,13 +1201,13 @@ void CertManager::slotExportCertificate() {
   startCertificateExport( fingerprints );
 }
 
-static void showCertificateExportError( TQWidget * parent, const GpgME::Error & err ) {
+static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
 			   "the certificate:</p>"
 			   "<p><b>%1</b></p></qt>")
     .arg( TQString::fromLocal8Bit( err.asString() ) );
-  KMessageBox::error( parent, msg, i18n("Certificate Export Failed") );
+  KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") );
 }
 
 void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
@@ -1258,7 +1258,7 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
   kdDebug() << "CertManager::slotCertificateExportResult(): got " << data.size() << " bytes" << endl;
 
   const TQString filter = TQString("*.pem|") + i18n("ASCII Armored Certificate Bundles (*.pem)");
-  const KURL url = KFileDialog::getOpenURL( TQString::null,
+  const KURL url = KFileDialog::getOpenURL( TQString(),
                                       filter,
                                       this,
                                       i18n( "Save Certificate" ) );
@@ -1296,13 +1296,13 @@ void CertManager::slotExportSecretKey() {
   startSecretKeyExport( dlg.fingerprint() );
 }
 
-static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & err ) {
+static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
 			   "the secret key:</p>"
 			   "<p><b>%1</b></p></qt>")
     .arg( TQString::fromLocal8Bit( err.asString() ) );
-  KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") );
+  KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") );
 }
 
 void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
@@ -1377,7 +1377,7 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
 
   kdDebug() << "CertManager::slotSecretKeyExportResult(): got " << data.size() << " bytes" << endl;
   TQString filter = TQString("*.p12|") + i18n("PKCS#12 Key Bundle (*.p12)");
-  KURL url = KFileDialog::getOpenURL( TQString::null,
+  KURL url = KFileDialog::getOpenURL( TQString(),
                                       filter,
                                       this,
                                       i18n( "Save Certificate" ) );
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index bee15704..ef27db6e 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -78,10 +78,11 @@ namespace GpgME {
 
 class KDE_EXPORT CertManager : public KMainWindow {
   Q_OBJECT
+  TQ_OBJECT
 public:
-    CertManager( bool remote = false, const TQString& query = TQString::null,
-		 const TQString& import=TQString::null,
-		 TQWidget * parent=0, const char * name=0, WFlags f=0 );
+    CertManager( bool remote = false, const TQString& query = TQString(),
+		 const TQString& import=TQString(),
+		 TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
     ~CertManager();
 
     bool isRemote() const { return mRemote; }
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index e0893233..90720508 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -38,8 +38,8 @@
 
 #include <kdepimmacros.h>
 
-AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * tqparent, const char * name )
+    : KCModule( tqparent, name )
 {
   TQVBoxLayout* lay = new TQVBoxLayout( this );
   mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,10 +70,10 @@ void AppearanceConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *tqparent, const char * )
   {
     AppearanceConfigurationPage *page =
-      new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
+      new AppearanceConfigurationPage( tqparent, "kleopatra_config_appear" );
     return page;
   }
 }
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 4713e262..90c6bc13 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,8 +43,9 @@ namespace Kleo {
  */
 class AppearanceConfigurationPage : public KCModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 );
+  AppearanceConfigurationPage( TQWidget * tqparent=0, const char * name=0 );
 
   virtual void load();
   virtual void save();
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 77a97bb4..33f4189b 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -63,7 +63,7 @@
 
 using namespace Kleo;
 
-class CategoryListViewItem : public QListViewItem
+class CategoryListViewItem : public TQListViewItem
 {
 public:
   CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
@@ -114,7 +114,7 @@ public:
   TQFont font() const { return mFont; }
 
   void setDefaultAppearance() {
-    mForegroundColor = mIsExpired ? Qt::red : TQColor();
+    mForegroundColor = mIsExpired ? TQt::red : TQColor();
     mBackgroundColor = TQColor();
     mHasFont = false;
     mFont = TQFont();
@@ -178,8 +178,8 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
 ////
 
 Kleo::AppearanceConfigWidget::AppearanceConfigWidget (
-  TQWidget* parent,  const char* name, WFlags fl )
-  : AppearanceConfigWidgetBase( parent, name, fl )
+  TQWidget* tqparent,  const char* name, WFlags fl )
+  : AppearanceConfigWidgetBase( tqparent, name, fl )
 {
     categoriesLV->setSorting( -1 );
     load();
@@ -192,7 +192,7 @@ Kleo::AppearanceConfigWidget::AppearanceConfigWidget (
 
 AppearanceConfigWidget::~AppearanceConfigWidget()
 {
-  // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, TQt does it all for us
 }
 
 
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 5e7c1f8c..917a1cfb 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -42,10 +42,11 @@ namespace Kleo {
 
   class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     AppearanceConfigWidget(
-      TQWidget * parent=0, const char * name=0, WFlags f=0 );
+      TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
     ~AppearanceConfigWidget();
 
     void load();
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 60e10c21..9fb7af20 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AppearanceConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AppearanceConfigWidgetBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Key Categories</string>
@@ -35,7 +35,7 @@
                 <cstring>categoriesLV</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout2</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>foregroundButton</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>Set &amp;Text Color...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>backgroundButton</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <string>Set &amp;Background Color...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>fontButton</cstring>
                     </property>
@@ -76,7 +76,7 @@
                         <string>Set F&amp;ont...</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>italicCB</cstring>
                     </property>
@@ -87,7 +87,7 @@
                         <string>Italic</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>boldCB</cstring>
                     </property>
@@ -98,7 +98,7 @@
                         <string>Bold</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>strikeoutCB</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>defaultLookPB</cstring>
                     </property>
@@ -201,7 +201,7 @@
     <tabstop>strikeoutCB</tabstop>
     <tabstop>defaultLookPB</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotForegroundClicked()</slot>
     <slot access="protected">slotBackgroundClicked()</slot>
     <slot access="protected">slotFontClicked()</slot>
@@ -210,6 +210,6 @@
     <slot access="protected">slotItalicClicked()</slot>
     <slot access="protected">slotBoldClicked()</slot>
     <slot access="protected">slotStrikeoutClicked()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index aa161fc7..349f3070 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -38,8 +38,8 @@
 #include <kconfig.h>
 #include <klocale.h>
 
-ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
-  : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )
+ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal )
+  : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), tqparent, name, modal )
 {
   KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
   showButton( User1, true );
diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h
index 436816dd..456bc780 100644
--- a/certmanager/conf/configuredialog.h
+++ b/certmanager/conf/configuredialog.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -39,9 +39,10 @@
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+  ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
   ~ConfigureDialog();
 
 protected:
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 73fad674..fb367fd3 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,7 +49,7 @@
 
 #include <kdepimmacros.h>
 
-#if 0 // disabled, since it is apparently confusing
+#if 0 // disabled, since it is aptqparently confusing
 // For sync'ing kabldaprc
 class KABSynchronizer
 {
@@ -137,8 +137,8 @@ static const char s_addnewservers_componentName[] = "dirmngr";
 static const char s_addnewservers_groupName[] = "LDAP";
 static const char s_addnewservers_entryName[] = "add-servers";
 
-DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * tqparent, const char * name )
+    : KCModule( tqparent, name )
 {
   mConfig = Kleo::CryptoBackendFactory::instance()->config();
   TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -153,8 +153,8 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget
   box->setSpacing( KDialog::spacingHint() );
   lay->addWidget( box );
   TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box );
-  mTimeout = new QTimeEdit( box );
-  mTimeout->setDisplay( QTimeEdit::Minutes | QTimeEdit::Seconds );
+  mTimeout = new TQTimeEdit( box );
+  mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds );
   connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) );
   label->setBuddy( mTimeout );
   TQWidget* stretch = new TQWidget( box );
@@ -165,7 +165,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget
   box->setSpacing( KDialog::spacingHint() );
   lay->addWidget( box );
   mMaxItems = new KIntNumInput( box );
-  mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), Qt::AlignLeft | Qt::AlignVCenter );
+  mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter );
   mMaxItems->setMinValue( 0 );
   connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
   stretch = new TQWidget( box );
@@ -235,7 +235,7 @@ void DirectoryServicesConfigurationPage::save()
   KURL::List::const_iterator end = toAdd.end();
   for( ; it != end; ++it ) {
     // check if the URL is already in currentList
-    if ( currentList.find( *it ) == currentList.end() )
+    if ( currentList.tqfind( *it ) == currentList.end() )
       // if not, add it
       currentList.append( *it );
   }
@@ -259,10 +259,10 @@ void DirectoryServicesConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *tqparent, const char * )
   {
     DirectoryServicesConfigurationPage *page =
-      new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
+      new DirectoryServicesConfigurationPage( tqparent, "kleopatra_config_dirserv" );
     return page;
   }
 }
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index bb440d4b..24f5f9df 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -37,7 +37,7 @@
 #include <kdepimmacros.h>
 
 class TQCheckBox;
-class QTimeEdit;
+class TQTimeEdit;
 class KIntNumInput;
 namespace Kleo {
   class CryptoConfig;
@@ -52,8 +52,9 @@ namespace Kleo {
  */
 class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 );
+  DirectoryServicesConfigurationPage( TQWidget * tqparent=0, const char * name=0 );
 
   virtual void load();
   virtual void save();
@@ -70,7 +71,7 @@ private:
                                         bool isList );
 
   Kleo::DirectoryServicesWidget* mWidget;
-  QTimeEdit* mTimeout;
+  TQTimeEdit* mTimeout;
   KIntNumInput* mMaxItems;
   TQCheckBox* mAddNewServersCB;
 
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index bc358f91..f84bb1e7 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -38,8 +38,8 @@
 
 #include <tqlayout.h>
 
-DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
-  : KCModule( parent, name )
+DNOrderConfigPage::DNOrderConfigPage( TQWidget * tqparent, const char * name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( this );
   mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -70,8 +70,8 @@ void DNOrderConfigPage::slotChanged() {
   emit changed(true);
 }
 
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
-    return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
+extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * tqparent, const char * ) {
+    return new DNOrderConfigPage( tqparent, "kleopatra_config_dnorder" );
 }
 
 #include "dnorderconfigpage.moc"
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index aedc0e82..5108b3a0 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,8 +43,9 @@ namespace Kleo {
  */
 class DNOrderConfigPage : public KCModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  DNOrderConfigPage( TQWidget * parent=0, const char * name=0 );
+  DNOrderConfigPage( TQWidget * tqparent=0, const char * name=0 );
 
   /*! reimplementation */
   void load();
diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp
index 49a82f98..6b46bef9 100644
--- a/certmanager/crlview.cpp
+++ b/certmanager/crlview.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,8 +49,8 @@
 #include <tqfontmetrics.h>
 #include <tqtimer.h>
 
-CRLView::CRLView( TQWidget* parent, const char* name, bool modal )
-  : TQDialog( parent, name, modal ), _process(0)
+CRLView::CRLView( TQWidget* tqparent, const char* name, bool modal )
+  : TQDialog( tqparent, name, modal ), _process(0)
 {
   TQVBoxLayout* topLayout = new TQVBoxLayout( this, 10, 4 );
 
@@ -97,7 +97,7 @@ void CRLView::slotUpdateView()
 {
   _updateButton->setEnabled( false );
   _textView->clear();
-  _buffer = TQString::null;
+  _buffer = TQString();
   if( _process == 0 ) {
     _process = new KProcess();
     *_process << "gpgsm" << "--call-dirmngr" << "listcrls";
@@ -121,7 +121,7 @@ void CRLView::slotReadStdout( KProcess*, char* buf, int len)
 
 void CRLView::slotAppendBuffer() {
   _textView->append( _buffer );
-  _buffer = TQString::null;
+  _buffer = TQString();
 }
 
 void CRLView::slotProcessExited()
diff --git a/certmanager/crlview.h b/certmanager/crlview.h
index c801410e..41a78bfa 100644
--- a/certmanager/crlview.h
+++ b/certmanager/crlview.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,8 +43,9 @@ class TQTimer;
 
 class CRLView : public TQDialog {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false );
+  CRLView( TQWidget* tqparent = 0, const char* name = 0, bool modal = false );
   ~CRLView();
 public slots:
   void slotUpdateView();
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index 27fed1ae..7289652b 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -39,9 +39,9 @@
 #include <tqlabel.h>
 
 
-LabelAction::LabelAction( const TQString & text,  KActionCollection * parent,
+LabelAction::LabelAction( const TQString & text,  KActionCollection * tqparent,
 			  const char* name )
-  : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name )
+  : KAction( text, TQIconSet(), KShortcut(), 0, 0, tqparent, name )
 {
 
 }
@@ -62,9 +62,9 @@ int LabelAction::plug( TQWidget * widget, int index ) {
   return KAction::plug( widget, index );
 }
 
-LineEditAction::LineEditAction( const TQString & text, KActionCollection * parent,
+LineEditAction::LineEditAction( const TQString & text, KActionCollection * tqparent,
 				TQObject * receiver, const char * member, const char * name )
-  : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ),
+  : KAction( text, TQIconSet(), KShortcut(), 0, 0, tqparent, name ),
     _le(0), _receiver(receiver), _member(member)
 {
 
@@ -108,10 +108,10 @@ void LineEditAction::setText( const TQString & txt ) {
 }
 
 
-ComboAction::ComboAction( const TQStringList & lst,  KActionCollection * parent,
+ComboAction::ComboAction( const TQStringList & lst,  KActionCollection * tqparent,
 			  TQObject * receiver, const char * member, const char * name,
                           int selectedID )
-  : KAction( TQString::null, TQIconSet(), KShortcut(), 0, 0, parent, name ),
+  : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, tqparent, name ),
     _lst(lst), _receiver(receiver), _member(member), _selectedId( selectedID )
 {
 
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index 288aeb16..6d6600fb 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -41,8 +41,9 @@ class TQLineEdit;
 
 class LabelAction : public KAction {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  LabelAction( const TQString & text, KActionCollection * parent,
+  LabelAction( const TQString & text, KActionCollection * tqparent,
 	       const char* name );
 
   int plug( TQWidget * widget, int index=-1 );
@@ -50,8 +51,9 @@ public:
 
 class LineEditAction : public KAction {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  LineEditAction( const TQString & text, KActionCollection * parent,
+  LineEditAction( const TQString & text, KActionCollection * tqparent,
 		  TQObject * receiver, const char * member, const char * name );
 
   int plug( TQWidget * widget, int index=-1 );
@@ -67,8 +69,9 @@ private:
 
 class ComboAction : public KAction {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComboAction( const TQStringList & lst,  KActionCollection * parent,
+  ComboAction( const TQStringList & lst,  KActionCollection * tqparent,
 	       TQObject * receiver, const char * member, const char * name,
                int selectedID );
 
diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp
index ed7809a7..96979adf 100644
--- a/certmanager/hierarchyanalyser.cpp
+++ b/certmanager/hierarchyanalyser.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -39,8 +39,8 @@
 #include <algorithm>
 #include <iterator>
 
-HierarchyAnalyser::HierarchyAnalyser( TQObject * parent, const char * name )
-  : TQObject( parent, name )
+HierarchyAnalyser::HierarchyAnalyser( TQObject * tqparent, const char * name )
+  : TQObject( tqparent, name )
 {
 
 }
@@ -54,7 +54,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) {
     return;
   if ( key.isRoot() || !key.chainID() || !*key.chainID() )
     // root keys have themselves as issuer - we don't want them to
-    // have parents, though:
+    // have tqparents, though:
     mSubjectsByIssuer[0].push_back( key );
   else
     mSubjectsByIssuer[key.chainID()].push_back( key );
@@ -63,7 +63,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) {
 const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char * issuer_dn ) const {
   static const std::vector<GpgME::Key> empty;
   std::map< TQCString, std::vector<GpgME::Key> >::const_iterator it =
-    mSubjectsByIssuer.find( issuer_dn );
+    mSubjectsByIssuer.tqfind( issuer_dn );
   return it == mSubjectsByIssuer.end() ? empty : it->second ;
 }
 
diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h
index 9521d84d..a27d8a6c 100644
--- a/certmanager/hierarchyanalyser.h
+++ b/certmanager/hierarchyanalyser.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,8 +43,9 @@
 
 class HierarchyAnalyser : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  HierarchyAnalyser( TQObject * parent=0, const char * name=0 );
+  HierarchyAnalyser( TQObject * tqparent=0, const char * name=0 );
   ~HierarchyAnalyser();
 
   const std::vector<GpgME::Key> & rootItems() const {
diff --git a/certmanager/kleopatraui.rc b/certmanager/kleopatraui.rc
index d07e08b8..786ae1a3 100644
--- a/certmanager/kleopatraui.rc
+++ b/certmanager/kleopatraui.rc
@@ -52,7 +52,7 @@
 	<Action name="label_action" />
 	<Action name="query_lineedit_action" />
 	<Action name="location_combo_action" />
-	<Action name="find" />
+	<Action name="tqfind" />
 </ToolBar>
 
 <Menu name="listview_popup">
diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp
index 4bde5219..2759ee31 100644
--- a/certmanager/kwatchgnupg/aboutdata.cpp
+++ b/certmanager/kwatchgnupg/aboutdata.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h
index 0e1f9f63..2a332410 100644
--- a/certmanager/kwatchgnupg/aboutdata.h
+++ b/certmanager/kwatchgnupg/aboutdata.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index c22be6b7..5edb1a42 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,9 +66,9 @@ static int log_level_to_int( const TQString& loglevel )
   }
 }
 
-KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
+KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* tqparent, const char* name )
   : KDialogBase( Plain, i18n("Configure KWatchGnuPG"),
-		 Ok|Cancel, Ok, parent, name )
+		 Ok|Cancel, Ok, tqparent, name )
 {
   // tmp vars:
   TQWidget * w;
@@ -168,7 +168,7 @@ void KWatchGnuPGConfig::loadConfig()
   mLoglenSB->setValue( config->readNumEntry( "MaxLogLen", 10000 ) );
   mWordWrapCB->setChecked( config->readBoolEntry("WordWrap", false ) );
 
-  config->setGroup( TQString::null );
+  config->setGroup( TQString() );
   enableButtonOK( false );
   enableButtonApply( false );
 }
@@ -185,7 +185,7 @@ void KWatchGnuPGConfig::saveConfig()
   config->writeEntry( "MaxLogLen", mLoglenSB->value() );
   config->writeEntry( "WordWrap", mWordWrapCB->isChecked() );
 
-  config->setGroup( TQString::null );
+  config->setGroup( TQString() );
   config->sync();
   enableButtonOK( false );
   enableButtonApply( false );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
index c73f5f6d..ac72ce1b 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -42,8 +42,9 @@ class KURLRequester;
 
 class KWatchGnuPGConfig : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 );
+  KWatchGnuPGConfig( TQWidget* tqparent, const char* name = 0 );
 
   void loadConfig();
   void saveConfig();
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 3b856ca1..01340ecd 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -58,8 +58,8 @@
 #define WATCHGNUPGBINARY "watchgnupg"
 #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket")
 
-KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name )
-  : KMainWindow( parent, name, WType_TopLevel ), mConfig(0)
+KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* tqparent, const char* name )
+  : KMainWindow( tqparent, name, WType_TopLevel ), mConfig(0)
 {
   createActions();
   createGUI();
@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
+						   .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -143,12 +143,12 @@ void KWatchGnuPGMainWindow::startWatcher()
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
   *mWatcher << config->readEntry("Socket", WATCHGNUPGSOCKET);
-  config->setGroup(TQString::null);
+  config->setGroup(TQString());
   if( !mWatcher->start() ) {
 	KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
   } else {
 	mCentralWidget->append( tr("[%1] Log started")
-							.arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
+							.arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
   }
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
 		   this, TQT_SLOT( slotWatcherExited() ) );
@@ -192,7 +192,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
 
 void KWatchGnuPGMainWindow::slotWatcherExited()
 {
-  if( KMessageBox::questionYesNo( this, i18n("The watchgnupg logging process died.\nDo you want to try to restart it?"), TQString::null, i18n("Try Restart"), i18n("Do Not Try") ) == KMessageBox::Yes ) {
+  if( KMessageBox::questionYesNo( this, i18n("The watchgnupg logging process died.\nDo you want to try to restart it?"), TQString(), i18n("Try Restart"), i18n("Do Not Try") ) == KMessageBox::Yes ) {
 	mCentralWidget->append( i18n("====== Restarting logging process =====") );
 	startWatcher();
   } else {
@@ -229,7 +229,7 @@ void KWatchGnuPGMainWindow::show()
 
 void KWatchGnuPGMainWindow::slotSaveAs()
 {
-  TQString filename = KFileDialog::getSaveFileName( TQString::null, TQString::null,
+  TQString filename = KFileDialog::getSaveFileName( TQString(), TQString(),
 												   this, i18n("Save Log to File") );
   if( filename.isEmpty() ) return;
   TQFile file(filename);
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index f37b2422..fc777689 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -42,8 +42,9 @@ class TQTextEdit;
 
 class KWatchGnuPGMainWindow : public KMainWindow {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 );
+  KWatchGnuPGMainWindow( TQWidget* tqparent = 0, const char* name = 0 );
   virtual ~KWatchGnuPGMainWindow();
 public slots:
   void slotWatcherExited();
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index 7c25a8da..cbd0dd17 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp
index c58f1b12..f7740b2f 100644
--- a/certmanager/kwatchgnupg/tray.cpp
+++ b/certmanager/kwatchgnupg/tray.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h
index 85695f8f..6c94d85c 100644
--- a/certmanager/kwatchgnupg/tray.h
+++ b/certmanager/kwatchgnupg/tray.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -40,6 +40,7 @@ class KWatchGnuPGMainWindow;
 
 class KWatchGnuPGTray : public KSystemTray {
   Q_OBJECT
+  TQ_OBJECT
 public:
   KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin );
   virtual ~KWatchGnuPGTray();
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 2804cca1..5ce7f617 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -106,7 +106,7 @@ namespace {
     KURL::List m;
   public:
     to( const TQVariant & v ) {
-      // wow, KURL::List is broken... it lacks conversion from and to QVL<KURL>...
+      // wow, KURL::List is broken... it lacks conversion from and to TQVL<KURL>...
       m += to< TQValueList<KURL> >( v );
     }
     operator KURL::List() const { return m; }
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
index 96eda06e..1619f9ea 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 99fdda01..c6b718ca 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -163,7 +163,7 @@ void Kleo::ChiasmusJob::showChiasmusOutput() {
   kdDebug() << k_funcinfo << endl;
   if ( mStderr.isEmpty() )
     return;
-  KMessageBox::information( 0 /*how to get a parent widget?*/,
+  KMessageBox::information( 0 /*how to get a tqparent widget?*/,
                             mStderr,
                             i18n( "Output from chiasmus" ) );
 }
@@ -200,7 +200,7 @@ void Kleo::ChiasmusJob::slotTimeout() {
 }
 
 
-void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
   if ( !mError )
     return;
   if ( mError.isCanceled() )
@@ -211,9 +211,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap
     .arg( TQString::fromLocal8Bit( mError.asString() ) );
   if ( !mStderr.isEmpty() ) {
     const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
-    KMessageBox::detailedError( parent, msg, details, caption );
+    KMessageBox::detailedError( tqparent, msg, details, caption );
   } else {
-    KMessageBox::error( parent, msg, caption );
+    KMessageBox::error( tqparent, msg, caption );
   }
 }
 
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 54b3763c..08b3ec1d 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,12 +51,13 @@ namespace Kleo {
   */
   class ChiasmusJob : public Kleo::SpecialJob {
     Q_OBJECT
+  TQ_OBJECT
     Q_ENUMS( Mode )
-    Q_PROPERTY( Mode mode READ mode )
-    Q_PROPERTY( TQString key READ key WRITE setKey )
-    Q_PROPERTY( TQString options READ options WRITE setOptions )
-    Q_PROPERTY( TQByteArray input READ input WRITE setInput )
-    Q_PROPERTY( TQByteArray result READ result )
+    TQ_PROPERTY( Mode mode READ mode )
+    TQ_PROPERTY( TQString key READ key WRITE setKey )
+    TQ_PROPERTY( TQString options READ options WRITE setOptions )
+    TQ_PROPERTY( TQByteArray input READ input WRITE setInput )
+    TQ_PROPERTY( TQByteArray result READ result )
   public:
     enum Mode {
       Encrypt, Decrypt
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index de1a01e1..002bf018 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
index 1b15e86e..fa1adc73 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/chiasmus/config_data.c b/certmanager/lib/backends/chiasmus/config_data.c
index bb3f3391..a9bd1451 100644
--- a/certmanager/lib/backends/chiasmus/config_data.c
+++ b/certmanager/lib/backends/chiasmus/config_data.c
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index 4a79a195..fe0b19b1 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -101,8 +101,8 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
 
   const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );
 
-  if ( const QFileInfoList * xisFiles = dir.entryInfoList( "*.xis;*.XIS", TQDir::Files ) )
-    for ( QFileInfoList::const_iterator it = xisFiles->begin(), end = xisFiles->end() ; it != end ; ++it )
+  if ( const TQFileInfoList * xisFiles = dir.entryInfoList( "*.xis;*.XIS", TQDir::Files ) )
+    for ( TQFileInfoList::const_iterator it = xisFiles->begin(), end = xisFiles->end() ; it != end ; ++it )
       if ( (*it)->isReadable() )
         mResult.push_back( (*it)->absFilePath() );
 
@@ -114,13 +114,13 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
     slotPerform( false );
 }
 
-void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
   if ( !mError )
     return;
   if ( mError.isCanceled() )
     return;
   const TQString msg = TQString::fromUtf8( mError.asString() );
-  KMessageBox::error( parent, msg, caption );
+  KMessageBox::error( tqparent, msg, caption );
 }
 
 #include "obtainkeysjob.moc"
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index 4e3f8f7e..6803bd7f 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,7 +64,8 @@ namespace Kleo {
   */
   class ObtainKeysJob : public Kleo::SpecialJob {
     Q_OBJECT
-    Q_PROPERTY( TQStringList result READ result )
+  TQ_OBJECT
+    TQ_PROPERTY( TQStringList result READ result )
   public:
     ObtainKeysJob();
     ~ObtainKeysJob();
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index 3dc3b937..a2408a73 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,8 +44,8 @@
 Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, const TQString & program,
                                                       const TQString & keyFile, const TQString & options,
                                                       Operation mode,
-                                                      TQObject * parent, const char * name )
-  : KProcess( parent, name ),
+                                                      TQObject * tqparent, const char * name )
+  : KProcess( tqparent, name ),
     mOperation( mode ), mOptions( options )
 {
   *this << "symcryptrun"
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index 3c3690ae..2fb136fb 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,6 +43,7 @@ namespace Kleo {
 
 class SymCryptRunProcessBase : public KProcess {
   Q_OBJECT
+  TQ_OBJECT
 public:
   enum Operation {
     Encrypt, Decrypt
@@ -50,7 +51,7 @@ public:
   SymCryptRunProcessBase( const TQString & class_, const TQString & program,
                           const TQString & keyFile, const TQString& options,
                           Operation op,
-                          TQObject * parent=0, const char * name=0 );
+                          TQObject * tqparent=0, const char * name=0 );
   ~SymCryptRunProcessBase();
 
   bool launch( const TQByteArray & input, RunMode rm=NotifyOnExit );
diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h
index c965673d..a1ff723c 100644
--- a/certmanager/lib/backends/kpgp/gpg1backend.h
+++ b/certmanager/lib/backends/kpgp/gpg1backend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
index 2dbc3868..2395dc6e 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
index c91c2391..6fdf29bf 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
index 2e69f939..3d28ac4b 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
index 4cfb3d04..2e35896f 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,6 +51,7 @@ namespace Kleo {
 
   class KpgpKeyListJob : public KeyListJob {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KpgpKeyListJob( Kpgp::Base * pgpBase );
     ~KpgpKeyListJob();
diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
index a2ff064f..71c08293 100644
--- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h
index 40c6e925..8dc7dbc2 100644
--- a/certmanager/lib/backends/kpgp/kpgpwrapper.h
+++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h
index d5b1988e..b486bfd6 100644
--- a/certmanager/lib/backends/kpgp/pgp2backend.h
+++ b/certmanager/lib/backends/kpgp/pgp2backend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h
index f45f4ace..2db55932 100644
--- a/certmanager/lib/backends/kpgp/pgp5backend.h
+++ b/certmanager/lib/backends/kpgp/pgp5backend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h
index 6e174503..c5f9eeff 100644
--- a/certmanager/lib/backends/kpgp/pgp6backend.h
+++ b/certmanager/lib/backends/kpgp/pgp6backend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index 9e746179..d179aa95 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -56,8 +56,8 @@ struct Kleo::GnuPGProcessBase::Private {
 };
 
 
-Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name )
-  : KProcess( parent, name )
+Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * tqparent, const char * name )
+  : KProcess( tqparent, name )
 {
   d = new Private();
 }
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
   if ( d->useStatusFD ) {
     ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
     d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
-    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
+    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildtqStatus(int)) );
   }
   return KProcess::commSetupDoneP();
 }
@@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() {
   return KProcess::commSetupDoneC();
 }
 
-void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
-  if ( !childStatus(fd) )
-    closeStatus();
+void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) {
+  if ( !childtqStatus(fd) )
+    closetqStatus();
 }
 
-bool Kleo::GnuPGProcessBase::closeStatus() {
+bool Kleo::GnuPGProcessBase::closetqStatus() {
   if ( !d->useStatusFD )
     return false;
   d->useStatusFD = false;
@@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closeStatus() {
   return true;
 }
 
-int Kleo::GnuPGProcessBase::childStatus( int fd ) {
+int Kleo::GnuPGProcessBase::childtqStatus( int fd ) {
   char buf[1024];
   const int len = ::read( fd, buf, sizeof(buf)-1 );
   if ( len > 0 ) {
@@ -158,28 +158,28 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
   static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;
 
   int lineStart = 0;
-  for ( int lineEnd = d->statusBuffer.find( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.find( '\n', lineStart = lineEnd+1 ) ) {
+  for ( int lineEnd = d->statusBuffer.tqfind( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.tqfind( '\n', lineStart = lineEnd+1 ) ) {
     // get next line:
     const TQCString line = d->statusBuffer.mid( lineStart, lineEnd - lineStart ).stripWhiteSpace();
     if ( line.isEmpty() )
       continue;
     // check status token
     if ( line.left( startTokenLen ) != startToken ) {
-      kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line doesn't begin with \""
+      kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line doesn't begin with \""
 		      << startToken << "\"" << endl;
       continue;
     }
     // remove status token:
     const TQCString command = line.mid( startTokenLen ).simplifyWhiteSpace() + ' ';
     if ( command == " " ) {
-      kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line without content." << endl;
+      kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line without content." << endl;
       continue;
     }
     // split into base and args
     TQString cmd;
     TQStringList args;
     int tagStart = 0;
-    for ( int tagEnd = command.find( ' ' ) ; tagEnd >= 0 ; tagEnd = command.find( ' ', tagStart = tagEnd+1 ) ) {
+    for ( int tagEnd = command.tqfind( ' ' ) ; tagEnd >= 0 ; tagEnd = command.tqfind( ' ', tagStart = tagEnd+1 ) ) {
       const TQCString tag = command.mid( tagStart, tagEnd - tagStart );
       if ( cmd.isNull() )
 	cmd = fromHexEscapedUtf8( tag );
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index 9abe5b88..46b7f287 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,9 @@ namespace Kleo {
    */
   class GnuPGProcessBase : public KProcess {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
+    GnuPGProcessBase( TQObject * tqparent=0, const char * name=0 );
     ~GnuPGProcessBase();
 
     void setUseStatusFD( bool use );
@@ -56,7 +57,7 @@ namespace Kleo {
     /*! reimplementation */
     bool start( RunMode runmode, Communication comm );
 
-    bool closeStatus();
+    bool closetqStatus();
 
   signals:
     void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args );
@@ -69,11 +70,11 @@ namespace Kleo {
     /*! reimplementation */
     int commSetupDoneC();
 
-    int childStatus( int fd );
+    int childtqStatus( int fd );
 
 
   private slots:
-    void slotChildStatus( int fd );
+    void slotChildtqStatus( int fd );
 
   private:
     void parseStatusOutput();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 5905bc5e..27680585 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
index c4971e62..a23c08d4 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
@@ -20,19 +20,19 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 
-#ifndef __KLEO_QGPGMEBACKEND_H__
-#define __KLEO_QGPGMEBACKEND_H__
+#ifndef __KLEO_TQGPGMEBACKEND_H__
+#define __KLEO_TQGPGMEBACKEND_H__
 
 #include "kleo/cryptobackend.h"
 
@@ -79,4 +79,4 @@ namespace Kleo {
 }
 
 
-#endif // __KLEO_QGPGMEBACKEND_H__
+#endif // __KLEO_TQGPGMEBACKEND_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 6dc5c5e3..3aa3b336 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -131,7 +131,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name
 {
   if ( !mParsed )
     const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false );
-  return mComponents.find( name );
+  return mComponents.tqfind( name );
 }
 
 void QGpgMECryptoConfig::sync( bool runtime )
@@ -215,7 +215,7 @@ void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc )
       } else {
         // normal entry
         if ( !mCurrentGroup ) {  // first toplevel entry -> create toplevel group
-          mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString::null, 0 );
+          mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString(), 0 );
           mCurrentGroupName = "<nogroup>";
         }
         mCurrentGroup->mEntries.insert( lst[0], new QGpgMECryptoConfigEntry( lst ) );
@@ -240,7 +240,7 @@ TQStringList QGpgMECryptoConfigComponent::groupList() const
 
 Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const
 {
-  return mGroups.find( name );
+  return mGroups.tqfind( name );
 }
 
 void QGpgMECryptoConfigComponent::sync( bool runtime )
@@ -341,7 +341,7 @@ TQStringList QGpgMECryptoConfigGroup::entryList() const
 
 Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const
 {
-  return mEntries.find( name );
+  return mEntries.tqfind( name );
 }
 
 ////
@@ -460,7 +460,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes
       TQString val = *valit;
       if ( isString ) {
         if ( val.isEmpty() ) {
-          lst << TQString::null;
+          lst << TQString();
           continue;
         }
         else if ( unescape ) {
@@ -476,7 +476,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes
     TQString val( str );
     if ( isString ) {
       if ( val.isEmpty() )
-        return TQVariant( TQString::null ); // not set  [ok with lists too?]
+        return TQVariant( TQString() ); // not set  [ok with lists too?]
       else if ( unescape ) {
         Q_ASSERT( val[0] == '"' ); // see README.gpgconf
         val = val.mid( 1 );
@@ -787,7 +787,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   // Basically the opposite of stringToValue
   if ( isStringType() ) {
     if ( mValue.isNull() )
-      return TQString::null;
+      return TQString();
     else if ( isList() ) { // string list
       TQStringList lst = mValue.toStringList();
       if ( escape ) {
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null;
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString();
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index 20a01d31..de766de3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef KLEO_QGPGMECRYPTOCONFIG_H
-#define KLEO_QGPGMECRYPTOCONFIG_H
+#ifndef KLEO_TQGPGMECRYPTOCONFIG_H
+#define KLEO_TQGPGMECRYPTOCONFIG_H
 
 #include <kleo/cryptoconfig.h>
 #include <tqdict.h>
@@ -49,6 +49,7 @@ class QGpgMECryptoConfigEntry;
 class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
 
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -80,6 +81,7 @@ class QGpgMECryptoConfigGroup;
 class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
 
   Q_OBJECT
+  TQ_OBJECT
 public:
   QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
   ~QGpgMECryptoConfigComponent();
@@ -112,7 +114,7 @@ public:
   ~QGpgMECryptoConfigGroup() {}
 
   TQString name() const { return mName; }
-  TQString iconName() const { return TQString::null; }
+  TQString iconName() const { return TQString(); }
   TQString description() const { return mDescription; }
   Kleo::CryptoConfigEntry::Level level() const { return mLevel; }
   TQStringList entryList() const;
@@ -183,4 +185,4 @@ private:
   uint mSet : 1;
 };
 
-#endif /* KLEO_QGPGMECRYPTOCONFIG_H */
+#endif /* KLEO_TQGPGMECRYPTOCONFIG_H */
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp
index 15d3246f..da005298 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
index 13380669..78e17304 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEDECRYPTJOB_H__
-#define __KLEO_QGPGMEDECRYPTJOB_H__
+#ifndef __KLEO_TQGPGMEDECRYPTJOB_H__
+#define __KLEO_TQGPGMEDECRYPTJOB_H__
 
 #include <kleo/decryptjob.h>
 
@@ -47,7 +47,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEDecryptJob( GpgME::Context * context );
     ~QGpgMEDecryptJob();
@@ -71,4 +72,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEDECRYPTJOB_H__
+#endif // __KLEO_TQGPGMEDECRYPTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp
index a14e7e18..f8c7db6a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index 58da84d0..31db6a6f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEDECRYPTVERIFYJOB_H__
-#define __KLEO_QGPGMEDECRYPTVERIFYJOB_H__
+#ifndef __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__
+#define __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__
 
 #include <kleo/decryptverifyjob.h>
 
@@ -48,7 +48,8 @@ namespace GpgME {
 namespace Kleo {
 
   class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEDecryptVerifyJob( GpgME::Context * context );
     ~QGpgMEDecryptVerifyJob();
@@ -72,4 +73,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEDECRYPTVERIFYJOB_H__
+#endif // __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp
index 3665ee66..46edada1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
index 9dec128f..992404a2 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEDELETEJOB_H__
-#define __KLEO_QGPGMEDELETEJOB_H__
+#ifndef __KLEO_TQGPGMEDELETEJOB_H__
+#define __KLEO_TQGPGMEDELETEJOB_H__
 
 #include <kleo/deletejob.h>
 
@@ -46,7 +46,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEDeleteJob( GpgME::Context * context );
     ~QGpgMEDeleteJob();
@@ -65,4 +66,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEDELETEJOB_H__
+#endif // __KLEO_TQGPGMEDELETEJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp
index 979a8549..5f44fb00 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
index 6dc7b209..76baa88f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEDOWNLOADJOB_H__
-#define __KLEO_QGPGMEDOWNLOADJOB_H__
+#ifndef __KLEO_TQGPGMEDOWNLOADJOB_H__
+#define __KLEO_TQGPGMEDOWNLOADJOB_H__
 
 #include <kleo/downloadjob.h>
 
@@ -45,7 +45,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEDownloadJob( GpgME::Context * context );
     ~QGpgMEDownloadJob();
@@ -64,4 +65,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEDOWNLOADJOB_H__
+#endif // __KLEO_TQGPGMEDOWNLOADJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
index a6a380b0..8350f19b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -103,9 +103,9 @@ void Kleo::QGpgMEEncryptJob::doOperationDoneEvent( const GpgME::Error & ) {
   emit result( mResult, ciphertext );
 }
 
-void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
   if ( mResult.error() && !mResult.error().isCanceled() )
-      Kleo::MessageBox::error( parent, mResult, this, caption );
+      Kleo::MessageBox::error( tqparent, mResult, this, caption );
 }
 
 #include "qgpgmeencryptjob.moc"
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
index ecc7afd8..640ff8c3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEENCRYPTJOB_H__
-#define __KLEO_QGPGMEENCRYPTJOB_H__
+#ifndef __KLEO_TQGPGMEENCRYPTJOB_H__
+#define __KLEO_TQGPGMEENCRYPTJOB_H__
 
 #include <kleo/encryptjob.h>
 
@@ -50,7 +50,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEEncryptJob( GpgME::Context * context );
     ~QGpgMEEncryptJob();
@@ -65,7 +66,7 @@ namespace Kleo {
 				  TQByteArray & cipherText );
 
     /*! \reimp from Job */
-    void showErrorDialog( TQWidget * parent, const TQString & caption ) const;
+    void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const;
 
   private slots:
     void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) {
@@ -83,4 +84,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEENCRYPTJOB_H__
+#endif // __KLEO_TQGPGMEENCRYPTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp
index 16e5fb77..d4a4320b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
index 2c13f409..11bcec18 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEEXPORTJOB_H__
-#define __KLEO_QGPGMEEXPORTJOB_H__
+#ifndef __KLEO_TQGPGMEEXPORTJOB_H__
+#define __KLEO_TQGPGMEEXPORTJOB_H__
 
 #include <kleo/exportjob.h>
 
@@ -47,7 +47,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEExportJob : public ExportJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEExportJob( GpgME::Context * context );
     ~QGpgMEExportJob();
@@ -66,4 +67,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEEXPORTJOB_H__
+#endif // __KLEO_TQGPGMEEXPORTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp
index 80792161..302bf763 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
index f9b20839..e98eab6e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEIMPORTJOB_H__
-#define __KLEO_QGPGMEIMPORTJOB_H__
+#ifndef __KLEO_TQGPGMEIMPORTJOB_H__
+#define __KLEO_TQGPGMEIMPORTJOB_H__
 
 #include <kleo/importjob.h>
 
@@ -47,7 +47,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEImportJob : public ImportJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEImportJob( GpgME::Context * context );
     ~QGpgMEImportJob();
@@ -70,4 +71,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEIMPORTJOB_H__
+#endif // __KLEO_TQGPGMEIMPORTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 6d7ae5b4..61da793e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -223,13 +223,13 @@ GpgME::Error Kleo::QGpgMEJob::setSigningKeys( const std::vector<GpgME::Key> & si
 }
 
 void Kleo::QGpgMEJob::createInData( const TQByteArray & in ) {
-  mInDataDataProvider = new QGpgME::QByteArrayDataProvider( in );
+  mInDataDataProvider = new QGpgME::TQByteArrayDataProvider( in );
   mInData = new GpgME::Data( mInDataDataProvider );
   assert( !mInData->isNull() );
 }
 
 void Kleo::QGpgMEJob::createOutData() {
-  mOutDataDataProvider = new QGpgME::QByteArrayDataProvider();
+  mOutDataDataProvider = new QGpgME::TQByteArrayDataProvider();
   mOutData = new GpgME::Data( mOutDataDataProvider );
   assert( !mOutData->isNull() );
 }
@@ -238,7 +238,7 @@ static const unsigned int GetAuditLogFlags = GpgME::Context::AuditLogWithHelp|Gp
 
 static TQString audit_log_as_html( GpgME::Context * ctx, GpgME::Error & err ) {
     assert( ctx );
-    QGpgME::QByteArrayDataProvider dp;
+    QGpgME::TQByteArrayDataProvider dp;
     GpgME::Data data( &dp );
     assert( !data.isNull() );
     if ( ( err = ctx->getAuditLog( data, GetAuditLogFlags ) ) )
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 4a03d7d9..4f393cfb 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEJOB_H__
-#define __KLEO_QGPGMEJOB_H__
+#ifndef __KLEO_TQGPGMEJOB_H__
+#define __KLEO_TQGPGMEJOB_H__
 
 #include <gpgmepp/interfaces/progressprovider.h>
 #include <gpgmepp/interfaces/passphraseprovider.h>
@@ -54,7 +54,7 @@ namespace Kleo {
 }
 
 namespace QGpgME {
-  class QByteArrayDataProvider;
+  class TQByteArrayDataProvider;
 }
 
 class TQString;
@@ -63,14 +63,14 @@ class TQStringList;
 namespace Kleo {
 
   /** This is a hackish helper class to avoid code duplication in this
-      backend's Kleo::Job subclasses. It tqcontains several workarounds
+      backend's Kleo::Job subclasses. It contains several workarounds
       for tqmoc/signal/slot shortcomings, most of which the author of
-      this thinks are Qt bugs (lazy implementations), first and
+      this thinks are TQt bugs (lazy implementations), first and
       foremost the inability of tqmoc to handle inheritance from
-      multiple QObject-derived subclasses.
+      multiple TQObject-derived subclasses.
 
       To use it, inherit from the Job-subclass, then from this class,
-      add QGPGME_JOB to just after Q OBJECT and implement
+      add TQGPGME_JOB to just after Q OBJECT and implement
       doOperationDoneEvent() by emitting your variant of the result()
       signal there. Pass "this" as the first argument this QGpgMEJOb's
       ctor. The rest is dealt with automatically.
@@ -98,9 +98,9 @@ namespace Kleo {
     void setChunkSize( unsigned int size );
     /*! @return current chunksize */
     unsigned int chunkSize() const { return mChunkSize; }
-    /*! Creates an empty GpgME::Data/QGpgME::QByteArrayDataProvider pair */
+    /*! Creates an empty GpgME::Data/QGpgME::TQByteArrayDataProvider pair */
     void createOutData();
-    /*! Creates a GpgME::Data/QGpgME::QByteArrayDataProvider pair,
+    /*! Creates a GpgME::Data/QGpgME::TQByteArrayDataProvider pair,
       filled with the contents of \a in */
     void createInData( const TQByteArray & in );
     /*! Sets the list of signing keys */
@@ -135,12 +135,12 @@ namespace Kleo {
     Kleo::Job * mThis;
     GpgME::Context * mCtx;
     GpgME::Data * mInData;
-    QGpgME::QByteArrayDataProvider * mInDataDataProvider;
+    QGpgME::TQByteArrayDataProvider * mInDataDataProvider;
     GpgME::Data * mOutData;
-    QGpgME::QByteArrayDataProvider * mOutDataDataProvider;
+    QGpgME::TQByteArrayDataProvider * mOutDataDataProvider;
   private:
     const char* * mPatterns;
-    // holds the entry - if any - in mPattern that was tqreplaced with
+    // holds the entry - if any - in mPattern that was replaced with
     // NULL to create a temporary end-of-array marker for gpgme:
     const char * mReplacedPattern;
     unsigned int mNumPatterns;
@@ -156,6 +156,6 @@ namespace Kleo {
 #define make_progress_emitter private: void doEmitProgressSignal( const TQString & what, int cur, int tot ) { emit progress( what, cur, tot ); }
 #define make_done_emitter private: void doEmitDoneSignal() { emit done(); }
 #define make_auditLogAsHtml private: TQString auditLogAsHtml() const { return QGpgMEJob::auditLogAsHtml(); } GpgME::Error auditLogError() const { return QGpgMEJob::auditLogError(); }
-#define QGPGME_JOB make_slot_cancel make_progress_emitter make_done_emitter make_auditLogAsHtml
+#define TQGPGME_JOB make_slot_cancel make_progress_emitter make_done_emitter make_auditLogAsHtml
 
-#endif // __KLEO_QGPGMEJOB_H__
+#endif // __KLEO_TQGPGMEJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp
index 16e13134..0d79f581 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,7 +64,7 @@ GpgME::Error Kleo::QGpgMEKeyGenerationJob::start( const TQString & parameters )
 
   // set up empty data object for the public key data
   if ( mCtx->protocol() == GpgME::Context::CMS ) {
-    mPubKeyDataProvider = new QGpgME::QByteArrayDataProvider();
+    mPubKeyDataProvider = new QGpgME::TQByteArrayDataProvider();
     mPubKey = new GpgME::Data( mPubKeyDataProvider );
     assert( !mPubKey->isNull() );
   }
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index bf99007f..93e2efb0 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEKEYGENERATIONJOB_H__
-#define __KLEO_QGPGMEKEYGENERATIONJOB_H__
+#ifndef __KLEO_TQGPGMEKEYGENERATIONJOB_H__
+#define __KLEO_TQGPGMEKEYGENERATIONJOB_H__
 
 #include <kleo/keygenerationjob.h>
 
@@ -46,13 +46,14 @@ namespace GpgME {
 }
 
 namespace QGpgME {
-  class QByteArrayDataProvider;
+  class TQByteArrayDataProvider;
 }
 
 namespace Kleo {
 
   class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEKeyGenerationJob( GpgME::Context * context );
     ~QGpgMEKeyGenerationJob();
@@ -69,10 +70,10 @@ namespace Kleo {
     void doOperationDoneEvent( const GpgME::Error & e );
 
   private:
-    QGpgME::QByteArrayDataProvider * mPubKeyDataProvider;
+    QGpgME::TQByteArrayDataProvider * mPubKeyDataProvider;
     GpgME::Data * mPubKey;
   };
 
 }
 
-#endif // __KLEO_QGPGMEKEYGENERATIONJOB_H__
+#endif // __KLEO_TQGPGMEKEYGENERATIONJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index b07135f0..2634579f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -190,14 +190,14 @@ void Kleo::QGpgMEKeyListJob::slotOperationDoneEvent( GpgME::Context * context, c
   deleteLater();
 }
 
-void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
   if ( !mResult.error() || mResult.error().isCanceled() )
     return;
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
     .arg( TQString::fromLocal8Bit( mResult.error().asString() ) );
-  KMessageBox::error( parent, msg, caption );
+  KMessageBox::error( tqparent, msg, caption );
 }
 
 #include "qgpgmekeylistjob.moc"
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
index 38864107..cf0b3086 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEKEYLISTJOB_H__
-#define __KLEO_QGPGMEKEYLISTJOB_H__
+#ifndef __KLEO_TQGPGMEKEYLISTJOB_H__
+#define __KLEO_TQGPGMEKEYLISTJOB_H__
 
 #include <kleo/keylistjob.h>
 
@@ -48,7 +48,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEKeyListJob( GpgME::Context * context );
     ~QGpgMEKeyListJob();
@@ -60,7 +61,7 @@ namespace Kleo {
     GpgME::KeyListResult exec( const TQStringList & patterns, bool secretOnly, std::vector<GpgME::Key> & keys );
 
     /*! \reimp from Job */
-    void showErrorDialog( TQWidget * parent, const TQString & caption ) const;
+    void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const;
 
   private slots:
     void slotNextKeyEvent( GpgME::Context * context, const GpgME::Key & key );
@@ -79,4 +80,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEKEYLISTJOB_H__
+#endif // __KLEO_TQGPGMEKEYLISTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index 89d9dda3..5f629678 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -126,26 +126,26 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
 
 TQString Kleo::QGpgMEProgressTokenMapper::map( const char * tokenUtf8, int subtoken, int cur, int tot ) const {
   if ( !tokenUtf8 || !*tokenUtf8 )
-    return TQString::null;
+    return TQString();
 
   if ( qstrcmp( tokenUtf8, "file:" ) == 0 )
-    return TQString::null; // gpgme's job
+    return TQString(); // gpgme's job
 
   return map( TQString::fromUtf8( tokenUtf8 ), subtoken, cur, tot );
 }
 
 TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subtoken, int cur, int tot ) const {
   if ( token.startsWith( "file:" ) )
-    return TQString::null; // gpgme's job
+    return TQString(); // gpgme's job
 
   static const Map & tokenMap = makeMap();
 
-  const Map::const_iterator it1 = tokenMap.find( token.lower() );
+  const Map::const_iterator it1 = tokenMap.tqfind( token.lower() );
   if ( it1 == tokenMap.end() )
     return token;
-  std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken );
+  std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken );
   if ( it2 == it1->second.end() )
-    it2 = it1->second.find( 0 );
+    it2 = it1->second.tqfind( 0 );
   if ( it2 == it1->second.end() )
     return token;
   const Desc & desc = it2->second;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
index d3731f4f..3e8fd622 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
@@ -20,19 +20,19 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 
-#ifndef __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__
-#define __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__
+#ifndef __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__
+#define __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__
 
 
 class TQString;
@@ -55,4 +55,4 @@ namespace Kleo {
 }
 
 
-#endif // __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__
+#endif // __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 7517b2a8..234644dd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 7246f0a3..f94957b3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEREFRESHKEYSJOB_H__
-#define __KLEO_QGPGMEREFRESHKEYSJOB_H__
+#ifndef __KLEO_TQGPGMEREFRESHKEYSJOB_H__
+#define __KLEO_TQGPGMEREFRESHKEYSJOB_H__
 
 #include <kleo/refreshkeysjob.h>
 
@@ -51,6 +51,7 @@ namespace Kleo {
 
   class QGpgMERefreshKeysJob : public RefreshKeysJob {
     Q_OBJECT
+  TQ_OBJECT
   public:
     QGpgMERefreshKeysJob();
     ~QGpgMERefreshKeysJob();
@@ -62,7 +63,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
@@ -77,4 +78,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEREFRESHKEYSJOB_H__
+#endif // __KLEO_TQGPGMEREFRESHKEYSJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index d73b4cb1..7111a80a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index cb65d549..aae3fd22 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMESECRETKEYEXPORTJOB_H__
-#define __KLEO_QGPGMESECRETKEYEXPORTJOB_H__
+#ifndef __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__
+#define __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__
 
 #include <kleo/exportjob.h>
 
@@ -47,7 +47,7 @@ namespace GpgME {
 }
 
 namespace QGpgME {
-  class QByteArrayDataProvider;
+  class TQByteArrayDataProvider;
 }
 
 class KProcess;
@@ -56,6 +56,7 @@ namespace Kleo {
 
   class QGpgMESecretKeyExportJob : public ExportJob {
     Q_OBJECT
+  TQ_OBJECT
   public:
     QGpgMESecretKeyExportJob( bool armour, const TQString& charset );
     ~QGpgMESecretKeyExportJob();
@@ -67,7 +68,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
@@ -82,4 +83,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMESECRETKEYEXPORTJOB_H__
+#endif // __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
index 9a469001..28901c30 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -114,10 +114,10 @@ void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) {
   emit result( mResult.first, mResult.second, cipherText );
 }
 
-void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
     if ( mResult.first.error()  && !mResult.first.error().isCanceled() ||
          mResult.second.error() && !mResult.second.error().isCanceled() )
-        Kleo::MessageBox::error( parent, mResult.first, mResult.second, this, caption );
+        Kleo::MessageBox::error( tqparent, mResult.first, mResult.second, this, caption );
 }
 
 #include "qgpgmesignencryptjob.moc"
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 003377cf..e4b2a0be 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMESIGNENCRYPTJOB_H__
-#define __KLEO_QGPGMESIGNENCRYPTJOB_H__
+#ifndef __KLEO_TQGPGMESIGNENCRYPTJOB_H__
+#define __KLEO_TQGPGMESIGNENCRYPTJOB_H__
 
 #include <kleo/signencryptjob.h>
 
@@ -54,7 +54,8 @@ namespace GpgME {
 namespace Kleo {
 
   class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMESignEncryptJob( GpgME::Context * context );
     ~QGpgMESignEncryptJob();
@@ -71,7 +72,7 @@ namespace Kleo {
 	    TQByteArray & cipherText );
 
     /*! \reimp from Job */
-    void showErrorDialog( TQWidget * parent, const TQString & caption ) const;
+    void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const;
 
   private slots:
     void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) {
@@ -88,4 +89,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMESIGNENCRYPTJOB_H__
+#endif // __KLEO_TQGPGMESIGNENCRYPTJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
index 01ae8a91..4607f2c0 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -108,9 +108,9 @@ void Kleo::QGpgMESignJob::doOperationDoneEvent( const GpgME::Error & ) {
   emit result( mResult, signature );
 }
 
-void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {
+void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const {
   if ( mResult.error() && !mResult.error().isCanceled() )
-      Kleo::MessageBox::error( parent, mResult, this, caption );
+      Kleo::MessageBox::error( tqparent, mResult, this, caption );
 }
 
 #include "qgpgmesignjob.moc"
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
index 6034b542..5c16137e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMESIGNJOB_H__
-#define __KLEO_QGPGMESIGNJOB_H__
+#ifndef __KLEO_TQGPGMESIGNJOB_H__
+#define __KLEO_TQGPGMESIGNJOB_H__
 
 #include <kleo/signjob.h>
 
@@ -50,7 +50,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMESignJob : public SignJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMESignJob( GpgME::Context * context );
     ~QGpgMESignJob();
@@ -67,7 +68,7 @@ namespace Kleo {
 			       TQByteArray & signature );
 
     /*! \reimp from Job */
-    void showErrorDialog( TQWidget * parent, const TQString & caption ) const;
+    void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const;
 
   private slots:
     void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) {
@@ -84,4 +85,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMESIGNJOB_H__
+#endif // __KLEO_TQGPGMESIGNJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp
index 41fa4849..3b194613 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -62,7 +62,7 @@ void Kleo::QGpgMEVerifyDetachedJob::setup( const TQByteArray & signature, const
   createInData( signature );
 
   // two "in" data objects - (mis|re)use the "out" data object for the second...
-  mOutDataDataProvider = new QGpgME::QByteArrayDataProvider( signedData );
+  mOutDataDataProvider = new QGpgME::TQByteArrayDataProvider( signedData );
   mOutData = new GpgME::Data( mOutDataDataProvider );
   assert( !mOutData->isNull() );
 }
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
index 4e353fe2..76d1715b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEVERIFYDETACHEDJOB_H__
-#define __KLEO_QGPGMEVERIFYDETACHEDJOB_H__
+#ifndef __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__
+#define __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__
 
 #include <kleo/verifydetachedjob.h>
 
@@ -47,7 +47,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEVerifyDetachedJob( GpgME::Context * context );
     ~QGpgMEVerifyDetachedJob();
@@ -72,4 +73,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEVERIFYDETACHEDJOB_H__
+#endif // __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp
index e4340aa3..eb79e281 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
index 869024f2..e24b6bc6 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
@@ -20,18 +20,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KLEO_QGPGMEVERIFYOPAQUEJOB_H__
-#define __KLEO_QGPGMEVERIFYOPAQUEJOB_H__
+#ifndef __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__
+#define __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__
 
 #include <kleo/verifyopaquejob.h>
 
@@ -47,7 +47,8 @@ namespace GpgME {
 namespace Kleo {
 
   class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob {
-    Q_OBJECT QGPGME_JOB
+    Q_OBJECT
+    TQ_OBJECT TQGPGME_JOB
   public:
     QGpgMEVerifyOpaqueJob( GpgME::Context * context );
     ~QGpgMEVerifyOpaqueJob();
@@ -70,4 +71,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_QGPGMEVERIFYOPAQUEJOB_H__
+#endif // __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index c3c8b462..53865edf 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -226,7 +226,7 @@ OpenPGPCryptPlug::OpenPGPCryptPlug() : CryptPlug() {
 /* Max number of parts in a DN */
 #define MAX_GPGME_IDX 20
 
-/* some macros to tqreplace ctype ones and avoid locale problems */
+/* some macros to replace ctype ones and avoid locale problems */
 #define spacep(p)   (*(p) == ' ' || *(p) == '\t')
 #define digitp(p)   (*(p) >= '0' && *(p) <= '9')
 #define hexdigitp(a) (digitp (a)                     \
@@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status )
 // gpgme 0.3 version below, too!
 static
 void obtain_signature_information( gpgme_ctx_t ctx,
-                                   gpgme_sig_stat_t & overallStatus,
+                                   gpgme_sig_stat_t & overalltqStatus,
                                    struct CryptPlug::SignatureMetaData* sigmeta,
                                    char** attrOrder,
                                    const char* unknownAttrsHandling,
@@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx,
     storeNewCharPtr( &this_info.status_text, sig_status );
   }
   sigmeta->extended_info_count = sig_idx;
-  overallStatus = intersect_stati( result->signatures );
-  sigmeta->status_code = overallStatus;
-  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) );
+  overalltqStatus = intersect_stati( result->signatures );
+  sigmeta->status_code = overalltqStatus;
+  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) );
   if ( signatureFound )
-    *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE );
+    *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE );
 }
 
 bool CryptPlug::checkMessageSignature( char** cleartext,
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index 6af3a644..081702a7 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -104,7 +104,7 @@ namespace GpgME {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section tqcontains messages for configuring the
+    This section contains messages for configuring the
     directory service.
 */
 
@@ -501,7 +501,7 @@ bool hasFeature( ::Feature );
 
    <b>How to use StructuringInfo data in your program:</b>
    \li To compose a signed message please act as described below.
-   \li For constructing an encrypted message just tqreplace the
+   \li For constructing an encrypted message just replace the
    \c signMessage() call by the respective \c encryptMessage() call
    and then proceed exactly the same way.
    \li In any case make <b>sure</b> to free your \c ciphertext <b>and</b>
diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp
index 949e8db9..a5015a54 100644
--- a/certmanager/lib/cryptplugfactory.cpp
+++ b/certmanager/lib/cryptplugfactory.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index e880f5b5..333ae027 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,6 +49,7 @@ namespace KMail {
 
   class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     CryptPlugFactory();
     ~CryptPlugFactory();
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 7694a138..f15ab747 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -209,24 +209,24 @@ public:
     return _unknownAttrsHandlingChar;
   }
 
-  TQValueList< QPair<TQString,TQString> > reorder( const TQValueList< QPair<TQString,TQString> > & dn ) const
+  TQValueList< TQPair<TQString,TQString> > reorder( const TQValueList< TQPair<TQString,TQString> > & dn ) const
   {
     return reorder( dn, _attrOrder, _unknownAttrsHandling );
   }
 
 
-  static TQValueList< QPair<TQString,TQString> > reorder(
-    const TQValueList< QPair<TQString,TQString> > & dn,
+  static TQValueList< TQPair<TQString,TQString> > reorder(
+    const TQValueList< TQPair<TQString,TQString> > & dn,
     TQStringList attrOrder,
     UnknownAttrsHandling unknownAttrsHandling )
   {
     if( !attrOrder.isEmpty() ){
-      TQPtrList<   QPair<TQString,TQString> > unknownEntries;
-      TQValueList< QPair<TQString,TQString> > dnNew;
+      TQPtrList<   TQPair<TQString,TQString> > unknownEntries;
+      TQValueList< TQPair<TQString,TQString> > dnNew;
 
-      QPair<TQString,TQString>* unknownEntry;
+      TQPair<TQString,TQString>* unknownEntry;
       TQStringList::ConstIterator itOrder;
-      TQValueList< QPair<TQString,TQString> >::ConstIterator itDN;
+      TQValueList< TQPair<TQString,TQString> >::ConstIterator itDN;
       bool bFound;
 
       if( unknownAttrsHandling != unknownAttrsHide ){
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
     _libName( libName ),
     _updateURL( update ),
     _active(  active  ),
-    _iniStatus( IniStatus_undef ),
+    _initqStatus( IniStatus_undef ),
     _cp( 0 ),
     _config( 0 ),
     _cryptoConfig( 0 )
@@ -472,7 +472,7 @@ TQString CryptPlugWrapper::protocol() const
     return "SMIME";
   if ( _libName.tqcontains( "openpgp" ) )
     return "OpenPGP";
-  return TQString::null;
+  return TQString();
 }
 
 void CryptPlugWrapper::setDisplayName( const TQString& name )
@@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const
     return i18n("(Unknown Protocol)");
 }
 
-bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg )
 {
     if ( _cp )
       return true;
 
-    _iniStatus = IniStatus_undef;
+    _initqStatus = IniStatus_undef;
     /* make sure we have a lib name */
     if ( _libName.isEmpty() ) {
-      _iniStatus = IniStatus_NoLibName;
+      _initqStatus = IniStatus_NoLibName;
       kdDebug(5150) << "No library name was given.\n" << endl;
     } else {
       if ( _libName.tqcontains( "smime" ) ) {
@@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
       }
 
       if ( !_cp ) {
-	_iniStatus = IniStatus_LoadError;
+	_initqStatus = IniStatus_LoadError;
 	kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
       } else {
 	/* now call the init function */
 	if( !_cp->initialize() ) {
-	  _iniStatus = IniStatus_InitError;
+	  _initqStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
 	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
 	  if ( errorMsg )
@@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 	  delete _cp; _cp = 0;
 	  delete _config; _config = 0;
 	} else {
-	  _iniStatus  = IniStatus_Ok;
+	  _initqStatus  = IniStatus_Ok;
 	}
       }
     }
-    if( iniStatus )
-        *iniStatus = _iniStatus;
-    return _iniStatus == IniStatus_Ok;
+    if( initqStatus )
+        *initqStatus = _initqStatus;
+    return _initqStatus == IniStatus_Ok;
 }
 
 
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
 }
 
 
-CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
+CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const
 {
     if( errorMsg )
         *errorMsg = _lastError;
-    return _iniStatus;
+    return _initqStatus;
 }
 
 
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index a2ddea95..882c43dd 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -170,7 +170,7 @@ namespace Kleo {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section tqcontains messages for configuring the
+    This section contains messages for configuring the
     directory service.
 */
 
@@ -322,7 +322,7 @@ class CryptPlugWrapper;
 
   <b>How to use StructuringInfoWrapper data in your program:</b>
   \li To compose a signed message please act as described below.
-  \li For constructing an encrypted message just tqreplace the
+  \li For constructing an encrypted message just replace the
   \c signMessage() call by the respective \c encryptMessage() call
   and then proceed exactly the same way.
   \li In any case make <b>sure</b> to free your \c ciphertext when
@@ -462,7 +462,7 @@ public:
         If initialize was not called before return value will be
         \c CryptPlugInit_undef.
 
-        \sa iniStatus, initialize
+        \sa initqStatus, initialize
     */
     typedef enum {
         IniStatus_undef         = 0,
@@ -471,7 +471,7 @@ public:
         IniStatus_NoLibName     = 2,
         IniStatus_LoadError     = 0x1000,
         IniStatus_InitError     = 0x2000
-    } IniStatus;
+    } InitqStatus;
 
     /*! \ingroup groupSignAct
         \brief Flags used to compose the SigStatusFlags value.
@@ -543,11 +543,11 @@ public:
                        or not.
 
         \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
-        \sa iniStatus
+        \sa initqStatus
     */
-    CryptPlugWrapper( const TQString& name=TQString::null,
-                      const TQString& libName=TQString::null,
-                      const TQString& update=TQString::null,
+    CryptPlugWrapper( const TQString& name=TQString(),
+                      const TQString& libName=TQString(),
+                      const TQString& update=TQString(),
                       bool           active = false );
 
     /*! \ingroup groupAdmin
@@ -582,7 +582,7 @@ public:
               structures - if just prevents the normal functions from
               being called erroneously. When deactivated only the following
               functions are operational: constructor , destructor ,
-              setActive , active, setLibName , libName , iniStatus;
+              setActive , active, setLibName , libName , initqStatus;
               calling other functions will be ignored and their return
               values will be undefined.
 
@@ -590,7 +590,7 @@ public:
                        or not.
 
         \sa active, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, iniStatus
+        \sa deinitialize, initialize, initqStatus
     */
     void setActive( bool active );
 
@@ -613,7 +613,7 @@ public:
         This name may be set in the constructor or by calling setLibName().
 
         \note Setting/changing the library name may only be done when
-              the iniStatus() is <b>not</b> \c IniStatus_Ok.
+              the initqStatus() is <b>not</b> \c IniStatus_Ok.
               If you want to change the name of the library after
               successfully having called initialize() please make
               sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
                 above 'note'.
 
         \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, iniStatus
+        \sa deinitialize, initialize, initqStatus
     */
     bool setLibName( const TQString& libName );
 
@@ -666,13 +666,13 @@ private:
         undefined in this case, this rule does not apply to the functions
         \c setActive() and \c setLibName().
 
-        \param iniStatus will receive the resulting IniStatus if not NULL
+        \param initqStatus will receive the resulting InitqStatus if not NULL
         \param errorMsg will receive the system error message if not NULL
 
-        \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+        \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    bool initialize( IniStatus* iniStatus, TQString* errorMsg );
+    bool initialize( InitqStatus* initqStatus, TQString* errorMsg );
 
 public:
     /*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
         After this function has been called, no other plugin functions
         should be called; the behavior is undefined in this case.
 
-        \note Deinitializing sets the internal iniStatus value back
+        \note Deinitializing sets the internal initqStatus value back
               to \c IniStatus_undef.
 
-        \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+        \sa initqStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
         \sa setActive, active
     */
     void deinitialize();
@@ -693,7 +693,7 @@ public:
         \brief Returns this CRYPTPLUG wrapper's initialization state.
 
         \param errorMsg receives the last system error message, this value
-        should be ignored if IniStatus value equals \c IniStatus_Ok.
+        should be ignored if InitqStatus value equals \c IniStatus_Ok.
 
         \return  whether the relative library was loaded and initialized
                  correctly
@@ -701,7 +701,7 @@ public:
         \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    IniStatus iniStatus( TQString* errorMsg ) const;
+    InitqStatus initqStatus( TQString* errorMsg ) const;
 
 
     /*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
         however.
 
         \note In case this function cannot be executed the system's error
-        message may be retrieved by calling iniStatus( TQString* ).
+        message may be retrieved by calling initqStatus( TQString* ).
 
         \return  whether the relative feature is implemented or not
     */
@@ -805,7 +805,7 @@ public:
 
     Kleo::ImportJob * importJob() const;
     Kleo::ExportJob * publicKeyExportJob( bool armor=false ) const;
-    Kleo::ExportJob * secretKeyExportJob( bool armor=false, const TQString& charset = TQString::null ) const;
+    Kleo::ExportJob * secretKeyExportJob( bool armor=false, const TQString& charset = TQString() ) const;
     Kleo::DownloadJob * downloadJob( bool armor=false ) const;
     Kleo::DeleteJob * deleteJob() const;
 
@@ -824,7 +824,7 @@ private:
     TQString    _libName;
     TQString    _updateURL;
     bool       _active;
-    IniStatus _iniStatus;
+    InitqStatus _initqStatus;
     TQString    _lastError;
     CryptPlug* _cp;
     // local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp
index 43f88670..7b1c7572 100644
--- a/certmanager/lib/cryptplugwrapperlist.cpp
+++ b/certmanager/lib/cryptplugwrapperlist.cpp
@@ -28,7 +28,7 @@
 CryptPlugWrapper * CryptPlugWrapperList::findForLibName( const TQString & libName ) const
 {
   for ( TQPtrListIterator<CryptPlugWrapper> it( *this ) ; it.current() ; ++it )
-    if ( (*it)->libName().find( libName, 0, false ) >= 0 )
+    if ( (*it)->libName().tqfind( libName, 0, false ) >= 0 )
       return *it;
   return 0;
 }
diff --git a/certmanager/lib/kleo/cryptobackend.cpp b/certmanager/lib/kleo/cryptobackend.cpp
index 7a779c8e..a10aa516 100644
--- a/certmanager/lib/kleo/cryptobackend.cpp
+++ b/certmanager/lib/kleo/cryptobackend.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h
index 0c2c7926..6cb690d0 100644
--- a/certmanager/lib/kleo/cryptobackend.h
+++ b/certmanager/lib/kleo/cryptobackend.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -107,7 +107,7 @@ namespace Kleo {
     virtual ImportJob         * importJob() const = 0;
     virtual ExportJob         * publicKeyExportJob( bool armor=false ) const = 0;
     // @param charset the encoding of the passphrase in the exported file
-    virtual ExportJob         * secretKeyExportJob( bool armor=false, const TQString& charset = TQString::null ) const = 0;
+    virtual ExportJob         * secretKeyExportJob( bool armor=false, const TQString& charset = TQString() ) const = 0;
     virtual DownloadJob       * downloadJob( bool armor=false ) const = 0;
     virtual DeleteJob         * deleteJob() const = 0;
     virtual SignEncryptJob    * signEncryptJob( bool armor=false, bool textMode=false ) const = 0;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 9b56e89b..c6ce40fd 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() {
 // }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const {
-  const BackendMap::const_iterator it = mBackends.find( "SMIME" );
+  const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const
 }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const {
-  const BackendMap::const_iterator it = mBackends.find( "OpenPGP" );
+  const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons
 }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const {
-  const BackendMap::const_iterator it = mBackends.find( name );
+  const BackendMap::const_iterator it = mBackends.tqfind( name );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -174,8 +174,8 @@ const Kleo::CryptoBackend * Kleo::CryptoBackendFactory::backendByName( const TQS
   return 0;
 }
 
-Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * parent, const char * name ) const {
-  return new Kleo::BackendConfigWidget( mSelf, parent, name );
+Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * tqparent, const char * name ) const {
+  return new Kleo::BackendConfigWidget( mSelf, tqparent, name );
 }
 
 KConfig* Kleo::CryptoBackendFactory::configObject() const {
@@ -194,7 +194,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
 }
 
 void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
-  const TQString name = backend ? backend->name() : TQString::null ;
+  const TQString name = backend ? backend->name() : TQString() ;
   KConfigGroup group( configObject(), "Backends" );
   group.writeEntry( protocol, name );
   configObject()->sync();
@@ -267,7 +267,7 @@ namespace {
 }
 
 bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const {
-  return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(),
+  return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(),
                     CaseInsensitiveString( name ) ) != mAvailableProtocols.end();
 }
 
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 3ced2c50..8f299026 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -58,6 +58,7 @@ namespace Kleo {
 
   class KDE_EXPORT CryptoBackendFactory : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     CryptoBackendFactory();
     ~CryptoBackendFactory();
@@ -73,7 +74,7 @@ namespace Kleo {
 
     bool hasBackends() const;
 
-    Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
+    Kleo::BackendConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const;
 
     KConfig* configObject() const;
 
diff --git a/certmanager/lib/kleo/cryptoconfig.h b/certmanager/lib/kleo/cryptoconfig.h
index ec0a0ed5..90272a67 100644
--- a/certmanager/lib/kleo/cryptoconfig.h
+++ b/certmanager/lib/kleo/cryptoconfig.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h
index 8351a1ff..ee5802f8 100644
--- a/certmanager/lib/kleo/decryptjob.h
+++ b/certmanager/lib/kleo/decryptjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,8 +61,9 @@ namespace Kleo {
   */
   class DecryptJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    DecryptJob( TQObject * parent, const char * name );
+    DecryptJob( TQObject * tqparent, const char * name );
   public:
     ~DecryptJob();
 
diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h
index e220670c..0431279a 100644
--- a/certmanager/lib/kleo/decryptverifyjob.h
+++ b/certmanager/lib/kleo/decryptverifyjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,8 +64,9 @@ namespace Kleo {
   */
   class DecryptVerifyJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    DecryptVerifyJob( TQObject * parent, const char * name );
+    DecryptVerifyJob( TQObject * tqparent, const char * name );
   public:
     ~DecryptVerifyJob();
 
diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h
index f5d5f111..e6a3e223 100644
--- a/certmanager/lib/kleo/deletejob.h
+++ b/certmanager/lib/kleo/deletejob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -57,8 +57,9 @@ namespace Kleo {
   */
   class DeleteJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    DeleteJob( TQObject * parent, const char * name );
+    DeleteJob( TQObject * tqparent, const char * name );
   public:
     ~DeleteJob();
 
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index a9333ebb..e82b02de 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -289,7 +289,7 @@ static TQString dn_escape( const TQString & s ) {
     return result;
 }
 
-static QString
+static TQString
 serialise( const TQValueVector<Kleo::DN::Attribute> & dn ) {
   TQStringList result;
   for ( TQValueVector<Kleo::DN::Attribute>::const_iterator it = dn.begin() ; it != dn.end() ; ++it )
@@ -309,7 +309,7 @@ reorder_dn( const Kleo::DN::Attribute::List & dn ) {
 
   // find all unknown entries in their order of appearance
   for ( Kleo::DN::const_iterator it = dn.begin(); it != dn.end(); ++it )
-    if ( attrOrder.find( (*it).name() ) == attrOrder.end() )
+    if ( attrOrder.tqfind( (*it).name() ) == attrOrder.end() )
       unknownEntries.push_back( *it );
 
   // process the known attrs in the desired order
@@ -378,14 +378,14 @@ const Kleo::DN & Kleo::DN::operator=( const DN & that ) {
 
 TQString Kleo::DN::prettyDN() const {
   if ( !d )
-    return TQString::null;
+    return TQString();
   if ( d->reorderedAttributes.empty() )
     d->reorderedAttributes = reorder_dn( d->attributes );
   return serialise( d->reorderedAttributes );
 }
 
 TQString Kleo::DN::dn() const {
-  return d ? serialise( d->attributes ) : TQString::null ;
+  return d ? serialise( d->attributes ) : TQString() ;
 }
 
 // static
@@ -413,13 +413,13 @@ void Kleo::DN::append( const Attribute & attr ) {
 
 TQString Kleo::DN::operator[]( const TQString & attr ) const {
   if ( !d )
-    return TQString::null;
+    return TQString();
   const TQString attrUpper = attr.upper();
   for ( TQValueVector<Attribute>::const_iterator it = d->attributes.begin() ;
 	it != d->attributes.end() ; ++it )
     if ( (*it).name() == attrUpper )
       return (*it).value();
-  return TQString::null;
+  return TQString();
 }
 
 static TQValueVector<Kleo::DN::Attribute> empty;
@@ -507,9 +507,9 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() {
 
 TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const {
   const std::map<const char*,const char*,ltstr>::const_iterator it
-    = d->map.find( s.stripWhiteSpace().upper().latin1() );
+    = d->map.tqfind( s.stripWhiteSpace().upper().latin1() );
   if ( it == d->map.end() )
-    return TQString::null;
+    return TQString();
   return i18n( it->second );
 }
 
@@ -533,6 +533,6 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   config.writeEntry( "AttributeOrder", order );
 }
 
-Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * parent, const char * name ) const {
-  return new DNAttributeOrderConfigWidget( mSelf, parent, name );
+Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * tqparent, const char * name ) const {
+  return new DNAttributeOrderConfigWidget( mSelf, tqparent, name );
 }
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index 13a3c02e..0baf83ad 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -62,7 +62,7 @@ namespace Kleo {
 
     void setAttributeOrder( const TQStringList & order );
 
-    DNAttributeOrderConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
+    DNAttributeOrderConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const;
 
   private:
     class Private;
@@ -114,7 +114,7 @@ namespace Kleo {
   public:
     typedef DN::AttributeList List;
 
-    Attribute( const TQString & name=TQString::null, const TQString & value=TQString::null )
+    Attribute( const TQString & name=TQString(), const TQString & value=TQString() )
       : mName( name.upper() ), mValue( value ) {}
     Attribute( const Attribute & other )
       : mName( other.name() ), mValue( other.value() ) {}
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index 45a4bf9c..d7f83f24 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -60,8 +60,9 @@ namespace Kleo {
   */
   class DownloadJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    DownloadJob( TQObject * parent, const char * name );
+    DownloadJob( TQObject * tqparent, const char * name );
   public:
     ~DownloadJob();
 
diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h
index 9c3b77df..64041934 100644
--- a/certmanager/lib/kleo/encryptjob.h
+++ b/certmanager/lib/kleo/encryptjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -63,8 +63,9 @@ namespace Kleo {
   */
   class EncryptJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    EncryptJob( TQObject * parent, const char * name );
+    EncryptJob( TQObject * tqparent, const char * name );
   public:
     ~EncryptJob();
 
diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp
index ca842807..1d48c6b6 100644
--- a/certmanager/lib/kleo/enum.cpp
+++ b/certmanager/lib/kleo/enum.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -81,7 +81,7 @@ TQString Kleo::cryptoMessageFormatToLabel( Kleo::CryptoMessageFormat f ) {
   for ( unsigned int i = 0 ; i < numCryptoMessageFormats ; ++i )
     if ( f == cryptoMessageFormats[i].format )
       return i18n( cryptoMessageFormats[i].displayName );
-  return TQString::null;
+  return TQString();
 }
 
 Kleo::CryptoMessageFormat Kleo::stringToCryptoMessageFormat( const TQString & s ) {
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index ff9ac1c6..1f186456 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 193ea863..19472593 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -60,15 +60,16 @@ namespace Kleo {
   */
   class ExportJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    ExportJob( TQObject * parent, const char * name );
+    ExportJob( TQObject * tqparent, const char * name );
   public:
     ~ExportJob();
 
     /**
        Starts the export operation. \a patterns is a list of patterns
        used to restrict the list of keys exported. Empty patterns are
-       ignored. If \a patterns is empty or tqcontains only empty
+       ignored. If \a patterns is empty or contains only empty
        strings, all available keys are exported.
     */
     virtual GpgME::Error start( const TQStringList & patterns ) = 0;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index 4d33761f..e94f9700 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -93,7 +93,7 @@ void Kleo::HierarchicalKeyListJob::slotNextKey( const GpgME::Key & key ) {
   if ( const char * chain_id = key.chainID() )
     mNextSet.insert( chain_id );
   if ( const char * fpr = key.primaryFingerprint() )
-    if ( mSentSet.find( fpr ) == mSentSet.end() ) {
+    if ( mSentSet.tqfind( fpr ) == mSentSet.end() ) {
       mSentSet.insert( fpr );
       emit nextKey( key );
     }
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index c4f7fe04..42d037ef 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -70,6 +70,7 @@ namespace Kleo {
   */
   class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
     Q_OBJECT
+  TQ_OBJECT
   public:
     HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
 			    bool remote=false, bool includeSigs=false, bool validating=false );
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index 275c9b6c..4bd25b34 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,13 +61,14 @@ namespace Kleo {
   */
   class ImportJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    ImportJob( TQObject * parent, const char * name );
+    ImportJob( TQObject * tqparent, const char * name );
   public:
     ~ImportJob();
 
     /**
-       Starts the importing operation. \a keyData tqcontains the data to
+       Starts the importing operation. \a keyData contains the data to
        import from.
     */
     virtual GpgME::Error start( const TQByteArray & keyData ) = 0;
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index ac5dbac2..709b68de 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -59,8 +59,8 @@
 
 #include <gpg-error.h>
 
-Kleo::Job::Job( TQObject * parent, const char * name )
-  : TQObject( parent, name )
+Kleo::Job::Job( TQObject * tqparent, const char * name )
+  : TQObject( tqparent, name )
 {
   if ( tqApp )
     connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
@@ -90,7 +90,7 @@ bool Kleo::Job::isAuditLogSupported() const {
 }
 
 #define make_job_subclass(x) \
-  Kleo::x::x( TQObject * parent, const char * name ) : Job( parent, name ) {} \
+  Kleo::x::x( TQObject * tqparent, const char * name ) : Job( tqparent, name ) {} \
   Kleo::x::~x() {}
 
 make_job_subclass(KeyListJob)
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index 78ff58ce..9dfaf822 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -63,12 +63,13 @@ namespace Kleo {
   */
   class Job : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    Job( TQObject * parent, const char * name );
+    Job( TQObject * tqparent, const char * name );
   public:
     ~Job();
 
-    virtual void showErrorDialog( TQWidget * parent=0, const TQString & caption=TQString::null ) const;
+    virtual void showErrorDialog( TQWidget * tqparent=0, const TQString & caption=TQString() ) const;
 
     virtual TQString auditLogAsHtml() const;
     virtual GpgME::Error auditLogError() const;
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 7cf0bd55..47e1548e 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 8d77b391..98050cc6 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/keyfilter.h b/certmanager/lib/kleo/keyfilter.h
index 49d8cce3..aa3599ab 100644
--- a/certmanager/lib/kleo/keyfilter.h
+++ b/certmanager/lib/kleo/keyfilter.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 51caf5d2..049e3e6f 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,8 +66,8 @@ struct Kleo::KeyFilterManager::Private {
 
 Kleo::KeyFilterManager * Kleo::KeyFilterManager::mSelf = 0;
 
-Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
-  : TQObject( parent, name ), d( 0 )
+Kleo::KeyFilterManager::KeyFilterManager( TQObject * tqparent, const char * name )
+  : TQObject( tqparent, name ), d( 0 )
 {
   mSelf = this;
   d = new Private();
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index 662dfdb8..b37a6e37 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,9 @@ namespace Kleo {
 
   class KDE_EXPORT KeyFilterManager : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    KeyFilterManager( TQObject * parent=0, const char * name=0 );
+    KeyFilterManager( TQObject * tqparent=0, const char * name=0 );
     ~KeyFilterManager();
 
   public:
diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h
index 384d4306..d6478d09 100644
--- a/certmanager/lib/kleo/keygenerationjob.h
+++ b/certmanager/lib/kleo/keygenerationjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -60,8 +60,9 @@ namespace Kleo {
   */
   class KeyGenerationJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    KeyGenerationJob( TQObject * parent, const char * name );
+    KeyGenerationJob( TQObject * tqparent, const char * name );
   public:
     ~KeyGenerationJob();
 
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 667ddadc..2200dee3 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,8 +64,9 @@ namespace Kleo {
   */
   class KeyListJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    KeyListJob( TQObject * parent, const char * name );
+    KeyListJob( TQObject * tqparent, const char * name );
 
   public:
    ~KeyListJob();
@@ -73,7 +74,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or tqcontains only empty strings,
+       ignored. If \a pattern is empty or contains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index bd476647..7d1a2730 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 9bc5d05a..d6749477 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,6 +66,7 @@ namespace Kleo {
   */
   class KDE_EXPORT MultiDeleteJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   public:
     MultiDeleteJob( const CryptoBackend::Protocol * protocol );
     ~MultiDeleteJob();
diff --git a/certmanager/lib/kleo/oidmap.h b/certmanager/lib/kleo/oidmap.h
index 59629633..a31d7642 100644
--- a/certmanager/lib/kleo/oidmap.h
+++ b/certmanager/lib/kleo/oidmap.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 6249116d..8d790fb7 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,8 +61,9 @@ namespace Kleo {
   */
   class RefreshKeysJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    RefreshKeysJob( TQObject * parent, const char * name );
+    RefreshKeysJob( TQObject * tqparent, const char * name );
 
   public:
    ~RefreshKeysJob();
@@ -70,7 +71,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or tqcontains only empty strings,
+       ignored. If \a pattern is empty or contains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h
index 5e12723e..117ac622 100644
--- a/certmanager/lib/kleo/signencryptjob.h
+++ b/certmanager/lib/kleo/signencryptjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,8 +66,9 @@ namespace Kleo {
   */
   class SignEncryptJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    SignEncryptJob( TQObject * parent, const char * name );
+    SignEncryptJob( TQObject * tqparent, const char * name );
   public:
     ~SignEncryptJob();
 
diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h
index 677aedcf..7d90dc85 100644
--- a/certmanager/lib/kleo/signjob.h
+++ b/certmanager/lib/kleo/signjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,8 +64,9 @@ namespace Kleo {
   */
   class SignJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    SignJob( TQObject * parent, const char * name );
+    SignJob( TQObject * tqparent, const char * name );
   public:
     ~SignJob();
 
diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h
index 04867c32..79769391 100644
--- a/certmanager/lib/kleo/specialjob.h
+++ b/certmanager/lib/kleo/specialjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,7 +54,7 @@ namespace Kleo {
      After result() is emitted, the SpecialJob will schedule its own
      destruction by calling TQObject::deleteLater().
 
-     Parameters are set using the Qt property system. More general, or
+     Parameters are set using the TQt property system. More general, or
      constructor parameters are given in the call to
      Kleo::CryptoBackend::Protocol::specialJob().
 
@@ -64,8 +64,9 @@ namespace Kleo {
   */
   class SpecialJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    SpecialJob( TQObject * parent, const char * name );
+    SpecialJob( TQObject * tqparent, const char * name );
 
   public:
    ~SpecialJob();
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index c88c3461..5c0a3c47 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,14 +61,15 @@ namespace Kleo {
   */
   class VerifyDetachedJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    VerifyDetachedJob( TQObject * parent, const char * name );
+    VerifyDetachedJob( TQObject * tqparent, const char * name );
   public:
     ~VerifyDetachedJob();
 
     /**
-       Starts the verification operation. \a signature tqcontains the
-       signature data, while \a signedData tqcontains the data over
+       Starts the verification operation. \a signature contains the
+       signature data, while \a signedData contains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signature,
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index ba7f40d8..942afac1 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,14 +61,15 @@ namespace Kleo {
   */
   class VerifyOpaqueJob : public Job {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    VerifyOpaqueJob( TQObject * parent, const char * name );
+    VerifyOpaqueJob( TQObject * tqparent, const char * name );
   public:
     ~VerifyOpaqueJob();
 
     /**
-       Starts the verification operation. \a signature tqcontains the
-       signature data, while \a signedData tqcontains the data over
+       Starts the verification operation. \a signature contains the
+       signature data, while \a signedData contains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signedData ) = 0;
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index bd6af17e..9d2efd16 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,8 +44,9 @@ class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  GnuPGViewer( TQWidget * parent=0, const char * name=0 );
+  GnuPGViewer( TQWidget * tqparent=0, const char * name=0 );
   ~GnuPGViewer();
 
   void setProcess( Kleo::GnuPGProcessBase * process );
@@ -53,12 +54,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLasStatus;
+  TQString mLastStdout, mLastStderr, mLastqStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data
index b4bce1a9..f09481ba 100644
--- a/certmanager/lib/tests/test.data
+++ b/certmanager/lib/tests/test.data
@@ -116,7 +116,7 @@ static int status( void * void_ctx, const char * line ) {
 static int inquire( void * void_ctx, const char * keyword ) {
     assuan_context_t ctx = (assuan_context_t)void_ctx;
     assert( ctx );
-    const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
+    const std::map<std::string,std::string>::const_iterator it = inquireData.tqfind( keyword );
     if ( it == inquireData.end() )
         return gpg_error( GPG_ERR_UNKNOWN_COMMAND );
 
@@ -179,7 +179,7 @@ int main( int argc, char * argv[] ) {
             options.push_back( argv[++optind] );
         } else if ( qstrcmp( arg, "--inquire" ) == 0 ) {
             const std::string inqval = argv[++optind];
-            const size_t pos = inqval.find( '=' );
+            const size_t pos = inqval.tqfind( '=' );
             // ### implement indirection with "@file"...
             inquireData[inqval.substr( 0, pos )] = inqval.substr( pos+1 );
         } else {
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 96467483..6a872070 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -312,7 +312,7 @@ int main( int argc, char** argv ) {
       // Test with query containing a litteral ':' (KURL supports this)
       // and a ' ' (KURL will escape it, see issue119)
       lst << KURL( "ldap://foo:389/?a:b c" );
-      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query tqcontains a litteral ','
+      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query contains a litteral ','
       //cout << " trying to set: " << lst.toStringList().join(", ").local8Bit() << endl;
       assert( lst[0].query() == "?b" );
       assert( lst[1].query() == "?a:b%20c" ); // see, the space got escaped
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index daccda6d..c3ec0c33 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,8 +46,8 @@
 
 #include <tqstringlist.h>
 
-GnuPGViewer::GnuPGViewer( TQWidget * parent, const char * name )
-  : TQTextEdit( parent, name ), mProcess( 0 )
+GnuPGViewer::GnuPGViewer( TQWidget * tqparent, const char * name )
+  : TQTextEdit( tqparent, name ), mProcess( 0 )
 {
   setTextFormat( LogText );
   setMaxLogLines( 10000 );
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -79,7 +79,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) {
   if ( l.empty() )
     return l;
   if ( str.endsWith( "\n" ) ) {
-    old = TQString::null;
+    old = TQString();
   } else {
     old = l.back();
     l.pop_back();
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "<b>stderr: " + escape( *it ) + "</b>" );
 }
-void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::slotqStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
 }
 void GnuPGViewer::slotProcessExited( KProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
-    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) );
+    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index dfa17a45..95b8dcc9 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 7a751bc1..090c3f3a 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -69,8 +69,8 @@ static const int numKeyParams = sizeof keyParams / sizeof *keyParams;
 
 static const char * protocol = 0;
 
-KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags )
-  : KDialogBase( parent, name, true, "KeyGenerationJob test",
+KeyGenerator::KeyGenerator( TQWidget * tqparent, const char * name, WFlags )
+  : KDialogBase( tqparent, name, true, "KeyGenerationJob test",
 		 Close|User1, User1, true, KGuiItem( "Create" ) )
 {
   TQWidget * w = new TQWidget( this );
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index f066756c..44c07580 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,8 +45,9 @@ class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
+  KeyGenerator( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
   ~KeyGenerator();
 
 public slots:
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 1f032bb1..212d0228 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -68,7 +68,7 @@ namespace {
     case 3: return "Serial";
     case 4: return "Protocol";
     case 5: return "Validity";
-    default: return TQString::null;
+    default: return TQString();
     }
   }
 
@@ -86,13 +86,13 @@ namespace {
     case 3: return key.issuerSerial();
     case 4: return key.protocolAsString();
     case 5: return TQChar( key.userID(0).validityAsString() );
-    default: return TQString::null;
+    default: return TQString();
     }
   }
 }
 
-CertListView::CertListView( TQWidget * parent, const char * name, WFlags f )
-  : Kleo::KeyListView( new TestColumnStrategy(), 0, parent, name, f )
+CertListView::CertListView( TQWidget * tqparent, const char * name, WFlags f )
+  : Kleo::KeyListView( new TestColumnStrategy(), 0, tqparent, name, f )
 {
   setHierarchical( true );
   setRootIsDecorated( true );
diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h
index 23cd99e3..6af935f9 100644
--- a/certmanager/lib/tests/test_keylister.h
+++ b/certmanager/lib/tests/test_keylister.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -41,8 +41,9 @@ namespace GpgME {
 
 class CertListView : public Kleo::KeyListView {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );
+  CertListView( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
 
 public slots:
   void slotResult( const GpgME::KeyListResult & result );
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index 1e3794bc..f4c574da 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index cb5db396..153c62b0 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index f15d2d20..121f5b1a 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AddDirectoryServiceDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddDirectoryServiceDialog</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>serverNameLA</cstring>
             </property>
@@ -36,12 +36,12 @@
                 <cstring>serverNameED</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>descriptionED</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>portED</cstring>
             </property>
@@ -49,12 +49,12 @@
                 <string>389</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>serverNameED</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>usernameLA</cstring>
             </property>
@@ -82,7 +82,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>passwordLA</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <cstring>passwordED</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="8" column="2">
+        <widget class="TQPushButton" row="8" column="2">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -104,7 +104,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="8" column="3">
+        <widget class="TQPushButton" row="8" column="3">
             <property name="name">
                 <cstring>PushButton4</cstring>
             </property>
@@ -143,12 +143,12 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>usernameED</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>passwordED</cstring>
             </property>
@@ -156,7 +156,7 @@
                 <enum>Password</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>descriptionLA</cstring>
             </property>
@@ -167,7 +167,7 @@
                 <cstring>descriptionED</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>portLA</cstring>
             </property>
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
index 7567be71..a6210cab 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -40,14 +40,14 @@
 #include <klineedit.h>
 
 /*
- *  Constructs a AddDirectoryServiceDialogImpl which is a child of 'parent', with the
+ *  Constructs a AddDirectoryServiceDialogImpl which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : AddDirectoryServiceDialog( parent, name, modal, fl )
+AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : AddDirectoryServiceDialog( tqparent, name, modal, fl )
 {
     portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
 }
@@ -57,7 +57,7 @@ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent,
  */
 AddDirectoryServiceDialogImpl::~AddDirectoryServiceDialogImpl()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 #include "adddirectoryservicedialogimpl.moc"
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
index 3fc0d6a5..d6ad086d 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -37,9 +37,10 @@
 class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    AddDirectoryServiceDialogImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~AddDirectoryServiceDialogImpl();
 
 };
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 720525a1..b1a135a9 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -76,8 +76,8 @@ namespace Kleo {
 class Kleo::BackendListView : public KListView
 {
 public:
-  BackendListView( BackendConfigWidget* parent, const char* name = 0 )
-    : KListView( parent, name ) {}
+  BackendListView( BackendConfigWidget* tqparent, const char* name = 0 )
+    : KListView( tqparent, name ) {}
 
   /// return backend for currently selected (/current) item. Used by Configure button.
   const Kleo::CryptoBackend* currentBackend() const;
@@ -92,7 +92,7 @@ public:
 };
 
 // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2")
-class Kleo::BackendListViewItem : public QListViewItem
+class Kleo::BackendListViewItem : public TQListViewItem
 {
 public:
   BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend )
@@ -110,7 +110,7 @@ private:
 
 // Checklist item under a BackendListViewItem
 // (e.g. "GpgME supports protocol OpenPGP")
-class Kleo::ProtocolCheckListItem : public QCheckListItem
+class Kleo::ProtocolCheckListItem : public TQCheckListItem
 {
 public:
   ProtocolCheckListItem( BackendListViewItem* blvi,
@@ -162,7 +162,7 @@ const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const {
   if ( !curItem ) // can't happen
     return 0;
   if ( lvi_cast<Kleo::ProtocolCheckListItem>( curItem ) )
-    curItem = curItem->parent();
+    curItem = curItem->tqparent();
   if ( const Kleo::BackendListViewItem * blvi = lvi_cast<Kleo::BackendListViewItem>( curItem ) )
     return blvi->cryptoBackend();
   return 0;
@@ -175,9 +175,9 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr
         it.current() ; ++it )
     if ( ProtocolCheckListItem * p = lvi_cast<ProtocolCheckListItem>( it.current() ) )
       if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) {
-        // OK that's the one. Now go up to the parent backend
+        // OK that's the one. Now go up to the tqparent backend
         // (need to do that in the listview since Protocol doesn't know it)
-        if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->parent() ) )
+        if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->tqparent() ) )
           return parItem->cryptoBackend();
       }
   return 0;
@@ -196,8 +196,8 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListI
 
 ////
 
-Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent, const char * name, WFlags f )
-  : TQWidget( parent, name, f ), d( 0 )
+Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent, const char * name, WFlags f )
+  : TQWidget( tqparent, name, f ), d( 0 )
 {
   assert( factory );
   d = new Private();
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index c8b45848..83b2eea0 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,9 @@ namespace Kleo {
 
   class KDE_EXPORT BackendConfigWidget : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 );
+    BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
     ~BackendConfigWidget();
 
     void load();
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 0d383083..169af00b 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -34,11 +34,11 @@
 #include <klocale.h>
 #include <kaccelmanager.h>
 
-Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
+Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent, const char* name )
   : KDialogBase( Swallow,
                  // Remove the "whats's this" button since we have no support for it
                  WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | WStyle_Title | WStyle_SysMenu,
-                 parent, name, true /*modal*/,
+                 tqparent, name, true /*modal*/,
                  i18n( "Configure" ), Default|Cancel|Apply|Ok|User1,
                  Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) )
 {
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index d25cdc16..05bb1c39 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,8 +46,9 @@ namespace Kleo {
   class KDE_EXPORT CryptoConfigDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 );
+    CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent = 0, const char* name = 0 );
 
   protected:
     virtual void slotOk();
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 3bed433e..dd92b160 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -80,8 +80,8 @@ static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * c
     : KJanusWidget::IconList ;
 }
 
-Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent, const char * name )
-  : KJanusWidget( parent, name, determineJanusFace( config ) ), mConfig( config )
+Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent, const char * name )
+  : KJanusWidget( tqparent, name, determineJanusFace( config ) ), mConfig( config )
 {
   TQWidget * vbox = 0;
   if ( face() == Plain ) {
@@ -98,7 +98,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
     if ( comp->groupList().empty() )
       continue;
     if ( face() != Plain ) {
-      vbox = addVBoxPage( comp->description(), TQString::null, loadIcon( comp->iconName() ) );
+      vbox = addVBoxPage( comp->description(), TQString(), loadIcon( comp->iconName() ) );
     }
 
     TQScrollView * scrollView = new TQScrollView( vbox );
@@ -125,7 +125,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
     TQSize sz = scrollView->tqsizeHint();
     scrollView->setMinimumSize( sz.width()
                                 + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
-                                QMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
+                                TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
       Q_ASSERT( face() == Plain );
@@ -182,8 +182,8 @@ void Kleo::CryptoConfigModule::cancel()
 
 Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI(
   CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
-  TQWidget* parent, const char* name )
-  : TQWidget( parent, name ),
+  TQWidget* tqparent, const char* name )
+  : TQWidget( tqparent, name ),
     mComponent( component )
 {
   TQGridLayout * glay = new TQGridLayout( this, 1, 3, 0, KDialog::spacingHint() );
@@ -262,7 +262,7 @@ Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI(
 
   TQLabel * l = new TQLabel( widget );
   l->setPixmap( loadIcon( iconName ) );
-  glay->addMultiCellWidget( l, startRow, endRow, 0, 0, Qt::AlignTop );
+  glay->addMultiCellWidget( l, startRow, endRow, 0, 0, TQt::AlignTop );
 }
 
 bool Kleo::CryptoConfigGroupGUI::save()
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index 167c3ac8..46606c55 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,9 @@ namespace Kleo {
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 );
+    CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent=0, const char * name=0 );
 
     bool hasError() const;
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index cce1afea..fb9acc6c 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -58,10 +58,11 @@ namespace Kleo {
    */
   class CryptoConfigComponentGUI : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
-                              TQWidget* parent, const char* name = 0 );
+                              TQWidget* tqparent, const char* name = 0 );
 
     bool save();
     void load();
@@ -77,10 +78,11 @@ namespace Kleo {
    */
   class CryptoConfigGroupGUI : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
-                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
+                          TQGridLayout * tqlayout, TQWidget* tqparent, const char* name = 0 );
 
     bool save();
     void load();
@@ -108,6 +110,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryGUI : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     CryptoConfigEntryGUI( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
@@ -145,13 +148,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
                                TQGridLayout * tqlayout,
-                               TQWidget* parent, const char* name = 0 );
+                               TQWidget* tqparent, const char* name = 0 );
 
     virtual void doSave();
     virtual void doLoad();
@@ -164,13 +168,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryPath : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryPath( CryptoConfigModule* module,
                            Kleo::CryptoConfigEntry* entry,
                            const TQString& entryName,
                            TQGridLayout * tqlayout,
-                           TQWidget* parent, const char* name = 0 );
+                           TQWidget* tqparent, const char* name = 0 );
 
     virtual void doSave();
     virtual void doLoad();
@@ -183,13 +188,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
                               TQGridLayout * tqlayout,
-                              TQWidget* parent, const char* name = 0 );
+                              TQWidget* tqparent, const char* name = 0 );
 
     virtual void doSave();
     virtual void doLoad();
@@ -202,13 +208,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryURL : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryURL( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
                           const TQString& entryName,
                           TQGridLayout * tqlayout,
-                          TQWidget* parent, const char* name = 0 );
+                          TQWidget* tqparent, const char* name = 0 );
 
     virtual void doSave();
     virtual void doLoad();
@@ -221,13 +228,14 @@ namespace Kleo {
    */
   class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
                               TQGridLayout * tqlayout,
-                              TQWidget* parent, const char* name = 0 );
+                              TQWidget* tqparent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
   private:
@@ -240,13 +248,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
                                TQGridLayout * tqlayout,
-                               TQWidget* parent, const char* name = 0 );
+                               TQWidget* tqparent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
   private:
@@ -258,13 +267,14 @@ namespace Kleo {
    */
   class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
                               TQGridLayout * tqlayout,
-                              TQWidget* parent, const char* name = 0 );
+                              TQWidget* tqparent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
   private slots:
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 3f99ddb9..3dc3cd10 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,7 +48,7 @@
 
 using namespace Kleo;
 
-class QX500ListViewItem : public QListViewItem
+class QX500ListViewItem : public TQListViewItem
 {
 public:
   QX500ListViewItem( TQListView* lv, TQListViewItem* prev,
@@ -63,7 +63,7 @@ public:
 
   void setPassword( const TQString& pass ) {
     mPassword = pass;
-    setText( 4, pass.isEmpty() ? TQString::null : TQString::tqfromLatin1( "******" ) );
+    setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) );
   }
 
   const TQString& password() const { return mPassword; }
@@ -92,8 +92,8 @@ private:
 
 Kleo::DirectoryServicesWidget::DirectoryServicesWidget(
   Kleo::CryptoConfigEntry* configEntry,
-  TQWidget* parent,  const char* name, WFlags fl )
-    : DirectoryServicesWidgetBase( parent, name, fl ),
+  TQWidget* tqparent,  const char* name, WFlags fl )
+    : DirectoryServicesWidgetBase( tqparent, name, fl ),
       mConfigEntry( configEntry )
 {
     x500LV->setSorting( -1 );
@@ -112,7 +112,7 @@ Kleo::DirectoryServicesWidget::DirectoryServicesWidget(
  */
 DirectoryServicesWidget::~DirectoryServicesWidget()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index 5c58dc09..8a275f67 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,11 +44,12 @@ class CryptoConfigEntry;
 class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   DirectoryServicesWidget(
     Kleo::CryptoConfigEntry* configEntry,
-    TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~DirectoryServicesWidget();
 
   void load();
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index c2c22501..9ecc87f1 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>DirectoryServicesWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DirectoryServicesWidgetBase</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>x500LA</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <cstring>x500LV</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout2</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Server Name</string>
@@ -124,7 +124,7 @@ If you do not use a directory service, you can still use local certificates.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout1</cstring>
                     </property>
@@ -132,7 +132,7 @@ If you do not use a directory service, you can still use local certificates.
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QToolButton">
+                        <widget class="TQToolButton">
                             <property name="name">
                                 <cstring>upButton</cstring>
                             </property>
@@ -140,7 +140,7 @@ If you do not use a directory service, you can still use local certificates.
                                 <string></string>
                             </property>
                         </widget>
-                        <widget class="QToolButton">
+                        <widget class="TQToolButton">
                             <property name="name">
                                 <cstring>downButton</cstring>
                             </property>
@@ -169,7 +169,7 @@ If you do not use a directory service, you can still use local certificates.
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout3</cstring>
             </property>
@@ -194,7 +194,7 @@ If you do not use a directory service, you can still use local certificates.
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addServicePB</cstring>
                     </property>
@@ -228,7 +228,7 @@ By clicking this button, you can select a new directory service to be used for r
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeServicePB</cstring>
                     </property>
@@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service
         <slot>slotMoveDown()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotAddService()</slot>
     <slot access="protected">slotDeleteService()</slot>
     <slot access="protected">slotServiceChanged( QListViewItem* )</slot>
     <slot access="protected">slotServiceSelected( QListViewItem* )</slot>
     <slot access="protected">slotMoveUp()</slot>
     <slot access="protected">slotMoveDown()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 8f2bc6ec..6f42393f 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -70,12 +70,12 @@ static void prepare( TQListView * lv ) {
   lv->setAllColumnsShowFocus( true );
   lv->setResizeMode( TQListView::LastColumn );
   lv->header()->setClickEnabled( false );
-  lv->addColumn( TQString::null );
+  lv->addColumn( TQString() );
   lv->addColumn( i18n("Description") );
 }
 
-Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent, const char * name, WFlags f )
-  : TQWidget( parent, name, f ), d( 0 )
+Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent, const char * name, WFlags f )
+  : TQWidget( tqparent, name, f ), d( 0 )
 {
   assert( mapper );
   d = new Private();
@@ -173,7 +173,7 @@ void Kleo::DNAttributeOrderConfigWidget::load() {
 
   const TQStringList all = Kleo::DNAttributeMapper::instance()->names();
   for ( TQStringList::const_iterator it = all.begin() ; it != all.end() ; ++it )
-    if ( order.find( *it ) == order.end() )
+    if ( order.tqfind( *it ) == order.end() )
       (void)new TQListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) );
 
   if ( !d->placeHolderItem->listView() )
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index b33c0077..a0867c4f 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,9 +45,10 @@ namespace Kleo {
 
   class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */
-    DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 );
+    /*! Use Kleo::DNAttributeMapper::instance()->configWidget( tqparent, name ) instead. */
+    DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
     ~DNAttributeOrderConfigWidget();
 
     void load();
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index bb9432a9..4f212517 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++ -*-
-   KD Tools - a set of useful widgets for Qt
+   KD Tools - a set of useful widgets for TQt
 */
 
 /****************************************************************************
@@ -27,11 +27,11 @@
 **
 ** In addition, as a special exception, the copyright holders give
 ** permission to link the code of this program with any edition of the
-** Qt library by Trolltech AS, Norway (or with modified versions of Qt
-** that use the same license as Qt), and distribute linked
+** TQt library by Trolltech AS, Norway (or with modified versions of TQt
+** that use the same license as TQt), and distribute linked
 ** combinations including the two.  You must obey the GNU General
 ** Public License in all respects for all of the code used other than
-** Qt.  If you modify this file, you may extend this exception to your
+** TQt.  If you modify this file, you may extend this exception to your
 ** version of the file, but you are not obligated to do so.  If you do
 ** not wish to do so, delete this exception statement from your
 ** version.
@@ -42,23 +42,23 @@
 
 #include <tqstyle.h>
 #include <tqpainter.h>
-#ifdef QT_ACCESSIBILITY_SUPPORT
+#ifdef TQT_ACCESSIBILITY_SUPPORT
 #include <tqaccessible.h>
 #endif
 #include <tqfontmetrics.h>
 #include <tqapplication.h>
 
-KDHorizontalLine::KDHorizontalLine( TQWidget * parent, const char * name, WFlags f )
-  : TQFrame( parent, name, f ),
-    mAlign( Qt::AlignAuto ),
+KDHorizontalLine::KDHorizontalLine( TQWidget * tqparent, const char * name, WFlags f )
+  : TQFrame( tqparent, name, f ),
+    mAlign( TQt::AlignAuto ),
     mLenVisible( 0 )
 {
   TQFrame::setFrameStyle( HLine | Sunken );
 }
 
-KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * parent, const char * name, WFlags f )
-  : TQFrame( parent, name, f ),
-    mAlign( Qt::AlignAuto ),
+KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * tqparent, const char * name, WFlags f )
+  : TQFrame( tqparent, name, f ),
+    mAlign( TQt::AlignAuto ),
     mLenVisible( 0 )
 {
   TQFrame::setFrameStyle( HLine | Sunken );
@@ -78,7 +78,7 @@ void KDHorizontalLine::setTitle( const TQString & title ) {
   calculateFrame();
   update();
   updateGeometry();
-#ifdef QT_ACCESSIBILITY_SUPPORT
+#ifdef TQT_ACCESSIBILITY_SUPPORT
   TQAccessible::updateAccessibility( this, 0, TQAccessible::NameChanged );
 #endif
 }
@@ -123,7 +123,7 @@ TQSize KDHorizontalLine::tqminimumSizeHint() const {
   const int w = fontMetrics().width( mTitle, mLenVisible ) +
                 fontMetrics().width( TQChar( ' ' ) );
   const int h = fontMetrics().height();
-  return TQSize( QMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() );
+  return TQSize( TQMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() );
 }
 
 void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
@@ -150,11 +150,9 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
     int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (QRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
-#if QT_VERSION >= 0x030300
+    const TQColor pen( (TQRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
     if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
-#endif
     style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 0b857bac..fe286801 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++ -*-
-   KD Tools - a set of useful widgets for Qt
+   KD Tools - a set of useful widgets for TQt
 */
 
 /****************************************************************************
@@ -27,11 +27,11 @@
 **
 ** In addition, as a special exception, the copyright holders give
 ** permission to link the code of this program with any edition of the
-** Qt library by Trolltech AS, Norway (or with modified versions of Qt
-** that use the same license as Qt), and distribute linked
+** TQt library by Trolltech AS, Norway (or with modified versions of TQt
+** that use the same license as TQt), and distribute linked
 ** combinations including the two.  You must obey the GNU General
 ** Public License in all respects for all of the code used other than
-** Qt.  If you modify this file, you may extend this exception to your
+** TQt.  If you modify this file, you may extend this exception to your
 ** version of the file, but you are not obligated to do so.  If you do
 ** not wish to do so, delete this exception statement from your
 ** version.
@@ -46,10 +46,11 @@
 
 class KDHorizontalLine : public TQFrame {
   Q_OBJECT
-  Q_PROPERTY( TQString title READ title WRITE setTitle )
+  TQ_OBJECT
+  TQ_PROPERTY( TQString title READ title WRITE setTitle )
 public:
-  KDHorizontalLine( TQWidget * parent=0, const char * name=0,  WFlags f=0 );
-  KDHorizontalLine( const TQString & title, TQWidget * parent=0, const char * name=0,  WFlags f=0 );
+  KDHorizontalLine( TQWidget * tqparent=0, const char * name=0,  WFlags f=0 );
+  KDHorizontalLine( const TQString & title, TQWidget * tqparent=0, const char * name=0,  WFlags f=0 );
   ~KDHorizontalLine();
 
   TQString title() const { return mTitle; }
@@ -74,7 +75,7 @@ private:
 
 private:
   TQString mTitle;
-  Qt::AlignmentFlags mAlign;
+  TQt::AlignmentFlags mAlign;
   int mLenVisible;
 };
 
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 8c48f896..5bdadfd0 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -106,9 +106,9 @@ struct Kleo::KeyApprovalDialog::Private {
 
 Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients,
                                       const std::vector<GpgME::Key> & sender,
-                                      TQWidget * parent, const char * name,
+                                      TQWidget * tqparent, const char * name,
                                       bool modal )
-  : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ),
+  : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ),
     d( 0 )
 {
   assert( !recipients.empty() );
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index b596fc7c..993db126 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -57,6 +57,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyApprovalDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
     struct Item {
       Item() : pref( UnknownPreference ) {}
@@ -70,7 +71,7 @@ namespace Kleo {
 
     KeyApprovalDialog( const std::vector<Item> & recipients,
 		       const std::vector<GpgME::Key> & sender,
-		       TQWidget * parent=0, const char * name=0,
+		       TQWidget * tqparent=0, const char * name=0,
                        bool modal=true );
     ~KeyApprovalDialog();
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index d8afcc59..7519f7e8 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -63,15 +63,15 @@ namespace {
 
   class ItemToolTip : public TQToolTip {
   public:
-    ItemToolTip( Kleo::KeyListView * parent );
+    ItemToolTip( Kleo::KeyListView * tqparent );
   protected:
     void maybeTip( const TQPoint & p );
   private:
     Kleo::KeyListView * mKeyListView;
   };
 
-  ItemToolTip::ItemToolTip( Kleo::KeyListView * parent )
-    : TQToolTip( parent->viewport() ), mKeyListView( parent ) {}
+  ItemToolTip::ItemToolTip( Kleo::KeyListView * tqparent )
+    : TQToolTip( tqparent->viewport() ), mKeyListView( tqparent ) {}
 
   void ItemToolTip::maybeTip( const TQPoint & p ) {
     if ( !mKeyListView )
@@ -117,7 +117,7 @@ struct Kleo::KeyListView::Private {
   std::map<TQCString,KeyListViewItem*> itemMap;
 };
 
-// a list of signals where we want to tqreplace TQListViewItem with
+// a list of signals where we want to replace TQListViewItem with
 // Kleo:KeyListViewItem:
 static const struct {
   const char * source;
@@ -135,8 +135,8 @@ static const struct {
 static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements;
 
 
-Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f )
-  : KListView( parent, name ),
+Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * tqparent, const char * name, WFlags f )
+  : KListView( tqparent, name ),
     mColumnStrategy( columnStrategy ),
     mDisplayStrategy ( displayStrategy  ),
     mHierarchical( false )
@@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
 
 Kleo::KeyListView::~KeyListView() {
   d->updateTimer->stop();
-  // need to clear here, since in ~TQListView, our children won't have
+  // need to clear here, since in ~TQListView, our tqchildren won't have
   // a valid listView() pointing to us anymore, and their dtors try to
   // unregister from us.
   clear();
@@ -261,7 +261,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) {
   if ( !item )
     return;
   std::map<TQCString,KeyListViewItem*>::iterator it
-    = d->itemMap.find( item->key().primaryFingerprint() );
+    = d->itemMap.tqfind( item->key().primaryFingerprint() );
   if ( it == d->itemMap.end() )
     return;
   Q_ASSERT( it->second == item );
@@ -276,9 +276,9 @@ void Kleo::KeyListView::doHierarchicalInsert( const GpgME::Key & key ) {
     return;
   KeyListViewItem * item = 0;
   if ( !key.isRoot() )
-    if ( KeyListViewItem * parent = itemByFingerprint( key.chainID() ) ) {
-      item = new KeyListViewItem( parent, key );
-      parent->setOpen( true );
+    if ( KeyListViewItem * tqparent = itemByFingerprint( key.chainID() ) ) {
+      item = new KeyListViewItem( tqparent, key );
+      tqparent->setOpen( true );
     }
   if ( !item )
     item = new KeyListViewItem( this, key ); // top-level (for now)
@@ -293,12 +293,12 @@ void Kleo::KeyListView::gatherScattered() {
     item = item->nextSibling();
     if ( cur->key().isRoot() )
       continue;
-    if ( KeyListViewItem * parent = itemByFingerprint( cur->key().chainID() ) ) {
-      // found a new parent...
+    if ( KeyListViewItem * tqparent = itemByFingerprint( cur->key().chainID() ) ) {
+      // found a new tqparent...
       // ### todo: optimize by suppressing removing/adding the item to the itemMap...
       takeItem( cur );
-      parent->insertItem( cur );
-      parent->setOpen( true );
+      tqparent->insertItem( cur );
+      tqparent->setOpen( true );
     }
   }
 }
@@ -313,8 +313,8 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) {
     assert( cur->childCount() == 0 );
 
     // ### todo: optimize by suppressing removing/adding the item to the itemMap...
-    if ( cur->parent() )
-      cur->parent()->takeItem( cur );
+    if ( cur->tqparent() )
+      cur->tqparent()->takeItem( cur );
     else
       takeItem( cur );
     insertItem( cur );
@@ -324,7 +324,7 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) {
 Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const {
   if ( s.isEmpty() )
     return 0;
-  const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s );
+  const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.tqfind( s );
   if ( it == d->itemMap.end() )
     return 0;
   return it->second;
@@ -370,39 +370,39 @@ void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item,
 //
 //
 
-Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, const GpgME::Key & key )
-  : TQListViewItem( parent )
+Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key )
+  : TQListViewItem( tqparent )
 {
   setKey( key );
 }
 
-Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key )
-  : TQListViewItem( parent, after )
+Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key )
+  : TQListViewItem( tqparent, after )
 {
   setKey( key );
 }
 
-Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key )
-  : TQListViewItem( parent )
+Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key )
+  : TQListViewItem( tqparent )
 {
   setKey( key );
 }
 
-Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key )
-  : TQListViewItem( parent, after )
+Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key )
+  : TQListViewItem( tqparent, after )
 {
   setKey( key );
 }
 
 Kleo::KeyListViewItem::~KeyListViewItem() {
-  // delete the children first... When children are deleted in the
-  // QLVI dtor, they don't have listView() anymore, thus they don't
+  // delete the tqchildren first... When tqchildren are deleted in the
+  // TQLVI dtor, they don't have listView() anymore, thus they don't
   // call deregister( this ), leading to stale entries in the
   // itemMap...
   while ( TQListViewItem * item = firstChild() )
     delete item;
   // better do this here, too, since deletion is top-down and thus
-  // we're deleted when our parent item is no longer a
+  // we're deleted when our tqparent item is no longer a
   // KeyListViewItem, but a mere TQListViewItem, so our takeItem()
   // overload is gone by that time...
   if ( KeyListView * lv = listView() )
@@ -434,7 +434,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
 TQString Kleo::KeyListViewItem::toolTip( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->toolTip( key(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const {
@@ -483,45 +483,45 @@ void Kleo::KeyListViewItem::takeItem( TQListViewItem * qlvi ) {
 //
 //
 
-Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey )
-  : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey )
+Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey )
+  : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey )
 {
 
 }
 
-Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey )
-  : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey )
+Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey )
+  : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey )
 {
 
 }
 
-Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey )
-  : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey )
+Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey )
+  : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey )
 {
 
 }
 
-Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey )
-  : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey )
+Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey )
+  : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey )
 {
 
 }
 
 void Kleo::SubkeyKeyListViewItem::setSubkey( const GpgME::Subkey & subkey ) {
   mSubkey = subkey;
-  setKey( subkey.parent() );
+  setKey( subkey.tqparent() );
 }
 
 TQString Kleo::SubkeyKeyListViewItem::text( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->subkeyText( subkey(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 TQString Kleo::SubkeyKeyListViewItem::toolTip( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->subkeyToolTip( subkey(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 const TQPixmap * Kleo::SubkeyKeyListViewItem::pixmap( int col ) const {
@@ -561,45 +561,45 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
 //
 //
 
-Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userID )
-  : KeyListViewItem( parent, userID.parent() ), mUserID( userID )
+Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userID )
+  : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID )
 {
 
 }
 
-Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userID )
-  : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID )
+Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userID )
+  : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID )
 {
 
 }
 
-Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userID )
-  : KeyListViewItem( parent, userID.parent() ), mUserID( userID )
+Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userID )
+  : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID )
 {
 
 }
 
-Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userID )
-  : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID )
+Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userID )
+  : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID )
 {
 
 }
 
 void Kleo::UserIDKeyListViewItem::setUserID( const GpgME::UserID & userID ) {
   mUserID = userID;
-  setKey( userID.parent() );
+  setKey( userID.tqparent() );
 }
 
 TQString Kleo::UserIDKeyListViewItem::text( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->userIDText( userID(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 TQString Kleo::UserIDKeyListViewItem::toolTip( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->userIDToolTip( userID(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 const TQPixmap * Kleo::UserIDKeyListViewItem::pixmap( int col ) const {
@@ -640,45 +640,45 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
 //
 //
 
-Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & signature )
-  : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature )
+Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & signature )
+  : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature )
 {
 
 }
 
-Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature )
-  : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature )
+Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature )
+  : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature )
 {
 
 }
 
-Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & signature )
-  : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature )
+Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & signature )
+  : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature )
 {
 
 }
 
-Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature )
-  : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature )
+Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature )
+  : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature )
 {
 
 }
 
 void Kleo::SignatureKeyListViewItem::setSignature( const GpgME::UserID::Signature & signature ) {
   mSignature = signature;
-  setKey( signature.parent().parent() );
+  setKey( signature.tqparent().tqparent() );
 }
 
 TQString Kleo::SignatureKeyListViewItem::text( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->signatureText( signature(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 TQString Kleo::SignatureKeyListViewItem::toolTip( int col ) const {
   return listView() && listView()->columnStrategy()
     ? listView()->columnStrategy()->signatureToolTip( signature(), col )
-    : TQString::null ;
+    : TQString() ;
 }
 
 const TQPixmap * Kleo::SignatureKeyListViewItem::pixmap( int col ) const {
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 986ed267..6161bfe8 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,10 +64,10 @@ namespace Kleo {
 
   class KDE_EXPORT KeyListViewItem : public TQListViewItem {
   public:
-    KeyListViewItem( KeyListView * parent, const GpgME::Key & key );
-    KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key );
-    KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key );
-    KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key );
+    KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key );
+    KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key );
+    KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key );
+    KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key );
     ~KeyListViewItem();
 
     void setKey( const GpgME::Key & key );
@@ -103,10 +103,10 @@ namespace Kleo {
 
   class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem {
   public:
-    SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey );
-    SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey );
-    SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey );
-    SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey );
+    SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey );
+    SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey );
+    SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey );
+    SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey );
 
     void setSubkey( const GpgME::Subkey & subkey );
     const GpgME::Subkey & subkey() const { return mSubkey; }
@@ -135,10 +135,10 @@ namespace Kleo {
 
   class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem {
   public:
-    UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid );
-    UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid );
-    UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userid );
-    UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userid );
+    UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userid );
+    UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userid );
+    UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userid );
+    UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userid );
 
     void setUserID( const GpgME::UserID & userid );
     const GpgME::UserID userID() const { return mUserID; }
@@ -167,10 +167,10 @@ namespace Kleo {
 
   class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem {
   public:
-    SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig );
-    SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig );
-    SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & sig );
-    SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig );
+    SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & sig );
+    SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig );
+    SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & sig );
+    SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig );
 
     void setSignature( const GpgME::UserID::Signature & sig );
     const GpgME::UserID::Signature & signature() const { return mSignature; }
@@ -200,6 +200,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyListView : public KListView {
     Q_OBJECT
+  TQ_OBJECT
     friend class KeyListViewItem;
   public:
 
@@ -215,17 +216,17 @@ namespace Kleo {
       virtual const TQPixmap * pixmap( const GpgME::Key &, int ) const { return 0; }
       virtual int compare( const GpgME::Key & key1, const GpgME::Key & key2, const int column ) const;
 
-      virtual TQString subkeyText( const GpgME::Subkey &, int ) const { return TQString::null; }
+      virtual TQString subkeyText( const GpgME::Subkey &, int ) const { return TQString(); }
       virtual TQString subkeyToolTip( const GpgME::Subkey & subkey, int column ) const;
       virtual const TQPixmap * subkeyPixmap( const GpgME::Subkey &, int ) const { return 0; }
       virtual int subkeyCompare( const GpgME::Subkey & subkey1, const GpgME::Subkey & subkey2, const int column ) const;
 
-      virtual TQString userIDText( const GpgME::UserID &, int ) const { return TQString::null; }
+      virtual TQString userIDText( const GpgME::UserID &, int ) const { return TQString(); }
       virtual TQString userIDToolTip( const GpgME::UserID & userID, int column ) const;
       virtual const TQPixmap * userIDPixmap( const GpgME::UserID &, int ) const { return 0; }
       virtual int userIDCompare( const GpgME::UserID & userID1, const GpgME::UserID & userID2, const int column ) const;
 
-      virtual TQString signatureText( const GpgME::UserID::Signature &, int ) const { return TQString::null; }
+      virtual TQString signatureText( const GpgME::UserID::Signature &, int ) const { return TQString(); }
       virtual TQString signatureToolTip( const GpgME::UserID::Signature & sig, int column ) const;
       virtual const TQPixmap * signaturePixmap( const GpgME::UserID::Signature &, int ) const { return 0; }
       virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const;
@@ -253,7 +254,7 @@ namespace Kleo {
 
     KeyListView( const ColumnStrategy * strategy,
 		 const DisplayStrategy * display=0,
-		 TQWidget * parent=0, const char * name=0, WFlags f=0 );
+		 TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
 
     ~KeyListView();
 
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 27d9d873..7a56ab5a 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -70,7 +70,7 @@
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 
-// Qt
+// TQt
 #include <tqapplication.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
@@ -82,8 +82,8 @@
 #include <assert.h>
 
 Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys,
-				  TQWidget * parent, const char * name )
-  : TQWidget( parent, name ),
+				  TQWidget * tqparent, const char * name )
+  : TQWidget( tqparent, name ),
     mOpenPGPBackend( 0 ),
     mSMIMEBackend( 0 ),
     mMulti( multipleKeys ),
@@ -94,8 +94,8 @@ Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys,
   init();
 }
 
-Kleo::KeyRequester::KeyRequester( TQWidget * parent, const char * name )
-  : TQWidget( parent, name ),
+Kleo::KeyRequester::KeyRequester( TQWidget * tqparent, const char * name )
+  : TQWidget( tqparent, name ),
     mOpenPGPBackend( 0 ),
     mSMIMEBackend( 0 ),
     mMulti( false ),
@@ -171,7 +171,7 @@ void Kleo::KeyRequester::setKey( const GpgME::Key & key ) {
 
 TQString Kleo::KeyRequester::fingerprint() const {
   if ( mKeys.empty() )
-    return TQString::null;
+    return TQString();
   else
     return mKeys.front().primaryFingerprint();
 }
@@ -226,14 +226,14 @@ void Kleo::KeyRequester::updateKeys() {
 
 #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
-static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
+static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
     .arg( TQString::fromLocal8Bit( err.asString() ) );
 
-  KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
 }
 #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 
@@ -430,15 +430,15 @@ static inline unsigned int signingKeyUsage( bool openpgp, bool smime, bool trust
 }
 
 Kleo::EncryptionKeyRequester::EncryptionKeyRequester( bool multi, unsigned int proto,
-						      TQWidget * parent, const char * name,
+						      TQWidget * tqparent, const char * name,
 						      bool onlyTrusted, bool onlyValid )
   : KeyRequester( encryptionKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi,
-		  parent, name )
+		  tqparent, name )
 {
 }
 
-Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * parent, const char * name )
-  : KeyRequester( 0, false, parent, name )
+Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * tqparent, const char * name )
+  : KeyRequester( 0, false, tqparent, name )
 {
 }
 
@@ -451,15 +451,15 @@ void Kleo::EncryptionKeyRequester::setAllowedKeys( unsigned int proto, bool only
 }
 
 Kleo::SigningKeyRequester::SigningKeyRequester( bool multi, unsigned int proto,
-						TQWidget * parent, const char * name,
+						TQWidget * tqparent, const char * name,
 						bool onlyTrusted, bool onlyValid )
   : KeyRequester( signingKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi,
-		  parent, name )
+		  tqparent, name )
 {
 }
 
-Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * parent, const char * name )
-  : KeyRequester( 0, false, parent, name )
+Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * tqparent, const char * name )
+  : KeyRequester( 0, false, tqparent, name )
 {
 }
 
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 07f01b64..5c7913dd 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -75,11 +75,12 @@ namespace Kleo {
   /// Base class for SigningKeyRequester and EncryptionKeyRequester
   class KDE_EXPORT KeyRequester : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KeyRequester( unsigned int allowedKeys, bool multipleKeys=false,
-		  TQWidget * parent=0, const char * name=0 );
-    // Constructor for Qt Designer
-    KeyRequester( TQWidget * parent=0, const char * name=0 );
+		  TQWidget * tqparent=0, const char * name=0 );
+    // Constructor for TQt Designer
+    KeyRequester( TQWidget * tqparent=0, const char * name=0 );
     ~KeyRequester();
 
     const GpgME::Key & key() const;
@@ -160,6 +161,7 @@ namespace Kleo {
 
   class KDE_EXPORT EncryptionKeyRequester : public KeyRequester {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
@@ -167,12 +169,12 @@ namespace Kleo {
      * Preferred constructor
      */
     EncryptionKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols,
-			    TQWidget * parent=0, const char * name=0,
+			    TQWidget * tqparent=0, const char * name=0,
 			    bool onlyTrusted=true, bool onlyValid=true );
     /**
-     * Constructor for Qt designer
+     * Constructor for TQt designer
      */
-    EncryptionKeyRequester( TQWidget * parent=0, const char * name=0 );
+    EncryptionKeyRequester( TQWidget * tqparent=0, const char * name=0 );
     ~EncryptionKeyRequester();
 
     void setAllowedKeys( unsigned int proto, bool onlyTrusted=true, bool onlyValid=true );
@@ -187,6 +189,7 @@ namespace Kleo {
 
   class KDE_EXPORT SigningKeyRequester : public KeyRequester {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
@@ -199,12 +202,12 @@ namespace Kleo {
      * @param onlyValid only show valid keys
      */
     SigningKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols,
-			 TQWidget * parent=0, const char * name=0,
+			 TQWidget * tqparent=0, const char * name=0,
 			 bool onlyTrusted=true, bool onlyValid=true );
     /**
-     * Constructor for Qt designer
+     * Constructor for TQt designer
      */
-    SigningKeyRequester( TQWidget * parent=0, const char * name=0 );
+    SigningKeyRequester( TQWidget * tqparent=0, const char * name=0 );
     ~SigningKeyRequester();
 
     /*
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 1ff68570..22737199 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,7 +64,7 @@
 #include <kactivelabel.h>
 #include <kurl.h>
 
-// Qt
+// TQt
 #include <tqcheckbox.h>
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
@@ -198,7 +198,7 @@ namespace {
     switch ( col ) {
     case 0: return i18n("Key ID");
     case 1: return i18n("User ID");
-    default: return TQString::null;
+    default: return TQString();
     }
   }
 
@@ -227,12 +227,12 @@ namespace {
       {
 	const char * uid = key.userID(0).id();
 	if ( key.protocol() == GpgME::Context::OpenPGP )
-	  return uid && *uid ? TQString::fromUtf8( uid ) : TQString::null ;
+	  return uid && *uid ? TQString::fromUtf8( uid ) : TQString() ;
 	else // CMS
 	  return Kleo::DN( uid ).prettyDN();
       }
       break;
-    default: return TQString::null;
+    default: return TQString();
     }
   }
 
@@ -301,9 +301,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title,
 					      unsigned int keyUsage,
 					      bool extendedSelection,
 					      bool rememberChoice,
-					      TQWidget * parent, const char * name,
+					      TQWidget * tqparent, const char * name,
 					      bool modal )
-  : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
+  : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
     mOpenPGPBackend( 0 ),
     mSMIMEBackend( 0 ),
     mRememberCB( 0 ),
@@ -311,7 +311,7 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title,
     mKeyUsage( keyUsage ),
     mCurrentContextMenuItem( 0 )
 {
-  init( rememberChoice, extendedSelection, text, TQString::null );
+  init( rememberChoice, extendedSelection, text, TQString() );
 }
 
 Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title,
@@ -321,9 +321,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title,
 					      unsigned int keyUsage,
 					      bool extendedSelection,
 					      bool rememberChoice,
-					      TQWidget * parent, const char * name,
+					      TQWidget * tqparent, const char * name,
 					      bool modal )
-  : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
+  : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
     mOpenPGPBackend( 0 ),
     mSMIMEBackend( 0 ),
     mRememberCB( 0 ),
@@ -342,9 +342,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title,
 					      unsigned int keyUsage,
 					      bool extendedSelection,
 					      bool rememberChoice,
-					      TQWidget * parent, const char * name,
+					      TQWidget * tqparent, const char * name,
 					      bool modal )
-  : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
+  : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
     mOpenPGPBackend( 0 ),
     mSMIMEBackend( 0 ),
     mRememberCB( 0 ),
@@ -562,14 +562,14 @@ void Kleo::KeySelectionDialog::slotStartCertificateManager( const TQString &quer
 
 #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
-static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
+static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   assert( err );
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
     .arg( TQString::fromLocal8Bit( err.asString() ) );
 
-  KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
+  KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
 }
 #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
 
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index ab8dc756..c0bfa7ee 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -65,6 +65,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeySelectionDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
 
     enum KeyUsage {
@@ -89,7 +90,7 @@ namespace Kleo {
                         unsigned int keyUsage=AllKeys,
                         bool extendedSelection=false,
 			bool rememberChoice=false,
-                        TQWidget * parent=0, const char * name=0,
+                        TQWidget * tqparent=0, const char * name=0,
                         bool modal=true );
     KeySelectionDialog( const TQString & title,
                         const TQString & text,
@@ -98,7 +99,7 @@ namespace Kleo {
                         unsigned int keyUsage=AllKeys,
                         bool extendedSelection=false,
 			bool rememberChoice=false,
-                        TQWidget * parent=0, const char * name=0,
+                        TQWidget * tqparent=0, const char * name=0,
                         bool modal=true );
     KeySelectionDialog( const TQString & title,
                         const TQString & text,
@@ -106,7 +107,7 @@ namespace Kleo {
                         unsigned int keyUsage=AllKeys,
                         bool extendedSelection=false,
 			bool rememberChoice=false,
-                        TQWidget * parent=0, const char * name=0,
+                        TQWidget * tqparent=0, const char * name=0,
                         bool modal=true );
     ~KeySelectionDialog();
 
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index c209ff67..824600f1 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -75,9 +75,10 @@ static KGuiItem KGuiItem_showAuditLog() {
 
 class AuditLogViewer : public KDialogBase {
     // Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
-        : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"),
+    explicit AuditLogViewer( const TQString & log, TQWidget * tqparent=0, const char * name=0, WFlags f=0 )
+        : KDialogBase( tqparent, name, false, i18n("View GnuPG Audit Log"),
                        Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ),
           m_log( /* sic */ ),
           m_textEdit( new TQTextEdit( this, "m_textEdit" ) )
@@ -143,13 +144,13 @@ private:
 } // anon namespace
 
 // static
-void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) {
+void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString & caption ) {
 
     if ( !job )
         return;
 
     if ( !GpgME::hasFeature( AuditLogFeature ) || !job->isAuditLogSupported() ) {
-        KMessageBox::information( parent, i18n("Your system does not have support for GnuPG Audit Logs"),
+        KMessageBox::information( tqparent, i18n("Your system does not have support for GnuPG Audit Logs"),
                                   i18n("System Error") );
         return;
     }
@@ -157,7 +158,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString &
     const GpgME::Error err = job->auditLogError();
 
     if ( err.code() != GPG_ERR_NO_DATA ) {
-        KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
+        KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
                                   .arg( TQString::fromLocal8Bit( err.asString() ) ),
                                   i18n("GnuPG Audit Log Error") );
         return;
@@ -166,29 +167,29 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString &
     const TQString log = job->auditLogAsHtml();
 
     if ( log.isEmpty() ) {
-        KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."),
+        KMessageBox::information( tqparent, i18n("No GnuPG Audit Log available for this operation."),
                                   i18n("No GnuPG Audit Log") );
         return;
     }
 
-    auditLog( parent, log, caption );
+    auditLog( tqparent, log, caption );
 }
 
 // static
-void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) {
-    AuditLogViewer * const alv = new AuditLogViewer( log, parent, "alv", Qt::WDestructiveClose );
+void MessageBox::auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ) {
+    AuditLogViewer * const alv = new AuditLogViewer( log, tqparent, "alv", TQt::WDestructiveClose );
     alv->setCaption( caption );
     alv->show();
 }
 
 // static
-void MessageBox::auditLog( TQWidget * parent, const Job * job ) {
-    auditLog( parent, job, i18n("GnuPG Audit Log Viewer") );
+void MessageBox::auditLog( TQWidget * tqparent, const Job * job ) {
+    auditLog( tqparent, job, i18n("GnuPG Audit Log Viewer") );
 }
 
 // static
-void MessageBox::auditLog( TQWidget * parent, const TQString & log ) {
-    auditLog( parent, log, i18n("GnuPG Audit Log Viewer") );
+void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) {
+    auditLog( tqparent, log, i18n("GnuPG Audit Log Viewer") );
 }
 
 static TQString to_information_string( const SigningResult & result ) {
@@ -220,63 +221,63 @@ static TQString to_error_string( const SigningResult & sresult, const Encryption
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) {
-    information( parent, result, job, i18n("Signing Result"), options );
+void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) {
+    information( tqparent, result, job, i18n("Signing Result"), options );
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
+void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) {
-    error( parent, result, job, i18n("Signing Error"), options );
+void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) {
+    error( tqparent, result, job, i18n("Signing Error"), options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
+void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) {
-    information( parent, result, job, i18n("Encryption Result"), options );
+void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) {
+    information( tqparent, result, job, i18n("Encryption Result"), options );
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
+void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) {
-    error( parent, result, job, i18n("Encryption Error"), options );
+void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) {
+    error( tqparent, result, job, i18n("Encryption Error"), options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
+void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
-    information( parent, sresult, eresult, job, i18n("Encryption Result"), options );
+void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
+    information( tqparent, sresult, eresult, job, i18n("Encryption Result"), options );
 }
 
 // static
-void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options );
+void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
-    error( parent, sresult, eresult, job, i18n("Encryption Error"), options );
+void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
+    error( tqparent, sresult, eresult, job, i18n("Encryption Error"), options );
 }
 
 // static
-void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
-    make( parent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options );
+void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
+    make( tqparent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options );
 }
 
 // static
@@ -306,19 +307,19 @@ bool MessageBox::showAuditLogButton( const Kleo::Job * job ) {
 
 
 // static
-void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) {
+void MessageBox::make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) {
     KDialogBase * dialog = showAuditLogButton( job )
         ? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No,
                            KDialogBase::Yes, KDialogBase::Yes,
-                           parent, "error", true, true,
+                           tqparent, "error", true, true,
                            KStdGuiItem::ok(), KGuiItem_showAuditLog() )
         : new KDialogBase( caption, KDialogBase::Yes,
                            KDialogBase::Yes, KDialogBase::Yes,
-                           parent, "error", true, true,
+                           tqparent, "error", true, true,
                            KStdGuiItem::ok() ) ;
     if ( options & KMessageBox::PlainCaption )
         dialog->setPlainCaption( caption );
 
-    if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, TQStringList(), TQString::null, 0, options ) )
+    if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, TQStringList(), TQString(), 0, options ) )
         auditLog( 0, job );
 }
diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h
index ee72e43c..64cd1a2e 100644
--- a/certmanager/lib/ui/messagebox.h
+++ b/certmanager/lib/ui/messagebox.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,30 +54,30 @@ namespace Kleo {
 
     class MessageBox {
     public:
-        static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-
-        static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-
-        static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
-        static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
-
-        static void auditLog( TQWidget * parent, const Kleo::Job * job, const TQString & caption );
-        static void auditLog( TQWidget * parent, const Kleo::Job * job );
-        static void auditLog( TQWidget * parent, const TQString & log, const TQString & caption );
-        static void auditLog( TQWidget * parent, const TQString & log );
+        static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+        static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+        static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+        static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+        static void auditLog( TQWidget * tqparent, const Kleo::Job * job, const TQString & caption );
+        static void auditLog( TQWidget * tqparent, const Kleo::Job * job );
+        static void auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption );
+        static void auditLog( TQWidget * tqparent, const TQString & log );
 
         static bool showAuditLogButton( const Kleo::Job * job );
 
     private:
-        static void make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options );
+        static void make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options );
     };
 
 
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index a0bc7295..91ecdef6 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,8 +66,8 @@ struct Kleo::PassphraseDialog::Private {
 
 
 Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & caption,
-					  TQWidget * parent, const char * name, bool modal )
-  : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok ), d( 0 )
+					  TQWidget * tqparent, const char * name, bool modal )
+  : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok ), d( 0 )
 {
   d = new Private();
 
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 43b54042..6ff4289c 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -55,10 +55,11 @@ namespace Kleo {
 
   class PassphraseDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
     PassphraseDialog( const TQString & description,
-		      const TQString & caption=TQString::null,
-		      TQWidget * parent=0, const char * name=0,
+		      const TQString & caption=TQString(),
+		      TQWidget * tqparent=0, const char * name=0,
                       bool modal=true );
     ~PassphraseDialog();
 
diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp
index 1b14868d..b6518c60 100644
--- a/certmanager/lib/ui/progressbar.cpp
+++ b/certmanager/lib/ui/progressbar.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -39,8 +39,8 @@
 static const int busyTimerTickInterval = 100;
 static const int busyTimerTickIncrement = 5;
 
-Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f )
-  : TQProgressBar( 0, parent, name, f ),
+Kleo::ProgressBar::ProgressBar( TQWidget * tqparent, const char * name, WFlags f )
+  : TQProgressBar( 0, tqparent, name, f ),
     mRealProgress( -1 )
 {
   mBusyTimer = new TQTimer( this );
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 21953606..705fe11f 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,8 +44,9 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressBar : public TQProgressBar {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
+    ProgressBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
 
   public slots:
     void slotProgress( const TQString & message, int type, int current, int total );
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index 58f196d1..d6552922 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,7 +48,7 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText,
   : TQProgressDialog( creator, name, false, f ), mBaseText( baseText )
 {
   assert( job );
-  setBar( new ProgressBar( this, "tqreplacement progressbar in Kleo::ProgressDialog" ) );
+  setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) );
 
   setMinimumDuration( 2000 /*ms*/ );
   setAutoReset( false );
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index 64f53f37..c3cad24d 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,6 +45,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressDialog : public TQProgressDialog {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ProgressDialog( Job * job, const TQString & baseText,
 		    TQWidget * creator=0, const char * name=0, WFlags f=0  );
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index a77788d5..85f98900 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index acc97642..59e007a3 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -46,6 +46,7 @@ namespace KIOext {
  */
 class StoredTransferJob : public KIO::TransferJob {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
        /**
diff --git a/doc/api/Doxyfile.pim b/doc/api/Doxyfile.pim
index 319ad141..6ecb6dd8 100644
--- a/doc/api/Doxyfile.pim
+++ b/doc/api/Doxyfile.pim
@@ -74,7 +74,7 @@ REPEAT_BRIEF           = YES
 # as the annotated text. Otherwise, the brief description is used as-is. If left 
 # blank, the following values are used ("$name" is automatically replaced with the 
 # name of the entity): "The $name class" "The $name widget" "The $name file" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+# "is" "provides" "specifies" "tqcontains" "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       = 
 
@@ -431,8 +431,8 @@ EXCLUDE_SYMLINKS       = NO
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
 # certain files from those directories.
 
-EXCLUDE_PATTERNS       = *.moc.* \
-                         moc* \
+EXCLUDE_PATTERNS       = *.tqmoc.* \
+                         tqmoc* \
                          *.all_cpp.* \
                          *unload.* \
                          */test/* \
diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css
index 2e8f17f5..9e45a547 100644
--- a/doc/api/doxygen.css
+++ b/doc/api/doxygen.css
@@ -227,7 +227,7 @@ height: 100px;
 bottom:0px;
 }
 
-/* right footer, tqcontains the wave image */
+/* right footer, contains the wave image */
 #footer_right {
 position: absolute;
 right: 0px;
@@ -235,7 +235,7 @@ text-align: right;
 z-index: 5;
 }
 
-/* left footer, tqcontains the text */
+/* left footer, contains the text */
 #footer_left {
 position: absolute;
 left: 0px;
diff --git a/indexlib/GPL_V2 b/indexlib/GPL_V2
index cfa6e1a8..07dec1a9 100644
--- a/indexlib/GPL_V2
+++ b/indexlib/GPL_V2
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/indexlib/bitio.h b/indexlib/bitio.h
index 8072d74b..40f4ef7d 100644
--- a/indexlib/bitio.h
+++ b/indexlib/bitio.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/bitstream.cpp b/indexlib/bitstream.cpp
index 62e8803c..abb77bc2 100644
--- a/indexlib/bitstream.cpp
+++ b/indexlib/bitstream.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/bitstream.h b/indexlib/bitstream.h
index 7cc491a0..5533d262 100644
--- a/indexlib/bitstream.h
+++ b/indexlib/bitstream.h
@@ -20,11 +20,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp
index 9723a18f..b4e580ff 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.hpp
@@ -53,7 +53,7 @@ BOOST_LIB_TOOLSET:    The compiler toolset name (vc6, vc7, bcb5 etc).
 BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing.
 
 BOOST_LIB_RT_OPT:     A suffix that indicates the runtime library used,
-                      tqcontains one or more of the following letters after
+                      contains one or more of the following letters after
                       a hiphen:
 
                       s      static runtime (dynamic if not present).
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.hpp
index 4893faaa..3a5f4130 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.hpp
@@ -53,7 +53,7 @@
 
 #    define BOOST_HAS_MPTASKS
 
-// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe
+// The MP task implementation of Boost Threads aims to replace MP-unsafe
 // parts of the MSL, so we turn on threads unconditionally.
 #    define BOOST_HAS_THREADS
 
diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.hpp
index cfaff230..d8a35777 100644
--- a/indexlib/boost-compat/config/requires_threads.hpp
+++ b/indexlib/boost-compat/config/requires_threads.hpp
@@ -4,8 +4,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP
-#define BOOST_CONFIG_REQUIRES_THREADS_HPP
+#ifndef BOOST_CONFIG_RETQUIRES_THREADS_HPP
+#define BOOST_CONFIG_RETQUIRES_THREADS_HPP
 
 #ifndef BOOST_CONFIG_HPP
 #  include <boost/config.hpp>
@@ -89,4 +89,4 @@
 
 #endif // BOOST_HAS_THREADS
 
-#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP
+#endif // BOOST_CONFIG_RETQUIRES_THREADS_HPP
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp
index 735a03b0..b7bf5914 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.hpp
@@ -54,7 +54,7 @@
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp"
 
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Dinkumware Library (this has to appear after any possible tqreplacement libraries):
+// Dinkumware Library (this has to appear after any possible replacement libraries):
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
 
 #elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.hpp
index a144b4fe..3d60d718 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.hpp
@@ -500,7 +500,7 @@ namespace boost{
 
 //
 // Helper macro BOOST_STRINGIZE:
-// Converts the parameter X to a string after macro tqreplacement
+// Converts the parameter X to a string after macro replacement
 // on X has been performed.
 //
 #define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp
index d595f997..c83e9af6 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -71,12 +71,12 @@
 // #define BOOST_DISABLE_ABI_HEADERS
 
 // BOOST_ABI_PREFIX: A prefix header to include in place of whatever
-// boost.config would normally select, any tqreplacement should set up 
+// boost.config would normally select, any replacement should set up 
 // struct packing and tqalignment options as required. 
 // #define BOOST_ABI_PREFIX my-header-name
 
 // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever 
-// boost.config would normally select, any tqreplacement should undo 
+// boost.config would normally select, any replacement should undo 
 // the effects of the prefix header. 
 // #define BOOST_ABI_SUFFIX my-header-name
 
@@ -91,7 +91,7 @@
 // #define BOOST_ALL_DYN_LINK
  
 // BOOST_WHATEVER_DYN_LINK: Forces library "whatever" to be linked as a dll 
-// rather than a static library on Microsoft Windows: tqreplace the WHATEVER 
+// rather than a static library on Microsoft Windows: replace the WHATEVER 
 // part of the macro name with the name of the library that you want to 
 // dynamically link to, for example use BOOST_DATE_TIME_DYN_LINK or 
 // BOOST_REGEX_DYN_LINK etc (this macro is used to turn on __declspec(dllimport) 
@@ -112,7 +112,7 @@
  
 // BOOST_WHATEVER_NO_LIB: Tells the config system not to automatically 
 // select which library to link against for library "whatever", 
-// tqreplace WHATEVER in the macro name with the name of the library; 
+// replace WHATEVER in the macro name with the name of the library; 
 // for example BOOST_DATE_TIME_NO_LIB or BOOST_REGEX_NO_LIB.  
 // Normally if a compiler supports #pragma lib, then the correct library 
 // build variant will be automatically selected and linked against, simply 
diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.hpp
index 0a3bf6d8..ec88ae2e 100644
--- a/indexlib/boost-compat/shared_ptr.hpp
+++ b/indexlib/boost-compat/shared_ptr.hpp
@@ -445,7 +445,7 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
 #if (defined(__GNUC__) &&  (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
 
 // g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 also doesn't accept it
+// aptqparently EDG 2.38 also doesn't accept it
 
 template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
 {
diff --git a/indexlib/compat.h b/indexlib/compat.h
index f0dd0d18..4c3495f7 100644
--- a/indexlib/compat.h
+++ b/indexlib/compat.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -51,7 +51,7 @@ struct iterator {
 }
 #endif
 
-/* compatibility tqreplacements for functions not defined in older libstdc++ */
+/* compatibility replacements for functions not defined in older libstdc++ */
 template<class T> T kMin(const T &a, const T &b) { return a < b ? a : b; }
 template<class T> T kMax(const T &a, const T &b) { return a > b ? a : b; }
 
diff --git a/indexlib/compressed.cpp b/indexlib/compressed.cpp
index fdcc0219..a60c3f06 100644
--- a/indexlib/compressed.cpp
+++ b/indexlib/compressed.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/compressed.h b/indexlib/compressed.h
index 7397c821..e583e998 100644
--- a/indexlib/compressed.h
+++ b/indexlib/compressed.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/create.cpp b/indexlib/create.cpp
index 1020cc26..e47d116a 100644
--- a/indexlib/create.cpp
+++ b/indexlib/create.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/create.h b/indexlib/create.h
index 6a495e98..e865728e 100644
--- a/indexlib/create.h
+++ b/indexlib/create.h
@@ -22,11 +22,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/exception.cpp b/indexlib/exception.cpp
index d638a985..c48a587b 100644
--- a/indexlib/exception.cpp
+++ b/indexlib/exception.cpp
@@ -18,11 +18,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/exception.h b/indexlib/exception.h
index 4592283f..ce5f1f2b 100644
--- a/indexlib/exception.h
+++ b/indexlib/exception.h
@@ -20,11 +20,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/ifile.cpp b/indexlib/ifile.cpp
index ba5d7c3f..b71297a0 100644
--- a/indexlib/ifile.cpp
+++ b/indexlib/ifile.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/ifile.h b/indexlib/ifile.h
index db6cef90..4cfcf585 100644
--- a/indexlib/ifile.h
+++ b/indexlib/ifile.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/index.h b/indexlib/index.h
index 26135b9f..b7c68375 100644
--- a/indexlib/index.h
+++ b/indexlib/index.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/index_slow.h b/indexlib/index_slow.h
index ebe5e770..bbb4f7b7 100644
--- a/indexlib/index_slow.h
+++ b/indexlib/index_slow.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/leafdata.cpp b/indexlib/leafdata.cpp
index 95af29e0..70773330 100644
--- a/indexlib/leafdata.cpp
+++ b/indexlib/leafdata.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/leafdata.h b/indexlib/leafdata.h
index e499a2e6..fa08645e 100644
--- a/indexlib/leafdata.h
+++ b/indexlib/leafdata.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/leafdatavector.cpp b/indexlib/leafdatavector.cpp
index 56a3986c..0dae6555 100644
--- a/indexlib/leafdatavector.cpp
+++ b/indexlib/leafdatavector.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/leafdatavector.h b/indexlib/leafdatavector.h
index 60cdf943..f97ed64d 100644
--- a/indexlib/leafdatavector.h
+++ b/indexlib/leafdatavector.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/lockfile.cpp b/indexlib/lockfile.cpp
index d0225cda..6dfc122d 100644
--- a/indexlib/lockfile.cpp
+++ b/indexlib/lockfile.cpp
@@ -18,11 +18,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/lockfile.h b/indexlib/lockfile.h
index 42779519..d4968498 100644
--- a/indexlib/lockfile.h
+++ b/indexlib/lockfile.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/logfile.cpp b/indexlib/logfile.cpp
index 49797cb5..4605030f 100644
--- a/indexlib/logfile.cpp
+++ b/indexlib/logfile.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/logfile.h b/indexlib/logfile.h
index 09d5e78d..b29130ef 100644
--- a/indexlib/logfile.h
+++ b/indexlib/logfile.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/main.cpp b/indexlib/main.cpp
index eff248b4..b8685153 100644
--- a/indexlib/main.cpp
+++ b/indexlib/main.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/manager.h b/indexlib/manager.h
index da321cb7..aaa08713 100644
--- a/indexlib/manager.h
+++ b/indexlib/manager.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -56,12 +56,12 @@ class memory_manager  {
 		virtual void resize( unsigned ) = 0;
 };
 
-template <memory_manager* ( *get_parent )()>
+template <memory_manager* ( *get_tqparent )()>
 struct thing_manager {
 	public:
 
-		const unsigned char* ronly_base( unsigned idx ) const { return get_parent()->ronly_base( idx ); }
-		unsigned char* rw_base( unsigned idx ) const { return get_parent()->rw_base( idx ); }
+		const unsigned char* ronly_base( unsigned idx ) const { return get_tqparent()->ronly_base( idx ); }
+		unsigned char* rw_base( unsigned idx ) const { return get_tqparent()->rw_base( idx ); }
 };
 		
 
diff --git a/indexlib/match.cpp b/indexlib/match.cpp
index 03851a84..3a56c28d 100644
--- a/indexlib/match.cpp
+++ b/indexlib/match.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/match.h b/indexlib/match.h
index 6cbf448b..9c8fc24f 100644
--- a/indexlib/match.h
+++ b/indexlib/match.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/mempool.h b/indexlib/mempool.h
index e0cfc9a3..95416f08 100644
--- a/indexlib/mempool.h
+++ b/indexlib/mempool.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -114,20 +114,20 @@ struct mempool /* : boost::noncopyable */ {
 		friend struct list_node_manager;
 		struct list_node_manager {
 			protected:
-				const mempool* parent_;
+				const mempool* tqparent_;
 			public:
-				explicit list_node_manager( const mempool* p = 0 ):parent_( p ) {}
+				explicit list_node_manager( const mempool* p = 0 ):tqparent_( p ) {}
 
 				void* rw_base( unsigned idx ) const {
-					return parent_->manager_->rw_base( idx );
+					return tqparent_->manager_->rw_base( idx );
 				}
 				const void* ronly_base( unsigned idx ) const {
-					return parent_->manager_->ronly_base( idx );
+					return tqparent_->manager_->ronly_base( idx );
 				}
 		};
 
 		START_THING( list_node, thing<list_node_manager> )
-			void set_parent( const mempool* p ) { this->parent_ = p; }
+			void set_tqparent( const mempool* p ) { this->tqparent_ = p; }
 			MEMBER( uint16_t, order, 0 )
 			MEMBER( uint32_t, next, 2 )
 			MEMBER( uint32_t, prev, 6 )
diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc
index 19a5e6d4..fcb65942 100644
--- a/indexlib/mempool.tcc
+++ b/indexlib/mempool.tcc
@@ -142,7 +142,7 @@ template <typename Traits>
 typename mempool<Traits>::list_nodeptr mempool<Traits>::get_node( uint32_t p ) const {
 	assert( p );
 	list_nodeptr res = list_nodeptr::cast_from_uint32( p + Traits::type_offset() );
-	res->set_parent( this );
+	res->set_tqparent( this );
 	return res;
 }
 
diff --git a/indexlib/memreference.h b/indexlib/memreference.h
index 32c55e75..048482e0 100644
--- a/indexlib/memreference.h
+++ b/indexlib/memreference.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/memvector.h b/indexlib/memvector.h
index e251c447..680d2874 100644
--- a/indexlib/memvector.h
+++ b/indexlib/memvector.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/mmap_manager.cpp b/indexlib/mmap_manager.cpp
index 58ebd47e..7f6b1929 100644
--- a/indexlib/mmap_manager.cpp
+++ b/indexlib/mmap_manager.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/mmap_manager.h b/indexlib/mmap_manager.h
index eaed5d8d..a1068297 100644
--- a/indexlib/mmap_manager.h
+++ b/indexlib/mmap_manager.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/path.h b/indexlib/path.h
index 36e15179..013e8c46 100644
--- a/indexlib/path.h
+++ b/indexlib/path.h
@@ -20,11 +20,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/pointer.h b/indexlib/pointer.h
index 0699be19..70721918 100644
--- a/indexlib/pointer.h
+++ b/indexlib/pointer.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/quotes.cpp b/indexlib/quotes.cpp
index b84ac86c..e4c35db4 100644
--- a/indexlib/quotes.cpp
+++ b/indexlib/quotes.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/quotes.h b/indexlib/quotes.h
index 6af33e5d..b540db63 100644
--- a/indexlib/quotes.h
+++ b/indexlib/quotes.h
@@ -1,5 +1,5 @@
-#ifndef LPC_QUOTES_H1108078052_INCLUDE_GUARD_
-#define LPC_QUOTES_H1108078052_INCLUDE_GUARD_
+#ifndef LPC_TQUOTES_H1108078052_INCLUDE_GUARD_
+#define LPC_TQUOTES_H1108078052_INCLUDE_GUARD_
 
 /* This file is part of indexlib.
  * Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -58,4 +58,4 @@ struct quotes : public indexlib::index {
 
 
 
-#endif /* LPC_QUOTES_H1108078052_INCLUDE_GUARD_ */
+#endif /* LPC_TQUOTES_H1108078052_INCLUDE_GUARD_ */
diff --git a/indexlib/result.h b/indexlib/result.h
index 67ed1445..4cad40d7 100644
--- a/indexlib/result.h
+++ b/indexlib/result.h
@@ -22,11 +22,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/slow.cpp b/indexlib/slow.cpp
index fd0e362e..73f13af7 100644
--- a/indexlib/slow.cpp
+++ b/indexlib/slow.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/slow.h b/indexlib/slow.h
index afa45064..2ff52f9d 100644
--- a/indexlib/slow.h
+++ b/indexlib/slow.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/stringarray.cpp b/indexlib/stringarray.cpp
index fb3cf733..a50a8c42 100644
--- a/indexlib/stringarray.cpp
+++ b/indexlib/stringarray.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/stringarray.h b/indexlib/stringarray.h
index 0994c764..a928db31 100644
--- a/indexlib/stringarray.h
+++ b/indexlib/stringarray.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/stringset.cpp b/indexlib/stringset.cpp
index e10885ba..511bc1e8 100644
--- a/indexlib/stringset.cpp
+++ b/indexlib/stringset.cpp
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/stringset.h b/indexlib/stringset.h
index 0043d7a1..3daa5d60 100644
--- a/indexlib/stringset.h
+++ b/indexlib/stringset.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -129,7 +129,7 @@ struct stringset {
 		void clear();
 
 		/**
-		 * Returns std::make_pair( find( word ), find( word + 'Z' ) ) which makes it easy
+		 * Returns std::make_pair( tqfind( word ), tqfind( word + 'Z' ) ) which makes it easy
 		 * to implement word* searches
 		 */
 		std::pair<const_iterator, const_iterator> upper_lower( const char* ) const;
diff --git a/indexlib/tests/ifile-test.cpp b/indexlib/tests/ifile-test.cpp
index 9b9f9283..95509866 100644
--- a/indexlib/tests/ifile-test.cpp
+++ b/indexlib/tests/ifile-test.cpp
@@ -37,17 +37,17 @@ void simple() {
 	cleanup();
 	ifile ifi( fname );
 	ifi.add( "this", "doc" );
-	BOOST_CHECK_EQUAL( ifi.search( "this" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "this" )->list()[ 0 ], 0 );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" );
+	BOOST_CHECK_ETQUAL( ifi.search( "this" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "this" )->list()[ 0 ], 0 );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" );
 	ifi.add( "that", "doc2" );
-	BOOST_CHECK_EQUAL( ifi.search( "this" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "this" )->list()[ 0 ], 0 );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" );
+	BOOST_CHECK_ETQUAL( ifi.search( "this" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "this" )->list()[ 0 ], 0 );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" );
 	
-	BOOST_CHECK_EQUAL( ifi.search( "that" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "that" )->list()[ 0 ], 1 );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "that" )->list()[ 0 ] ), "doc2" );
+	BOOST_CHECK_ETQUAL( ifi.search( "that" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "that" )->list()[ 0 ], 1 );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "that" )->list()[ 0 ] ), "doc2" );
 }
 
 void ndocs() {
@@ -55,16 +55,16 @@ void ndocs() {
 	ifile ifi( fname );
 	ifi.add( "one", "one" );
 	ifi.add( "one", "two" );
-	BOOST_CHECK_EQUAL( ifi.ndocs(), 2 );
+	BOOST_CHECK_ETQUAL( ifi.ndocs(), 2 );
 
 	ifi.add( "one", "three" );
 	ifi.add( "one", "four" );
 
-	BOOST_CHECK_EQUAL( ifi.ndocs(), 4 );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( 0 ), std::string( "one" ) );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( 1 ), std::string( "two" ) );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( 2 ), std::string( "three" ) );
-	BOOST_CHECK_EQUAL( ifi.lookup_docname( 3 ), std::string( "four" ) );
+	BOOST_CHECK_ETQUAL( ifi.ndocs(), 4 );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( 0 ), std::string( "one" ) );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( 1 ), std::string( "two" ) );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( 2 ), std::string( "three" ) );
+	BOOST_CHECK_ETQUAL( ifi.lookup_docname( 3 ), std::string( "four" ) );
 }
 
 void space() {
@@ -72,7 +72,7 @@ void space() {
 	ifile ifi( fname );
 
 	ifi.add( "one two three", "doc" );
-	BOOST_CHECK_EQUAL( ifi.search( "two" )->list().size(), 1 );
+	BOOST_CHECK_ETQUAL( ifi.search( "two" )->list().size(), 1 );
 }
 
 void numbers() {
@@ -80,10 +80,10 @@ void numbers() {
 	ifile ifi( fname );
 
 	ifi.add( "one 123 123456789 four444 five", "doc" );
-	BOOST_CHECK_EQUAL( ifi.search( "123" )->list().size(), 1 );
-	BOOST_CHECK_EQUAL( ifi.search( "123456789" )->list().size(), 1 );
-	BOOST_CHECK_EQUAL( ifi.search( "four444" )->list().size(), 1 );
-	BOOST_CHECK_EQUAL( ifi.search( "five" )->list().size(), 1 );
+	BOOST_CHECK_ETQUAL( ifi.search( "123" )->list().size(), 1 );
+	BOOST_CHECK_ETQUAL( ifi.search( "123456789" )->list().size(), 1 );
+	BOOST_CHECK_ETQUAL( ifi.search( "four444" )->list().size(), 1 );
+	BOOST_CHECK_ETQUAL( ifi.search( "five" )->list().size(), 1 );
 }
 
 void partial() {
@@ -91,17 +91,17 @@ void partial() {
 	ifile ifi( fname );
 	ifi.add( "longword", "doc_0" );
 
-	BOOST_CHECK_EQUAL( ifi.search( "l" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "long" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "longword" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "l" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "long" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "longword" )->list().size(), 1u );
 
-	BOOST_CHECK_EQUAL( ifi.search( "longword" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "longword" )->list().size(), 1u );
 
 	ifi.add( "longnord", "doc_1" );
-	BOOST_CHECK_EQUAL( ifi.search( "l" )->list().size(), 2u );
-	BOOST_CHECK_EQUAL( ifi.search( "long" )->list().size(), 2u );
-	BOOST_CHECK_EQUAL( ifi.search( "longw" )->list().size(), 1u );
-	BOOST_CHECK_EQUAL( ifi.search( "longn" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "l" )->list().size(), 2u );
+	BOOST_CHECK_ETQUAL( ifi.search( "long" )->list().size(), 2u );
+	BOOST_CHECK_ETQUAL( ifi.search( "longw" )->list().size(), 1u );
+	BOOST_CHECK_ETQUAL( ifi.search( "longn" )->list().size(), 1u );
 }
 
 void several() {
@@ -115,15 +115,15 @@ void several() {
 	ifi.add( "else something", "5" );
 	ifi.add( "else four", "6" );
 
-	BOOST_CHECK_EQUAL( count_results( ifi, "one" ), 1u );
-	BOOST_CHECK_EQUAL( count_results( ifi, "one two three four" ), 1u );
-	BOOST_CHECK_EQUAL( count_results( ifi, "two three four" ), 2u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "one" ), 1u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "one two three four" ), 1u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "two three four" ), 2u );
 
-	BOOST_CHECK_EQUAL( count_results( ifi, "one two" ), 1u );
-	BOOST_CHECK_EQUAL( count_results( ifi, "one" ), 1u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "one two" ), 1u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "one" ), 1u );
 
-	BOOST_CHECK_EQUAL( count_results( ifi, "something else" ), 2u );
-	BOOST_CHECK_EQUAL( count_results( ifi, "something two" ), 2u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "something else" ), 2u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "something two" ), 2u );
 }
 
 void remove_doc() {
@@ -137,7 +137,7 @@ void remove_doc() {
 	BOOST_CHECK( check_results( ifi, "one", "0", NULL ) );
 	BOOST_CHECK( check_results( ifi, "two", "0", NULL ) );
 	BOOST_CHECK( check_results( ifi, "three", "0", "2", NULL ) );
-	BOOST_CHECK_EQUAL( count_results( ifi, "four" ), 0u );
+	BOOST_CHECK_ETQUAL( count_results( ifi, "four" ), 0u );
 }
 
 test_suite* get_suite() {
diff --git a/indexlib/tests/leafdatavector-test.cpp b/indexlib/tests/leafdatavector-test.cpp
index 8763327e..565717f8 100644
--- a/indexlib/tests/leafdatavector-test.cpp
+++ b/indexlib/tests/leafdatavector-test.cpp
@@ -14,10 +14,10 @@ void simple() {
 	cleanup();
 	leafdatavector f( fname );
 	f.add( 0, 1 );
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 1u );
-	BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 1u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 1u );
+	BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 1u );
 	f.add( 0, 2 );
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u );
 }
 
 void persistent() {
@@ -28,7 +28,7 @@ void persistent() {
 	}
 	{
 		leafdatavector f( fname );
-		BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 1u );
+		BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 1u );
 	}
 }
 
@@ -48,15 +48,15 @@ void complicated() {
 	f.add( 0, 5 );
 	f.add( 0, 9 );
 
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 6u );
-	BOOST_CHECK_EQUAL( f.get( 1 ).size(), 3u );
-	BOOST_CHECK_EQUAL( f.get( 2 ).size(), 2u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 6u );
+	BOOST_CHECK_ETQUAL( f.get( 1 ).size(), 3u );
+	BOOST_CHECK_ETQUAL( f.get( 2 ).size(), 2u );
 	std::vector<unsigned> one = f.get( 1 );
 	std::sort( one.begin(), one.end() );
-	BOOST_CHECK_EQUAL( one.size(), 3u );
-	BOOST_CHECK_EQUAL( one[ 0 ], 3u );
-	BOOST_CHECK_EQUAL( one[ 1 ], 5u );
-	BOOST_CHECK_EQUAL( one[ 2 ], 8u );
+	BOOST_CHECK_ETQUAL( one.size(), 3u );
+	BOOST_CHECK_ETQUAL( one[ 0 ], 3u );
+	BOOST_CHECK_ETQUAL( one[ 1 ], 5u );
+	BOOST_CHECK_ETQUAL( one[ 2 ], 8u );
 }
 
 void unique() {
@@ -67,15 +67,15 @@ void unique() {
 	f.add( 0, 1 );
 	f.add( 0, 1 );
 
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 1u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 1u );
 
 	f.add( 0, 4 );
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u );
 
 	f.add( 0, 1 );
 	f.add( 0, 4 );
 	
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u );
 
 }
 
@@ -93,7 +93,7 @@ void large() {
 	}
 	for ( std::map<uint,uint>::const_iterator first = counts.begin(), past = counts.end();
 			first != past; ++first ) {
-		BOOST_CHECK_EQUAL( first->second, f.get( first->first ).size() );
+		BOOST_CHECK_ETQUAL( first->second, f.get( first->first ).size() );
 	}
 
 }
@@ -106,10 +106,10 @@ void one_zero() {
 	f.add( 0, 1 );
 	f.add( 0, 3 );
 	
-	BOOST_CHECK_EQUAL( f.get( 0 ).size(), 3u );
-	BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 0u );
-	BOOST_CHECK_EQUAL( f.get( 0 )[ 1 ], 1u );
-	BOOST_CHECK_EQUAL( f.get( 0 )[ 2 ], 3u );
+	BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 3u );
+	BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 0u );
+	BOOST_CHECK_ETQUAL( f.get( 0 )[ 1 ], 1u );
+	BOOST_CHECK_ETQUAL( f.get( 0 )[ 2 ], 3u );
 
 }
 		
diff --git a/indexlib/tests/match-test.cpp b/indexlib/tests/match-test.cpp
index 16b8a8e9..a1a3930f 100644
--- a/indexlib/tests/match-test.cpp
+++ b/indexlib/tests/match-test.cpp
@@ -11,15 +11,15 @@ void cleanup() {
 void simple() {
 	cleanup();
 	Match m( "pat" );
-	BOOST_CHECK_EQUAL( m.process( "not here" ), false );
-	BOOST_CHECK_EQUAL( m.process( "p a t" ), false );
-	BOOST_CHECK_EQUAL( m.process( "pa t" ), false );
+	BOOST_CHECK_ETQUAL( m.process( "not here" ), false );
+	BOOST_CHECK_ETQUAL( m.process( "p a t" ), false );
+	BOOST_CHECK_ETQUAL( m.process( "pa t" ), false );
 
 	
-	BOOST_CHECK_EQUAL( m.process( "pat" ), true );
-	BOOST_CHECK_EQUAL( m.process( "pattern" ), true );
-	BOOST_CHECK_EQUAL( m.process( " pat " ), true );
-	BOOST_CHECK_EQUAL( m.process( "zpat patx ipato " ), true );
+	BOOST_CHECK_ETQUAL( m.process( "pat" ), true );
+	BOOST_CHECK_ETQUAL( m.process( "pattern" ), true );
+	BOOST_CHECK_ETQUAL( m.process( " pat " ), true );
+	BOOST_CHECK_ETQUAL( m.process( "zpat patx ipato " ), true );
 }
 
 void empty() {
@@ -40,28 +40,28 @@ void string() {
 	cleanup();
 	Match m( std::string( "pat" ) );
 
-	BOOST_CHECK_EQUAL( m.process( std::string( "not here" ) ), false );
-	BOOST_CHECK_EQUAL( m.process( std::string( "here pattern" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "not here" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "here pattern" ) ), true );
 }
 
 void casesensitive() {
 	cleanup();
 	Match m( std::string( "pat" ), ~Match::caseinsensitive );
 
-	BOOST_CHECK_EQUAL( m.process( std::string( "PAT" ) ), false );
-	BOOST_CHECK_EQUAL( m.process( std::string( "aPATa" ) ), false );
-	BOOST_CHECK_EQUAL( m.process( std::string( "pAt" ) ), false );
-	BOOST_CHECK_EQUAL( m.process( std::string( "pattern" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "PAT" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "aPATa" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "pAt" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "pattern" ) ), true );
 }
 
 void caseinsensitive() {
 	cleanup();
 	Match m( std::string( "pat" ), Match::caseinsensitive );
 
-	BOOST_CHECK_EQUAL( m.process( std::string( "PAT" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "aPATa" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "pAt" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "pattern" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "PAT" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "aPATa" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "pAt" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "pattern" ) ), true );
 }
 
 
@@ -69,16 +69,16 @@ void verylarge() {
 	cleanup();
 	Match m( std::string( "pat0123456789012345678901234567890" ) );
 
-	BOOST_CHECK_EQUAL( m.process( std::string( "pat0123456789012345678901234567890" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890xxxxxxxx" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x6789012345678901234567890xxxxxxxx" ) ), false );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "pat0123456789012345678901234567890" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890xxxxxxxx" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x6789012345678901234567890xxxxxxxx" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false );
 
 	m = Match( std::string( "12345678901234567890123456789012" ) );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012xxxxxxxxx" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012" ) ), true );
-	BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012xxxxxxxxx" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012" ) ), true );
+	BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false );
 }
 
 
diff --git a/indexlib/tests/mempool-test.cpp b/indexlib/tests/mempool-test.cpp
index a0895243..d0c4ba29 100644
--- a/indexlib/tests/mempool-test.cpp
+++ b/indexlib/tests/mempool-test.cpp
@@ -28,7 +28,7 @@ void deallocate() {
 		pointers.push_back( pool.allocate( 16 ) );
 		leafdata::init( pointers.back() );
 	}
-	BOOST_CHECK_EQUAL( size, pool.size() );
+	BOOST_CHECK_ETQUAL( size, pool.size() );
 }
 
 void large() {
diff --git a/indexlib/tests/memvector-test.cpp b/indexlib/tests/memvector-test.cpp
index 60023a4d..648d8e46 100644
--- a/indexlib/tests/memvector-test.cpp
+++ b/indexlib/tests/memvector-test.cpp
@@ -19,7 +19,7 @@ void test_size() {
 	test.push_back( 2 );
 	test.push_back( 3 );
 	test.push_back( 4 );
-	BOOST_CHECK_EQUAL( test.size(), 4u );
+	BOOST_CHECK_ETQUAL( test.size(), 4u );
 }
 
 template <typename T>
@@ -30,7 +30,7 @@ void test_put_recover() {
 		test.push_back( T( i*13 + i*i*45 + 23 ) );
 	}
 	for ( int i = 0; i != 20; ++i ) {
-		BOOST_CHECK_EQUAL( test[ i ], T( i*13 + i*i*45 + 23 ) );
+		BOOST_CHECK_ETQUAL( test[ i ], T( i*13 + i*i*45 + 23 ) );
 	}
 }
 
@@ -39,7 +39,7 @@ void resize() {
 	memvector<uint32_t> test( fname );
 	test.push_back( 1 );
 	test.resize( 50 );
-	BOOST_CHECK_EQUAL( test.size(), 50u );
+	BOOST_CHECK_ETQUAL( test.size(), 50u );
 }
 
 
@@ -55,9 +55,9 @@ void test_persistent() {
 	}
 	{
 		memvector<uint32_t> test( fname );
-		BOOST_CHECK_EQUAL( test.size(), 5u );
+		BOOST_CHECK_ETQUAL( test.size(), 5u );
 		for ( unsigned i = 0; i != test.size(); ++i ) 
-			BOOST_CHECK_EQUAL( test[ i ], i + 1 );
+			BOOST_CHECK_ETQUAL( test[ i ], i + 1 );
 	}
 }
 
@@ -71,12 +71,12 @@ void test_insert() {
 
 	test.insert( test.begin() + 2, 13 );
 
-	BOOST_CHECK_EQUAL( test.size(), 5u );
-	BOOST_CHECK_EQUAL( test[ 0 ], 12u );
-	BOOST_CHECK_EQUAL( test[ 1 ], 12u );
-	BOOST_CHECK_EQUAL( test[ 2 ], 13u );
-	BOOST_CHECK_EQUAL( test[ 3 ], 12u );
-	BOOST_CHECK_EQUAL( test[ 4 ], 12u );
+	BOOST_CHECK_ETQUAL( test.size(), 5u );
+	BOOST_CHECK_ETQUAL( test[ 0 ], 12u );
+	BOOST_CHECK_ETQUAL( test[ 1 ], 12u );
+	BOOST_CHECK_ETQUAL( test[ 2 ], 13u );
+	BOOST_CHECK_ETQUAL( test[ 3 ], 12u );
+	BOOST_CHECK_ETQUAL( test[ 4 ], 12u );
 }
 
 void test_iterator() {
@@ -85,38 +85,38 @@ void test_iterator() {
 	test.push_back( 1 );
 	test.push_back( 2 );
 
-	BOOST_CHECK_EQUAL( test[ 0 ], 1u );
-	BOOST_CHECK_EQUAL( test[ 1 ], 2u );
+	BOOST_CHECK_ETQUAL( test[ 0 ], 1u );
+	BOOST_CHECK_ETQUAL( test[ 1 ], 2u );
 	
-	BOOST_CHECK_EQUAL( *test.begin(),  1u );
-	BOOST_CHECK_EQUAL( *( test.begin() + 1 ),  2u );
+	BOOST_CHECK_ETQUAL( *test.begin(),  1u );
+	BOOST_CHECK_ETQUAL( *( test.begin() + 1 ),  2u );
 
 	memvector<unsigned>::iterator iter = test.begin();
 
-	BOOST_CHECK_EQUAL( *iter,  1u );
+	BOOST_CHECK_ETQUAL( *iter,  1u );
 
 	BOOST_CHECK( test.begin() == iter );
 
 	*iter= 3;
 
-	BOOST_CHECK_EQUAL( test[ 0 ],  3u );
-	BOOST_CHECK_EQUAL( *iter,  3u );
-	BOOST_CHECK_EQUAL( *test.begin(),  3u );
+	BOOST_CHECK_ETQUAL( test[ 0 ],  3u );
+	BOOST_CHECK_ETQUAL( *iter,  3u );
+	BOOST_CHECK_ETQUAL( *test.begin(),  3u );
 
 	++iter;
 	
-	BOOST_CHECK_EQUAL( *iter,  2u );
+	BOOST_CHECK_ETQUAL( *iter,  2u );
 	
 	*iter = 5;
 	
-	BOOST_CHECK_EQUAL( *iter,  5u );
-	BOOST_CHECK_EQUAL( test[ 1 ],  5u );
+	BOOST_CHECK_ETQUAL( *iter,  5u );
+	BOOST_CHECK_ETQUAL( test[ 1 ],  5u );
 
-	BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() );
+	BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() );
 	test.push_back( 5 );
-	BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() );
+	BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() );
 	test.push_back( 5 );
-	BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() );
+	BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() );
 }
 
 void test_iteration() {
@@ -133,15 +133,15 @@ void test_iteration() {
 	BOOST_CHECK( iter == test.begin() );
 	BOOST_CHECK( iter != test.end() );
 
-	BOOST_CHECK_EQUAL( *iter, 1u );
+	BOOST_CHECK_ETQUAL( *iter, 1u );
 	++iter;
-	BOOST_CHECK_EQUAL( *iter, 2u );
+	BOOST_CHECK_ETQUAL( *iter, 2u );
 	iter += 2;
-	BOOST_CHECK_EQUAL( *iter, 3u );
+	BOOST_CHECK_ETQUAL( *iter, 3u );
 	*iter = 7;
-	BOOST_CHECK_EQUAL( *iter, 7u );
+	BOOST_CHECK_ETQUAL( *iter, 7u );
 	--iter;
-	BOOST_CHECK_EQUAL( *iter, 5u );
+	BOOST_CHECK_ETQUAL( *iter, 5u );
 	BOOST_CHECK( iter != test.end() );
 	iter += 2;
 	BOOST_CHECK( iter == test.end() );
@@ -160,20 +160,20 @@ void test_sort() {
 	test.push_back(  3 );
 
 	
-	BOOST_CHECK_EQUAL( *std::min_element( test.begin(), test.end() ),  0 );
+	BOOST_CHECK_ETQUAL( *std::min_element( test.begin(), test.end() ),  0 );
 	BOOST_CHECK( std::min_element( test.begin(), test.end() ) == test.begin() + 1 );
-	BOOST_CHECK_EQUAL( *std::max_element( test.begin(), test.end() ), 14 );
+	BOOST_CHECK_ETQUAL( *std::max_element( test.begin(), test.end() ), 14 );
 	BOOST_CHECK( std::max_element( test.begin(), test.end() ) == test.begin() + 2 );
 
 	std::sort( test.begin(), test.end() );
-	BOOST_CHECK_EQUAL( test[ 0 ],  0 );
-	BOOST_CHECK_EQUAL( test[ 1 ],  3 );
-	BOOST_CHECK_EQUAL( test[ 2 ],  4 );
-	BOOST_CHECK_EQUAL( test[ 3 ],  5 );
-	BOOST_CHECK_EQUAL( test[ 4 ],  8 );
-	BOOST_CHECK_EQUAL( test[ 5 ], 10 );
-	BOOST_CHECK_EQUAL( test[ 6 ], 12 );
-	BOOST_CHECK_EQUAL( test[ 7 ], 14 );
+	BOOST_CHECK_ETQUAL( test[ 0 ],  0 );
+	BOOST_CHECK_ETQUAL( test[ 1 ],  3 );
+	BOOST_CHECK_ETQUAL( test[ 2 ],  4 );
+	BOOST_CHECK_ETQUAL( test[ 3 ],  5 );
+	BOOST_CHECK_ETQUAL( test[ 4 ],  8 );
+	BOOST_CHECK_ETQUAL( test[ 5 ], 10 );
+	BOOST_CHECK_ETQUAL( test[ 6 ], 12 );
+	BOOST_CHECK_ETQUAL( test[ 7 ], 14 );
 }
 
 void remove() {
@@ -181,11 +181,11 @@ void remove() {
 		cleanup();
 		memvector<unsigned> test( fname );
 		test.push_back( 1 );
-		BOOST_CHECK_EQUAL( test.size(), 1 );
+		BOOST_CHECK_ETQUAL( test.size(), 1 );
 	}
 	memvector<unsigned>::remove( fname );
 	memvector<unsigned> test( fname );
-	BOOST_CHECK_EQUAL( test.size(), 0 );
+	BOOST_CHECK_ETQUAL( test.size(), 0 );
 }
 
 void assign() {
@@ -193,7 +193,7 @@ void assign() {
 	memvector<uint32_t> test( fname );
 	test.push_back( 2 );
 	test[ 0 ] = 3;
-	BOOST_CHECK_EQUAL( test[ 0 ], 3u );
+	BOOST_CHECK_ETQUAL( test[ 0 ], 3u );
 }
 
 void erase() {
@@ -205,20 +205,20 @@ void erase() {
 	test.push_back( 16 );
 	test.push_back( 32 );
 
-	BOOST_CHECK_EQUAL( test.size(), 5u );
+	BOOST_CHECK_ETQUAL( test.size(), 5u );
 	test.erase( test.begin() + 1 );
 
-	BOOST_CHECK_EQUAL( test[ 0 ],  2u );
-	BOOST_CHECK_EQUAL( test[ 1 ],  8u );
-	BOOST_CHECK_EQUAL( test[ 2 ], 16u );
-	BOOST_CHECK_EQUAL( test[ 3 ], 32u );
-	BOOST_CHECK_EQUAL( test.size(), 4u );
+	BOOST_CHECK_ETQUAL( test[ 0 ],  2u );
+	BOOST_CHECK_ETQUAL( test[ 1 ],  8u );
+	BOOST_CHECK_ETQUAL( test[ 2 ], 16u );
+	BOOST_CHECK_ETQUAL( test[ 3 ], 32u );
+	BOOST_CHECK_ETQUAL( test.size(), 4u );
 
 	test.erase( test.begin() + 3 );
-	BOOST_CHECK_EQUAL( test[ 0 ],  2u );
-	BOOST_CHECK_EQUAL( test[ 1 ],  8u );
-	BOOST_CHECK_EQUAL( test[ 2 ], 16u );
-	BOOST_CHECK_EQUAL( test.size(), 3u );
+	BOOST_CHECK_ETQUAL( test[ 0 ],  2u );
+	BOOST_CHECK_ETQUAL( test[ 1 ],  8u );
+	BOOST_CHECK_ETQUAL( test[ 2 ], 16u );
+	BOOST_CHECK_ETQUAL( test.size(), 3u );
 
 }
 
@@ -234,7 +234,7 @@ void clear() {
 	test.clear();
 
 
-	BOOST_CHECK_EQUAL( test.size(), 0u );
+	BOOST_CHECK_ETQUAL( test.size(), 0u );
 }
 
 test_suite* get_suite() {
diff --git a/indexlib/tests/stringarray-test.cpp b/indexlib/tests/stringarray-test.cpp
index d0f5ecef..110b82c9 100644
--- a/indexlib/tests/stringarray-test.cpp
+++ b/indexlib/tests/stringarray-test.cpp
@@ -17,21 +17,21 @@ void test_size() {
 	test.add( "one" );
 	test.add( "one" );
 	test.add( "one" );
-	//BOOST_CHECK_EQUAL( test.size(), 4 );
+	//BOOST_CHECK_ETQUAL( test.size(), 4 );
 	cleanup();
 }
 
 void test_put_recover() {
 	stringarray test( fname );
-	BOOST_CHECK_EQUAL( test.add( "one" ), 0 );
-	BOOST_CHECK_EQUAL( test.add( "two" ), 1 );
-	BOOST_CHECK_EQUAL( test.add( "three" ), 2 );
-	BOOST_CHECK_EQUAL( test.add( "four" ), 3 );
+	BOOST_CHECK_ETQUAL( test.add( "one" ), 0 );
+	BOOST_CHECK_ETQUAL( test.add( "two" ), 1 );
+	BOOST_CHECK_ETQUAL( test.add( "three" ), 2 );
+	BOOST_CHECK_ETQUAL( test.add( "four" ), 3 );
 
-	BOOST_CHECK_EQUAL( test.get( 0 ), "one" );
-	BOOST_CHECK_EQUAL( test.get( 1 ), "two" );
-	BOOST_CHECK_EQUAL( test.get( 2 ), "three" );
-	BOOST_CHECK_EQUAL( test.get( 3 ), "four" );
+	BOOST_CHECK_ETQUAL( test.get( 0 ), "one" );
+	BOOST_CHECK_ETQUAL( test.get( 1 ), "two" );
+	BOOST_CHECK_ETQUAL( test.get( 2 ), "three" );
+	BOOST_CHECK_ETQUAL( test.get( 3 ), "four" );
 
 	cleanup();
 }
@@ -39,19 +39,19 @@ void test_put_recover() {
 void test_persistent() {
 	{
 		stringarray test( fname );
-		BOOST_CHECK_EQUAL( test.add( "one" ), 0 );
-		BOOST_CHECK_EQUAL( test.add( "two" ), 1 );
-		BOOST_CHECK_EQUAL( test.add( "three" ), 2 );
-		BOOST_CHECK_EQUAL( test.add( "four" ), 3 );
+		BOOST_CHECK_ETQUAL( test.add( "one" ), 0 );
+		BOOST_CHECK_ETQUAL( test.add( "two" ), 1 );
+		BOOST_CHECK_ETQUAL( test.add( "three" ), 2 );
+		BOOST_CHECK_ETQUAL( test.add( "four" ), 3 );
 	}
 	{
 		stringarray test( fname );
 
-		//BOOST_CHECK_EQUAL( test.size(), 4 );
-		BOOST_CHECK_EQUAL( test.get( 0 ), "one" );
-		BOOST_CHECK_EQUAL( test.get( 1 ), "two" );
-		BOOST_CHECK_EQUAL( test.get( 2 ), "three" );
-		BOOST_CHECK_EQUAL( test.get( 3 ), "four" );
+		//BOOST_CHECK_ETQUAL( test.size(), 4 );
+		BOOST_CHECK_ETQUAL( test.get( 0 ), "one" );
+		BOOST_CHECK_ETQUAL( test.get( 1 ), "two" );
+		BOOST_CHECK_ETQUAL( test.get( 2 ), "three" );
+		BOOST_CHECK_ETQUAL( test.get( 3 ), "four" );
 
 	}
 	cleanup();
@@ -83,9 +83,9 @@ void erase() {
 	test.add( "four" );
 
 	test.erase( 1 );
-	BOOST_CHECK_EQUAL( test.get( 0 ), "one" );
-	BOOST_CHECK_EQUAL( test.get( 1 ), "three" );
-	BOOST_CHECK_EQUAL( test.size(), 3u );
+	BOOST_CHECK_ETQUAL( test.get( 0 ), "one" );
+	BOOST_CHECK_ETQUAL( test.get( 1 ), "three" );
+	BOOST_CHECK_ETQUAL( test.size(), 3u );
 	cleanup();
 }
 
diff --git a/indexlib/tests/stringset-test.cpp b/indexlib/tests/stringset-test.cpp
index 56d32695..8aed8615 100644
--- a/indexlib/tests/stringset-test.cpp
+++ b/indexlib/tests/stringset-test.cpp
@@ -56,11 +56,11 @@ void iterator() {
 
 	stringset::const_iterator iter = set.begin();
 
-	BOOST_CHECK_EQUAL( std::string( "string" ), *iter );
-	BOOST_CHECK_EQUAL( set.begin(), iter );
+	BOOST_CHECK_ETQUAL( std::string( "string" ), *iter );
+	BOOST_CHECK_ETQUAL( set.begin(), iter );
 	BOOST_CHECK( !( set.end() == iter ) );
 	++iter;
-	BOOST_CHECK_EQUAL( set.end(), iter );
+	BOOST_CHECK_ETQUAL( set.end(), iter );
 }
 
 void order() {
@@ -73,49 +73,49 @@ void order() {
 
 	stringset::const_iterator iter = set.begin();
 
-	BOOST_CHECK_EQUAL( *iter, std::string( "one" ) );
+	BOOST_CHECK_ETQUAL( *iter, std::string( "one" ) );
 	++iter;
-	BOOST_CHECK_EQUAL( *iter, std::string( "two" ) );
+	BOOST_CHECK_ETQUAL( *iter, std::string( "two" ) );
 	++iter;
-	BOOST_CHECK_EQUAL( *iter, std::string( "wlast" ) );
+	BOOST_CHECK_ETQUAL( *iter, std::string( "wlast" ) );
 	++iter;
-	BOOST_CHECK_EQUAL( iter, set.end() );
+	BOOST_CHECK_ETQUAL( iter, set.end() );
 }
 
 void order_of() {
 	cleanup();
 	stringset set( fname );
 	set.add( "one" );
-	BOOST_CHECK_EQUAL( set.order_of( "one" ), 0 );
-	BOOST_CHECK_EQUAL( set.order_of( "two" ), unsigned( -1 ) );
+	BOOST_CHECK_ETQUAL( set.order_of( "one" ), 0 );
+	BOOST_CHECK_ETQUAL( set.order_of( "two" ), unsigned( -1 ) );
 	set.add( "two" );
-	BOOST_CHECK_EQUAL( set.order_of( "two" ), 1 );
+	BOOST_CHECK_ETQUAL( set.order_of( "two" ), 1 );
 	set.add( "before" );
-	BOOST_CHECK_EQUAL( set.order_of( "two" ), 2 );
-	BOOST_CHECK_EQUAL( set.order_of( "one" ), 1 );
-	BOOST_CHECK_EQUAL( set.order_of( "before" ), 0 );
+	BOOST_CHECK_ETQUAL( set.order_of( "two" ), 2 );
+	BOOST_CHECK_ETQUAL( set.order_of( "one" ), 1 );
+	BOOST_CHECK_ETQUAL( set.order_of( "before" ), 0 );
 }
 
 void id_of() {
 	cleanup();
 	stringset set( fname );
 	set.add( "one" );
-	BOOST_CHECK_EQUAL( set.id_of( "one" ), 0 );
-	BOOST_CHECK_EQUAL( set.id_of( "two" ), unsigned( -1 ) );
+	BOOST_CHECK_ETQUAL( set.id_of( "one" ), 0 );
+	BOOST_CHECK_ETQUAL( set.id_of( "two" ), unsigned( -1 ) );
 	set.add( "two" );
-	BOOST_CHECK_EQUAL( set.id_of( "two" ), 1 );
+	BOOST_CHECK_ETQUAL( set.id_of( "two" ), 1 );
 	set.add( "before" );
-	BOOST_CHECK_EQUAL( set.id_of( "two" ), 1 );
-	BOOST_CHECK_EQUAL( set.id_of( "one" ), 0 );
-	BOOST_CHECK_EQUAL( set.id_of( "before" ), 2 );
+	BOOST_CHECK_ETQUAL( set.id_of( "two" ), 1 );
+	BOOST_CHECK_ETQUAL( set.id_of( "one" ), 0 );
+	BOOST_CHECK_ETQUAL( set.id_of( "before" ), 2 );
 }
 
 void add_return() {
 	cleanup();
 	stringset set( fname );
-	BOOST_CHECK_EQUAL( set.add( "one" ), 0 );
-	BOOST_CHECK_EQUAL( set.add( "two" ), 1 );
-	BOOST_CHECK_EQUAL( set.add( "before" ), 2 );
+	BOOST_CHECK_ETQUAL( set.add( "one" ), 0 );
+	BOOST_CHECK_ETQUAL( set.add( "two" ), 1 );
+	BOOST_CHECK_ETQUAL( set.add( "before" ), 2 );
 }
 
 void lower() {
@@ -127,8 +127,8 @@ void lower() {
 	set.add( "abc" );
 	set.add( "acc" );
 
-	BOOST_CHECK_EQUAL( std::string( *set.lower_bound( "ab" ) ), "aba" );
-	BOOST_CHECK_EQUAL( std::string( *set.lower_bound( "abz" ) ), "acc" );
+	BOOST_CHECK_ETQUAL( std::string( *set.lower_bound( "ab" ) ), "aba" );
+	BOOST_CHECK_ETQUAL( std::string( *set.lower_bound( "abz" ) ), "acc" );
 }
 
 void lower_upper() {
@@ -146,19 +146,19 @@ void lower_upper() {
 
 
 	limits = set.upper_lower( "ab" );
-	BOOST_CHECK_EQUAL( std::distance( upper, lower ), 2u );
-	BOOST_CHECK_EQUAL( std::string( *upper ), "aba" );
+	BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 2u );
+	BOOST_CHECK_ETQUAL( std::string( *upper ), "aba" );
 	++upper;
-	BOOST_CHECK_EQUAL( std::string( *upper ), "abc" );
+	BOOST_CHECK_ETQUAL( std::string( *upper ), "abc" );
 	++upper;
 	BOOST_CHECK( upper == lower );
 
 	limits = set.upper_lower( "abc" );
-	BOOST_CHECK_EQUAL( std::distance( upper, lower ), 1u );
-	BOOST_CHECK_EQUAL( std::string( *upper ), "abc" );
+	BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 1u );
+	BOOST_CHECK_ETQUAL( std::string( *upper ), "abc" );
 
 	limits = set.upper_lower( "abz" );
-	BOOST_CHECK_EQUAL( std::distance( upper, lower ), 0u );
+	BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 0u );
 }
 
 void clear() {
@@ -171,7 +171,7 @@ void clear() {
 	set.add( "three" );
 
 	set.clear();
-	BOOST_CHECK_EQUAL( set.size(), 0u );
+	BOOST_CHECK_ETQUAL( set.size(), 0u );
 }
 
 test_suite* get_suite() {
diff --git a/indexlib/tests/testdriver.cpp b/indexlib/tests/testdriver.cpp
index db11e036..2548fd46 100644
--- a/indexlib/tests/testdriver.cpp
+++ b/indexlib/tests/testdriver.cpp
@@ -18,11 +18,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/indexlib/tests/tokenizer-test.cpp b/indexlib/tests/tokenizer-test.cpp
index 372859d9..b5b10f39 100644
--- a/indexlib/tests/tokenizer-test.cpp
+++ b/indexlib/tests/tokenizer-test.cpp
@@ -19,9 +19,9 @@ void simple() {
 	expected.push_back( "AAACE" );
 	std::sort( tokens.begin(), tokens.end() );
 	std::sort( expected.begin(), expected.end() );
-	BOOST_CHECK_EQUAL( expected.size(), tokens.size() );
+	BOOST_CHECK_ETQUAL( expected.size(), tokens.size() );
 	for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) {
-		BOOST_CHECK_EQUAL( expected[ i ], tokens[ i ] );
+		BOOST_CHECK_ETQUAL( expected[ i ], tokens[ i ] );
 	}
 }
 
@@ -35,9 +35,9 @@ void with_newlines() {
 	expected.push_back( "THREE" );
 	std::sort( tokens.begin(), tokens.end() );
 	std::sort( expected.begin(), expected.end() );
-	BOOST_CHECK_EQUAL( expected.size(), tokens.size() );
+	BOOST_CHECK_ETQUAL( expected.size(), tokens.size() );
 	for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) {
-		BOOST_CHECK_EQUAL( expected.at( i ), tokens.at( i ) );
+		BOOST_CHECK_ETQUAL( expected.at( i ), tokens.at( i ) );
 	}
 }
 
@@ -52,9 +52,9 @@ void with_numbers() {
 	expected.push_back( "FOUR" );
 	std::sort( tokens.begin(), tokens.end() );
 	std::sort( expected.begin(), expected.end() );
-	BOOST_CHECK_EQUAL( expected.size(), tokens.size() );
+	BOOST_CHECK_ETQUAL( expected.size(), tokens.size() );
 	for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) {
-		BOOST_CHECK_EQUAL( expected.at( i ), tokens.at( i ) );
+		BOOST_CHECK_ETQUAL( expected.at( i ), tokens.at( i ) );
 	}
 }
 
diff --git a/indexlib/thing.h b/indexlib/thing.h
index 26afb07b..923bad33 100644
--- a/indexlib/thing.h
+++ b/indexlib/thing.h
@@ -21,11 +21,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui
index 3497a980..c07497bb 100644
--- a/kabc/frontend/mainWindow.ui
+++ b/kabc/frontend/mainWindow.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MainWindow</class>
-<widget class="QMainWindow">
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>MainWindow</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -63,7 +63,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="1">
+        <widget class="TQTabWidget" row="0" column="1">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
@@ -81,7 +81,7 @@
             <property name="tabShape">
                 <enum>Rounded</enum>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -98,12 +98,12 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLineEdit" row="0" column="1">
+                    <widget class="TQLineEdit" row="0" column="1">
                         <property name="name">
                             <cstring>mNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -111,7 +111,7 @@
                             <string>Name:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -119,47 +119,47 @@
                             <string>URL:</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="1" column="1">
+                    <widget class="TQLineEdit" row="1" column="1">
                         <property name="name">
                             <cstring>mUrlEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="5" column="1">
+                    <widget class="TQLineEdit" row="5" column="1">
                         <property name="name">
                             <cstring>mAdditionalNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="7" column="1">
+                    <widget class="TQLineEdit" row="7" column="1">
                         <property name="name">
                             <cstring>mSuffixEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="4" column="1">
+                    <widget class="TQLineEdit" row="4" column="1">
                         <property name="name">
                             <cstring>mGivenNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="3" column="1">
+                    <widget class="TQLineEdit" row="3" column="1">
                         <property name="name">
                             <cstring>mPrefixEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="6" column="1">
+                    <widget class="TQLineEdit" row="6" column="1">
                         <property name="name">
                             <cstring>mFamilyNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="2" column="1">
+                    <widget class="TQLineEdit" row="2" column="1">
                         <property name="name">
                             <cstring>mFormattedNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="8" column="1">
+                    <widget class="TQLineEdit" row="8" column="1">
                         <property name="name">
                             <cstring>mNickNameEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="8" column="0">
+                    <widget class="TQLabel" row="8" column="0">
                         <property name="name">
                             <cstring>TextLabel7</cstring>
                         </property>
@@ -167,7 +167,7 @@
                             <string>Nickname:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0">
+                    <widget class="TQLabel" row="7" column="0">
                         <property name="name">
                             <cstring>TextLabel5</cstring>
                         </property>
@@ -175,7 +175,7 @@
                             <string>Honorific suffixes:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0">
+                    <widget class="TQLabel" row="6" column="0">
                         <property name="name">
                             <cstring>TextLabel3_2</cstring>
                         </property>
@@ -183,7 +183,7 @@
                             <string>Family name:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>TextLabel4</cstring>
                         </property>
@@ -191,7 +191,7 @@
                             <string>Additional names:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>TextLabel6</cstring>
                         </property>
@@ -199,7 +199,7 @@
                             <string>Given name:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>TextLabel1_3</cstring>
                         </property>
@@ -207,7 +207,7 @@
                             <string>Honorific prefixes:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel8</cstring>
                         </property>
@@ -215,7 +215,7 @@
                             <string>Formatted name:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="0">
+                    <widget class="TQLabel" row="9" column="0">
                         <property name="name">
                             <cstring>TextLabel15</cstring>
                         </property>
@@ -223,12 +223,12 @@
                             <string>Sort string:</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="9" column="1">
+                    <widget class="TQLineEdit" row="9" column="1">
                         <property name="name">
                             <cstring>mSortStringEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="11" column="0">
+                    <widget class="TQLabel" row="11" column="0">
                         <property name="name">
                             <cstring>TextLabel11</cstring>
                         </property>
@@ -236,7 +236,7 @@
                             <string>Role:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="12" column="0">
+                    <widget class="TQLabel" row="12" column="0">
                         <property name="name">
                             <cstring>TextLabel12</cstring>
                         </property>
@@ -244,7 +244,7 @@
                             <string>Organization:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="10" column="0">
+                    <widget class="TQLabel" row="10" column="0">
                         <property name="name">
                             <cstring>TextLabel10</cstring>
                         </property>
@@ -252,17 +252,17 @@
                             <string>Title:</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="10" column="1">
+                    <widget class="TQLineEdit" row="10" column="1">
                         <property name="name">
                             <cstring>mTitleEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="11" column="1">
+                    <widget class="TQLineEdit" row="11" column="1">
                         <property name="name">
                             <cstring>mRoleEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="12" column="1">
+                    <widget class="TQLineEdit" row="12" column="1">
                         <property name="name">
                             <cstring>mOrganizationEdit</cstring>
                         </property>
@@ -286,7 +286,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -297,7 +297,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -314,7 +314,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_3</cstring>
                                 </property>
@@ -322,12 +322,12 @@
                                     <string>Id:</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                            <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>mPhoneIdCombo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="3">
+                            <widget class="TQPushButton" row="0" column="3">
                                 <property name="name">
                                     <cstring>PushButton3</cstring>
                                 </property>
@@ -335,7 +335,7 @@
                                     <string>Remove</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="4">
+                            <widget class="TQPushButton" row="0" column="4">
                                 <property name="name">
                                     <cstring>PushButton4</cstring>
                                 </property>
@@ -343,12 +343,12 @@
                                     <string>New</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="1" column="2" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>mPhoneNumberEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>TextLabel1_5</cstring>
                                 </property>
@@ -356,7 +356,7 @@
                                     <string>Number:</string>
                                 </property>
                             </widget>
-                            <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="5">
+                            <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="5">
                                 <property name="name">
                                     <cstring>ButtonGroup2</cstring>
                                 </property>
@@ -373,7 +373,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QCheckBox" row="2" column="0">
+                                    <widget class="TQCheckBox" row="2" column="0">
                                         <property name="name">
                                             <cstring>mPhoneWorkCheck</cstring>
                                         </property>
@@ -381,7 +381,7 @@
                                             <string>Work</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="3" column="0">
+                                    <widget class="TQCheckBox" row="3" column="0">
                                         <property name="name">
                                             <cstring>mPhonePrefCheck</cstring>
                                         </property>
@@ -389,7 +389,7 @@
                                             <string>Pref</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="0">
+                                    <widget class="TQCheckBox" row="1" column="0">
                                         <property name="name">
                                             <cstring>mPhoneHomeCheck</cstring>
                                         </property>
@@ -397,7 +397,7 @@
                                             <string>Home</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="1">
+                                    <widget class="TQCheckBox" row="1" column="1">
                                         <property name="name">
                                             <cstring>mPhoneCellCheck</cstring>
                                         </property>
@@ -405,7 +405,7 @@
                                             <string>Cell</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="0">
+                                    <widget class="TQCheckBox" row="0" column="0">
                                         <property name="name">
                                             <cstring>mPhoneFaxCheck</cstring>
                                         </property>
@@ -413,7 +413,7 @@
                                             <string>Fax</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>mPhoneBbsCheck</cstring>
                                         </property>
@@ -421,7 +421,7 @@
                                             <string>BBS</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="1">
+                                    <widget class="TQCheckBox" row="0" column="1">
                                         <property name="name">
                                             <cstring>mPhoneCarCheck</cstring>
                                         </property>
@@ -429,7 +429,7 @@
                                             <string>Car</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="2" column="1">
+                                    <widget class="TQCheckBox" row="2" column="1">
                                         <property name="name">
                                             <cstring>mPhoneVideoCheck</cstring>
                                         </property>
@@ -437,7 +437,7 @@
                                             <string>Video</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="2">
+                                    <widget class="TQCheckBox" row="0" column="2">
                                         <property name="name">
                                             <cstring>mPhoneIsdnCheck</cstring>
                                         </property>
@@ -445,7 +445,7 @@
                                             <string>ISDN</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="3">
+                                    <widget class="TQCheckBox" row="0" column="3">
                                         <property name="name">
                                             <cstring>mPhoneVoiceCheck</cstring>
                                         </property>
@@ -453,7 +453,7 @@
                                             <string>Voice</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="2">
+                                    <widget class="TQCheckBox" row="1" column="2">
                                         <property name="name">
                                             <cstring>mPhonePcsCheck</cstring>
                                         </property>
@@ -461,7 +461,7 @@
                                             <string>PCS</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="3">
+                                    <widget class="TQCheckBox" row="1" column="3">
                                         <property name="name">
                                             <cstring>mPhoneModemCheck</cstring>
                                         </property>
@@ -469,7 +469,7 @@
                                             <string>Modem</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="2" column="2">
+                                    <widget class="TQCheckBox" row="2" column="2">
                                         <property name="name">
                                             <cstring>mPhonePagerCheck</cstring>
                                         </property>
@@ -477,7 +477,7 @@
                                             <string>Pager</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="2" column="3">
+                                    <widget class="TQCheckBox" row="2" column="3">
                                         <property name="name">
                                             <cstring>mPhoneMsgCheck</cstring>
                                         </property>
@@ -489,7 +489,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>GroupBox2</cstring>
                         </property>
@@ -506,7 +506,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>PushButton7</cstring>
                                 </property>
@@ -514,7 +514,7 @@
                                     <string>&amp;New</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>PushButton5</cstring>
                                 </property>
@@ -522,7 +522,7 @@
                                     <string>&amp;Edit</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="1">
+                            <widget class="TQPushButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>PushButton6</cstring>
                                 </property>
@@ -547,7 +547,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QListView" row="0" column="0" rowspan="4" colspan="1">
+                            <widget class="TQListView" row="0" column="0" rowspan="4" colspan="1">
                                 <column>
                                     <property name="text">
                                         <string>Address</string>
@@ -570,7 +570,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -581,7 +581,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel16</cstring>
                         </property>
@@ -589,7 +589,7 @@
                             <string>Id:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel1_4</cstring>
                         </property>
@@ -597,7 +597,7 @@
                             <string>Post office box:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
@@ -605,7 +605,7 @@
                             <string>Extended:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel3_3</cstring>
                         </property>
@@ -613,7 +613,7 @@
                             <string>Street:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel4_2</cstring>
                         </property>
@@ -621,32 +621,32 @@
                             <string>Locality:</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressPostOfficeBoxEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="3" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="3" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressExtendedEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="4" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="4" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressStreetEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="5" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="5" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressLocalityEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="6" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="6" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressRegionEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel5_2</cstring>
                         </property>
@@ -654,7 +654,7 @@
                             <string>Region:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel7_2</cstring>
                         </property>
@@ -662,7 +662,7 @@
                             <string>Country:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel6_2</cstring>
                         </property>
@@ -670,12 +670,12 @@
                             <string>Postal code:</string>
                         </property>
                     </widget>
-                    <widget class="QTextEdit" row="10" column="0" rowspan="1" colspan="5">
+                    <widget class="TQTextEdit" row="10" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>mAddressLabelEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel13</cstring>
                         </property>
@@ -683,17 +683,17 @@
                             <string>Label:</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="7" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="7" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressPostalCodeEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="8" column="2" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="8" column="2" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>mAddressCountryEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="5">
+                    <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>ButtonGroup1</cstring>
                         </property>
@@ -710,7 +710,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox" row="0" column="3">
+                            <widget class="TQCheckBox" row="0" column="3">
                                 <property name="name">
                                     <cstring>mAddressDomCheck</cstring>
                                 </property>
@@ -718,7 +718,7 @@
                                     <string>Dom</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="3">
+                            <widget class="TQCheckBox" row="1" column="3">
                                 <property name="name">
                                     <cstring>mAddressIntlCheck</cstring>
                                 </property>
@@ -726,7 +726,7 @@
                                     <string>Intl</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="2">
+                            <widget class="TQCheckBox" row="0" column="2">
                                 <property name="name">
                                     <cstring>mAddressParcelCheck</cstring>
                                 </property>
@@ -734,7 +734,7 @@
                                     <string>Parcel</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="2">
+                            <widget class="TQCheckBox" row="1" column="2">
                                 <property name="name">
                                     <cstring>mAddressPostalCheck</cstring>
                                 </property>
@@ -742,7 +742,7 @@
                                     <string>Postal</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>mAddressHomeCheck</cstring>
                                 </property>
@@ -750,7 +750,7 @@
                                     <string>Home</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>mAddressPrefCheck</cstring>
                                 </property>
@@ -758,7 +758,7 @@
                                     <string>Pref</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>mAddressWorkCheck</cstring>
                                 </property>
@@ -768,7 +768,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QPushButton" row="0" column="4">
+                    <widget class="TQPushButton" row="0" column="4">
                         <property name="name">
                             <cstring>PushButton1</cstring>
                         </property>
@@ -776,7 +776,7 @@
                             <string>&amp;New</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="3">
+                    <widget class="TQPushButton" row="0" column="3">
                         <property name="name">
                             <cstring>PushButton2</cstring>
                         </property>
@@ -784,14 +784,14 @@
                             <string>&amp;Remove</string>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                    <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>mAddressIdCombo</cstring>
                         </property>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -808,12 +808,12 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QTextEdit" row="2" column="0">
+                    <widget class="TQTextEdit" row="2" column="0">
                         <property name="name">
                             <cstring>mNoteEdit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel14</cstring>
                         </property>
@@ -821,7 +821,7 @@
                             <string>Note:</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>GroupBox2_2</cstring>
                         </property>
@@ -838,7 +838,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QListView" row="0" column="0" rowspan="4" colspan="1">
+                            <widget class="TQListView" row="0" column="0" rowspan="4" colspan="1">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -874,7 +874,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton" row="2" column="1">
+                            <widget class="TQPushButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>PushButton6_2</cstring>
                                 </property>
@@ -882,7 +882,7 @@
                                     <string>&amp;Remove</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>PushButton5_2</cstring>
                                 </property>
@@ -890,7 +890,7 @@
                                     <string>&amp;Edit</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>PushButton7_2</cstring>
                                 </property>
@@ -902,7 +902,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -919,7 +919,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>GroupBox2_2_2</cstring>
                         </property>
@@ -936,7 +936,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QListView" row="0" column="0" rowspan="4" colspan="1">
+                            <widget class="TQListView" row="0" column="0" rowspan="4" colspan="1">
                                 <column>
                                     <property name="text">
                                         <string>App</string>
@@ -977,7 +977,7 @@
                                     <enum>AllColumns</enum>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>PushButton7_2_2</cstring>
                                 </property>
@@ -985,7 +985,7 @@
                                     <string>&amp;New</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>PushButton5_2_2</cstring>
                                 </property>
@@ -993,7 +993,7 @@
                                     <string>&amp;Edit</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="1">
+                            <widget class="TQPushButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>PushButton6_2_2</cstring>
                                 </property>
@@ -1365,7 +1365,7 @@
     <variable>QString mCurrentAddress</variable>
     <variable>QString mCurrentPhone</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>fileSave()</slot>
@@ -1404,6 +1404,6 @@
     <slot>addressBookLocked()</slot>
     <slot>addressBookUnlocked()</slot>
     <slot>fileOpenStd()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index fb8377cb..0740d9cf 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -17,11 +17,11 @@
 
 using namespace KABC;
 
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public TQListViewItem
 {
   public:
-    AddresseeItem( TQListView *parent, const Addressee &a ) :
-      TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {}
+    AddresseeItem( TQListView *tqparent, const Addressee &a ) :
+      TQListViewItem( tqparent, a.realName(), a.uid() ), mAddressee( a ) {}
       
     void setAddressee( const Addressee &a ) { mAddressee = a; }
     Addressee &addressee() { return mAddressee; }
@@ -72,7 +72,7 @@ void MainWindow::loadAddressBook( const TQString &fileName )
 
   mAddresseeList->clear();
   mCurrentItem = 0;
-  mCurrentAddress = TQString::null;
+  mCurrentAddress = TQString();
   readAddressee( Addressee() );
     
   KABC::AddressBook::Iterator it;
@@ -139,8 +139,8 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
   TQStringList customs = a.customs();
   TQStringList::ConstIterator it5;
   for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
-    int posDash = (*it5).find( "-" );
-    int posColon = (*it5).find( ":" );
+    int posDash = (*it5).tqfind( "-" );
+    int posColon = (*it5).tqfind( ":" );
   
     TQString app = (*it5).left( posDash );
     TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 );
@@ -156,7 +156,7 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
     mAddressIdCombo->insertItem( (*it).id() );
   }
   if ( mAddressIdCombo->count() > 0 ) mCurrentAddress = mAddressIdCombo->currentText();
-  else mCurrentAddress = TQString::null;
+  else mCurrentAddress = TQString();
   readAddress( mCurrentAddress );
 
   mPhoneIdCombo->clear();
@@ -202,7 +202,7 @@ void MainWindow::newEntry()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Address Book Entry"),
                                         i18n("Please enter name:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -232,7 +232,7 @@ void MainWindow::updateAddress( int id )
   if ( mAddressIdCombo->count()  > 0 ) {
     mCurrentAddress = mAddressIdCombo->text( id );
   } else {
-    mCurrentAddress = TQString::null;
+    mCurrentAddress = TQString();
   }
   readAddress( mCurrentAddress );
 }
@@ -323,7 +323,7 @@ void MainWindow::updatePhone( int id )
   if ( mPhoneIdCombo->count()  > 0 ) {
     mCurrentPhone = mPhoneIdCombo->text( id );
   } else {
-    mCurrentPhone = TQString::null;
+    mCurrentPhone = TQString();
   }
   readPhone( mCurrentPhone );
 }
@@ -452,7 +452,7 @@ void MainWindow::newEmail()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Email Address"),
                                         i18n("Please enter email address:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -524,7 +524,7 @@ void MainWindow::newCategory()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Category"),
                                         i18n("Please enter category name:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -583,8 +583,8 @@ void MainWindow::editCustom()
                                         this );
   if ( !ok || name.isEmpty() ) return;
 
-  int posDash = name.find( "-" );
-  int posColon = name.find( ":" );
+  int posDash = name.tqfind( "-" );
+  int posColon = name.tqfind( ":" );
   
   TQString app = name.left( posDash );
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );
@@ -606,12 +606,12 @@ void MainWindow::newCustom()
   TQString name = KInputDialog::getText( i18n("New Custom Entry"),
                                         i18n("Please enter custom entry.\n"
                                              "Format: APP-NAME:VALUE"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
-  int posDash = name.find( "-" );
-  int posColon = name.find( ":" );
+  int posDash = name.tqfind( "-" );
+  int posColon = name.tqfind( ":" );
   
   TQString app = name.left( posDash );
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index b86521dd..7e10dc32 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -29,8 +29,8 @@
 
 static std::ostream & operator<< ( std::ostream &os, const TQString &s );
 
-KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name )
-  : TQObject( parent, name ), mFormat( Aliases ),
+KABC2Mutt::KABC2Mutt( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mFormat( Aliases ),
     mIgnoreCase( false ), mAllAddresses( false ),
     mAlternateKeyFormat( false ),
     mAddressBook( 0 )
@@ -53,8 +53,8 @@ void KABC2Mutt::loadingFinished()
   for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) {
     const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
     if ( !mQuery.isEmpty() ) {
-      bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) ||
-                   ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 );
+      bool match = (name.tqfind(mQuery, 0, mIgnoreCase) > -1) ||
+                   ((*iaddr).preferredEmail().tqfind( mQuery, 0, mIgnoreCase ) > -1 );
       if ( !match )
         continue;
     }
@@ -130,7 +130,7 @@ void KABC2Mutt::loadingFinished()
     KABC::DistributionList *list = manager.list( *iaddr );
     if ( list ) {
       if ( !mQuery.isEmpty() ) {
-        bool match = ((*iaddr).find(mQuery) > -1);
+        bool match = ((*iaddr).tqfind(mQuery) > -1);
         if ( !match )
           continue;
       }
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index ebe4f53f..855b48db 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -22,15 +22,16 @@
 
 #include <kabc/stdaddressbook.h>
 
-class KABC2Mutt : public QObject
+class KABC2Mutt : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
     enum Format { Aliases, Query };
 
-    KABC2Mutt( TQObject *parent, const char *name = 0 );
+    KABC2Mutt( TQObject *tqparent, const char *name = 0 );
 
     void setQuery( const TQString &query ) { mQuery = query; }
     void setFormat( Format format ) { mFormat = format; }
diff --git a/kaddressbook/TODO b/kaddressbook/TODO
index df0db82b..83f33587 100644
--- a/kaddressbook/TODO
+++ b/kaddressbook/TODO
@@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten)
     file to get a list of views) - DONE
 - Redo and move the DCOP interface - 50%
 - Cleanup the tableview more - DONE
-- Relayout the edit contact dialog - DONE
+- Retqlayout the edit contact dialog - DONE
 - Remove ContactEntry*. Impelement supporting classes required
     for this. - DONE
 - Update the way the ConfigureView dialog gets the view config page - DONE
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index ac70cbaa..4f616844 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -54,11 +54,11 @@
 
 #include "addresseditwidget.h"
 
-class TabPressEater : public QObject
+class TabPressEater : public TQObject
 {
   public:
-    TabPressEater( TQObject *parent )
-      : TQObject( parent, "TabPressEater" )
+    TabPressEater( TQObject *tqparent )
+      : TQObject( tqparent, "TabPressEater" )
     {
     }
 
@@ -67,8 +67,8 @@ class TabPressEater : public QObject
     {
       if ( event->type() == TQEvent::KeyPress ) {
         TQKeyEvent *keyEvent = (TQKeyEvent*)event;
-        if ( keyEvent->key() == Qt::Key_Tab ) {
-          TQApplication::sendEvent( parent(), event );
+        if ( keyEvent->key() == TQt::Key_Tab ) {
+          TQApplication::sendEvent( tqparent(), event );
           return true;
         } else
           return false;
@@ -79,8 +79,8 @@ class TabPressEater : public QObject
 };
 
 
-AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+AddressEditWidget::AddressEditWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
   tqlayout->setSpacing( KDialog::spacingHint() );
@@ -93,8 +93,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
   mAddressField = new KActiveLabel( this );
   mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
   mAddressField->setMinimumHeight( 20 );
-  mAddressField->tqsetAlignment( Qt::AlignTop );
-  mAddressField->setTextFormat( Qt::PlainText );
+  mAddressField->tqsetAlignment( TQt::AlignTop );
+  mAddressField->setTextFormat( TQt::PlainText );
   tqlayout->addWidget( mAddressField );
 
   mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
@@ -257,10 +257,10 @@ void AddressEditWidget::updateAddressEdit()
 }
 
 AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
-                                      int selected, TQWidget *parent,
+                                      int selected, TQWidget *tqparent,
                                       const char *name )
   : KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok,
-                 parent, name, true, true ),
+                 tqparent, name, true, true ),
     mPreviousAddress( 0 )
 {
   mAddressList = list;
@@ -274,10 +274,10 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
-  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
+  label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
   mStreetTextEdit = new TQTextEdit( page );
-  mStreetTextEdit->setTextFormat( Qt::PlainText );
+  mStreetTextEdit->setTextFormat( TQt::PlainText );
   label->setBuddy( mStreetTextEdit );
   topLayout->addWidget( mStreetTextEdit, 1, 1 );
 
@@ -599,9 +599,9 @@ void AddressEditDialog::fillCountryCombo()
 }
 
 
-AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
+AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
   : KDialogBase( Plain, i18n( "street/postal", "Edit Address Type" ), Ok | Cancel, Ok,
-                 parent, "AddressTypeDialog" )
+                 tqparent, "AddressTypeDialog" )
 {
   TQWidget *page = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
@@ -617,7 +617,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
     new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
     box->setChecked( type & mTypeList[ i ] );
   }
 }
@@ -630,7 +630,7 @@ int AddressTypeDialog::type() const
 {
   int type = 0;
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }
@@ -642,7 +642,7 @@ int AddressTypeDialog::type() const
   Small helper class, I hope we can remove it as soon as a general solution has
   been committed to kdelibs
  */
-class LocaleAwareString : public QString
+class LocaleAwareString : public TQString
 {
   public:
     LocaleAwareString() : TQString()
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index 1fccc604..40465d37 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEDITWIDGET_H
@@ -49,12 +49,13 @@ typedef TypeCombo<KABC::Address> AddressTypeCombo;
 /**
   Editor widget for addresses.
  */
-class AddressEditWidget : public QWidget
+class AddressEditWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddressEditWidget( TQWidget *parent, const char *name = 0 );
+    AddressEditWidget( TQWidget *tqparent, const char *name = 0 );
     ~AddressEditWidget();
 
     KABC::Address::List addresses();
@@ -92,10 +93,11 @@ class AddressEditWidget : public QWidget
 class AddressEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AddressEditDialog( const KABC::Address::List &list, int selected,
-                       TQWidget *parent, const char *name = 0 );
+                       TQWidget *tqparent, const char *name = 0 );
     ~AddressEditDialog();
 
     KABC::Address::List addresses();
@@ -140,7 +142,7 @@ class AddressEditDialog : public KDialogBase
 class AddressTypeDialog : public KDialogBase
 {
   public:
-    AddressTypeDialog( int type, TQWidget *parent );
+    AddressTypeDialog( int type, TQWidget *tqparent );
     ~AddressTypeDialog();
 
     int type() const;
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index 9d5f1cf9..98495c41 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "addresseeconfig.h"
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index b9d22589..a0dcd45a 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEECONFIG_H
diff --git a/kaddressbook/addresseeeditorbase.cpp b/kaddressbook/addresseeeditorbase.cpp
index f0352a70..21e56264 100644
--- a/kaddressbook/addresseeeditorbase.cpp
+++ b/kaddressbook/addresseeeditorbase.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "addresseeeditorbase.moc"
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index 25d5c1ab..3dc670b4 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEEDITORBASE_H
@@ -28,13 +28,14 @@
 
 #include <tqwidget.h>
 
-class AddresseeEditorBase : public QWidget
+class AddresseeEditorBase : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeEditorBase( TQWidget *parent, const char *name = 0 )
-      : TQWidget( parent, name )
+    AddresseeEditorBase( TQWidget *tqparent, const char *name = 0 )
+      : TQWidget( tqparent, name )
     {
     }
 
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 7e6bab40..9fe48731 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -35,10 +35,10 @@
 #include "addresseeeditordialog.h"
 
 AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
-                                              TQWidget *parent, const char *name )
+                                              TQWidget *tqparent, const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ),
                  KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
-                 KDialogBase::Ok, parent, name, false )
+                 KDialogBase::Ok, tqparent, name, false )
 {
   // Set this to be the group leader for all subdialogs - this means
   // modal subdialogs will only affect this dialog, not the other windows
@@ -103,7 +103,7 @@ void AddresseeEditorDialog::slotApply()
     return;
 
   if ( mEditorWidget->dirty() ) {
-    TQApplication::setOverrideCursor( Qt::waitCursor );
+    TQApplication::setOverrideCursor( TQt::waitCursor );
     mEditorWidget->save();
     emit contactModified( mEditorWidget->addressee() );
     TQApplication::restoreOverrideCursor();
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 0cd09397..7d0258e9 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEEDITORDIALOG_H
@@ -35,10 +35,11 @@ namespace KAB { class Core; }
 class AddresseeEditorDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AddresseeEditorDialog( KAB::Core *core,
-                           TQWidget *parent, const char *name = 0 );
+                           TQWidget *tqparent, const char *name = 0 );
     ~AddresseeEditorDialog();
 
     void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index ab8572ce..61ba5c18 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -33,8 +33,8 @@
 
 #include "addresseeeditorextension.h"
 
-AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
-  : KAB::ExtensionWidget( core, parent, name )
+AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name )
+  : KAB::ExtensionWidget( core, tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h
index d3368248..0c1a735b 100644
--- a/kaddressbook/addresseeeditorextension.h
+++ b/kaddressbook/addresseeeditorextension.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEEDITOREXTENSION_H
@@ -30,9 +30,10 @@
 class AddresseeEditorExtension : public KAB::ExtensionWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 );
+    AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
     ~AddresseeEditorExtension();
 
     /**
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 519a817f..097f513b 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -67,8 +67,8 @@
 
 #include "addresseeeditorwidget.h"
 
-AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *parent, const char *name )
-  : AddresseeEditorBase( parent, name ),
+AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *tqparent, const char *name )
+  : AddresseeEditorBase( tqparent, name ),
     mBlockSignals( false ), mReadOnly( false )
 {
   kdDebug(5720) << "AddresseeEditorWidget()" << endl;
@@ -430,7 +430,7 @@ void AddresseeEditorWidget::setupTab2()
    //////////////////////////////////////
   // Notes
   label = new TQLabel( i18n( "Note:" ), tab2 );
-  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
+  label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
   tqlayout->addWidget( label, 7, 0 );
   mNoteEdit = new TQTextEdit( tab2 );
   mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
 
   const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-    if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
+    if ( activePages.tqfind( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
       continue;
 
     ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
@@ -558,7 +558,7 @@ void AddresseeEditorWidget::load()
   mBirthdayPicker->setDate( mAddressee.birthday().date() );
 
   TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
-  TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate ));
+  TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate ));
   mAnniversaryPicker->setDate( anniversary );
   mNicknameEdit->setText( mAddressee.nickName() );
   mCategoryEdit->setText( mAddressee.categories().join( "," ) );
@@ -652,7 +652,7 @@ void AddresseeEditorWidget::save()
 
   if ( mAnniversaryPicker->date().isValid() )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary",
-                             mAnniversaryPicker->date().toString( Qt::ISODate ) );
+                             mAnniversaryPicker->date().toString( TQt::ISODate ) );
   else
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
 
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index f3e6dc59..3e04dcd7 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEEDITORWIDGET_H
@@ -66,9 +66,10 @@ namespace KABC { class AddressBook; }
 class AddresseeEditorWidget : public AddresseeEditorBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeEditorWidget( TQWidget *parent, const char *name = 0 );
+    AddresseeEditorWidget( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeEditorWidget();
 
     void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index 7e598017..e99677c1 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/stdaddressbook.h>
diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h
index 5bcac313..11ccf653 100644
--- a/kaddressbook/addresseeutil.h
+++ b/kaddressbook/addresseeutil.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEUTIL_H
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index c936e5fa..4f3a5807 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -34,10 +34,10 @@
 #include "addviewdialog.h"
 
 AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
-                              TQWidget *parent, const char *name )
+                              TQWidget *tqparent, const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Add View" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
-                 parent, name ),
+                 tqparent, name ),
    mViewFactoryDict( viewFactoryDict )
 {
   mTypeId = 0;
@@ -57,7 +57,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
            TQT_SLOT( textChanged( const TQString& ) ) );
   tqlayout->addWidget( mViewNameEdit, 0, 1 );
 
-  mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
+  mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page );
   connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
   tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
   TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
@@ -69,10 +69,10 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
     TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()),
                                              mTypeGroup, (*iter)->type().latin1() );
     label = new TQLabel( (*iter)->description(), mTypeGroup );
-    label->tqsetAlignment( Qt::WordBreak );
+    label->tqsetAlignment( TQt::WordBreak );
 
-    groupLayout->addWidget( button, row, 0, Qt::AlignTop );
-    groupLayout->addWidget( label, row, 1, Qt::AlignTop );
+    groupLayout->addWidget( button, row, 0, TQt::AlignTop );
+    groupLayout->addWidget( label, row, 1, TQt::AlignTop );
 
     row++;
   }
@@ -94,7 +94,7 @@ TQString AddViewDialog::viewName()const
 TQString AddViewDialog::viewType()const
 {
   // we missuse the name property for storing the type
-  return mTypeGroup->find( mTypeId )->name();
+  return mTypeGroup->tqfind( mTypeId )->name();
 }
 
 void AddViewDialog::clicked( int id )
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 13cf2ef8..6e1fcd44 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDVIEWDIALOG_H
@@ -41,9 +41,10 @@ class ViewFactory;
 class AddViewDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *parent,
+    AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *tqparent,
                    const char *name = 0 );
     ~AddViewDialog();
 
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index c2f5dc40..3606fdac 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -85,8 +85,8 @@ class KABCStorage : public KPIM::DesignerFields::Storage
 
 
 AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
-                                            TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name )
+                                            TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name )
 {
   initGUI( uiFile );
 }
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index 26b46227..fd00b58e 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADVANCEDCUSTOMFIELDS_H
@@ -39,10 +39,11 @@
 class AdvancedCustomFields : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
-                          TQWidget *parent, const char *name = 0 );
+                          TQWidget *tqparent, const char *name = 0 );
 
     void loadContact( KABC::Addressee *addr );
     void storeContact( KABC::Addressee *addr );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 13e5f5fc..932f6f10 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kconfig.h>
@@ -29,7 +29,7 @@
 #include "filter.h"
 
 Filter::Filter()
-  : mName( TQString::null ), mMatchRule( Matching ), mEnabled( true ),
+  : mName( TQString() ), mMatchRule( Matching ), mEnabled( true ),
     mInternal( false ), mIsEmpty( true )
 {
 }
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index 9f66699e..cb13ce53 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FILTER_H
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index cacb2dfd..18180b80 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kconfig.h>
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index 5c7c8c0c..bab2cb70 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABPREFS_H
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 5788e6fc..716e1764 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kapplication.h>
@@ -75,7 +75,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
   TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() );
   if ( urlTemplate.isEmpty() ) {
     KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) );
-    return TQString::null;
+    return TQString();
   }
 
 #if KDE_VERSION >= 319
diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h
index e8a79036..c244ce72 100644
--- a/kaddressbook/common/locationmap.h
+++ b/kaddressbook/common/locationmap.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LOCATIONMAP_H
@@ -28,9 +28,10 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-class LocationMap : public QObject
+class LocationMap : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static LocationMap *instance();
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index d48be3d9..8cee7a9b 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -107,8 +107,8 @@ void ContactEditorWidgetManager::reload()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-ContactEditorTabPage::ContactEditorTabPage( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+ContactEditorTabPage::ContactEditorTabPage( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   mLayout = new TQGridLayout( this, 0, 2, KDialog::marginHint(),
                              KDialog::spacingHint() );
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 4b78b17f..ae9c69b9 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONTACTEDITORWIDGETMANAGER_H
@@ -34,9 +34,10 @@ class Addressee;
 
 class TQGridLayout;
 
-class ContactEditorWidgetManager : public QObject
+class ContactEditorWidgetManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static ContactEditorWidgetManager *self();
@@ -63,12 +64,13 @@ class ContactEditorWidgetManager : public QObject
     static ContactEditorWidgetManager *mSelf;
 };
 
-class ContactEditorTabPage : public QWidget
+class ContactEditorTabPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ContactEditorTabPage( TQWidget *parent, const char *name = 0 );
+    ContactEditorTabPage( TQWidget *tqparent, const char *name = 0 );
 
     /**
       Adds a widget to the tab.
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 44b0294a..5ceac5db 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -42,9 +42,9 @@
 #include "customfieldswidget.h"
 
 
-AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
+AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Add Field" ), Ok | Cancel,
-                 Ok, parent, name, true, true )
+                 Ok, tqparent, name, true, true )
 {
   TQWidget *page = plainPage();
 
@@ -121,14 +121,14 @@ void AddFieldDialog::nameChanged( const TQString &name )
   enableButton( Ok, !name.isEmpty() );
 }
 
-FieldWidget::FieldWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+FieldWidget::FieldWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
-  mGlobalLayout->tqsetAlignment( Qt::AlignTop );
+  mGlobalLayout->tqsetAlignment( TQt::AlignTop );
 
   mSeparator = new TQFrame( this );
   mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
@@ -136,7 +136,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name )
   tqlayout->addWidget( mSeparator );
 
   mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
-  mLocalLayout->tqsetAlignment( Qt::AlignTop );
+  mLocalLayout->tqsetAlignment( TQt::AlignTop );
 }
 
 void FieldWidget::addField( const TQString &identifier, const TQString &title,
@@ -159,17 +159,17 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title,
     connect( wdg, TQT_SIGNAL( toggled( bool ) ),
              this, TQT_SIGNAL( changed() ) );
   } else if ( type == "date" ) {
-    QDateEdit *wdg = new QDateEdit( this );
+    TQDateEdit *wdg = new TQDateEdit( this );
     record.mWidget = wdg;
     connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ),
              this, TQT_SIGNAL( changed() ) );
   } else if ( type == "time" ) {
-    QTimeEdit *wdg = new QTimeEdit( this );
+    TQTimeEdit *wdg = new TQTimeEdit( this );
     record.mWidget = wdg;
     connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ),
              this, TQT_SIGNAL( changed() ) );
   } else if ( type == "datetime" ) {
-    QDateTimeEdit *wdg = new QDateTimeEdit( this );
+    TQDateTimeEdit *wdg = new TQDateTimeEdit( this );
     record.mWidget = wdg;
     connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
              this, TQT_SIGNAL( changed() ) );
@@ -186,11 +186,11 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title,
   if ( isGlobal ) {
     record.mLayout = new TQHBoxLayout( mGlobalLayout );
     record.mLayout->addWidget( record.mLabel );
-    record.mLayout->addWidget( record.mWidget, Qt::AlignLeft );
+    record.mLayout->addWidget( record.mWidget, TQt::AlignLeft );
   } else {
     record.mLayout = new TQHBoxLayout( mLocalLayout );
     record.mLayout->addWidget( record.mLabel );
-    record.mLayout->addWidget( record.mWidget, Qt::AlignLeft );
+    record.mLayout->addWidget( record.mWidget, TQt::AlignLeft );
     mSeparator->show();
   }
 
@@ -236,14 +236,14 @@ void FieldWidget::clearFields()
     } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
       TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
       wdg->setChecked( true );
-    } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
-      QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget );
+    } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
       wdg->setDate( TQDate::tqcurrentDate() );
-    } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) {
-      QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget );
+    } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
       wdg->setTime( TQTime::currentTime() );
-    } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) {
-      QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget );
+    } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
       wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     }
   }
@@ -274,15 +274,15 @@ void FieldWidget::loadContact( KABC::Addressee *addr )
         } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
           TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
           wdg->setChecked( value == "true" || value == "1" );
-        } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
-          QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget );
-          wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
-        } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) {
-          QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget );
-          wdg->setTime( TQTime::fromString( value, Qt::ISODate ) );
-        } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) {
-          QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget );
-          wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+        } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+          TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
+          wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
+        } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+          TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
+          wdg->setTime( TQTime::fromString( value, TQt::ISODate ) );
+        } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+          TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
+          wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
         }
       }
     }
@@ -330,15 +330,15 @@ void FieldWidget::storeContact( KABC::Addressee *addr )
     } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
       TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
       value = ( wdg->isChecked() ? "true" : "false" );
-    } else if ( (*it).mWidget->isA( "QDateEdit" ) ) {
-      QDateEdit *wdg = static_cast<QDateEdit*>( (*it).mWidget );
-      value = wdg->date().toString( Qt::ISODate );
-    } else if ( (*it).mWidget->isA( "QTimeEdit" ) ) {
-      QTimeEdit *wdg = static_cast<QTimeEdit*>( (*it).mWidget );
-      value = wdg->time().toString( Qt::ISODate );
-    } else if ( (*it).mWidget->isA( "QDateTimeEdit" ) ) {
-      QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*it).mWidget );
-      value = wdg->dateTime().toString( Qt::ISODate );
+    } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
+      value = wdg->date().toString( TQt::ISODate );
+    } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
+      value = wdg->time().toString( TQt::ISODate );
+    } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
+      value = wdg->dateTime().toString( TQt::ISODate );
     }
 
     if ( value.isEmpty() )
@@ -370,15 +370,15 @@ void FieldWidget::recalculateLayout()
 
   FieldRecordList::ConstIterator it;
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
-    maxWidth = QMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() );
+    maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() );
 
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
     (*it).mLabel->setMinimumWidth( maxWidth );
 }
 
 CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab,
-                                        TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name )
+                                        TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name )
 {
   initGUI();
 
@@ -492,11 +492,11 @@ void CustomFieldsWidget::initGUI()
   tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
-  tqlayout->addWidget( mAddButton, 1, 1, Qt::AlignRight );
+  tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
   mRemoveButton->setEnabled( false );
-  tqlayout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
 
   // load global fields
   TQStringList globalFields = KABPrefs::instance()->globalCustomFields();
@@ -527,11 +527,11 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
         type = "integer";
       } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
         type = "boolean";
-      } else if ( (*it).mWidget->isA( "QDateEdit" ) ) {
+      } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
         type = "date";
-      } else if ( (*it).mWidget->isA( "QTimeEdit" ) ) {
+      } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
         type = "time";
-      } else if ( (*it).mWidget->isA( "QDateTimeEdit" ) ) {
+      } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
         type = "datetime";
       } else if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
         type = "text";
@@ -547,12 +547,12 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
 
 void splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
 {
-  int colon = str.find( ':' );
+  int colon = str.tqfind( ':' );
   if ( colon != -1 ) {
     TQString tmp = str.left( colon );
     value = str.mid( colon + 1 );
 
-    int dash = tmp.find( '-' );
+    int dash = tmp.tqfind( '-' );
     if ( dash != -1 ) {
       app = tmp.left( dash );
       name = tmp.mid( dash + 1 );
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index b4c11326..c1dc6b8c 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CUSTOMFIELDSWIDGET_H
@@ -61,9 +61,10 @@ typedef TQValueList<FieldRecord> FieldRecordList;
 class AddFieldDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddFieldDialog( TQWidget *parent, const char *name = 0 );
+    AddFieldDialog( TQWidget *tqparent, const char *name = 0 );
 
     TQString title() const;
     TQString identifier() const;
@@ -82,12 +83,13 @@ class AddFieldDialog : public KDialogBase
     TQValueVector<TQString> mTypeName;
 };
 
-class FieldWidget : public QWidget
+class FieldWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FieldWidget( TQWidget *parent, const char *name = 0 );
+    FieldWidget( TQWidget *tqparent, const char *name = 0 );
 
     void addField( const TQString &identifier, const TQString &title,
                    const TQString &type, bool isGlobal );
@@ -119,9 +121,10 @@ class FieldWidget : public QWidget
 class CustomFieldsWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     void loadContact( KABC::Addressee *addr );
     void storeContact( KABC::Addressee *addr );
@@ -148,9 +151,9 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget
 class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new CustomFieldsWidget( ab, parent, name );
+      return new CustomFieldsWidget( ab, tqparent, name );
     }
 
     TQString pageTitle() const { return i18n( "Custom Fields" ); }
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index ac0115fe..485b7797 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "distributionlisteditor.h"
@@ -64,7 +64,7 @@ public:
 };
 
 
-KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
+KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* tqparent ) : TQWidget( tqparent ), m_addressBook( book )
 {
     Q_ASSERT( m_addressBook );
     TQBoxLayout* tqlayout = new TQHBoxLayout( this );
@@ -106,7 +106,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
         return KABC::Addressee();
 
     typedef KABC::Addressee::List List;
-    const List byEmail = m_addressBook->tqfindByEmail( email );
+    const List byEmail = m_addressBook->findByEmail( email );
     if ( !byEmail.isEmpty() )
     {
         const List::ConstIterator end = byEmail.end();
@@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
     KPIM::DistributionList::Entry res;
     if ( !m_uid.isNull() )
     {
-        const KABC::Addressee addr = m_addressBook->tqfindByUid( m_uid );
+        const KABC::Addressee addr = m_addressBook->findByUid( m_uid );
         if ( m_initialText == text || addr.formattedName() == name )
             res.addressee = addr;
     }
@@ -147,14 +147,14 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
 }
 
 
-KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::AddresseeLineEdit( parent )
+KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* tqparent ) : KPIM::AddresseeLineEdit( tqparent )
 {
   allowDistributionLists( false );
 }
 
 
-KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book,  TQWidget* parent )
-    : KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate )
+KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book,  TQWidget* tqparent )
+    : KDialogBase( tqparent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate )
 {
     d->addressBook = book;
     Q_ASSERT( d->addressBook );
diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h
index 7c512109..448221ce 100644
--- a/kaddressbook/distributionlisteditor.h
+++ b/kaddressbook/distributionlisteditor.h
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KPIM_DISTRIBUTIONLISTEDITOR_H
@@ -39,8 +39,9 @@ class EditorWidgetPrivate;
 class EditorWidget : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 );
+    explicit EditorWidget( KABC::AddressBook* book, TQWidget* tqparent = 0 );
     ~EditorWidget();
 
     void setDistributionList( const KPIM::DistributionList& list );
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 6deb2d00..e4754e5a 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KPIM_DISTRIBUTIONLISTEDITOR_P_H
@@ -42,16 +42,18 @@ namespace DistributionListEditor {
 class LineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit LineEdit( TQWidget* parent = 0 );
+    explicit LineEdit( TQWidget* tqparent = 0 );
 };
 
 
-class Line : public QWidget
+class Line : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 );
+    explicit Line( KABC::AddressBook* book, TQWidget* tqparent = 0 );
 
     void setEntry( const KPIM::DistributionList::Entry& entry );
     KPIM::DistributionList::Entry entry() const; 
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 42e90a3b..9ea49c3a 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -20,7 +20,7 @@
 #include <tqstringlist.h>
 #include <tqvbuttongroup.h>
 
-KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* parent ) : TQWidget( parent ), m_core( core ), m_emailGroup( 0 )
+KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* tqparent ) : TQWidget( tqparent ), m_core( core ), m_emailGroup( 0 )
 {
     m_mainLayout = new TQVBoxLayout( this );
     m_mainLayout->setSpacing( KDialog::spacingHint() );
@@ -31,10 +31,10 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     m_imageLabel = new TQLabel( this );
     m_imageLabel->setAutoResize( true );
-    headerLayout->addWidget( m_imageLabel, 0, Qt::AlignTop );
+    headerLayout->addWidget( m_imageLabel, 0, TQt::AlignTop );
 
     m_addresseeLabel = new TQLabel( this );
-    headerLayout->addWidget( m_addresseeLabel, 0, Qt::AlignTop );
+    headerLayout->addWidget( m_addresseeLabel, 0, TQt::AlignTop );
     headerLayout->addStretch();
 
     m_mainLayout->addItem( headerLayout );
@@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* distLabel = new TQLabel( this );
     distLabel->setText( i18n( "<b>Distribution list:</b>" ) );
-    distLabel->tqsetAlignment( Qt::SingleLine );
+    distLabel->tqsetAlignment( TQt::SingleLine );
     distLayout->addWidget( distLabel );
 
     m_distListLabel = new KURLLabel( this );
@@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* emailLabel = new TQLabel( this );
     emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) );
-    emailLabel->tqsetAlignment( Qt::SingleLine );
+    emailLabel->tqsetAlignment( TQt::SingleLine );
     m_mainLayout->addWidget( emailLabel );
 
     TQBoxLayout* emailLayout = new TQHBoxLayout;
@@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
     m_distListLabel->setURL( m_list.name() );
     m_distListLabel->setText( m_list.name() );
     m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
-    m_resourceLabel->tqsetAlignment( Qt::SingleLine );
+    m_resourceLabel->tqsetAlignment( TQt::SingleLine );
  
     m_emailGroup = new TQVButtonGroup( this );
     m_emailGroup->setFlat( true );
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index 3ee06309..3eba6efa 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -21,12 +21,13 @@ namespace KAB {
 
 class Core;
 
-class DistributionListEntryView : public QWidget
+class DistributionListEntryView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 );
+    explicit DistributionListEntryView( KAB::Core* core, TQWidget* tqparent = 0 );
     void setEntry( const KPIM::DistributionList& list, const KPIM::DistributionList::Entry& entry );
 
 public slots:
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 7858e295..fab91bc4 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "distributionlistpicker.h"
@@ -41,7 +41,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
+KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent ) : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
 {
     Q_ASSERT( m_book );
     setModal( true );
diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h
index f5309c13..9d7d23fa 100644
--- a/kaddressbook/distributionlistpicker.h
+++ b/kaddressbook/distributionlistpicker.h
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KPIM_DISTRIBUTIONLISTPICKER_H
@@ -38,8 +38,9 @@ namespace KPIM {
 class DistributionListPickerDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 );
+    explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent = 0 );
     TQString selectedDistributionList() const;
 
     void setLabelText( const TQString& text );
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index 45a5efba..a4d8b8bb 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <config.h>
@@ -68,8 +68,8 @@ TQString CryptoWidgetFactory::pageIdentifier() const
   return "crypto";
 }
 
-CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
+CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(),
                                             KDialog::spacingHint() );
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 8037a4a4..12f3ba99 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CRYPTOWIDGET_H
@@ -36,9 +36,10 @@ class TQCheckBox;
 class CryptoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~CryptoWidget();
 
     void loadContact( KABC::Addressee *addr );
@@ -59,9 +60,9 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
     CryptoWidgetFactory();
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new CryptoWidget( ab, parent, name );
+      return new CryptoWidget( ab, tqparent, name );
     }
 
     TQString pageTitle() const;
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui
index 2f608a08..0a096f6f 100644
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>IMAddressBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>IMAddressBase</cstring>
     </property>
@@ -27,12 +27,12 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>cmbProtocol</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>labelProtocol</cstring>
             </property>
@@ -43,12 +43,12 @@
                 <cstring>cmbProtocol</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>edtAddress</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>labelAddress</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <cstring>edtAddress</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>labelNetwork</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <cstring>edtNetwork</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>edtNetwork</cstring>
             </property>
@@ -81,9 +81,9 @@
     <tabstop>cmbProtocol</tabstop>
     <tabstop>edtAddress</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotProtocolChanged( const QString &amp; )</slot>
     <slot>slotProtocolChanged()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 097b092c..1d64c5b9 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -33,18 +33,18 @@
 
 #include "imaddresswidget.h"
 
-IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols )
-  : IMAddressBase( parent )
+IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols )
+  : IMAddressBase( tqparent )
 {
   mProtocols = protocols;
   populateProtocols();
   init();
 }
 
-IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols,
+IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols,
                                   KPluginInfo *protocol, const TQString& address,
                                   const IMContext& context )
-  : IMAddressBase( parent )
+  : IMAddressBase( tqparent )
 {
   Q_UNUSED( context );
 
diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h
index 11ee5f45..3cec21cf 100644
--- a/kaddressbook/editors/imaddresswidget.h
+++ b/kaddressbook/editors/imaddresswidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef IMADDRESSWIDGET_H
 #define IMADDRESSWIDGET_H
@@ -42,10 +42,11 @@ class KPluginInfo;
 class IMAddressWidget : public IMAddressBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols);
-    IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols,
+    IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols);
+    IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols,
                      KPluginInfo *protocol, const TQString& address,
                      const IMContext& context = Any );
 
diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui
index 3c8e3601..bbc26637 100644
--- a/kaddressbook/editors/imeditorbase.ui
+++ b/kaddressbook/editors/imeditorbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>IMEditorBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>IMEditorBase</cstring>
     </property>
@@ -44,7 +44,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>btnSetStandard</cstring>
             </property>
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 30c3ca98..3e306a03 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlistview.h>
@@ -43,9 +43,9 @@
 #include "imeditorwidget.h"
 
 
-IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol,
+IMAddressLVI::IMAddressLVI( KListView *tqparent, KPluginInfo *protocol,
                             const TQString &address, const IMContext &context )
-  : KListViewItem( parent )
+  : KListViewItem( tqparent )
 {
   setProtocol( protocol );
   setAddress( address );
@@ -140,8 +140,8 @@ void IMAddressLVI::activate()
 
 /*===========================================================================*/
 
-IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name )
-  : KDialogBase( parent, name, false, i18n( "Edit Instant Messenging Address" ),
+IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name )
+  : KDialogBase( tqparent, name, false, i18n( "Edit Instant Messenging Address" ),
                  Help | Ok | Cancel, Ok, false ),
     mReadOnly( false )
 {
@@ -351,7 +351,7 @@ void IMEditorWidget::slotAdd()
       mPreferred = addressWid->address();
     }
 
-    if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() )
+    if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() )
       mChangedProtocols.append( addressWid->protocol() );
 
     mWidget->lvAddresses->sort();
@@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit()
       }
 
       // the entry for the protocol of the current address has changed
-      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) {
+      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) {
         mChangedProtocols.append( current->protocol() );
       }
       // update protocol - has another protocol gained an address?
@@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit()
         modified = true;
         // this proto is losing an entry
         current->setProtocol( addressWid->protocol() );
-        if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
+        if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
           mChangedProtocols.append( current->protocol() );
       }
 
@@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete()
   while( it.current() ) {
     if ( it.current()->isSelected() ) {
       IMAddressLVI * current = static_cast<IMAddressLVI*>( *it );
-      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
+      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
         mChangedProtocols.append( current->protocol() );
 
       if ( current->preferred() )
@@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c
 
 void IMEditorWidget::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
 {
-  int colon = str.find( ':' );
+  int colon = str.tqfind( ':' );
   if ( colon != -1 ) {
     TQString tmp = str.left( colon );
     value = str.mid( colon + 1 );
 
-    int dash = tmp.find( '-' );
+    int dash = tmp.tqfind( '-' );
     if ( dash != -1 ) {
       app = tmp.left( dash );
       name = tmp.mid( dash + 1 );
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 25fd9804..f1f2708d 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef IMEDITORWIDGET_H
@@ -49,9 +49,10 @@ enum IMContext { Any, Home, Work };
 class IMEditorWidget : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 );
+    IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name = 0 );
     ~IMEditorWidget() {};
 
     void loadContact( KABC::Addressee *addr );
@@ -99,7 +100,7 @@ class IMEditorWidget : public KDialogBase
 class IMAddressLVI : public KListViewItem
 {
   public:
-    IMAddressLVI( KListView *parent, KPluginInfo * protocol,
+    IMAddressLVI( KListView *tqparent, KPluginInfo * protocol,
                   const TQString &address, const IMContext &context = Any );
 
     void setAddress( const TQString &address );
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 3cc2de14..21d21e52 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -44,7 +44,7 @@
 
 #include "emaileditwidget.h"
 
-class EmailValidator : public QRegExpValidator
+class EmailValidator : public TQRegExpValidator
 {
   public:
     EmailValidator()
@@ -55,11 +55,11 @@ class EmailValidator : public QRegExpValidator
     }
 };
 
-class EmailItem : public QListBoxText
+class EmailItem : public TQListBoxText
 {
   public:
-    EmailItem( TQListBox *parent, const TQString &text, bool preferred )
-      : TQListBoxText( parent, text ), mPreferred( preferred )
+    EmailItem( TQListBox *tqparent, const TQString &text, bool preferred )
+      : TQListBoxText( tqparent, text ), mPreferred( preferred )
     {}
 
     void setPreferred( bool preferred ) { mPreferred = preferred; }
@@ -86,8 +86,8 @@ class EmailItem : public QListBoxText
     bool mPreferred;
 };
 
-EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+EmailEditWidget::EmailEditWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(),
                                             KDialog::spacingHint() );
@@ -171,11 +171,11 @@ void EmailEditWidget::textChanged( const TQString &text )
 }
 
 
-EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
+EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *tqparent,
                                   const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Help,
-                 parent, name, true )
+                 tqparent, name, true )
 {
   TQWidget *page = plainPage();
 
@@ -254,7 +254,7 @@ void EmailEditDialog::add()
   bool ok = false;
 
   TQString email = KInputDialog::getText( i18n( "Add Email" ), i18n( "New Email:" ),
-                                         TQString::null, &ok, this, "EmailEditDialog",
+                                         TQString(), &ok, this, "EmailEditDialog",
                                          validator );
 
   if ( !ok )
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index ea1af4c3..c73308f0 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef EMAILEDITWIDGET_H
@@ -41,12 +41,13 @@ class KListView;
   This widget displays a list box of the email addresses as well as buttons
   to manipulate them (up, down, add, remove).
 */
-class EmailEditWidget : public QWidget
+class EmailEditWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EmailEditWidget( TQWidget *parent, const char *name = 0 );
+    EmailEditWidget( TQWidget *tqparent, const char *name = 0 );
     ~EmailEditWidget();
 
     void setEmails( const TQStringList &list );
@@ -70,9 +71,10 @@ class EmailEditWidget : public QWidget
 class EmailEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EmailEditDialog( const TQStringList &list, TQWidget *parent,
+    EmailEditDialog( const TQStringList &list, TQWidget *tqparent,
                      const char *name = 0 );
     ~EmailEditDialog();
 
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index aa4a5c00..0f8100db 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kactionclasses.h>
@@ -44,9 +44,9 @@ ExtensionData::ExtensionData() : action( 0 ), widget( 0 ), weight( 0 ), isDetail
 {
 }
 
-ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *parent,
+ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *tqparent,
                                     const char *name )
-    : TQObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ),
+    : TQObject( tqparent, name ), mExtensionBar( extensionBar ), mCore( core ),
       mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
 {
   Q_ASSERT( mExtensionBar );
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 05426620..5c5a14c4 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef EXTENSIONMANAGER_H
@@ -53,12 +53,13 @@ class ExtensionData
     bool isDetailsExtension;
 };
 
-class ExtensionManager : public QObject
+class ExtensionManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 );
+    ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *tqparent, const char *name = 0 );
     ~ExtensionManager();
 
     /**
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index d6b1d7d9..1eac56b0 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "distributionlistngwidget.h"
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent )
+KAB::DistributionListNg::ListBox::ListBox( TQWidget* tqparent ) : KListBox( tqparent )
 {
     setAcceptDrops( true );
 }
@@ -84,9 +84,9 @@ namespace DistributionListNg {
 class Factory : public KAB::ExtensionFactory
 {
   public:
-    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
+    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAB::DistributionListNg::MainWidget( core, parent, name );
+      return new KAB::DistributionListNg::MainWidget( core, tqparent, name );
     }
 
     TQString identifier() const
@@ -115,7 +115,7 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
     return "distribution_list_editor_ng";
 }
 
-KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
+KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *tqparent, const char *name ) : KAB::ExtensionWidget( core, tqparent, name )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
     tqlayout->setSpacing( KDialog::spacingHint() );
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index 8c90c0dc..090fe0d5 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_DISTRIBUTIONLISTNG_MAINWIDGET_H
@@ -47,8 +47,9 @@ namespace DistributionListNg {
 class ListBox : public KListBox
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ListBox( TQWidget* parent = 0 );
+    ListBox( TQWidget* tqparent = 0 );
 
 signals:
 
@@ -66,9 +67,10 @@ protected:
 class MainWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 );
+    explicit MainWidget( KAB::Core *core, TQWidget *tqparent = 0, const char *name = 0 );
 
     //impl
     TQString title() const;
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 878ede7a..16277784 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "distributionlistwidget.h"
@@ -55,9 +55,9 @@ typedef KABC::DistributionList DistributionList;
 class DistributionListFactory : public KAB::ExtensionFactory
 {
   public:
-    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
+    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new DistributionListWidget( core, parent, name );
+      return new DistributionListWidget( core, tqparent, name );
     }
 
     TQString identifier() const
@@ -78,11 +78,11 @@ extern "C" {
   the event is forwarded to the ViewManager and it tries to
   remove a contact instead of the distribution list.
  */
-class DeletePressedCatcher : public QObject
+class DeletePressedCatcher : public TQObject
 {
   public:
-    DeletePressedCatcher( DistributionListWidget *parent )
-      : TQObject( parent, "DeletePressedCatcher" ), mWidget( parent )
+    DeletePressedCatcher( DistributionListWidget *tqparent )
+      : TQObject( tqparent, "DeletePressedCatcher" ), mWidget( tqparent )
     {
     }
 
@@ -91,7 +91,7 @@ class DeletePressedCatcher : public QObject
     {
       if ( event->type() == TQEvent::AccelOverride ) {
         TQKeyEvent *keyEvent = (TQKeyEvent*)event;
-        if ( keyEvent->key() == Qt::Key_Delete ) {
+        if ( keyEvent->key() == TQt::Key_Delete ) {
           keyEvent->accept();
           mWidget->removeContact();
           return true;
@@ -106,12 +106,12 @@ class DeletePressedCatcher : public QObject
     DistributionListWidget *mWidget;
 };
 
-class ContactItem : public QListViewItem
+class ContactItem : public TQListViewItem
 {
   public:
-    ContactItem( DistributionListView *parent, const KABC::Addressee &addressee,
-               const TQString &email = TQString::null ) :
-      TQListViewItem( parent ),
+    ContactItem( DistributionListView *tqparent, const KABC::Addressee &addressee,
+               const TQString &email = TQString() ) :
+      TQListViewItem( tqparent ),
       mAddressee( addressee ),
       mEmail( email )
     {
@@ -146,9 +146,9 @@ class ContactItem : public QListViewItem
     TQString mEmail;
 };
 
-DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent,
+DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *tqparent,
                                                 const char *name )
-  : KAB::ExtensionWidget( core, parent, name )
+  : KAB::ExtensionWidget( core, tqparent, name )
 #ifndef KDEPIM_NEW_DISTRLISTS
   , mManager( 0 )
 #endif
@@ -265,7 +265,7 @@ void DistributionListWidget::createList()
 {
   TQString newName = KInputDialog::getText( i18n( "New Distribution List" ),
                                            i18n( "Please enter name:" ),
-                                           TQString::null, 0, this );
+                                           TQString(), 0, this );
 
   if ( newName.isEmpty() ) return;
 
@@ -344,7 +344,7 @@ void DistributionListWidget::removeList()
 {
   int result = KMessageBox::warningContinueCancel( this,
       i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ),
-      TQString::null, KGuiItem( i18n("Delete"), "editdelete") );
+      TQString(), KGuiItem( i18n("Delete"), "editdelete") );
 
   if ( result != KMessageBox::Continue )
     return;
@@ -519,7 +519,7 @@ void DistributionListWidget::updateNameCombo()
   const TQStringList names = mManager->listNames();
 #endif
   mNameCombo->insertStringList( names );
-  mNameCombo->setCurrentItem( QMIN( pos, (int)names.count() - 1 ) );
+  mNameCombo->setCurrentItem( TQMIN( pos, (int)names.count() - 1 ) );
 
   updateContactView();
 }
@@ -590,8 +590,8 @@ void DistributionListWidget::changed()
 }
 #endif
 
-DistributionListView::DistributionListView( TQWidget *parent, const char* name )
-  : KListView( parent, name )
+DistributionListView::DistributionListView( TQWidget *tqparent, const char* name )
+  : KListView( tqparent, name )
 {
   setDragEnabled( true );
   setAcceptDrops( true );
@@ -622,9 +622,9 @@ void DistributionListView::dropEvent( TQDropEvent *e )
 
 
 EmailSelector::EmailSelector( const TQStringList &emails,
-                              const TQString &current, TQWidget *parent )
+                              const TQString &current, TQWidget *tqparent )
   : KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok|Cancel, Ok,
-               parent )
+               tqparent )
 {
   TQFrame *topFrame = plainPage();
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -653,13 +653,13 @@ TQString EmailSelector::selected() const
   if ( button )
     return mEmailMap[ mButtonGroup->id( button ) ];
 
-  return TQString::null;
+  return TQString();
 }
 
 TQString EmailSelector::getEmail( const TQStringList &emails,
-                                 const TQString &current, TQWidget *parent, bool &canceled )
+                                 const TQString &current, TQWidget *tqparent, bool &canceled )
 {
-  EmailSelector dlg( emails, current, parent );
+  EmailSelector dlg( emails, current, tqparent );
   if(dlg.exec())
   {
     canceled = false;
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index e74ac758..6890a6a7 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef DISTRIBUTIONLISTWIDGET_H
@@ -48,9 +48,10 @@ class DistributionListManager;
 class DistributionListWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 );
+    DistributionListWidget( KAB::Core*, TQWidget *tqparent, const char *name = 0 );
     virtual ~DistributionListWidget();
 
     void contactsSelectionChanged();
@@ -107,9 +108,10 @@ class DistributionListWidget : public KAB::ExtensionWidget
 class DistributionListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DistributionListView( TQWidget *parent, const char* name = 0 );
+    DistributionListView( TQWidget *tqparent, const char* name = 0 );
 
   protected:
     void dragEnterEvent( TQDragEnterEvent *e );
@@ -125,12 +127,12 @@ class EmailSelector : public KDialogBase
 {
   public:
     EmailSelector( const TQStringList &emails, const TQString &current,
-                   TQWidget *parent );
+                   TQWidget *tqparent );
 
     TQString selected() const;
 
     static TQString getEmail( const TQStringList &emails, const TQString &current,
-                             TQWidget *parent, bool &canceled );
+                             TQWidget *tqparent, bool &canceled );
 
   private:
     TQButtonGroup *mButtonGroup;
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 59a3c1ee..049f879b 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -54,11 +54,11 @@ class AddressBookWrapper : public KABC::AddressBook
     }
 };
 
-class ResourceItem : public QCheckListItem
+class ResourceItem : public TQCheckListItem
 {
   public:
-    ResourceItem( KListView *parent, KABC::Resource *resource )
-      : TQCheckListItem( parent, resource->resourceName(), CheckBox ),
+    ResourceItem( KListView *tqparent, KABC::Resource *resource )
+      : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ),
         mResource( resource ), mChecked( false ),
         mIsSubresource( false ), mSubItemsCreated( false ),
         mResourceIdentifier()
@@ -68,9 +68,9 @@ class ResourceItem : public QCheckListItem
       mChecked = isOn();
     }
 
-    ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* parent,
+    ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* tqparent,
                   const TQString& resourceIdent )
-      : TQCheckListItem( parent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ),
+      : TQCheckListItem( tqparent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ),
         mResource( resourceABC ), mChecked( false ),
         mIsSubresource( true ), mSubItemsCreated( false ),
         mResourceIdentifier( resourceIdent )
@@ -134,8 +134,8 @@ void ResourceItem::stateChange( bool active )
 
 ////
 
-ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const char *name )
-  : KAB::ExtensionWidget( core, parent, name ), mManager( 0 )
+ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *tqparent, const char *name )
+  : KAB::ExtensionWidget( core, tqparent, name ), mManager( 0 )
 {
   initGUI();
 
@@ -466,12 +466,12 @@ ResourceItem* ResourceSelection::selectedItem() const
 ResourceItem* ResourceSelection::findSubResourceItem( KPIM::ResourceABC *resource,
                                                 const TQString &subResource )
 {
-    TQListViewItemIterator parentIt( mListView );
-    for ( ; *parentIt; ++parentIt ) {
-        if ( static_cast<ResourceItem*>(*parentIt)->resource() != resource )
+    TQListViewItemIterator tqparentIt( mListView );
+    for ( ; *tqparentIt; ++tqparentIt ) {
+        if ( static_cast<ResourceItem*>(*tqparentIt)->resource() != resource )
             continue;
 
-        TQListViewItemIterator childIt( *parentIt );
+        TQListViewItemIterator childIt( *tqparentIt );
         for ( ; *childIt; ++childIt ) {
             ResourceItem *item = static_cast<ResourceItem*>(*childIt);
             if ( item->resourceIdentifier() == subResource )
@@ -520,9 +520,9 @@ void ResourceSelection::initGUI()
 class ResourceSelectionFactory : public KAB::ExtensionFactory
 {
   public:
-    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
+    KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new ResourceSelection( core, parent, name );
+      return new ResourceSelection( core, tqparent, name );
     }
 
     TQString identifier() const
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index 21c3ee84..e8939812 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef RESOURCESELECTION_H
@@ -38,9 +38,10 @@ class ResourceItem;
 class ResourceSelection : public KAB::ExtensionWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceSelection( KAB::Core*, TQWidget *parent, const char *name );
+    ResourceSelection( KAB::Core*, TQWidget *tqparent, const char *name );
     virtual ~ResourceSelection();
 
     TQString title() const;
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index a6ccd462..60a67014 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -45,9 +45,9 @@
 #include "kabprefs.h"
 #include "filtereditdialog.h"
 
-FilterEditDialog::FilterEditDialog( TQWidget *parent, const char *name )
+FilterEditDialog::FilterEditDialog( TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Address Book Filter" ),
-                 Help | Ok | Cancel, Ok, parent, name, false, true )
+                 Help | Ok | Cancel, Ok, tqparent, name, false, true )
 {
   initGUI();
 
@@ -102,7 +102,7 @@ Filter FilterEditDialog::filter()
   }
   filter.setCategories( categories );
 
-  if ( mMatchRuleGroup->find( 0 )->isOn() )
+  if ( mMatchRuleGroup->tqfind( 0 )->isOn() )
     filter.setMatchRule( Filter::Matching );
   else
     filter.setMatchRule( Filter::NotMatching );
@@ -161,9 +161,9 @@ void FilterEditDialog::slotHelp()
   kapp->invokeHelp( "using-filters" );
 }
 
-FilterDialog::FilterDialog( TQWidget *parent, const char *name )
+FilterDialog::FilterDialog( TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Address Book Filters" ),
-                 Ok | Cancel, Ok, parent, name, false, true )
+                 Ok | Cancel, Ok, tqparent, name, false, true )
 {
   initGUI();
 }
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 2b5d38b6..1d3c6439 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FILTEREDITDIALOG_H
@@ -40,9 +40,10 @@ class KListView;
 class FilterDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FilterDialog( TQWidget *parent, const char *name = 0 );
+    FilterDialog( TQWidget *tqparent, const char *name = 0 );
     ~FilterDialog();
 
     void setFilters( const Filter::List &list );
@@ -70,8 +71,9 @@ class FilterDialog : public KDialogBase
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FilterEditDialog( TQWidget *parent, const char *name = 0 );
+    FilterEditDialog( TQWidget *tqparent, const char *name = 0 );
     ~FilterEditDialog();
 
     void setFilter( const Filter &filter );
diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp
index c963024d..1b487317 100644
--- a/kaddressbook/filterselectionwidget.cpp
+++ b/kaddressbook/filterselectionwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -29,8 +29,8 @@
 
 #include "filterselectionwidget.h"
 
-FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name )
-  : TQHBox( parent, name )
+FilterSelectionWidget::FilterSelectionWidget( TQWidget *tqparent, const char *name )
+  : TQHBox( tqparent, name )
 {
   setSpacing( KDialog::spacingHint() );
 
diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h
index bedb2711..da8077c4 100644
--- a/kaddressbook/filterselectionwidget.h
+++ b/kaddressbook/filterselectionwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FILTERSELECTIONWIDGET_H
@@ -33,12 +33,13 @@ class KComboBox;
   horizontal line. The combo box allows the user to select the active
   filter.
  */
-class FilterSelectionWidget : public QHBox
+class FilterSelectionWidget : public TQHBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FilterSelectionWidget( TQWidget *parent, const char *name = 0 );
+    FilterSelectionWidget( TQWidget *tqparent, const char *name = 0 );
     ~FilterSelectionWidget();
 
     void setItems( const TQStringList &names );
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 5b588fcf..5a419907 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -32,8 +32,8 @@
 
 #include "freebusywidget.h"
 
-FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name )
+FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name )
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h
index a3336569..a758f141 100644
--- a/kaddressbook/freebusywidget.h
+++ b/kaddressbook/freebusywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef FREEBUSYWIDGET_H
@@ -31,9 +31,10 @@
 class FreeBusyWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~FreeBusyWidget();
 
     void loadContact( KABC::Addressee *addr );
@@ -50,9 +51,9 @@ class FreeBusyWidget : public KAB::ContactEditorWidget
 class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new FreeBusyWidget( ab, parent, name );
+      return new FreeBusyWidget( ab, tqparent, name );
     }
 
     TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index ec8c92f9..4837a1ef 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/geo.h>
@@ -44,8 +44,8 @@
 
 #include "geowidget.h"
 
-GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
+GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
 {
   TQLabel *label = 0;
 
@@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->tqsetAlignment( Qt::AlignTop );
+  label->tqsetAlignment( TQt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
 
   mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this );
@@ -157,9 +157,9 @@ void GeoWidget::editGeoData()
 
 
 
-GeoDialog::GeoDialog( TQWidget *parent, const char *name )
+GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok,
-                 parent, name, true, true ),
+                 tqparent, name, true, true ),
     mUpdateSexagesimalInput( true )
 {
   TQFrame *page = plainPage();
@@ -408,9 +408,9 @@ void GeoDialog::loadCityList()
       }
 
       if ( !c.isEmpty() && !n.isEmpty() ) {
-        pos = c.find( "+", 1 );
+        pos = c.tqfind( "+", 1 );
         if ( pos < 0 )
-          pos = c.find( "-", 1 );
+          pos = c.tqfind( "-", 1 );
         if ( pos > 0 ) {
           GeoData data;
           data.latitude = calculateCoordinate( c.left( pos ) );
@@ -482,8 +482,8 @@ int GeoDialog::nearestCity( double x, double y ) const
 }
 
 
-GeoMapWidget::GeoMapWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
+GeoMapWidget::GeoMapWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mLatitude( 0 ), mLongitude( 0 )
 {
   setBackgroundMode( NoBackground );
 
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 0713d02e..f6f8dffd 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef GEOWIDGET_H
@@ -51,9 +51,10 @@ typedef struct {
 class GeoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~GeoWidget();
 
     void loadContact( KABC::Addressee *addr );
@@ -77,9 +78,10 @@ class GeoWidget : public KAB::ContactEditorWidget
 class GeoDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GeoDialog( TQWidget *parent, const char *name = 0 );
+    GeoDialog( TQWidget *tqparent, const char *name = 0 );
     ~GeoDialog();
 
     void setLatitude( double latitude );
@@ -119,12 +121,13 @@ class GeoDialog : public KDialogBase
     bool mUpdateSexagesimalInput;
 };
 
-class GeoMapWidget : public QWidget
+class GeoMapWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GeoMapWidget( TQWidget *parent, const char *name = 0 );
+    GeoMapWidget( TQWidget *tqparent, const char *name = 0 );
     ~GeoMapWidget();
 
     void setLatitude( double latitude );
@@ -148,9 +151,9 @@ class GeoMapWidget : public QWidget
 class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new GeoWidget( ab, parent, name );
+      return new GeoWidget( ab, tqparent, name );
     }
 
     TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 4a8ab340..0dc83ae4 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/picture.h>
@@ -47,8 +47,8 @@
 
 #include "imagewidget.h"
 
-ImageLoader::ImageLoader( TQWidget *parent )
-  : TQObject( 0, "ImageLoader" ), mParent( parent )
+ImageLoader::ImageLoader( TQWidget *tqparent )
+  : TQObject( 0, "ImageLoader" ), mParent( tqparent )
 {
 }
 
@@ -103,8 +103,8 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
 }
 
 
-ImageButton::ImageButton( const TQString &title, TQWidget *parent )
-  : TQPushButton( title, parent ),
+ImageButton::ImageButton( const TQString &title, TQWidget *tqparent )
+  : TQPushButton( title, tqparent ),
     mReadOnly( false ), mImageLoader( 0 )
 {
   setAcceptDrops( true );
@@ -247,14 +247,14 @@ void ImageButton::clear()
 }
 
 ImageBaseWidget::ImageBaseWidget( const TQString &title,
-                                  TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mReadOnly( false )
+                                  TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mReadOnly( false )
 {
   mImageLoader = new ImageLoader( this );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                             KDialog::spacingHint() );
-  TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
+  TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this );
   TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
 
   mImageButton = new ImageButton( i18n( "Picture" ), box );
@@ -290,8 +290,8 @@ KABC::Picture ImageBaseWidget::image() const
 }
 
 
-ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name )
+ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name )
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 82c8426f..52b9c9c6 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef IMAGEWIDGET_H
@@ -35,12 +35,13 @@
 /**
   Small helper class
  */
-class ImageLoader : public QObject
+class ImageLoader : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ImageLoader( TQWidget *parent );
+    ImageLoader( TQWidget *tqparent );
 
     KABC::Picture loadPicture( const KURL &url, bool *ok );
 
@@ -52,12 +53,13 @@ class ImageLoader : public QObject
 /**
   Small helper class
  */
-class ImageButton : public QPushButton
+class ImageButton : public TQPushButton
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ImageButton( const TQString &title, TQWidget *parent );
+    ImageButton( const TQString &title, TQWidget *tqparent );
 
     void setReadOnly( bool readOnly );
 
@@ -93,12 +95,13 @@ class ImageButton : public QPushButton
 };
 
 
-class ImageBaseWidget : public QWidget
+class ImageBaseWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 );
+    ImageBaseWidget( const TQString &title, TQWidget *tqparent, const char *name = 0 );
     ~ImageBaseWidget();
 
     /**
@@ -126,7 +129,7 @@ class ImageBaseWidget : public QWidget
 class ImageWidget : public KAB::ContactEditorWidget
 {
   public:
-    ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     void loadContact( KABC::Addressee *addr );
     void storeContact( KABC::Addressee *addr );
@@ -142,9 +145,9 @@ class ImageWidget : public KAB::ContactEditorWidget
 class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new ImageWidget( ab, parent, name );
+      return new ImageWidget( ab, tqparent, name );
     }
 
     TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index 11827f89..c7507afc 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -43,8 +43,8 @@
 #include "imeditwidget.h"
 #include "imeditorwidget.h"
 
-IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name )
-  : TQWidget( parent, name ), mAddressee(addr)
+IMEditWidget::IMEditWidget( TQWidget *tqparent, KABC::Addressee &addr, const char *name )
+  : TQWidget( tqparent, name ), mAddressee(addr)
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(),
                                             KDialog::spacingHint() );
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index 0d1ee222..d528fafe 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef IMEDITWIDGET_H
@@ -41,12 +41,13 @@ class KListView;
   This widget displays a list box of the instant messaging addresses as well as buttons
   to manipulate them (up, down, add, remove).
 */
-class IMEditWidget : public QWidget
+class IMEditWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 );
+    IMEditWidget(TQWidget *tqparent, KABC::Addressee &addr, const char *name = 0 );
     ~IMEditWidget();
 
     void setIMs( const TQStringList &list );
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 74349bd7..6b346327 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -37,8 +37,8 @@
 
 #include "incsearchwidget.h"
 
-IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
-    : TQWidget( parent, name )
+IncSearchWidget::IncSearchWidget( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name )
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
 
@@ -159,10 +159,10 @@ void IncSearchWidget::clear()
 
 void IncSearchWidget::keyPressEvent( TQKeyEvent *event )
 {
-  if ( event->key() == Qt::Key_Up ) {
+  if ( event->key() == TQt::Key_Up ) {
     event->accept();
     emit scrollUp();
-  } else if ( event->key() == Qt::Key_Down ) {
+  } else if ( event->key() == TQt::Key_Down ) {
     event->accept();
     emit scrollDown();
   }
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 0d400c0f..fa3a99a2 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef INCSEARCHWIDGET_H
@@ -32,12 +32,13 @@ class TQComboBox;
 class TQTimer;
 class KLineEdit;
 
-class IncSearchWidget : public QWidget
+class IncSearchWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IncSearchWidget( TQWidget *parent, const char *name = 0 );
+    IncSearchWidget( TQWidget *tqparent, const char *name = 0 );
     ~IncSearchWidget();
 
     KABC::Field::List currentFields() const;
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index f82b757f..1f9325ed 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/addressbook.h>
@@ -27,9 +27,9 @@
 
 using namespace KAB;
 
-ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                   const char *name )
-  : TQWidget( parent, name ), mAddressBook( ab )
+  : TQWidget( tqparent, name ), mAddressBook( ab )
 {
 }
 
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 0ce35e5c..89e98008 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_CONFIGUREWIDGET_H
@@ -35,10 +35,10 @@ class AddressBook;
 
 namespace KAB {
 
-class KDE_EXPORT ConfigureWidget : public QWidget
+class KDE_EXPORT ConfigureWidget : public TQWidget
 {
   public:
-    ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~ConfigureWidget();
 
     /**
diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp
index 45b38ef3..230f8d01 100644
--- a/kaddressbook/interfaces/contacteditorwidget.cpp
+++ b/kaddressbook/interfaces/contacteditorwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "contacteditorwidget.h"
@@ -26,8 +26,8 @@
 using namespace KAB;
 
 ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab,
-                                          TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mAddressBook( ab ), mModified( false )
+                                          TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mAddressBook( ab ), mModified( false )
 {
 }
 
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 28a376e7..dc8039b6 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_CONTACTEDITORWIDGET_H
@@ -34,14 +34,15 @@
 
 namespace KAB {
 
-class KDE_EXPORT ContactEditorWidget : public QWidget
+class KDE_EXPORT ContactEditorWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     typedef TQValueList<ContactEditorWidget*> List;
 
-    ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ContactEditorWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~ContactEditorWidget();
 
     /**
@@ -116,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public QWidget
 class ContactEditorWidgetFactory : public KLibFactory
 {
   public:
-    virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent,
+    virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                                const char *name = 0 ) = 0;
 
     /**
diff --git a/kaddressbook/interfaces/core.cpp b/kaddressbook/interfaces/core.cpp
index 7f7d1048..b604d656 100644
--- a/kaddressbook/interfaces/core.cpp
+++ b/kaddressbook/interfaces/core.cpp
@@ -17,16 +17,16 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "core.h"
 
 using namespace KAB;
 
-Core::Core( KXMLGUIClient *client, TQObject *parent, const char *name )
-  : TQObject( parent, name ), mGUIClient( client )
+Core::Core( KXMLGUIClient *client, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mGUIClient( client )
 {
 }
 
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 16fa4c83..b4289249 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_CORE_H
@@ -52,12 +52,13 @@ namespace KAB {
 
 class SearchManager;
 
-class KDE_EXPORT Core : public QObject
+class KDE_EXPORT Core : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 );
+    Core( KXMLGUIClient *client, TQObject *tqparent, const char *name = 0 );
 
     /**
       Returns a pointer to the StdAddressBook of the application.
@@ -95,10 +96,10 @@ class KDE_EXPORT Core : public QObject
       resource or a null pointer if no resource was selected by
       the user.
      */
-    virtual KABC::Resource *requestResource( TQWidget *parent ) = 0;
+    virtual KABC::Resource *requestResource( TQWidget *tqparent ) = 0;
 
     /**
-      Returns the parent widget.
+      Returns the tqparent widget.
      */
     virtual TQWidget *widget() const = 0;
 
@@ -187,7 +188,7 @@ class KDE_EXPORT Core : public QObject
     /**
       Shows an edit dialog for the given uid.
      */
-    virtual void editContact( const TQString &uid = TQString::null ) = 0;
+    virtual void editContact( const TQString &uid = TQString() ) = 0;
 
     /**
       Shows an edit dialog for the given distribution list 
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index 75622935..bae99b03 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "core.h"
@@ -27,9 +27,9 @@
 
 using namespace KAB;
 
-ExtensionWidget::ExtensionWidget( Core *core, TQWidget *parent,
+ExtensionWidget::ExtensionWidget( Core *core, TQWidget *tqparent,
                                   const char *name )
-  : TQWidget( parent, name ), mCore( core )
+  : TQWidget( tqparent, name ), mCore( core )
 {
 }
 
@@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt = uids.end();
   for ( it = uids.begin(); it != endIt; ++it )
-    list.append( mCore->addressBook()->tqfindByUid( *it ) );
+    list.append( mCore->addressBook()->findByUid( *it ) );
 
   return list;
 }
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 52ee946c..7b3daca9 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_EXTENSIONWIDGET_H
@@ -36,12 +36,13 @@ namespace KAB {
 class Core;
 class ConfigureWidget;
 
-class KDE_EXPORT ExtensionWidget : public QWidget
+class KDE_EXPORT ExtensionWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 );
+    ExtensionWidget( Core *core, TQWidget *tqparent, const char *name = 0 );
     ~ExtensionWidget();
 
     /**
@@ -91,7 +92,7 @@ class KDE_EXPORT ExtensionWidget : public QWidget
 class ExtensionFactory : public KLibFactory
 {
   public:
-    virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *parent,
+    virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent,
                                         const char *name = 0 ) = 0;
 
     virtual ConfigureWidget *configureWidget( TQWidget*, const char* = 0 )
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 798ebf55..d4f5b286 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqmap.h>
@@ -40,9 +40,9 @@ class XXPort::XXPortPrivate
     KApplication *mKApp;
 };
 
-XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
+XXPort::XXPort( KABC::AddressBook *ab, TQWidget *tqparent,
                             const char *name )
-  : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
+  : TQObject( tqparent, name ), mAddressBook( ab ), mParentWidget( tqparent ),
     d( new XXPortPrivate )
 {
   setInstance( new KInstance( "kaddressbook" ) );
@@ -117,12 +117,12 @@ void XXPort::processEvents() const
 
 void XXPort::slotExportActivated( const TQString &data )
 {
-  emit exportActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) );
+  emit exportActivated( identifier(), ( data == "<empty>" ? TQString() : data ) );
 }
 
 void XXPort::slotImportActivated( const TQString &data )
 {
-  emit importActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) );
+  emit importActivated( identifier(), ( data == "<empty>" ? TQString() : data ) );
 }
 
 #include "xxport.moc"
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index d8b83c40..9b41850f 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KAB_XXPORT_H
@@ -45,10 +45,10 @@ class KApplication;
  */
 #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \
  class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \
-	KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \
+	KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) \
 	 { const char *cat = catalog; \
 	   if (cat) KGlobal::locale()->insertCatalogue(cat); \
-	   return new XXPortClass( ab, parent, name ); \
+	   return new XXPortClass( ab, tqparent, name ); \
          } \
  }; \
  K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory )
@@ -68,9 +68,10 @@ namespace KAB {
 class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~XXPort();
 
     /**
@@ -94,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     /**
       Processes outstanding KApplication events. It should be called
       occasionally when the import/export filter is busy performing
-      a long operation (e.g. reading from slow external devices).
+      a long operation (e.g. reading from slow external tqdevices).
       @see: TQApplication::processEvents()
      */
     void processEvents() const;
@@ -113,14 +114,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
   signals:
     /**
       Emitted whenever the export action is activated.
-      The parameter tqcontains the @ref identifier() for
+      The parameter contains the @ref identifier() for
       unique identification.
      */
     void exportActivated( const TQString&, const TQString& );
 
     /**
       Emitted whenever the import action is activated.
-      The parameter tqcontains the @ref identifier() for
+      The parameter contains the @ref identifier() for
       unique identification.
      */
     void importActivated( const TQString&, const TQString& );
@@ -129,12 +130,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     /**
       Create the import action. The identifier is passed in the import slot.
      */
-    void createImportAction( const TQString &label, const TQString &identifier = TQString::null );
+    void createImportAction( const TQString &label, const TQString &identifier = TQString() );
 
     /**
       Create the export action. The identifier is passed in the export slot.
      */
-    void createExportAction( const TQString &label, const TQString &identifier = TQString::null );
+    void createExportAction( const TQString &label, const TQString &identifier = TQString() );
 
     /**
       Returns a pointer to the address book object.
@@ -142,7 +143,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     KABC::AddressBook *addressBook() const;
 
     /**
-      Returns a pointer to the parent widget. It can be used as parent for
+      Returns a pointer to the tqparent widget. It can be used as tqparent for
       message boxes.
      */
     TQWidget *tqparentWidget() const;
@@ -162,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 class XXPortFactory : public KLibFactory
 {
   public:
-    virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent,
+    virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent,
                                   const char *name = 0 ) = 0;
 
   protected:
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index aa7cb891..4ef22bc5 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -39,11 +39,11 @@
 
 #include "jumpbuttonbar.h"
 
-class JumpButton : public QPushButton
+class JumpButton : public TQPushButton
 {
   public:
     JumpButton( const TQString &firstChar, const TQString &lastChar,
-                TQWidget *parent );
+                TQWidget *tqparent );
 
     TQString firstChar() const { return mChar; }
 
@@ -52,8 +52,8 @@ class JumpButton : public QPushButton
 };
 
 JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar,
-                        TQWidget *parent )
-  : TQPushButton( "", parent ), mChar( firstChar )
+                        TQWidget *tqparent )
+  : TQPushButton( "", tqparent ), mChar( firstChar )
 {
   setToggleButton( true );
   if ( !lastChar.isEmpty() )
@@ -62,17 +62,17 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar,
     setText( firstChar.upper() );
 }
 
-JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mCore( core )
+JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mCore( core )
 {
   setMinimumSize( 1, 1 );
 
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 );
-  tqlayout->tqsetAlignment( Qt::AlignTop );
+  tqlayout->tqsetAlignment( TQt::AlignTop );
   tqlayout->setAutoAdd( true );
   tqlayout->setResizeMode( TQLayout::FreeResize );
 
-  mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
+  mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this );
   mGroupBox->setExclusive( true );
   mGroupBox->tqlayout()->setSpacing( 0 );
   mGroupBox->tqlayout()->setMargin( 0 );
@@ -130,7 +130,7 @@ void JumpButtonBar::updateButtons()
   if ( characters.count() <= possibleButtons ) {
     // at first the easy case: all buttons fits in window
     for ( uint i = 0; i < characters.count(); ++i ) {
-      JumpButton *button = new JumpButton( characters[ i ], TQString::null,
+      JumpButton *button = new JumpButton( characters[ i ], TQString(),
                                            mGroupBox );
       connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) );
       mButtons.append( button );
@@ -150,7 +150,7 @@ void JumpButtonBar::updateButtons()
         continue;
       if ( characters.count() - current <= possibleButtons - i ) {
         JumpButton *button = new JumpButton( characters[ current ],
-                                             TQString::null, mGroupBox );
+                                             TQString(), mGroupBox );
         connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) );
         mButtons.append( button );
         button->show();
@@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons()
   int maxWidth = 0;
   TQPushButton *button;
   for ( button = mButtons.first(); button; button = mButtons.next() )
-    maxWidth = QMAX( maxWidth, button->tqsizeHint().width() );
+    maxWidth = TQMAX( maxWidth, button->tqsizeHint().width() );
 
   setFixedWidth( maxWidth );
 }
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index 7ff67898..6408582d 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef JUMPBUTTONBAR_H
@@ -44,12 +44,13 @@ class Field;
 /**
   Used to draw the jump button bar on the right of the view.
  */
-class JumpButtonBar : public QWidget
+class JumpButtonBar : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 );
+    JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
     ~JumpButtonBar();
 
   public slots:
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 66b0bb81..14f9577a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 // Needed for ugly hack, to be removed in 4.0
@@ -92,16 +92,16 @@
 
 #include "kabcore.h"
 
-KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
+KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
                   const TQString &file, const char *name )
-  : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ),
+  : KAB::Core( client, tqparent, name ), mStatusBar( 0 ), mViewManager( 0 ),
     mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
     mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
     mModified( false )
 {
-  mWidget = new TQWidget( parent, name );
+  mWidget = new TQWidget( tqparent, name );
 
-  mIsPart = !parent->isA( "KAddressBookMain" );
+  mIsPart = !tqparent->isA( "KAddressBookMain" );
 
   mAddressBookChangedTimer = new TQTimer( this );
   connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ),
@@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
     mAddressBook = new KABC::AddressBook;
     mAddressBook->addResource( new KABC::ResourceFile( file ) );
     if ( !mAddressBook->load() ) {
-      KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) );
+      KMessageBox::error( tqparent, i18n("Unable to load '%1'.").arg( file ) );
     }
   }
   mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
@@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
   mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal,
                                 "BlogFeed", "KADDRESSBOOK" );
 
-  mSearchManager = new KAB::SearchManager( mAddressBook, parent );
+  mSearchManager = new KAB::SearchManager( mAddressBook, tqparent );
 
   connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
            this, TQT_SLOT( slotContactsUpdated() ) );
@@ -270,7 +270,7 @@ TQStringList KABCore::selectedUIDs() const
   return mViewManager->selectedUids();
 }
 
-KABC::Resource *KABCore::requestResource( TQWidget *parent )
+KABC::Resource *KABCore::requestResource( TQWidget *tqparent )
 {
   TQPtrList<KABC::Resource> kabcResources = addressBook()->resources();
 
@@ -301,7 +301,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *parent )
     }
   }
 
-  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
+  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent );
   return static_cast<KABC::Resource*>( res ); // upcast
 }
 
@@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid )
       return;
   }
 
-  KABC::Addressee addr = mAddressBook->tqfindByUid( uid );
+  KABC::Addressee addr = mAddressBook->findByUid( uid );
   if ( !mDetailsViewer->isHidden() )
     mDetailsViewer->setAddressee( addr );
 #ifdef KDEPIM_NEW_DISTRLISTS
@@ -430,9 +430,9 @@ void KABCore::setContactSelected( const TQString &uid )
   mActionMerge->setEnabled( ( list.size() == 2 ) && writable );
 
   if ( mReadWrite ) {
-    QClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
-    const TQMimeSource *data = cb->data( QClipboard::Clipboard );
+    const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
     list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
     list = AddresseeUtil::clipboardToAddressees( cb->text() );
@@ -482,7 +482,7 @@ void KABCore::browse( const TQString& url )
 
 void KABCore::selectAllContacts()
 {
-  mViewManager->setSelected( TQString::null, true );
+  mViewManager->setSelected( TQString(), true );
 }
 
 void KABCore::deleteContacts()
@@ -498,7 +498,7 @@ void KABCore::deleteDistributionLists( const TQStringList & names )
       return;
   if ( KMessageBox::warningContinueCancelList( mWidget, i18n( "Do you really want to delete this distribution list?",
                                                  "Do you really want to delete these %n distribution lists?", names.count() ),
-                                                 names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel )
+                                                 names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel )
    return;
 
   TQStringList uids;
@@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
     TQStringList::ConstIterator it = uids.begin();
     const TQStringList::ConstIterator endIt( uids.end() );
     while ( it != endIt ) {
-      KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
+      KABC::Addressee addr = mAddressBook->findByUid( *it );
       names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
       ++it;
     }
@@ -533,7 +533,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
                  "<b>Note:</b>The contacts will be also removed from all distribution lists."
                  "</qt>",
                  uids.count() ),
-           names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel ) {
+           names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) {
       return;
     }
 
@@ -541,7 +541,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
     mCommandHistory->addCommand( command );
 
     // now if we deleted anything, refresh
-    setContactSelected( TQString::null );
+    setContactSelected( TQString() );
     setModified( true );
   }
 }
@@ -552,11 +552,11 @@ void KABCore::copyContacts()
 
 #if defined(KABC_VCARD_ENCODING_FIX)
   TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   cb->setText( TQString::fromUtf8( clipText.data() ) );
 #else
   TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   cb->setText( clipText );
 #endif
 }
@@ -575,9 +575,9 @@ void KABCore::cutContacts()
 
 void KABCore::pasteContacts()
 {
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
-  const TQMimeSource *data = cb->data( QClipboard::Clipboard );
+  const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
@@ -640,19 +640,19 @@ void KABCore::setWhoAmI()
   }
 
   TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
-  if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString::null, i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
+  if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
     static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
 }
 
 void KABCore::incrementalTextSearch( const TQString& text )
 {
-  setContactSelected( TQString::null );
+  setContactSelected( TQString() );
   mSearchManager->search( text, mIncSearchWidget->currentFields() );
 }
 
 void KABCore::incrementalJumpButtonSearch( const TQString& character )
 {
-  mViewManager->setSelected( TQString::null, false );
+  mViewManager->setSelected( TQString(), false );
 
   KABC::AddresseeList list = mSearchManager->contacts();
   KABC::Field *field = mViewManager->currentSortField();
@@ -692,7 +692,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )
   Command *command = 0;
 
   // check if it exists already
-  KABC::Addressee origAddr = mAddressBook->tqfindByUid( addr.uid() );
+  KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
   if ( origAddr.isEmpty() ) {
     KABC::Addressee::List addressees;
     addressees.append( addr );
@@ -829,9 +829,9 @@ void KABCore::editContact( const TQString &uid )
   }
 #endif
 
-  KABC::Addressee addr = mAddressBook->tqfindByUid( localUID );
+  KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
-    AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
+    AddresseeEditorDialog *dialog = mEditorDict.tqfind( addr.uid() );
     if ( !dialog ) {
 
       if ( !addr.resource()->readOnly() )
@@ -950,7 +950,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list )
       Command *command = 0;
 
       // check if it exists already
-      KABC::Addressee origAddr = mAddressBook->tqfindByUid( (*it).uid() );
+      KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() );
       if ( origAddr.isEmpty() ) {
         KABC::Addressee::List addressees;
         addressees.append( *it );
@@ -973,7 +973,7 @@ void KABCore::extensionDeleted( const TQStringList &uidList )
   mCommandHistory->addCommand( command );
 
   // now if we deleted anything, refresh
-  setContactSelected( TQString::null );
+  setContactSelected( TQString() );
   setModified( true );
 }
 
@@ -1084,7 +1084,7 @@ void KABCore::showContactsAddress( const TQString &addrUid )
   if ( uidList.isEmpty() )
     return;
 
-  KABC::Addressee addr = mAddressBook->tqfindByUid( uidList.first() );
+  KABC::Addressee addr = mAddressBook->findByUid( uidList.first() );
   if ( addr.isEmpty() )
     return;
 
@@ -1139,9 +1139,9 @@ void KABCore::addressBookChanged()
 
   mSearchManager->reload();
 
-  mViewManager->setSelected( TQString::null, false );
+  mViewManager->setSelected( TQString(), false );
 
-  TQString uid = TQString::null;
+  TQString uid = TQString();
   if ( !selectedUids.isEmpty() ) {
     uid = selectedUids.first();
     mViewManager->setSelected( uid, true );
@@ -1152,10 +1152,10 @@ void KABCore::addressBookChanged()
   updateCategories();
 }
 
-AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent,
+AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *tqparent,
                                                              const char *name )
 {
-  AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent,
+  AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, tqparent,
                                                  name ? name : "editorDialog" );
   connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ),
            TQT_SLOT( contactModified( const KABC::Addressee& ) ) );
@@ -1186,7 +1186,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid )
   KABC::Addressee addr = dialog->addressee();
 
   if ( !addr.resource()->readOnly() ) {
-    TQApplication::setOverrideCursor( Qt::waitCursor );
+    TQApplication::setOverrideCursor( TQt::waitCursor );
     KABLock::self( mAddressBook )->unlock( addr.resource() );
     TQApplication::restoreOverrideCursor();
   }
@@ -1205,7 +1205,7 @@ void KABCore::initGUI()
   mDetailsSplitter = new TQSplitter( mWidget );
 
   mLeftSplitter = new TQSplitter( mDetailsSplitter );
-  mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal );
+  mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal );
 
   topLayout->addWidget( searchTB );
   topLayout->addWidget( mDetailsSplitter );
@@ -1406,7 +1406,7 @@ void KABCore::initActions()
   action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
 
   // misc
-  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
+  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "tqfind", 0,
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
 
@@ -1449,7 +1449,7 @@ void KABCore::updateCategories()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( customCategories.end() );
   for ( it = customCategories.begin(); it != endIt; ++it ) {
-    if ( categories.find( *it ) == categories.end() ) {
+    if ( categories.tqfind( *it ) == categories.end() ) {
       categories.append( *it );
     }
   }
@@ -1503,14 +1503,14 @@ void KABCore::categoriesSelected( const TQStringList &categories )
 {
   bool merge = false;
   TQString msg = i18n( "Merge with existing categories?" );
-  if ( KMessageBox::questionYesNo( mWidget, msg, TQString::null, i18n( "Merge" ), i18n( "Do Not Merge" ) ) == KMessageBox::Yes )
+  if ( KMessageBox::questionYesNo( mWidget, msg, TQString(), i18n( "Merge" ), i18n( "Do Not Merge" ) ) == KMessageBox::Yes )
     merge = true;
 
   TQStringList uids = mViewManager->selectedUids();
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( it = uids.begin(); it != endIt; ++it ) {
-    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
+    KABC::Addressee addr = mAddressBook->findByUid( *it );
     if ( !addr.isEmpty() ) {
       if ( !merge )
         addr.setCategories( categories );
@@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList()
   TQStringList::ConstIterator it = uids.begin();
   const TQStringList::ConstIterator endIt( uids.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
+    KABC::Addressee addr = mAddressBook->findByUid( *it );
     names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
     ++it;
   }
@@ -1635,7 +1635,7 @@ void KABCore::removeSelectedContactsFromDistList()
                "any other distribution list."
                "</qt>",
                uids.count() ).arg( mSelectedDistributionList ),
-         names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel ) {
+         names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) {
     return;
   }
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d1c27575..aed5e08f 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABCORE_H
@@ -83,10 +83,11 @@ typedef struct {
 class KDE_EXPORT KABCore : public KAB::Core
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
-             const TQString &file = TQString::null, const char *name = 0 );
+    KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
+             const TQString &file = TQString(), const char *name = 0 );
     ~KABCore();
 
     /**
@@ -130,10 +131,10 @@ class KDE_EXPORT KABCore : public KAB::Core
       resource or a null pointer if no resource was selected by
       the user.
      */
-    KABC::Resource *requestResource( TQWidget *parent );
+    KABC::Resource *requestResource( TQWidget *tqparent );
 
     /**
-      Returns the parent widget.
+      Returns the tqparent widget.
      */
     TQWidget *widget() const;
 
@@ -340,16 +341,16 @@ class KDE_EXPORT KABCore : public KAB::Core
     void load();
 
     /**
-      Shows the edit dialog for the given uid. If the uid is TQString::null,
+      Shows the edit dialog for the given uid. If the uid is TQString(),
       the method will try to find a selected addressee in the view.
      */
-    void editContact( const TQString &uid = TQString::null );
+    void editContact( const TQString &uid = TQString() );
 
     /**
      * Let the user chose a different resource for the selected contacts.
      * If the adding to the new resource is successfull, the contact is
      * removed from the old one, unless the Copy flag is given. */
-    void storeContactIn( const TQString &uid = TQString::null, bool copy = false );
+    void storeContactIn( const TQString &uid = TQString(), bool copy = false );
 
     /**
      * Lets the user chose a different resource for the selected contacts and
@@ -434,7 +435,7 @@ class KDE_EXPORT KABCore : public KAB::Core
     void updateCategories();
     TQStringList allCategories() const;
 
-    AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *parent,
+    AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *tqparent,
                                                         const char *name = 0 );
 
     TQWidget *mWidget;
diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp
index acb6c287..259ee70d 100644
--- a/kaddressbook/kablock.cpp
+++ b/kaddressbook/kablock.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/addressbook.h>
@@ -65,7 +65,7 @@ KABLock *KABLock::self( KABC::AddressBook *ab )
 
 bool KABLock::lock( KABC::Resource *resource )
 {
-  if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet
+  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // not locked yet
     KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource );
     if ( !ticket ) {
       return false;
@@ -89,7 +89,7 @@ bool KABLock::unlock( KABC::Resource *resource )
   if ( resource == 0 )
     resource = wrapper->getStandardResource();
 
-  if ( mLocks.find( resource ) == mLocks.end() ) { // hmm, not good...
+  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // hmm, not good...
     return false;
   } else {
     LockEntry &entry = mLocks[ resource ];
diff --git a/kaddressbook/kablock.h b/kaddressbook/kablock.h
index a90f77c9..a706d88f 100644
--- a/kaddressbook/kablock.h
+++ b/kaddressbook/kablock.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABLOCK_H
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 83571a7a..0b98eab3 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/addressbook.h>
@@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
   TQStringList::ConstIterator it( uids.begin() );
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( ; it != endIt; ++it ) {
-    KABC::Addressee addressee = ab->tqfindByUid( *it );
+    KABC::Addressee addressee = ab->findByUid( *it );
 
     if ( addressee.isEmpty() )
       continue;
@@ -97,10 +97,10 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
     }
   }
 
-  kapp->invokeMailer( TQString::null, TQString::null, TQString::null,
-                      TQString::null,
-                      TQString::null,
-                      TQString::null,
+  kapp->invokeMailer( TQString(), TQString(), TQString(),
+                      TQString(),
+                      TQString(),
+                      TQString(),
                       urls.toStringList() );
 }
 
diff --git a/kaddressbook/kabtools.h b/kaddressbook/kabtools.h
index 0d57c65e..504540e9 100644
--- a/kaddressbook/kabtools.h
+++ b/kaddressbook/kabtools.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABTOOLS_H
diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h
index 9439870b..7b12532c 100644
--- a/kaddressbook/kaddressbook_options.h
+++ b/kaddressbook/kaddressbook_options.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOK_OPTIONS_H
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 39216b8f..a29380ad 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -43,9 +43,9 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory;
 K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory )
 
 KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
-                                    TQObject *parent, const char *name,
+                                    TQObject *tqparent, const char *name,
                                     const TQStringList & )
-  : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name )
+  : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name )
 {
   setInstance( KAddressbookFactory::instance() );
 
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index c2e6b10f..05e099d2 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KADDRESSBOOK_PART_H
 #define KADDRESSBOOK_PART_H
@@ -37,10 +37,11 @@ class KABCore;
 class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
-                      TQObject *parent, const char *name, const TQStringList& );
+                      TQObject *tqparent, const char *name, const TQStringList& );
     virtual ~KAddressbookPart();
 
     static KAboutData *createAboutData();
diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h
index ffdf941e..2b70849f 100644
--- a/kaddressbook/kaddressbookiface.h
+++ b/kaddressbook/kaddressbookiface.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKIFACE_H
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index cf67d2ee..55f664a6 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kedittoolbar.h>
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index aa1bb4eb..0047f534 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKMAIN_H
@@ -45,9 +45,10 @@ class KABCore;
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookMain( const TQString &file = TQString::null );
+    KAddressBookMain( const TQString &file = TQString() );
     virtual ~KAddressBookMain();
 
   public slots:
diff --git a/kaddressbook/kaddressbookservice.cpp b/kaddressbook/kaddressbookservice.cpp
index 320e9099..859db0ff 100644
--- a/kaddressbook/kaddressbookservice.cpp
+++ b/kaddressbook/kaddressbookservice.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "core.h"
diff --git a/kaddressbook/kaddressbookservice.h b/kaddressbook/kaddressbookservice.h
index ac323f64..4470ff02 100644
--- a/kaddressbook/kaddressbookservice.h
+++ b/kaddressbook/kaddressbookservice.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKSERVICE_H
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 2059fbb3..9f1aa3ce 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -37,9 +37,9 @@
 
 #include "kaddressbookview.h"
 
-KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent,
+KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *tqparent,
                                     const char *name )
-    : TQWidget( parent, name ), mCore( core ), mFieldList()
+    : TQWidget( tqparent, name ), mCore( core ), mFieldList()
 {
   initGUI();
 
@@ -79,10 +79,10 @@ TQString KAddressBookView::selectedEmails()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it ) {
-    addr = mCore->addressBook()->tqfindByUid( *it );
+    addr = mCore->addressBook()->findByUid( *it );
 
     if ( !addr.isEmpty() ) {
-      TQString m = TQString::null;
+      TQString m = TQString();
 
       if ( addr.emails().count() > 1 )
         m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this );
@@ -189,15 +189,15 @@ void KAddressBookView::updateView()
     if ( !contacts.isEmpty() )
       setFirstSelected( true );
     else
-      emit selected( TQString::null );
+      emit selected( TQString() );
   }
 }
 
 ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
-                                                   TQWidget *parent,
+                                                   TQWidget *tqparent,
                                                    const char *name )
 {
-  return new ViewConfigureWidget( ab, parent, name );
+  return new ViewConfigureWidget( ab, tqparent, name );
 }
 
 #include "kaddressbookview.moc"
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index a851e684..eca5521b 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKVIEW_H
@@ -53,14 +53,15 @@ namespace KABC { class AddressBook; }
 
   @author Mike Pilone <mpilone@slac.com>
  */
-class KDE_EXPORT KAddressBookView : public QWidget
+class KDE_EXPORT KAddressBookView : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };
 
-    KAddressBookView( KAB::Core *core, TQWidget *parent, const char *name );
+    KAddressBookView( KAB::Core *core, TQWidget *tqparent, const char *name );
     virtual ~KAddressBookView();
 
     /**
@@ -169,7 +170,7 @@ class KDE_EXPORT KAddressBookView : public QWidget
     /**
       This method must be overloaded in subclasses. Select (highlight)
       the addressee matching <i>uid</i>. If uid
-      is equal to TQString::null, then all addressees should be selected.
+      is equal to TQString(), then all addressees should be selected.
      */
     virtual void setSelected( const TQString &uid = TQString(), bool selected = true ) = 0;
 
@@ -250,8 +251,8 @@ class KDE_EXPORT KAddressBookView : public QWidget
     KABC::Addressee::List addressees();
 
     /**
-      This method returns the widget that should be used as the parent for
-      all view components. By using this widget as the parent and not
+      This method returns the widget that should be used as the tqparent for
+      all view components. By using this widget as the tqparent and not
       'this', the view subclass has the option of placing other widgets
       around the view (ie: search fields, etc). Do not delete this widget!
      */
@@ -275,7 +276,7 @@ class KDE_EXPORT KAddressBookView : public QWidget
 class KDE_EXPORT ViewFactory : public KLibFactory
 {
   public:
-    virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent,
+    virtual KAddressBookView *view( KAB::Core *core, TQWidget *tqparent,
                                     const char *name = 0 ) = 0;
     /**
       @return The type of the view. This is normally a small one word
@@ -300,7 +301,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory
       <B>not</B> be called.
      */
     virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab,
-                                                  TQWidget *parent,
+                                                  TQWidget *tqparent,
                                                   const char *name = 0 );
 
   protected:
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index c09e5b94..a6174dff 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -33,8 +33,8 @@
 #include <klocale.h>
 #include "addhostdialog.h"
 
-AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const char* name )
-  : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, parent, name, true, true )
+AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* tqparent,  const char* name )
+  : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, tqparent, name, true, true )
 {
   mServer = server;
 
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 702bb323..956892d9 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDHOSTDIALOG_H
@@ -35,9 +35,10 @@ class TQSpinBox;
 class AddHostDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 );
+    AddHostDialog( KPIM::LdapServer* server, TQWidget* tqparent = 0, const char* name = 0 );
     ~AddHostDialog();
 
   signals:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index a7d9ebe6..b68e96c6 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcstring.h>
@@ -41,12 +41,12 @@
 #include "addresseewidget.h"
 
 NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
-                                TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mTitle( title ), mLabel( label )
+                                TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mTitle( title ), mLabel( label )
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
-  TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
+  TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
   TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
@@ -55,7 +55,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
            TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
   groupLayout->addWidget( mBox, 0, 0 );
 
-  KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
+  KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
   mAddButton = bbox->addButton( i18n( "Add..." ), this,  TQT_SLOT( add() ) );
   mEditButton = bbox->addButton( i18n( "Edit..." ), this,  TQT_SLOT( edit() ) );
   mEditButton->setEnabled( false );
@@ -91,7 +91,7 @@ void NamePartWidget::add()
   bool ok;
 
   TQString namePart = KInputDialog::getText( i18n( "New" ), mLabel,
-                                            TQString::null, &ok );
+                                            TQString(), &ok );
   if ( ok && !namePart.isEmpty() ) {
     mBox->insertItem( namePart );
     emit modified();
@@ -131,8 +131,8 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
 
 
 
-AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+AddresseeWidget::AddresseeWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index b8bbf217..8c81ac23 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEWIDGET_H
@@ -33,12 +33,13 @@ class TQListBox;
 class TQListBoxItem;
 class TQPushButton;
 
-class NamePartWidget : public QWidget
+class NamePartWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent,
+    NamePartWidget( const TQString &title, const TQString &label, TQWidget *tqparent,
                     const char *name = 0 );
     ~NamePartWidget();
 
@@ -65,12 +66,13 @@ class NamePartWidget : public QWidget
     TQString mLabel;
 };
 
-class AddresseeWidget : public QWidget
+class AddresseeWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeWidget( TQWidget *parent, const char *name = 0 );
+    AddresseeWidget( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeWidget();
 
     void restoreSettings();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 0758f320..62716886 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -30,8 +30,8 @@
 #include "extensionwidget.h"
 
 ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
-                                              TQWidget *parent, const char *name )
-  : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
+                                              TQWidget *tqparent, const char *name )
+  : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, tqparent,
                  name, true, true ), mWidget( 0 ), mConfig( config )
 {
   TQFrame *page = plainPage();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 34339fa0..de5f506b 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef EXTENSIONCONFIGDIALOG_H
@@ -35,10 +35,11 @@ class ConfigureWidget;
 class ExtensionConfigDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
-                           TQWidget *parent, const char *name = 0 );
+                           TQWidget *tqparent, const char *name = 0 );
     ~ExtensionConfigDialog();
 
   protected slots:
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index d1888624..c65255db 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -45,8 +45,8 @@
 
 #include "kabconfigwidget.h"
 
-KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
@@ -59,9 +59,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
+  TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
   TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   tqlayout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
   TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,9 +126,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   tqlayout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
   boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mLocationMapURL = new TQComboBox( true, groupBox );
   mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 54cdbf0e..e169f2ef 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABCONFIGWIDGET_H
@@ -36,12 +36,13 @@ class KListView;
 
 class AddresseeWidget;
 
-class KABConfigWidget : public QWidget
+class KABConfigWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KABConfigWidget( TQWidget *parent, const char *name = 0 );
+    KABConfigWidget( TQWidget *tqparent, const char *name = 0 );
 
     void restoreSettings();
     void saveSettings();
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 2d29acdf..e007f2b5 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=find
+Icon=tqfind
 Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index f112c4c8..a504af0b 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -35,13 +35,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
-    return new KCMKabConfig( parent, "kcmkabconfig" );
+  KDE_EXPORT KCModule *create_kabconfig( TQWidget *tqparent, const char * ) {
+    return new KCMKabConfig( tqparent, "kcmkabconfig" );
   }
 }
 
-KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKabConfig::KCMKabConfig( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index 5ffecea5..74232946 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKABCONFIG_H
@@ -31,9 +31,10 @@ class KABConfigWidget;
 class KCMKabConfig : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKabConfig( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 3b127eab..8c0fa731 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kcmkabcustomfields.h"
@@ -33,13 +33,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
-    return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
+  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *tqparent, const char * ) {
+    return new KCMKabCustomFields( tqparent, "kcmkabcustomfields" );
   }
 }
 
-KCMKabCustomFields::KCMKabCustomFields( TQWidget *parent, const char *name )
-  : KCMDesignerFields( parent, name )
+KCMKabCustomFields::KCMKabCustomFields( TQWidget *tqparent, const char *name )
+  : KCMDesignerFields( tqparent, name )
 {
 }
 
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
index 38cd19a9..4eb30a88 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KCMKABCUSTOMFIELDS_H
 #define KCMKABCUSTOMFIELDS_H
@@ -28,7 +28,7 @@
 class KCMKabCustomFields : public KPIM::KCMDesignerFields
 {
   public:
-    KCMKabCustomFields( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabCustomFields( TQWidget *tqparent = 0, const char *name = 0 );
 
   protected:
     TQString localUiDir();
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 4cadf263..b2f657c8 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -36,13 +36,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
-    return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
+  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *tqparent, const char * ) {
+    return new KCMKabLdapConfig( tqparent, "kcmkabldapconfig" );
   }
 }
 
-KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 53d1a21b..10ec0d21 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKABLDAPCONFIG_H
@@ -33,9 +33,10 @@ class LDAPOptionsWidget;
 class KCMKabLdapConfig : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabLdapConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 639cec02..e0bbca23 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqgroupbox.h>
@@ -42,11 +42,11 @@
 #include <tqvbox.h>
 #include <kiconloader.h>
 
-class LDAPItem : public QCheckListItem
+class LDAPItem : public TQCheckListItem
 {
   public:
-    LDAPItem( TQListView *parent, const KPIM::LdapServer &server, bool isActive = false )
-      : TQCheckListItem( parent, parent->lastItem(), TQString::null, TQCheckListItem::CheckBox ),
+    LDAPItem( TQListView *tqparent, const KPIM::LdapServer &server, bool isActive = false )
+      : TQCheckListItem( tqparent, tqparent->lastItem(), TQString(), TQCheckListItem::CheckBox ),
         mIsActive( isActive )
     {
       setServer( server );
@@ -69,15 +69,15 @@ class LDAPItem : public QCheckListItem
     bool mIsActive;
 };
 
-LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent,  const char* name )
-  : TQWidget( parent, name )
+LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* tqparent,  const char* name )
+  : TQWidget( tqparent, name )
 {
   initGUI();
 
   mHostListView->setSorting( -1 );
   mHostListView->setAllColumnsShowFocus( true );
   mHostListView->setFullWidth( true );
-  mHostListView->addColumn( TQString::null );
+  mHostListView->addColumn( TQString() );
   mHostListView->header()->hide();
 
   connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 10f1d90d..17fbe6e6 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LDAPOPTIONSWIDGET_H
@@ -31,12 +31,13 @@ class KListView;
 class TQListViewItem;
 class TQPushButton;
 
-class LDAPOptionsWidget : public QWidget
+class LDAPOptionsWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 );
+    LDAPOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 );
     ~LDAPOptionsWidget();
 
     void restoreSettings();
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 0e309452..3949cd14 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -38,8 +38,8 @@
 
 #include "keywidget.h"
 
-KeyWidget::KeyWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+KeyWidget::KeyWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 566589dd..7e9a7b28 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KEYWIDGET_H
@@ -31,12 +31,13 @@ class KComboBox;
 
 class TQPushButton;
 
-class KeyWidget : public QWidget
+class KeyWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KeyWidget( TQWidget *parent, const char *name = 0 );
+    KeyWidget( TQWidget *tqparent, const char *name = 0 );
     ~KeyWidget();
 
     void setKeys( const KABC::Key::List &list );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 7074a596..f2304990 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -49,7 +49,7 @@
 static TQString asUtf8( const TQByteArray &val )
 {
   if ( val.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const char *data = val.data();
 
@@ -101,11 +101,11 @@ static TQMap<TQString, TQString>& adrbookattr2ldap()
   return keys;
 }
 
-class ContactListItem : public QListViewItem
+class ContactListItem : public TQListViewItem
 {
   public:
-    ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs )
-      : TQListViewItem( parent ), mAttrs( attrs )
+    ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs )
+      : TQListViewItem( tqparent ), mAttrs( attrs )
     { }
 
     KPIM::LdapAttrMap mAttrs;
@@ -139,9 +139,9 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi
 }
 
 LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
-                                    TQWidget* parent, const char* name )
+                                    TQWidget* tqparent, const char* name )
   : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 |
-                 Cancel, Default, parent, name, false, true ),
+                 Cancel, Default, tqparent, name, false, true ),
     mAddressBook( ab ), mCore( core ), d( new Private )
 {
   setButtonCancel( KStdGuiItem::close() );
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
                                        page );
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
-  groupBox->setColumnLayout( 0, Qt::Vertical );
+  groupBox->setColumnLayout( 0, TQt::Vertical );
   TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
@@ -202,7 +202,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
   mResultListView->setShowSortIndicator( true );
   topLayout->addWidget( mResultListView );
 
-  KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
+  KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
   buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
   buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
 
@@ -372,7 +372,7 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
       result = result.arg( "telephoneNumber" ).arg( query );
     } else {
       // Error?
-      result = TQString::null;
+      result = TQString();
       return result;
     }
   }
@@ -384,7 +384,7 @@ void LDAPSearchDialog::slotStartSearch()
 {
   cancelQuery();
 
-  TQApplication::setOverrideCursor( Qt::waitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
   mSearchButton->setText( i18n( "Stop" ) );
 
   disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
@@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
     for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
       const ContactListItem * const cli = *it;
       KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
-      const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() );
+      const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
         addr.setUid( KApplication::randomString( 10 ) );
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index f7f384d5..0d9727f6 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -50,9 +50,10 @@ namespace KABC {
 class LDAPSearchDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );
+    LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* tqparent, const char* name = 0 );
     ~LDAPSearchDialog();
 
     bool isOK() const { return mIsOK; }
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index 48cf08b6..bf0f35e5 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <stdlib.h>
@@ -97,7 +97,7 @@ int KAddressBookApp::newInstance()
   // Handle startup notification and window activation
   // We do it ourselves instead of calling KUniqueApplication::newInstance
   // to avoid the show() call there.
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
   static bool firstInstance = true;
 
   if ( !firstInstance )
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index f713ef4e..248c92bd 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -46,9 +46,9 @@
 #include "nameeditdialog.h"
 
 NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
-                                bool readOnly, TQWidget *parent, const char *name )
+                                bool readOnly, TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
-                 Ok, parent, name, true ), mAddressee( addr )
+                 Ok, tqparent, name, true ), mAddressee( addr )
 {
   TQWidget *page = plainPage();
   TQGridLayout *tqlayout = new TQGridLayout( page );
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 793c1a8f..8a160073 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef NAMEEDITDIALOG_H
@@ -40,6 +40,7 @@ class KComboBox;
 class NameEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum FormattedNameType
@@ -53,7 +54,7 @@ class NameEditDialog : public KDialogBase
     };
 
     NameEditDialog( const KABC::Addressee &addr, int type,
-                    bool readOnly, TQWidget *parent, const char *name = 0 );
+                    bool readOnly, TQWidget *tqparent, const char *name = 0 );
     ~NameEditDialog();
 
     TQString familyName() const;
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 46efcba9..2587ad3e 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -46,8 +46,8 @@
 
 #include "phoneeditwidget.h"
 
-PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent )
-  : KComboBox( parent, "TypeCombo" ),
+PhoneTypeCombo::PhoneTypeCombo( TQWidget *tqparent )
+  : KComboBox( tqparent, "TypeCombo" ),
     mType( KABC::PhoneNumber::Home ),
     mLastSelected( 0 ),
     mTypeList( KABC::PhoneNumber::typeList() )
@@ -126,8 +126,8 @@ void PhoneTypeCombo::otherSelected()
   update();
 }
 
-PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
-  : TQWidget( parent )
+PhoneNumberWidget::PhoneNumberWidget( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
 
@@ -166,8 +166,8 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
 }
 
 
-PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mReadOnly( false )
+PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mReadOnly( false )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
   tqlayout->setSpacing( KDialog::spacingHint() );
@@ -177,7 +177,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
   mAddButton->setMaximumSize( mAddButton->tqsizeHint() );
-  tqlayout->addWidget( mAddButton, 1, 0, Qt::AlignRight );
+  tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
@@ -291,9 +291,9 @@ void PhoneEditWidget::changed( int pos )
 
 ///////////////////////////////////////////
 // PhoneTypeDialog
-PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
+PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
   : KDialogBase( Plain, i18n( "Edit Phone Number" ), Ok | Cancel, Ok,
-                 parent, "PhoneTypeDialog", true ),
+                 tqparent, "PhoneTypeDialog", true ),
     mType( type )
 {
   TQWidget *page = plainPage();
@@ -315,7 +315,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
     new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
     box->setChecked( mType & mTypeList[ i ] );
   }
 
@@ -327,7 +327,7 @@ int PhoneTypeDialog::type() const
   int type = 0;
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 0db2301e..aa8eb4d5 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PHONEEDITWIDGET_H
@@ -39,9 +39,10 @@ class KComboBox;
 class PhoneTypeCombo : public KComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PhoneTypeCombo( TQWidget *parent );
+    PhoneTypeCombo( TQWidget *tqparent );
     ~PhoneTypeCombo();
 
     void setType( int type );
@@ -62,12 +63,13 @@ class PhoneTypeCombo : public KComboBox
     TQValueList<int> mTypeList;
 };
 
-class PhoneNumberWidget : public QWidget
+class PhoneNumberWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PhoneNumberWidget( TQWidget *parent );
+    PhoneNumberWidget( TQWidget *tqparent );
 
     void setNumber( const KABC::PhoneNumber &number );
     KABC::PhoneNumber number() const;
@@ -86,12 +88,13 @@ class PhoneNumberWidget : public QWidget
 /**
   Widget for editing phone numbers.
 */
-class PhoneEditWidget : public QWidget
+class PhoneEditWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PhoneEditWidget( TQWidget *parent, const char *name = 0 );
+    PhoneEditWidget( TQWidget *tqparent, const char *name = 0 );
     ~PhoneEditWidget();
 
     void setPhoneNumbers( const KABC::PhoneNumber::List &list );
@@ -128,8 +131,9 @@ class PhoneEditWidget : public QWidget
 class PhoneTypeDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    PhoneTypeDialog( int type, TQWidget *parent );
+    PhoneTypeDialog( int type, TQWidget *tqparent );
 
     int type() const;
 
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 4cd59780..13e4fb4e 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kapplication.h>
@@ -63,9 +63,9 @@ const char *ContactHeaderForeColor = "ContactHeaderForeColor";
 const char *ContactHeaderBGColor = "ContactHeaderBGColor";
 
 
-DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *name )
-  : PrintStyle( parent, name ),
-    mPageAppearance( new AppearancePage( parent, "AppearancePage" ) ),
+DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *tqparent, const char *name )
+  : PrintStyle( tqparent, name ),
+    mPageAppearance( new AppearancePage( tqparent, "AppearancePage" ) ),
     mPainter( 0 ),
     mPrintProgress( 0 )
 {
@@ -108,9 +108,9 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
   mPageAppearance->cbBackgroundColor->setChecked(
       config->readBoolEntry( ColoredContactHeaders, true ) );
   mPageAppearance->kcbHeaderBGColor->setColor(
-      config->readColorEntry( ContactHeaderBGColor, &Qt::black ) );
+      config->readColorEntry( ContactHeaderBGColor, &TQt::black ) );
   mPageAppearance->kcbHeaderTextColor->setColor(
-      config->readColorEntry( ContactHeaderForeColor, &Qt::white ) );
+      config->readColorEntry( ContactHeaderForeColor, &TQt::white ) );
 
   mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
   mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
@@ -131,10 +131,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
 
   bool useKDEFonts;
   TQFont font;
-  TQColor foreColor = Qt::black;
-  TQColor headerColor = Qt::white;
+  TQColor foreColor = TQt::black;
+  TQColor headerColor = TQt::white;
   bool useHeaderColor = true;
-  TQColor backColor = Qt::black;
+  TQColor backColor = TQt::black;
   bool useBGColor;
 
   // save, always available defaults:
@@ -222,10 +222,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
 
   TQPaintDeviceMetrics metrics( printer );
 
-  left = QMAX( printer->margins().width(), marginLeft );
-  top = QMAX( printer->margins().height(), marginTop );
-  width = metrics.width() - left - QMAX( printer->margins().width(), marginRight );
-  height = metrics.height() - top - QMAX( printer->margins().height(), marginBottom );
+  left = TQMAX( printer->margins().width(), marginLeft );
+  top = TQMAX( printer->margins().height(), marginTop );
+  width = metrics.width() - left - TQMAX( printer->margins().width(), marginRight );
+  height = metrics.height() - top - TQMAX( printer->margins().height(), marginBottom );
 
   painter.setViewport( left, top, width, height );
   progress->addMessage( i18n( "Printing" ) );
@@ -272,9 +272,9 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts,
   return true;
 }
 
-DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *parent,
+DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *tqparent,
                                                         const char *name )
-  : PrintStyleFactory( parent, name )
+  : PrintStyleFactory( tqparent, name )
 {
 }
 
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index e8515aa0..977bcd49 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef DETAILLEDSTYLE_H
@@ -36,9 +36,10 @@ namespace KABPrinting {
 class DetailledPrintStyle : public PrintStyle
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 );
+    DetailledPrintStyle( PrintingWizard *tqparent, const char *name = 0 );
     ~DetailledPrintStyle();
 
     void print( const KABC::Addressee::List &contacts, PrintProgress* );
@@ -57,7 +58,7 @@ class DetailledPrintStyle : public PrintStyle
 class DetailledPrintStyleFactory : public PrintStyleFactory
 {
   public:
-    DetailledPrintStyleFactory( PrintingWizard *parent, const char *name = 0 );
+    DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name = 0 );
 
     PrintStyle *create() const;
     TQString description() const;
diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui
index 03ca4b58..eb93bd76 100644
--- a/kaddressbook/printing/ds_appearance.ui
+++ b/kaddressbook/printing/ds_appearance.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>AppearancePage</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AppearancePage</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>labelHeader</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <set>AlignVCenter|AlignLeft</set>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>gbFont</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cbStandardFonts</cstring>
                     </property>
@@ -108,7 +108,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frameFonts</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>labelDetailsFont</cstring>
                             </property>
@@ -142,7 +142,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="2">
+                        <widget class="TQLabel" row="3" column="2">
                             <property name="name">
                                 <cstring>labelDetailsFontSize</cstring>
                             </property>
@@ -153,7 +153,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>labelBodyFont</cstring>
                             </property>
@@ -164,7 +164,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="2">
+                        <widget class="TQLabel" row="4" column="2">
                             <property name="name">
                                 <cstring>labelFixedFontSize</cstring>
                             </property>
@@ -175,7 +175,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>labelFixed</cstring>
                             </property>
@@ -196,7 +196,7 @@
                                 <cstring>kisbFixedFontSize</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="2">
+                        <widget class="TQLabel" row="2" column="2">
                             <property name="name">
                                 <cstring>labelBodyFontSize</cstring>
                             </property>
@@ -238,7 +238,7 @@
                                 <cstring>kfcFixedFont</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>labelHeaderFont</cstring>
                             </property>
@@ -267,7 +267,7 @@
                                 <cstring>kfcHeadlineFont</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>labelHeaderFontSize</cstring>
                             </property>
@@ -278,7 +278,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="2">
+                        <widget class="TQLabel" row="1" column="2">
                             <property name="name">
                                 <cstring>labelHeaderFontSize_2</cstring>
                             </property>
@@ -294,7 +294,7 @@
                                 <cstring>kisbBodyFontSize</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>labelHeadlines</cstring>
                             </property>
@@ -319,7 +319,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>gbHeadline</cstring>
             </property>
@@ -344,7 +344,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cbBackgroundColor</cstring>
                     </property>
@@ -355,7 +355,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frameBGColor</cstring>
                     </property>
@@ -393,7 +393,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>tlBackgroundColor</cstring>
                             </property>
@@ -404,7 +404,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>tlHeaderColor</cstring>
                             </property>
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index c74e4e41..356b53df 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -133,9 +133,9 @@ int KABEntryPainter::hitsTalk( const TQPoint &p )
   return hits( mTalkRects, p );
 }
 
-int KABEntryPainter::hits( const QRectList& list, const TQPoint &p )
+int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p )
 {
-  QRectList::const_iterator pos;
+  TQRectList::const_iterator pos;
   int count = 0;
 
   for ( pos = list.begin(); pos != list.end(); ++pos ) {
@@ -174,7 +174,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   // this is used to prepare some fields for printing and decide about
   // the tqlayout later:
   TQValueList<TQStringList> parts;
-  TQValueList<QRectList*> contents;
+  TQValueList<TQRectList*> contents;
 
   mEmailRects.clear();
   mPhoneRects.clear();
@@ -189,9 +189,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   painter->setPen( mBackgroundColor );
   text = addr.realName();
 
-  // tqreplacement for: api->addressbook()->literalName(entry, text);
+  // replacement for: api->addressbook()->literalName(entry, text);
   rect = painter->boundingRect( Ruler1, y, Width, Height,
-                                Qt::AlignVCenter | Qt::AlignLeft, text );
+                                TQt::AlignVCenter | TQt::AlignLeft, text );
   rect.setHeight( (int)( 1.25 * rect.height() ) );
 
   if ( !fake && mUseHeaderColor )
@@ -202,7 +202,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
     // create a little (1/8) space on top of the letters:
     float ypos = y + ( (float)rect.height() ) * 0.125;
     painter->drawText( Ruler1, (int)ypos, Width, rect.height(),
-                       Qt::AlignVCenter | Qt::AlignLeft, text );
+                       TQt::AlignVCenter | TQt::AlignLeft, text );
   }
 
   // paint the birthday to the right:
@@ -213,7 +213,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
       // create a little (1/8) space on top of the letters:
       float ypos = y + ( (float)rect.height() ) * 0.125;
       painter->drawText( 0, (int)ypos, Width-Ruler1, rect.height(),
-                         Qt::AlignVCenter | Qt::AlignRight, line1 );
+                         TQt::AlignVCenter | TQt::AlignRight, line1 );
     }
   }
 
@@ -229,9 +229,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
 
     if ( fake ) {
       rect = painter->boundingRect( Ruler1, y, Width-Ruler1, Height,
-                                    Qt::AlignTop | Qt::AlignLeft, line1 );
+                                    TQt::AlignTop | TQt::AlignLeft, line1 );
     } else {
-      painter->drawText( Ruler1, y, Width-Ruler1, Height, Qt::AlignTop | Qt::AlignLeft,
+      painter->drawText( Ruler1, y, Width-Ruler1, Height, TQt::AlignTop | TQt::AlignLeft,
                          line1, -1, &rect );
     }
 
@@ -304,10 +304,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   int heights[ 4 ]= { 0, 0, 0, 0 };
 
   TQValueList<TQStringList>::iterator pos = parts.begin();
-  TQValueList<QRectList*>::iterator rpos = contents.begin();
+  TQValueList<TQRectList*>::iterator rpos = contents.begin();
 
   for ( uint counter = 0; counter < parts.count(); ++counter ) {
-    const int Offset = counter > 1 ? QMAX( heights[ 0 ], heights[ 1 ] ) : 0;
+    const int Offset = counter > 1 ? TQMAX( heights[ 0 ], heights[ 1 ] ) : 0;
     TQStringList list = *pos;
 
     painter->setFont( mHeadLineFont );
@@ -316,11 +316,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
                                     limits[ counter ].top() + heights[counter]
                                     + Offset, limits[ counter ].width(),
                                     limits[ counter ].height(),
-                                    Qt::AlignTop | Qt::AlignLeft, *list.at( 0 ) );
+                                    TQt::AlignTop | TQt::AlignLeft, *list.at( 0 ) );
     } else {
       painter->drawText( limits[ counter ].left(), limits[ counter ].top() +
                          heights[ counter ] + Offset, limits[ counter ].width(),
-                         limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft,
+                         limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft,
                          *list.at( 0 ), -1, &rect );
     }
 
@@ -334,12 +334,12 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
         rect = painter->boundingRect ( limits[ counter ].left() + Ruler1,
                                        limits[ counter ].top() + heights[ counter ]
                                        + Offset, limits[ counter ].width() - Ruler1,
-                                       limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft,
+                                       limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft,
                                        *list.at( c2 ) );
       } else {
         painter->drawText( limits[ counter ].left() + Ruler1, limits[ counter ].top()
                            + heights[ counter ] + Offset, limits[ counter ].width()
-                           - Ruler1, limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft,
+                           - Ruler1, limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft,
                            *list.at( c2 ), -1, &rect );
       }
       (*rpos)->push_back( rect );
@@ -350,7 +350,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
     ++rpos;
   }
 
-  y = y + QMAX( heights[ 0 ], heights[ 1 ] ) + QMAX( heights[ 2 ], heights[ 3 ] );
+  y = y + TQMAX( heights[ 0 ], heights[ 1 ] ) + TQMAX( heights[ 2 ], heights[ 3 ] );
   // ^^^^^ done with emails, telephone, URLs and talk addresses
 
   // now print the addresses:
@@ -359,11 +359,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
     y += fmBody.lineSpacing() / 2;
     painter->setFont( mHeadLineFont );
     if ( fake ) {
-      rect = painter->boundingRect( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft,
+      rect = painter->boundingRect( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft,
                                     addresses.count() == 1 ? i18n( "Address:" )
                                     : i18n( "Addresses:" ) );
     } else {
-      painter->drawText( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft,
+      painter->drawText( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft,
                          addresses.count() == 1 ? i18n( "Address:" )
                          : i18n( "Addresses:" ), -1, &rect );
     }
@@ -400,7 +400,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
       }
 
       line1 += TQString::tqfromLatin1( ":" );
-      text = TQString::null;
+      text = TQString();
 
       if ( !address.extended().isEmpty() )
         text = address.extended().stripWhiteSpace();
@@ -425,20 +425,20 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
 
       if ( fake ) {
         rect = painter->boundingRect( Ruler1, y, Width - Ruler1, Height,
-                                      Qt::AlignTop | Qt::AlignLeft, line1 );
+                                      TQt::AlignTop | TQt::AlignLeft, line1 );
       } else {
         painter->drawText( Ruler1, y, Width - Ruler1, Height,
-                           Qt::AlignTop | Qt::AlignLeft, line1, -1, &rect );
+                           TQt::AlignTop | TQt::AlignLeft, line1, -1, &rect );
       }
 
       y += rect.height();
       if ( !line2.isEmpty() ) {
         if ( fake ) {
           rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height,
-                                        Qt::AlignTop | Qt::AlignLeft, line2 );
+                                        TQt::AlignTop | TQt::AlignLeft, line2 );
         } else {
           painter->drawText( Ruler2, y, Width - Ruler2, Height,
-                             Qt::AlignTop | Qt::AlignLeft, line2, -1, &rect );
+                             TQt::AlignTop | TQt::AlignLeft, line2, -1, &rect );
         }
         y += rect.height();
       }
@@ -446,10 +446,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
       if ( !line3.isEmpty() ) {
         if ( fake ) {
           rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height,
-                                        Qt::AlignTop | Qt::AlignLeft, line3 );
+                                        TQt::AlignTop | TQt::AlignLeft, line3 );
         } else {
           painter->drawText( Ruler2, y, Width - Ruler2, Height,
-                             Qt::AlignTop | Qt::AlignLeft, line3, -1, &rect );
+                             TQt::AlignTop | TQt::AlignLeft, line3, -1, &rect );
         }
         y += rect.height();
       }
@@ -457,10 +457,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
       if ( !line4.isEmpty() ) {
         if ( fake ) {
           rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height,
-                                        Qt::AlignTop | Qt::AlignLeft, line4 );
+                                        TQt::AlignTop | TQt::AlignLeft, line4 );
         } else {
           painter->drawText( Ruler2, y, Width - Ruler2, Height,
-                             Qt::AlignTop | Qt::AlignLeft, line4, -1, &rect );
+                             TQt::AlignTop | TQt::AlignLeft, line4, -1, &rect );
         }
         y += rect.height();
       }
@@ -469,11 +469,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
       if ( !address.label().isEmpty() ) {
         if ( fake ) {
           rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height,
-                                        Qt::AlignTop | Qt::AlignLeft,
+                                        TQt::AlignTop | TQt::AlignLeft,
                                         i18n( "(Deliver to:)" ) );
         } else {
           painter->drawText( Ruler2, y, Width - Ruler2, Height,
-                             Qt::AlignTop | Qt::AlignLeft,
+                             TQt::AlignTop | TQt::AlignLeft,
                              i18n( "(Deliver to:)" ), -1, &rect );
         }
 
@@ -481,10 +481,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
         y += fmBody.lineSpacing() / 4;
         if ( fake ) {
           rect = painter->boundingRect( Ruler3, y, Width - Ruler3, Height,
-                                        Qt::AlignTop | Qt::AlignLeft, address.label() );
+                                        TQt::AlignTop | TQt::AlignLeft, address.label() );
         } else {
           painter->drawText( Ruler3, y, Width - Ruler3, Height,
-                             Qt::AlignTop | Qt::AlignLeft, address.label(), -1, &rect );
+                             TQt::AlignTop | TQt::AlignLeft, address.label(), -1, &rect );
         }
 
         y += rect.height();
@@ -498,11 +498,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
     y += fmBody.lineSpacing() / 2;
     if ( fake ) {
       rect = painter->boundingRect( 0, y, Width, Height,
-                                    Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak,
+                                    TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak,
                                     addr.note() );
     } else {
       painter->drawText( 0, y, Width, Height,
-                         Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak,
+                         TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak,
                          addr.note(), -1, &rect );
     }
 
diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h
index 57ce69d8..6936128f 100644
--- a/kaddressbook/printing/kabentrypainter.h
+++ b/kaddressbook/printing/kabentrypainter.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABENTRYPAINTER_H
@@ -31,7 +31,7 @@
 #include <tqrect.h>
 #include <tqvaluelist.h>
 
-typedef TQValueList<TQRect> QRectList;
+typedef TQValueList<TQRect> TQRectList;
 
 class KABEntryPainter
 {
@@ -62,9 +62,9 @@ class KABEntryPainter
                          TQPainter *p, int top = 0, bool fake = false,
                          TQRect *rect = 0 );
 
-    void setForegroundColor( const TQColor &color = Qt::black );
-    void setBackgroundColor( const TQColor &color = Qt::black );
-    void setHeaderColor( const TQColor &color = Qt::white );
+    void setForegroundColor( const TQColor &color = TQt::black );
+    void setBackgroundColor( const TQColor &color = TQt::black );
+    void setHeaderColor( const TQColor &color = TQt::white );
 
     void setHeaderFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) );
     void setHeadLineFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) );
@@ -106,7 +106,7 @@ class KABEntryPainter
     int hitsURL( const TQPoint &p );
 
   private:
-    int hits( const QRectList& rects, const TQPoint &p );
+    int hits( const TQRectList& rects, const TQPoint &p );
 
     TQColor mForegroundColor;
     TQColor mBackgroundColor;
@@ -124,10 +124,10 @@ class KABEntryPainter
     bool mShowPhones;
     bool mShowURLs;
 
-    QRectList mEmailRects;
-    QRectList mPhoneRects;
-    QRectList mURLRects;
-    QRectList mTalkRects;
+    TQRectList mEmailRects;
+    TQRectList mPhoneRects;
+    TQRectList mURLRects;
+    TQRectList mTalkRects;
 };
 
 #endif
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 26312ee1..d7fb26b8 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpaintdevicemetrics.h>
@@ -43,8 +43,8 @@ using namespace KABPrinting;
 
 const int mFieldSpacingHint = 2;
 
-MikesStyle::MikesStyle( PrintingWizard *parent, const char *name )
-  : PrintStyle( parent, name )
+MikesStyle::MikesStyle( PrintingWizard *tqparent, const char *name )
+  : PrintStyle( tqparent, name )
 {
   setPreview( "mike-style.png" );
 }
@@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr
   mBoldFont = p.font();
   mBoldFont.setBold( true );
   TQFontMetrics fm( mFont );
-  TQPaintDeviceMetrics metrics( p.device() );
+  TQPaintDeviceMetrics metrics( p.tqdevice() );
 
   int height = 0;
   KABC::Addressee::List::ConstIterator it;
@@ -141,14 +141,14 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr,
 {
   TQFontMetrics fm( font );
   TQFontMetrics bfm( bFont );
-  TQPaintDeviceMetrics metrics( painter.device() );
+  TQPaintDeviceMetrics metrics( painter.tqdevice() );
   int margin = 10;
   int width = metrics.width() - 10;
   int xPos = 5;
   int yPos = 0;
-  TQBrush brush( Qt::lightGray );
+  TQBrush brush( TQt::lightGray );
 
-  painter.setPen( Qt::black );
+  painter.setPen( TQt::black );
   painter.drawRect( xPos, yPos, width, maxHeight );
 
   // The header
@@ -207,7 +207,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font )
   TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" )
                  .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
-  p.setPen( Qt::black );
+  p.setPen( TQt::black );
   p.drawText( 0, fm.height(), text );
 }
 
@@ -235,7 +235,7 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
   for ( int i = numFields / 2; i < numFields; i++ )
     halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
 
-  height = QMAX( height, halfHeight );
+  height = TQMAX( height, halfHeight );
 
   // Add the title and the spacing
   height += bfm.height() + ((numFields / 2 + 3) * mFieldSpacingHint);
@@ -244,8 +244,8 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
 }
 
 
-MikesStyleFactory::MikesStyleFactory( PrintingWizard *parent, const char *name )
-  : PrintStyleFactory( parent, name )
+MikesStyleFactory::MikesStyleFactory( PrintingWizard *tqparent, const char *name )
+  : PrintStyleFactory( tqparent, name )
 {
 }
 
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index dbfabf17..6b61287d 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef MIKESSTYLE_H
@@ -36,9 +36,10 @@ class PrintProgress;
 class MikesStyle : public PrintStyle
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    MikesStyle( PrintingWizard *parent, const char *name );
+    MikesStyle( PrintingWizard *tqparent, const char *name );
     ~MikesStyle();
 
     void print( const KABC::Addressee::List&, PrintProgress* );
@@ -54,7 +55,7 @@ class MikesStyle : public PrintStyle
 class MikesStyleFactory : public PrintStyleFactory
 {
   public:
-    MikesStyleFactory( PrintingWizard *parent, const char *name = 0 );
+    MikesStyleFactory( PrintingWizard *tqparent, const char *name = 0 );
 
     PrintStyle *create() const;
     TQString description() const;
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 8f2e98f2..949ebd51 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcombobox.h>
@@ -53,9 +53,9 @@
 using namespace KABPrinting;
 
 PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab,
-                                const TQStringList& selection, TQWidget *parent,
+                                const TQStringList& selection, TQWidget *tqparent,
                                 const char* name )
-  : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ),
+  : KWizard( tqparent, name ), mPrinter( printer ), mAddressBook( ab ),
     mSelection( selection ), mStyle( 0 )
 {
   mSelectionPage = new SelectionPage( this );
@@ -162,7 +162,7 @@ void PrintingWizard::print()
     if ( mSelectionPage->useSelection() ) {
       TQStringList::ConstIterator it;
       for ( it = mSelection.begin(); it != mSelection.end(); ++it ) {
-        KABC::Addressee addr = addressBook()->tqfindByUid( *it );
+        KABC::Addressee addr = addressBook()->findByUid( *it );
         if ( !addr.isEmpty() )
           list.append( addr );
       }
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index ab82a8bc..54442075 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PRINTINGWIZARD_H
@@ -50,6 +50,7 @@ namespace KABPrinting {
 class PrintingWizard : public KWizard
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -58,7 +59,7 @@ class PrintingWizard : public KWizard
     PrintingWizard( KPrinter *printer,
                     KABC::AddressBook* ab,
                     const TQStringList& selection,
-                    TQWidget *parent = 0, const char *name = 0 );
+                    TQWidget *tqparent = 0, const char *name = 0 );
     ~PrintingWizard();
 
     /**
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index a66ca960..9e0e3aa9 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -34,8 +34,8 @@
 
 using namespace KABPrinting;
 
-PrintProgress::PrintProgress( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+PrintProgress::PrintProgress( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   setCaption( i18n( "Printing: Progress" ) );
 
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index 916d8205..a27c5fc3 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PRINTPROGRESS_H
@@ -37,12 +37,13 @@ namespace KABPrinting {
   information. It is provided to all print styles during a print
   process. It displays messages and a a progress bar.
  */
-class PrintProgress : public QWidget
+class PrintProgress : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PrintProgress( TQWidget *parent, const char *name = 0 );
+    PrintProgress( TQWidget *tqparent, const char *name = 0 );
     ~PrintProgress();
 
     /**
diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp
index 215a5fa0..685a47ac 100644
--- a/kaddressbook/printing/printsortmode.cpp
+++ b/kaddressbook/printing/printsortmode.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/field.h>
diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h
index a7992cc6..69125419 100644
--- a/kaddressbook/printing/printsortmode.h
+++ b/kaddressbook/printing/printsortmode.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PRINTSORTMODE_H
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 90b19623..02e563ee 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kstandarddirs.h>
@@ -32,8 +32,8 @@
 using namespace KABPrinting;
 
 
-PrintStyle::PrintStyle( PrintingWizard* parent, const char* name )
-  : TQObject( parent, name ), mWizard( parent ), mSortField( 0 )
+PrintStyle::PrintStyle( PrintingWizard* tqparent, const char* name )
+  : TQObject( tqparent, name ), mWizard( tqparent ), mSortField( 0 )
 {
 }
 
@@ -76,7 +76,7 @@ PrintingWizard *PrintStyle::wizard()
 
 void PrintStyle::addPage( TQWidget *page, const TQString &title )
 {
-  if ( mPageList.find( page ) == -1 ) { // not yet in the list
+  if ( mPageList.tqfind( page ) == -1 ) { // not yet in the list
     mPageList.append( page );
     mPageTitles.append( title );
   }
@@ -118,8 +118,8 @@ bool PrintStyle::preferredSortType()
   return mSortType;
 }
 
-PrintStyleFactory::PrintStyleFactory( PrintingWizard* parent, const char* name )
-        : mParent( parent ), mName( name )
+PrintStyleFactory::PrintStyleFactory( PrintingWizard* tqparent, const char* name )
+        : mParent( tqparent ), mName( name )
 {
 }
 
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 19dbf3bc..f7e471e2 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PRINTSTYLE_H
@@ -57,12 +57,13 @@ class PrintProgress;
  to the wizard object.
  */
 
-class PrintStyle : public QObject
+class PrintStyle : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PrintStyle( PrintingWizard* parent, const char* name = 0 );
+    PrintStyle( PrintingWizard* tqparent, const char* name = 0 );
     virtual ~PrintStyle();
 
     /**
@@ -150,7 +151,7 @@ class PrintStyle : public QObject
 class PrintStyleFactory
 {
   public:
-    PrintStyleFactory( PrintingWizard* parent, const char* name = 0 );
+    PrintStyleFactory( PrintingWizard* tqparent, const char* name = 0 );
     virtual ~PrintStyleFactory();
 
     virtual PrintStyle *create() const = 0;
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index e926d0db..bf0a49a0 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kdialog.h>
@@ -38,8 +38,8 @@
 
 #include "selectionpage.h"
 
-SelectionPage::SelectionPage( TQWidget* parent, const char* name )
-    : TQWidget( parent, name )
+SelectionPage::SelectionPage( TQWidget* tqparent, const char* name )
+    : TQWidget( tqparent, name )
 {
   setCaption( i18n( "Choose Which Contacts to Print" ) );
 
@@ -51,12 +51,12 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
 
   mButtonGroup = new TQButtonGroup( this );
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
-  mButtonGroup->setColumnLayout( 0, Qt::Vertical );
+  mButtonGroup->setColumnLayout( 0, TQt::Vertical );
   mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  groupLayout->tqsetAlignment( TQt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
@@ -76,7 +76,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
   mUseCategories = new TQRadioButton( i18n( "Category &members" ), mButtonGroup );
   TQWhatsThis::add( mUseCategories, i18n( "Only print contacts who are members of a category that is checked on the list to the left.\n"
                                        "This option is disabled if you have no categories." ) );
-  groupLayout->addWidget( mUseCategories, 3, 0, Qt::AlignTop );
+  groupLayout->addWidget( mUseCategories, 3, 0, TQt::AlignTop );
 
   mFiltersCombo = new TQComboBox( false, mButtonGroup );
   TQWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to print." ) );
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index 031b0b5e..dded01ec 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef SELECTIONPAGE_H
 #define SELECTIONPAGE_H
@@ -32,12 +32,13 @@ class TQListView;
 class TQListViewItem;
 class TQRadioButton;
 
-class SelectionPage : public QWidget
+class SelectionPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SelectionPage( TQWidget* parent = 0, const char* name = 0 );
+    SelectionPage( TQWidget* tqparent = 0, const char* name = 0 );
     ~SelectionPage();
 
     void setFilters( const TQStringList& );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 172e7df7..721cffaa 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -34,8 +34,8 @@
 
 #include "stylepage.h"
 
-StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent,  const char* name )
-  : TQWidget( parent, name ), mAddressBook( ab )
+StylePage::StylePage( KABC::AddressBook *ab, TQWidget* tqparent,  const char* name )
+  : TQWidget( tqparent, name ), mAddressBook( ab )
 {
   initGUI();
 
@@ -121,10 +121,10 @@ void StylePage::initGUI()
   topLayout->addMultiCellWidget( label, 0, 0, 0, 1 );
 
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
-  group->setColumnLayout( 0, Qt::Vertical );
+  group->setColumnLayout( 0, TQt::Vertical );
   TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->tqsetAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( TQt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), group );
   sortLayout->addWidget( label, 0, 0 );
@@ -141,7 +141,7 @@ void StylePage::initGUI()
   topLayout->addWidget( group, 1, 0 );
 
   group = new TQButtonGroup( i18n( "Print Style" ), this );
-  group->setColumnLayout( 0, Qt::Vertical );
+  group->setColumnLayout( 0, TQt::Vertical );
   TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
                                               KDialog::spacingHint() );
 
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 91be390f..24d42459 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef STYLEPAGE_H
@@ -35,12 +35,13 @@ class TQPixmap;
 class TQRadioButton;
 class KComboBox;
 
-class StylePage : public QWidget
+class StylePage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );
+    StylePage( KABC::AddressBook *ab, TQWidget* tqparent = 0, const char* name = 0 );
     ~StylePage();
 
     /**
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 374a1af5..462451f3 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
 
@@ -30,8 +30,8 @@
 using namespace KAB;
 
 SearchManager::SearchManager( KABC::AddressBook *ab,
-                              TQObject *parent, const char *name )
-  : TQObject( parent, name ), mAddressBook( ab )
+                              TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mAddressBook( ab )
 {
 }
 
@@ -117,7 +117,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
         mContacts.append( *it );
         found = true;
         break;
-      } else if ( type == Contains && (*fieldIt)->value( *it ).find( pattern, 0, false ) != -1 ) {
+      } else if ( type == Contains && (*fieldIt)->value( *it ).tqfind( pattern, 0, false ) != -1 ) {
         mContacts.append( *it );
         found = true;
         break;
@@ -135,7 +135,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
       TQStringList::ConstIterator customIt( customs.begin() );
       const TQStringList::ConstIterator customEndIt( customs.end() );
       for ( ; customIt != customEndIt; ++customIt ) {
-        int pos = (*customIt).find( ':' );
+        int pos = (*customIt).tqfind( ':' );
         if ( pos != -1 ) {
           const TQString value = (*customIt).mid( pos + 1 );
           if ( type == StartsWith && value.startsWith( pattern, false ) ) {
@@ -144,7 +144,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
           } else if ( type == EndsWith && value.endsWith( pattern, false ) ) {
             mContacts.append( *it );
             break;
-          } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) {
+          } else if ( type == Contains && value.tqfind( pattern, 0, false ) != -1 ) {
             mContacts.append( *it );
             break;
           } else if ( type == Equals && value.localeAwareCompare( pattern ) == 0 ) {
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index 88ce94c7..8443c7d3 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SEARCHMANAGER_H
@@ -34,9 +34,10 @@
 
 namespace KAB {
 
-class SearchManager : public QObject
+class SearchManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Type {
@@ -47,7 +48,7 @@ class SearchManager : public QObject
     };
 
     SearchManager( KABC::AddressBook *ab,
-                   TQObject *parent, const char *name = 0 );
+                   TQObject *tqparent, const char *name = 0 );
 
     /**
       This method takes a pattern and searches for a match of the specified
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 4db7197a..34ff25eb 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -29,8 +29,8 @@
 
 #include "secrecywidget.h"
 
-SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+SecrecyWidget::SecrecyWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h
index 0c07c015..40492587 100644
--- a/kaddressbook/secrecywidget.h
+++ b/kaddressbook/secrecywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SECRECYWIDGET_H
@@ -29,12 +29,13 @@
 namespace KABC { class Secrecy; }
 class KComboBox;
 
-class SecrecyWidget : public QWidget
+class SecrecyWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SecrecyWidget( TQWidget *parent, const char *name = 0 );
+    SecrecyWidget( TQWidget *tqparent, const char *name = 0 );
     ~SecrecyWidget();
 
     void setSecrecy( const KABC::Secrecy &secrecy );
diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp
index f55ab303..d5eb004d 100644
--- a/kaddressbook/simpleaddresseeeditor.cpp
+++ b/kaddressbook/simpleaddresseeeditor.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -30,8 +30,8 @@
 
 #include "simpleaddresseeeditor.h"
 
-SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *parent, const char *name )
-  : AddresseeEditorBase( parent, name ),
+SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *tqparent, const char *name )
+  : AddresseeEditorBase( tqparent, name ),
     mDirty( false ),
     mBlockModified( false )
 {
diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h
index f8e16fb2..2ea10a82 100644
--- a/kaddressbook/simpleaddresseeeditor.h
+++ b/kaddressbook/simpleaddresseeeditor.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SIMPLEADDRESSEEEDITOR_H
@@ -32,8 +32,9 @@ class KLineEdit;
 class SimpleAddresseeEditor : public AddresseeEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
+    SimpleAddresseeEditor( TQWidget *tqparent, const char *name = 0 );
     ~SimpleAddresseeEditor();
 
     void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index f94a72d2..bb095636 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/sound.h>
@@ -39,8 +39,8 @@
 
 #include "soundwidget.h"
 
-SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
+SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                             KDialog::spacingHint() );
@@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   TQLabel *label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->tqsetAlignment( Qt::AlignTop );
+  label->tqsetAlignment( TQt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   mPlayButton = new TQPushButton( i18n( "Play" ), this );
@@ -77,7 +77,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   connect( mPlayButton, TQT_SIGNAL( clicked() ),
            TQT_SLOT( playSound() ) );
 
-  TQWhatsThis::add( this, i18n( "This field stores a sound file which tqcontains the name of the contact to clarify the pronunciation." ) );
+  TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) );
   TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) );
 }
 
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index 679609c6..66fb7477 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SOUNDWIDGET_H
@@ -36,9 +36,10 @@ class TQPushButton;
 class SoundWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~SoundWidget();
 
     void loadContact( KABC::Addressee *addr );
@@ -64,9 +65,9 @@ class SoundWidget : public KAB::ContactEditorWidget
 class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory
 {
   public:
-    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+    KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
     {
-      return new SoundWidget( ab, parent, name );
+      return new SoundWidget( ab, tqparent, name );
     }
 
     TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 6a8e495d..eb6b7670 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -184,9 +184,9 @@ bool VCard_LDIFCreator::createImageSmall()
   // render the information
   TQRect rect;
   int rest = mPixmap.width() - (numCharsPerLine * chSize.width());
-  xborder = QMAX( xborder, rest / 2 ); // center horizontally
+  xborder = TQMAX( xborder, rest / 2 ); // center horizontally
   rest = mPixmap.height() - (numLines * chSize.height());
-  yborder = QMAX( yborder, rest / 2 ); // center vertically
+  yborder = TQMAX( yborder, rest / 2 ); // center vertically
   // end centering
 
   int x = xborder, y = yborder; // where to paint the characters
@@ -207,7 +207,7 @@ bool VCard_LDIFCreator::createImageSmall()
       // after starting a new line, we also jump to the next
       // physical newline in the file if we don't come from one
       if ( !newLine ) {
-        int pos = text.find( '\n', i );
+        int pos = text.tqfind( '\n', i );
         if ( pos > (int) i )
           i = pos +1;
       }
@@ -228,7 +228,7 @@ bool VCard_LDIFCreator::createImageSmall()
 
     rect = mSplitter->coordinates( ch );
     if ( !rect.isEmpty() )
-      bitBlt( &mPixmap, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP );
+      bitBlt( &mPixmap, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP );
 
     x += xOffset; // next character
   }
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index a8bbb4ca..0648bf42 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef TYPECOMBO_H
@@ -37,7 +37,7 @@ class TypeCombo : public KComboBox
     typedef typename T::List List;
     typedef typename T::List::Iterator Iterator;
 
-    TypeCombo( List &list, TQWidget *parent, const char *name = 0 );
+    TypeCombo( List &list, TQWidget *tqparent, const char *name = 0 );
 
     void setLineEdit( TQLineEdit *edit ) { mLineEdit = edit; }
     TQLineEdit *lineEdit() const { return mLineEdit; }
@@ -62,9 +62,9 @@ class TypeCombo : public KComboBox
 };
 
 template <class T>
-TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *parent,
+TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *tqparent,
                       const char *name )
-  : KComboBox( parent, name ),
+  : KComboBox( tqparent, name ),
     mTypeList( list )
 {
 }
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index bd26270f..c0cd5a8a 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -84,7 +84,7 @@ void DeleteCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->tqfindByUid( *it );
+    addr = addressBook()->findByUid( *it );
     lock()->lock( addr.resource() );
     mAddresseeList.append( addr );
     AddresseeConfig cfg( addr );
@@ -261,7 +261,7 @@ void CutCommand::unexecute()
 
   mAddresseeList.clear();
 
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   kapp->processEvents();
   cb->setText( mOldText );
 }
@@ -273,7 +273,7 @@ void CutCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->tqfindByUid( *it );
+    addr = addressBook()->findByUid( *it );
     mAddresseeList.append( addr );
     lock()->lock( addr.resource() );
   }
@@ -289,7 +289,7 @@ void CutCommand::execute()
   // Convert to clipboard
   mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList );
 
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   mOldText = cb->text();
   kapp->processEvents();
 #if defined(KABC_VCARD_ENCODING_FIX)
@@ -332,7 +332,7 @@ void CopyToCommand::execute()
   TQStringList::Iterator it( mUIDList.begin() );
   const TQStringList::Iterator endIt( mUIDList.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
+    KABC::Addressee addr = addressBook()->findByUid( *it++ );
     if ( !addr.isEmpty() ) {
       KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
@@ -379,7 +379,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
     TQStringList::Iterator it( mUIDList.begin() );
     const TQStringList::Iterator endIt( mUIDList.end() );
     while ( it != endIt ) {
-        KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
+        KABC::Addressee addr = addressBook()->findByUid( *it++ );
         if ( !addr.isEmpty() ) {
             KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
@@ -391,7 +391,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
               addressBook()->insertAddressee( newAddr );
             mAddresseeList.append( newAddr );
             mUIDList.append( uid );
-            const bool inserted = addressBook()->find( newAddr ) != addressBook()->end();
+            const bool inserted = addressBook()->tqfind( newAddr ) != addressBook()->end();
             if ( inserted ) {
               if ( resourceExist( addr.resource() ) ) {
                 KABLock::self( addressBook() )->lock( addr.resource() );
diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h
index 43f6aae9..55c43767 100644
--- a/kaddressbook/undocmds.h
+++ b/kaddressbook/undocmds.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef COMMANDS_H
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 453f4758..7951bc77 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -36,14 +36,14 @@
 
 #include "viewconfigurefieldspage.h"
 
-class FieldItem : public QListBoxText
+class FieldItem : public TQListBoxText
 {
   public:
-    FieldItem( TQListBox *parent, KABC::Field *field )
-      : TQListBoxText( parent, field->label() ), mField( field ) {}
+    FieldItem( TQListBox *tqparent, KABC::Field *field )
+      : TQListBoxText( tqparent, field->label() ), mField( field ) {}
 
-    FieldItem( TQListBox *parent, KABC::Field *field, int index )
-      : TQListBoxText( parent, field->label(), parent->item( index ) ),
+    FieldItem( TQListBox *tqparent, KABC::Field *field, int index )
+      : TQListBoxText( tqparent, field->label(), tqparent->item( index ) ),
         mField( field ) {}
 
     KABC::Field *field() { return mField; }
@@ -54,9 +54,9 @@ class FieldItem : public QListBoxText
 
 
 ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
-                                                  TQWidget *parent,
+                                                  TQWidget *tqparent,
                                                   const char *name )
-  : TQWidget( parent, name ), mAddressBook( ab )
+  : TQWidget( tqparent, name ), mAddressBook( ab )
 {
   initGUI();
 }
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index eae95085..991a7e1c 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWCONFIGUREFIELDSPAGE_H
@@ -35,12 +35,13 @@ class TQListBoxItem;
 class TQPushButton;
 class TQToolButton;
 
-class ViewConfigureFieldsPage : public QWidget
+class ViewConfigureFieldsPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
+    ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *tqparent = 0,
                              const char *name = 0 );
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 923743f8..fe9cf441 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -34,9 +34,9 @@
 #include "viewconfigurefilterpage.h"
 #include "filter.h"
 
-ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
+ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *tqparent,
                                                   const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
   " this view is displayed. This feature allows you to configure views that only"
   " interact with certain types of information based on the filter. Once the view"
   " is activated, the filter can be changed at anytime." ), this );
-  label->tqsetAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
+  label->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
   topLayout->addWidget( label );
 
   TQWidget *spacer = new TQWidget( this );
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 77d0bde6..4459a1ce 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWCONFIGUREFILTERPAGE
@@ -31,12 +31,13 @@ class TQButtonGroup;
 class KComboBox;
 class KConfig;
 
-class ViewConfigureFilterPage : public QWidget
+class ViewConfigureFilterPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
+    ViewConfigureFilterPage( TQWidget *tqparent, const char *name = 0 );
     ~ViewConfigureFilterPage();
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index f75fe1ce..1045988c 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -37,9 +37,9 @@
 
 #include "viewconfigurewidget.h"
 
-ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                           const char *name )
-  : KAB::ConfigureWidget( ab, parent, name )
+  : KAB::ConfigureWidget( ab, tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -47,7 +47,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren
   topLayout->addWidget( mMainWidget );
 
   // Add the first page, the attributes
-  TQVBox *page = addPage( i18n( "Fields" ), TQString::null,
+  TQVBox *page = addPage( i18n( "Fields" ), TQString(),
                          KGlobal::iconLoader()->loadIcon( "view_detailed",
                          KIcon::Panel ) );
 
@@ -55,7 +55,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren
   mFieldsPage = new ViewConfigureFieldsPage( addressBook(), page );
 
   // Add the second page, the filter selection
-  page = addPage( i18n( "Default Filter" ), TQString::null,
+  page = addPage( i18n( "Default Filter" ), TQString(),
                   KGlobal::iconLoader()->loadIcon( "filter",
                   KIcon::Panel ) );
 
@@ -85,9 +85,9 @@ TQVBox *ViewConfigureWidget::addPage( const TQString &item, const TQString &head
 }
 
 ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
-                                          TQWidget *parent, const char *name )
+                                          TQWidget *tqparent, const char *name )
   : KDialogBase( Swallow, i18n( "Modify View: " ) + viewName, Help | Ok | Cancel,
-                 Ok, parent, name, true, true ), mConfigWidget( wdg )
+                 Ok, tqparent, name, true, true ), mConfigWidget( wdg )
 {
   setMainWidget( mConfigWidget );
 
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index d3f7022c..7abcf22f 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWCONFIGUREWIDGET_H
@@ -48,9 +48,10 @@ class ViewConfigureFilterPage;
 class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     virtual ~ViewConfigureWidget();
 
     /**
@@ -74,7 +75,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
     /**
       Use this method to add new pages to the widget.
      */
-    TQVBox *addPage( const TQString &item, const TQString &header = TQString::null,
+    TQVBox *addPage( const TQString &item, const TQString &header = TQString(),
                     const TQPixmap &pixmap = TQPixmap() );
 
   private:
@@ -87,10 +88,11 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 class ViewConfigureDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
-                         TQWidget *parent, const char *name = 0 );
+                         TQWidget *tqparent, const char *name = 0 );
     ~ViewConfigureDialog();
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 46eb653b..e6d04645 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -49,8 +49,8 @@
 
 #include "viewmanager.h"
 
-ViewManager::ViewManager( KAB::Core *core, TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mCore( core ), mActiveView( 0 ),
+ViewManager::ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mCore( core ), mActiveView( 0 ),
     mFilterSelectionWidget( 0 )
 {
   initGUI();
@@ -133,7 +133,7 @@ KABC::Addressee::List ViewManager::selectedAddressees() const
   const TQStringList uids = selectedUids();
   TQStringList::ConstIterator it;
   for ( it = uids.begin(); it != uids.end(); ++it ) {
-    KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
+    KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
     if ( !addr.isEmpty() )
       list.append( addr );
   }
@@ -195,7 +195,7 @@ void ViewManager::setActiveView( const TQString &name )
   // we can't find it, it means it hasn't been instantiated, so we will
   // create it on demand.
 
-  view = mViewDict.find( name );
+  view = mViewDict.tqfind( name );
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
@@ -205,7 +205,7 @@ void ViewManager::setActiveView( const TQString &name )
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
 
-    ViewFactory *factory = mViewFactoryDict.find( type );
+    ViewFactory *factory = mViewFactoryDict.tqfind( type );
     if ( factory )
       view = factory->view( mCore, mViewWidgetStack );
 
@@ -265,7 +265,7 @@ void ViewManager::editView()
   if ( !mActiveView )
     return;
 
-  ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() );
+  ViewFactory *factory = mViewFactoryDict.tqfind( mActiveView->type() );
   ViewConfigureWidget *wdg = 0;
 
   if ( factory ) {
@@ -436,7 +436,7 @@ void ViewManager::dropped( TQDropEvent *e )
   } else if ( KVCardDrag::decode( e, list ) ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
-      KABC::Addressee a = mCore->addressBook()->tqfindByUid( (*it).uid() );
+      KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() );
       if ( a.isEmpty() ) { // not yet in address book
         mCore->addressBook()->insertAddressee( *it );
         emit modified();
@@ -459,7 +459,7 @@ void ViewManager::startDrag()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it )
-    addrList.append( mCore->addressBook()->tqfindByUid( *it ) );
+    addrList.append( mCore->addressBook()->findByUid( *it ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
 
@@ -519,7 +519,7 @@ void ViewManager::setActiveFilter( int index )
   if ( mActiveView ) {
     mActiveView->setFilter( currentFilter );
     mActiveView->refresh();
-    emit selected( TQString::null );
+    emit selected( TQString() );
   }
 }
 
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 06405ac6..15fd68fd 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWMANAGER_H
@@ -47,12 +47,13 @@ namespace KABC { class AddressBook; }
   The view manager will also create and manage all dialogs directly related to
   views (ie: AddView, ConfigureView, DeleteView, etc).
  */
-class ViewManager : public QWidget
+class ViewManager : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 );
+    ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
     ~ViewManager();
 
     void restoreSettings();
@@ -70,10 +71,10 @@ class ViewManager : public QWidget
     KABC::Field::List viewFields() const;
 
   public slots:
-    void setSelected( const TQString &uid = TQString::null, bool selected = true );
+    void setSelected( const TQString &uid = TQString(), bool selected = true );
     void setFirstSelected( bool selected = true );
 
-    void refreshView( const TQString &uid = TQString::null );
+    void refreshView( const TQString &uid = TQString() );
     void editView();
     void deleteView();
     void addView();
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 5c8ccf82..9149c653 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -39,11 +39,11 @@
 
 #define MIN_ITEM_WIDTH 80
 
-class CardViewTip : public QLabel
+class CardViewTip : public TQLabel
 {
   public:
-    CardViewTip( TQWidget *parent = 0, const char *name = 0 )
-      : TQLabel( parent, name )
+    CardViewTip( TQWidget *tqparent = 0, const char *name = 0 )
+      : TQLabel( tqparent, name )
     {
       setPalette( TQToolTip::palette() );
       setFrameStyle( Panel | Plain );
@@ -61,7 +61,7 @@ class CardViewTip : public QLabel
 };
 
 //
-// Warning: make sure you use findRef() instead of find() to find an
+// Warning: make sure you use findRef() instead of tqfind() to find an
 //          item! Only the pointer value is unique in the list.
 //
 class CardViewItemList : public TQPtrList<CardViewItem>
@@ -136,7 +136,7 @@ class CardViewPrivate
        mCurrentItem( 0L ),
        mLastClickPos( TQPoint(0, 0) ),
        mRubberBandAnchor( 0 ),
-       mCompText( TQString::null )
+       mCompText( TQString() )
     {};
 
     CardViewItemList mItemList;
@@ -192,8 +192,8 @@ class CardViewItemPrivate
 };
 
 
-CardViewItem::CardViewItem( CardView *parent, const TQString &caption )
-  : d( new CardViewItemPrivate() ), mView( parent )
+CardViewItem::CardViewItem( CardView *tqparent, const TQString &caption )
+  : d( new CardViewItemPrivate() ), mView( tqparent )
 {
   d->mCaption = caption;
 
@@ -238,7 +238,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
   int h = height() - ( mg * 2 );
   const int colonWidth( fm.width( ":" ) );
   int labelXPos = 2 + mg;
-  int labelWidth = QMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 );
+  int labelWidth = TQMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 );
   int valueXPos = labelWidth + 4 + mg;
   int valueWidth = w - labelWidth - 4 - mg;
 
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
   for ( iter.toFirst(); iter.current(); ++iter ) {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
+    lines = TQMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;
   }
 
@@ -383,7 +383,7 @@ void CardViewItem::insertField( const TQString &label, const TQString &value )
 
   if ( mView ) {
     mView->setLayoutDirty( true );
-    d->maxLabelWidth = QMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
+    d->maxLabelWidth = TQMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
   }
 }
 
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     Field *_f;
     for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
       if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
+        y += ( TQMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
 
     if ( isLabel && itempos.y() > y + fh )
       return;
@@ -515,13 +515,13 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     s = isLabel ? f->first : f->second;
 
     int colonWidth = mView->d->mFm->width(":");
-    lw = drawLabels ? QMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0;
+    lw = drawLabels ? TQMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0;
     int mw = isLabel ? lw - colonWidth : w - lw - ( mrg * 2 );
     if ( isLabel ) {
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
-      TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.tqcontains( '\n' ) + 1, maxLines );
+      TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, TQt::AlignTop|TQt::AlignLeft, s ) );
+      trimmed = r.width() > mw || r.height() / fh >  TQMIN( s.tqcontains( '\n' ) + 1, maxLines );
     }
   }
 
@@ -539,7 +539,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     if ( pnt.x() + tip->width() > mView->visibleWidth() )
       pnt.setX( mView->visibleWidth() - tip->width() );
     if ( pnt.y() + tip->height() > mView->visibleHeight() )
-      pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) );
+      pnt.setY( TQMAX( 0, mView->visibleHeight() - tip->height() ) );
     // show
     tip->move( pnt );
     tip->show();
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
+      ypos += (TQMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
     if ( iy <= ypos )
       break;
   }
@@ -569,8 +569,8 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
 }
 
 
-CardView::CardView( TQWidget *parent, const char *name )
-  : TQScrollView( parent, name ),
+CardView::CardView( TQWidget *tqparent, const char *name )
+  : TQScrollView( tqparent, name ),
     d( new CardViewPrivate() )
 {
   d->mItemList.setAutoDelete( true );
@@ -805,7 +805,7 @@ int CardView::childCount() const
 }
 
 CardViewItem *CardView::findItem( const TQString &text, const TQString &label,
-                                  Qt::StringComparisonMode compare ) const
+                                  TQt::StringComparisonMode compare ) const
 {
   // If the text is empty, we will return null, since empty text will
   // match anything!
@@ -813,7 +813,7 @@ CardViewItem *CardView::findItem( const TQString &text, const TQString &label,
     return 0;
 
   TQPtrListIterator<CardViewItem> iter( d->mItemList );
-  if ( compare & Qt::BeginsWith ) {
+  if ( compare & TQt::BeginsWith ) {
     TQString value;
     for ( iter.toFirst(); iter.current(); ++iter ) {
       value = (*iter)->fieldValue( label ).upper();
@@ -915,7 +915,7 @@ void CardView::calcLayout()
     yPos += cardSpacing;
 
     if ( yPos + item->height() + cardSpacing >= height() - horizontalScrollBar()->height() ) {
-      maxHeight = QMAX( maxHeight, yPos );
+      maxHeight = TQMAX( maxHeight, yPos );
 
       // Drawing in this column would be greater than the height
       // of the scroll view, so move to next column
@@ -936,7 +936,7 @@ void CardView::calcLayout()
     item->d->y = yPos;
 
     yPos += item->height();
-    maxWidth = QMAX( maxWidth, d->mItemWidth );
+    maxWidth = TQMAX( maxWidth, d->mItemWidth );
   }
 
   xPos += maxWidth;
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
   emit clicked( item );
 
   // The RMB click
-  if ( e->button() & Qt::RightButton ) {
+  if ( e->button() & TQt::RightButton ) {
     // clear previous selection
     bool blocked = signalsBlocked();
     blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
     item->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
-    if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ShiftButton) ) {
+    if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
       if ( item == other )
         return;
 
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       }
 
       emit selectionChanged();
-    } else if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ControlButton) ) {
+    } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
       item->tqrepaintCard();
       emit selectionChanged();
-    } else if ( e->button() & Qt::LeftButton ) {
+    } else if ( e->button() & TQt::LeftButton ) {
       bool b = signalsBlocked();
       blockSignals( true );
       selectAll( false );
@@ -1111,7 +1111,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e )
     drawRubberBands( 0 );
     // we should move to reflect the new position if we are scrolled.
     if ( contentsX() ) {
-      int newX = QMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() );
+      int newX = TQMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() );
       setContentsPos( newX, contentsY() );
     }
     // set new item width
@@ -1123,7 +1123,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e )
   }
 
   // If there are accel keys, we will not emit signals
-  if ( (e->state() & Qt::ShiftButton) || (e->state() & Qt::ControlButton) )
+  if ( (e->state() & TQt::ShiftButton) || (e->state() & TQt::ControlButton) )
     return;
 
   // Get the item at this position
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
       return;
   }
 
-  if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
+  if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
        ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
 
     startDrag();
@@ -1283,7 +1283,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
       if ( contentsX() <= 0 )
         return;
       int cw = columnWidth();
-      int theCol = ( QMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing;
+      int theCol = ( TQMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing;
       aItem = itemAt( TQPoint( theCol + 1, d->mItemSpacing + 1 ) );
       if ( aItem )
         setCurrentItem( aItem );
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index a5410419..0001fcfb 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CARDVIEW_H
@@ -55,21 +55,21 @@ class CardViewItem
       A single field in the card view. The first item is the label
       and the second item is the value.
      */
-    typedef QPair<TQString, TQString> Field;
+    typedef TQPair<TQString, TQString> Field;
 
     /**
       Constructor.
 
-      @param parent The CardView that this card should be displayed on.
+      @param tqparent The CardView that this card should be displayed on.
       @param caption The caption of the card. This is the text that will
       appear at the top of the card. This is also the string that will
       be used to sort the cards in the view.
      */
-    CardViewItem( CardView *parent, const TQString &caption = TQString() );
+    CardViewItem( CardView *tqparent, const TQString &caption = TQString() );
     virtual ~CardViewItem();
 
     /**
-      @return The caption of the card, or TQString::null if none was ever set.
+      @return The caption of the card, or TQString() if none was ever set.
      */
     const TQString &caption() const;
 
@@ -129,7 +129,7 @@ class CardViewItem
     bool isSelected() const;
 
     /**
-      Called by the parent card view when the mouse has been resting for
+      Called by the tqparent card view when the mouse has been resting for
       a certain amount of time. If the label or value at pos is obscured
       (trimmed) make the label display the full text.
      */
@@ -191,22 +191,23 @@ class CardViewItem
   can be used elsewhere. With the exception of a few simple config checks,
   the CardView is also 100% independant of KDE.
  */
-class CardView : public QScrollView
+class CardView : public TQScrollView
 {
   friend class CardViewItem;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
       Constructor.
      */
-    CardView( TQWidget *parent, const char *name );
+    CardView( TQWidget *tqparent, const char *name );
     virtual ~CardView();
 
     /**
       Inserts the item into the card view. This method does not have
-      to be called if you created the item with a proper parent. Once
+      to be called if you created the item with a proper tqparent. Once
       inserted, the CardView takes ownership of the item.
      */
     void insertItem( CardViewItem *item );
@@ -261,7 +262,7 @@ class CardView : public QScrollView
     /**
       Sets the selection mode.
 
-      @see QListView
+      @see TQListView
      */
     void setSelectionMode( SelectionMode mode );
 
@@ -321,7 +322,7 @@ class CardView : public QScrollView
       @return The first matching item, or 0 if no items match.
      */
     CardViewItem *findItem( const TQString &text, const TQString &label,
-                            Qt::StringComparisonMode compare = Qt::BeginsWith ) const;
+                            TQt::StringComparisonMode compare = TQt::BeginsWith ) const;
 
     /**
       Returns the amounts of pixels required for one column.
@@ -391,7 +392,7 @@ class CardView : public QScrollView
       will probably mean a crash in the items painting routine.
      */
     // Note: I looked for a value in TQStyle::PixelMetric to use, but I could
-    // not see a useful one. One may turn up in a future version of Qt.
+    // not see a useful one. One may turn up in a future version of TQt.
     uint itemMargin() const;
 
     /**
@@ -436,7 +437,7 @@ class CardView : public QScrollView
     TQFont headerFont() const;
 
     /**
-      Reimplementation from QWidget
+      Reimplementation from TQWidget
      */
     void setFont( const TQFont &fnt );
 
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 8043eacd..df190d3c 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -25,8 +25,8 @@
 
 #include "colorlistbox.h"
 
-ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
-  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
+  :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
@@ -173,7 +173,7 @@ void ColorListItem::paint( TQPainter *p )
 
   p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() );
 
-  p->setPen( Qt::black );
+  p->setPen( TQt::black );
   p->drawRect( 3, 1, mBoxWidth, h-1 );
   p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
 }
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 053f06ff..566ec8b0 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -26,9 +26,10 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
+    ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
     void setColor( uint index, const TQColor &color );
     TQColor color( uint index ) const;
 
@@ -50,10 +51,10 @@ class ColorListBox : public KListBox
 };
 
 
-class ColorListItem : public QListBoxItem
+class ColorListItem : public TQListBoxItem
 {
   public:
-    ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+    ColorListItem( const TQString &text, const TQColor &color=TQt::black );
     const TQColor &color( void );
     void  setColor( const TQColor &color );
 
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 919e4987..fdccd52f 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -47,11 +47,11 @@
 /////////////////////////////////
 // ConfigureCardViewDialog
 
-ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                                   const char *name )
-  : ViewConfigureWidget( ab, parent, name )
+  : ViewConfigureWidget( ab, tqparent, name )
 {
-  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null,
+  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
                            DesktopIcon( "looknfeel" ) );
   mAdvancedPage = new CardViewLookNFeelPage( page );
 }
@@ -76,8 +76,8 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config )
 
 ////////////////////////
 // CardViewLookNFeelPage
-CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *parent, const char *name )
-  : TQVBox( parent, name )
+CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *tqparent, const char *name )
+  : TQVBox( tqparent, name )
 {
   initGUI();
 }
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
 
-  TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+  TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
 
   cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
 
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
   sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
   lSpacing->setBuddy( sbSpacing );
 
-  TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+  TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
 
   TQHBox *hbMargin = new TQHBox( gbCards );
   TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 441a1e89..52ec9cbb 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONFIGURECARDVIEWDIALOG_H
@@ -48,7 +48,7 @@ class CardViewLookAndFeelPage;
 class ConfigureCardViewWidget : public ViewConfigureWidget
 {
   public:
-    ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+    ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
     virtual ~ConfigureCardViewWidget();
 
     virtual void restoreSettings( KConfig* );
@@ -80,9 +80,10 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
 class CardViewLookNFeelPage : public TQVBox {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
+    CardViewLookNFeelPage( TQWidget *tqparent=0, const char *name=0 );
     ~CardViewLookNFeelPage();
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index d65f42d3..309244e5 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -41,11 +41,11 @@
 #include "configuretableviewdialog.h"
 
 ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
-                                                    TQWidget *parent,
+                                                    TQWidget *tqparent,
                                                     const char *name )
-  : ViewConfigureWidget( ab, parent, name )
+  : ViewConfigureWidget( ab, tqparent, name )
 {
-  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null,
+  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
                            KGlobal::iconLoader()->loadIcon( "looknfeel",
                            KIcon::Panel ) );
 
@@ -72,8 +72,8 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config )
 
 
 
-LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
-  : TQWidget(parent, name)
+LookAndFeelPage::LookAndFeelPage(TQWidget *tqparent, const char *name)
+  : TQWidget(tqparent, name)
 {
   initGUI();
 
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
-  TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
+  TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
                                          i18n("Row Separator"), this);
   tqlayout->addWidget(group);
 
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 2e3378b4..a0228cba 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONFIGURETABLEVIEWDIALOG_H
@@ -45,7 +45,7 @@ class LookAndFeelPage;
 class ConfigureTableViewWidget : public ViewConfigureWidget
 {
   public:
-    ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+    ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
     virtual ~ConfigureTableViewWidget();
 
     virtual void restoreSettings( KConfig* );
@@ -60,12 +60,13 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 /**
   Internal class. It is only defined here for tqmoc
 */
-class LookAndFeelPage : public QWidget
+class LookAndFeelPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LookAndFeelPage( TQWidget *parent, const char *name = 0 );
+    LookAndFeelPage( TQWidget *tqparent, const char *name = 0 );
     ~LookAndFeelPage() {}
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 5b9ecbf1..548ad5f9 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqheader.h>
@@ -47,8 +47,8 @@
 /////////////////////////////////
 // DynamicTip Methods
 
-DynamicTip::DynamicTip( ContactListView *parent)
-  : TQToolTip( parent )
+DynamicTip::DynamicTip( ContactListView *tqparent)
+  : TQToolTip( tqparent )
 {
 }
 
@@ -116,7 +116,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
             linew = lastw;
           }
           else
-            i = QMAX( a, i-1 );
+            i = TQMAX( a, i-1 );
         }
 
       if ( notes[i] == '\n' || doBreak ) {
@@ -147,12 +147,12 @@ void DynamicTip::maybeTip( const TQPoint &pos )
 // ContactListViewItem Methods
 
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
-                                         ContactListView *parent,
+                                         ContactListView *tqparent,
                                          KABC::AddressBook *doc,
                                          const KABC::Field::List &fields,
                                          KIMProxy *proxy )
-  : KListViewItem(parent), mAddressee(a), mFields( fields ),
-    parentListView( parent ), mDocument(doc), mIMProxy( proxy )
+  : KListViewItem(tqparent), mAddressee(a), mFields( fields ),
+    tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy )
 {
   if ( mIMProxy )
     mHasIM = mIMProxy->isPresent( mAddressee.uid() );
@@ -164,15 +164,15 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
 TQString ContactListViewItem::key(int column, bool ascending) const
 {
   // Preserve behaviour of TQListViewItem::key(), otherwise we cause a crash if the column does not exist
-  if ( column >= parentListView->columns() )
-    return TQString::null;
+  if ( column >= tqparentListView->columns() )
+    return TQString();
 
 #if KDE_VERSION >= 319
   Q_UNUSED( ascending )
-  if ( parentListView->showIM() ) {
+  if ( tqparentListView->showIM() ) {
     // in this case, one column is reserved for IM presence
     // so we have to process it differently
-    if ( column == parentListView->imColumn() ) {
+    if ( column == tqparentListView->imColumn() ) {
       // increment by one before converting to string so that -1 is not greater than 1
       // create the sort key by taking the numeric status 0 low, 5 high, and subtracting it from 5
       // so that the default ascending gives online before offline, etc.
@@ -201,16 +201,16 @@ void ContactListViewItem::paintCell(TQPainter * p,
   if ( !p )
     return;
 
-  if (parentListView->singleLine()) {
-    p->setPen( parentListView->alternateColor() );
+  if (tqparentListView->singleLine()) {
+    p->setPen( tqparentListView->alternateColor() );
     p->drawLine( 0, height() - 1, width, height() - 1 );
   }
 }
 
 
-ContactListView *ContactListViewItem::parent()
+ContactListView *ContactListViewItem::tqparent()
 {
-  return parentListView;
+  return tqparentListView;
 }
 
 
@@ -222,7 +222,7 @@ void ContactListViewItem::refresh()
   }
 
   // Update our addressee, since it may have changed elsewhere
-  mAddressee = mDocument->tqfindByUid(mAddressee.uid());
+  mAddressee = mDocument->findByUid(mAddressee.uid());
   if (mAddressee.isEmpty())
     return;
 
@@ -230,9 +230,9 @@ void ContactListViewItem::refresh()
   // don't show unknown presence, it's not interesting
   if ( mHasIM ) {
     if ( mIMProxy->presenceNumeric( mAddressee.uid() ) > 0 )
-      setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
+      setPixmap( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
     else
-      setPixmap( parentListView->imColumn(), TQPixmap() );
+      setPixmap( tqparentListView->imColumn(), TQPixmap() );
   }
 
   KABC::Field::List::ConstIterator it;
@@ -258,9 +258,9 @@ void ContactListViewItem::setHasIM( bool hasIM )
 
 ContactListView::ContactListView(KAddressBookTableView *view,
                                  KABC::AddressBook* /* doc */,
-                                 TQWidget *parent,
+                                 TQWidget *tqparent,
                                  const char *name )
-  : KListView( parent, name ),
+  : KListView( tqparent, name ),
     pabWidget( view ),
     oldColumn( 0 )
 {
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 7936333a..65c92702 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONTACTLISTVIEW_H
@@ -41,10 +41,10 @@ class KIMProxy;
 /** The whole tooltip design needs a lot of work. Currently it is
 * hacked together to function.
 */
-class DynamicTip : public QToolTip
+class DynamicTip : public TQToolTip
 {
   public:
-    DynamicTip( ContactListView * parent );
+    DynamicTip( ContactListView * tqparent );
 
   protected:
     void maybeTip( const TQPoint & );
@@ -56,11 +56,11 @@ class ContactListViewItem : public KListViewItem
 {
 
 public:
-  ContactListViewItem(const KABC::Addressee &a, ContactListView* parent,
+  ContactListViewItem(const KABC::Addressee &a, ContactListView* tqparent,
                       KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy );
   const KABC::Addressee &addressee() const { return mAddressee; }
   virtual void refresh();
-  virtual ContactListView* parent();
+  virtual ContactListView* tqparent();
   virtual TQString key ( int, bool ) const;
   void setHasIM( bool hasIM );
   /** Adds the border around the cell if the user wants it.
@@ -72,7 +72,7 @@ public:
 private:
   KABC::Addressee mAddressee;
   KABC::Field::List mFields;
-  ContactListView *parentListView;
+  ContactListView *tqparentListView;
   KABC::AddressBook *mDocument;
   KIMProxy *mIMProxy;
   bool mHasIM;
@@ -85,11 +85,12 @@ private:
 class ContactListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ContactListView(KAddressBookTableView *view,
                   KABC::AddressBook *doc,
-                  TQWidget *parent,
+                  TQWidget *tqparent,
                   const char *name = 0L );
   virtual ~ContactListView() {}
   //void resort();
@@ -138,7 +139,7 @@ public:
 
 protected:
   /** Paints the background pixmap in the empty area. This method is needed
-  * since Qt::FixedPixmap will not scroll with the list view.
+  * since TQt::FixedPixmap will not scroll with the list view.
   */
   virtual void paintEmptyArea( TQPainter * p, const TQRect & rect );
   virtual void contentsMousePressEvent(TQMouseEvent*);
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2f0c859c..1c7f2806 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -43,19 +43,19 @@
 class CardViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookCardView( core, parent, name );
+      return new KAddressBookCardView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP("Card"); }
 
     TQString description() const { return i18n( "Rolodex style cards represent contacts." ); }
 
-    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                           const char *name = 0 )
     {
-      return new ConfigureCardViewWidget( ab, parent, name );
+      return new ConfigureCardViewWidget( ab, tqparent, name );
     }
 };
 
@@ -72,8 +72,8 @@ class AddresseeCardViewItem : public CardViewItem
     AddresseeCardViewItem( const KABC::Field::List &fields,
                            bool showEmptyFields,
                            KABC::AddressBook *doc, const KABC::Addressee &addr,
-                           CardView *parent )
-      : CardViewItem( parent, addr.realName() ),
+                           CardView *tqparent )
+      : CardViewItem( tqparent, addr.realName() ),
         mFields( fields ), mShowEmptyFields( showEmptyFields ),
         mDocument( doc ), mAddressee( addr )
       {
@@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
+      mAddressee = mDocument->findByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() ) {
         clearFields();
@@ -116,8 +116,8 @@ class AddresseeCardViewItem : public CardViewItem
 };
 
 
-AddresseeCardView::AddresseeCardView( TQWidget *parent, const char *name )
-  : CardView( parent, name )
+AddresseeCardView::AddresseeCardView( TQWidget *tqparent, const char *name )
+  : CardView( tqparent, name )
 {
   setAcceptDrops( true );
 }
@@ -144,8 +144,8 @@ void AddresseeCardView::startDrag()
 
 
 KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
-                                            TQWidget *parent, const char *name )
-    : KAddressBookView( core, parent, name )
+                                            TQWidget *tqparent, const char *name )
+    : KAddressBookView( core, tqparent, name )
 {
   mShowEmptyFields = false;
 
@@ -282,7 +282,7 @@ void KAddressBookCardView::refresh( const TQString &uid )
     mCardView->viewport()->update();
 
     // by default nothing is selected
-    emit selected( TQString::null );
+    emit selected( TQString() );
   } else {
     // Try to find the one to refresh
     bool found = false;
@@ -349,7 +349,7 @@ void KAddressBookCardView::addresseeSelected()
   }
 
   if ( !found )
-    emit selected( TQString::null );
+    emit selected( TQString() );
 }
 
 void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point )
@@ -359,12 +359,12 @@ void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point )
 
 void KAddressBookCardView::scrollUp()
 {
-  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookCardView::scrollDown()
 {
-  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 #include "kaddressbookcardview.moc"
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 045c1e05..9ccc8a40 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -30,7 +30,7 @@
 #include "cardview.h"
 #include "kaddressbookview.h"
 
-class QDragEntryEvent;
+class TQDragEntryEvent;
 class TQDropEvent;
 class KConfig;
 class AddresseeCardView;
@@ -43,9 +43,10 @@ class AddresseeCardView;
 class KAddressBookCardView : public KAddressBookView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookCardView( KAB::Core *core, TQWidget *parent,
+    KAddressBookCardView( KAB::Core *core, TQWidget *tqparent,
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
 
@@ -77,8 +78,9 @@ class KAddressBookCardView : public KAddressBookView
 class AddresseeCardView : public CardView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AddresseeCardView( TQWidget *parent, const char *name = 0 );
+    AddresseeCardView( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeCardView();
 
   signals:
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 58b4a340..16fe5cad 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -42,9 +42,9 @@
 class IconViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookIconView( core, parent, name );
+      return new KAddressBookIconView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP( "Icon" ); }
@@ -59,8 +59,8 @@ extern "C" {
   }
 }
 
-AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
-  : KIconView( parent, name )
+AddresseeIconView::AddresseeIconView( TQWidget *tqparent, const char *name )
+  : KIconView( tqparent, name )
 {
   setSelectionMode( TQIconView::Extended );
   setResizeMode( TQIconView::Adjust );
@@ -96,8 +96,8 @@ class AddresseeIconViewItem : public KIconViewItem
 {
   public:
     AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc,
-                           const KABC::Addressee &addr, TQIconView *parent )
-      : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
+                           const KABC::Addressee &addr, TQIconView *tqparent )
+      : KIconViewItem( tqparent ), mDocument( doc ), mAddressee( addr )
       {
         refresh();
       }
@@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
+      mAddressee = mDocument->findByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() )
         setText( mAddressee.givenName() + " " + mAddressee.familyName() );
@@ -136,8 +136,8 @@ class AddresseeIconViewItem : public KIconViewItem
 
 
 KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
-                                            TQWidget *parent, const char *name)
-  : KAddressBookView( core, parent, name )
+                                            TQWidget *tqparent, const char *name)
+  : KAddressBookView( core, tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
@@ -233,7 +233,7 @@ void KAddressBookIconView::refresh( const TQString &uid )
       }
     }
 
-    refresh( TQString::null );
+    refresh( TQString() );
   }
 }
 
@@ -291,7 +291,7 @@ void KAddressBookIconView::addresseeSelected()
   }
 
   if ( !found )
-    emit selected( TQString::null );
+    emit selected( TQString() );
 }
 
 void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point )
@@ -301,12 +301,12 @@ void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point )
 
 void KAddressBookIconView::scrollUp()
 {
-  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookIconView::scrollDown()
 {
-  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 #include "kaddressbookiconview.moc"
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index dc6dddae..5b9c8c7c 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKICONVIEW_H
@@ -42,9 +42,10 @@ namespace KABC { class AddressBook; }
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookIconView( KAB::Core *core, TQWidget *parent,
+    KAddressBookIconView( KAB::Core *core, TQWidget *tqparent,
                           const char *name = 0 );
     virtual ~KAddressBookIconView();
 
@@ -75,9 +76,10 @@ class KAddressBookIconView : public KAddressBookView
 class AddresseeIconView : public KIconView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeIconView( TQWidget *parent, const char *name = 0 );
+    AddresseeIconView( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeIconView();
 
   signals:
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 89caa045..65bcd36c 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -61,9 +61,9 @@
 class TableViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookTableView( core, parent, name );
+      return new KAddressBookTableView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP( "Table" ); }
@@ -71,10 +71,10 @@ class TableViewFactory : public ViewFactory
     TQString description() const { return i18n( "A listing of contacts in a table. Each cell of "
                                   "the table holds a field of the contact." ); }
 
-    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                           const char *name = 0 )
     {
-      return new ConfigureTableViewWidget( ab, parent, name );
+      return new ConfigureTableViewWidget( ab, tqparent, name );
     }
 };
 
@@ -86,8 +86,8 @@ extern "C" {
 }
 
 KAddressBookTableView::KAddressBookTableView( KAB::Core *core,
-                                              TQWidget *parent, const char *name )
-  : KAddressBookView( core, parent, name )
+                                              TQWidget *tqparent, const char *name )
+  : KAddressBookView( core, tqparent, name )
 {
   mMainLayout = new TQVBoxLayout( viewWidget(), 2 );
 
@@ -262,7 +262,7 @@ void KAddressBookTableView::refresh( const TQString &uid )
         return;
       }
     }
-    refresh( TQString::null );
+    refresh( TQString() );
   }
 }
 
@@ -330,7 +330,7 @@ void KAddressBookTableView::addresseeSelected()
   }
 
   if ( !found )
-      emit selected( TQString::null );
+      emit selected( TQString() );
 }
 
 void KAddressBookTableView::addresseeExecuted( TQListViewItem *item )
@@ -341,9 +341,9 @@ void KAddressBookTableView::addresseeExecuted( TQListViewItem *item )
     if ( ceItem )
       emit executed( ceItem->addressee().uid() );
     else
-      emit executed( TQString::null );
+      emit executed( TQString() );
   } else {
-    emit executed( TQString::null );
+    emit executed( TQString() );
   }
 }
 
@@ -372,12 +372,12 @@ void KAddressBookTableView::updatePresence( const TQString &uid )
 
 void KAddressBookTableView::scrollUp()
 {
-  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookTableView::scrollDown()
 {
-  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index d4531412..f212829f 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKTABLEVIEW_H
@@ -62,9 +62,10 @@ class KAddressBookTableView : public KAddressBookView
 friend class ContactListView;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookTableView( KAB::Core *core, TQWidget *parent,
+    KAddressBookTableView( KAB::Core *core, TQWidget *tqparent,
                            const char *name = 0 );
     virtual ~KAddressBookTableView();
 
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 2cfdf98c..0b7c3dc7 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kbookmark.h>
@@ -33,8 +33,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort )
 
-BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createExportAction( i18n( "Export Bookmarks Menu..." ) );
 }
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index f12ed8e2..09d95f91 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef BOOKMARK_XXPORT_H
@@ -30,9 +30,10 @@
 class BookmarkXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "bookmark"; }
 
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 52286d3b..5fdc89a5 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -36,8 +36,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort )
 
-CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import CSV List..." ) );
   createExportAction( i18n( "Export CSV List..." ) );
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index b957299d..a55f326b 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CSV_XXPORT_H
@@ -29,9 +29,10 @@
 class CSVXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "csv"; }
 
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 36f76054..4356a599 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -50,10 +50,10 @@
 
 enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 };
 
-CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent,
                                   const char * name )
   : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 |
-                 User2, Ok, parent, name, true, true ),
+                 User2, Ok, tqparent, name, true, true ),
     mAdjustRows( false ),
     mStartLine( 0 ),
     mTextQuote( '"' ),
@@ -383,11 +383,11 @@ void CSVImportDialog::initGUI()
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
-  mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
+  mDelimiterBox->setColumnLayout( 0, TQt::Vertical );
   mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
   mDelimiterBox->tqlayout()->setMargin( marginHint() );
   TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
-  delimiterLayout->tqsetAlignment( Qt::AlignTop );
+  delimiterLayout->tqsetAlignment( TQt::AlignTop );
   tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
 
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
@@ -465,7 +465,7 @@ void CSVImportDialog::fillTable()
   int row, column;
   bool lastCharDelimiter = false;
   bool ignoreDups = mIgnoreDuplicates->isChecked();
-  enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
+  enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
          S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 
   TQChar x;
@@ -517,7 +517,7 @@ void CSVImportDialog::fillTable()
     switch ( state ) {
      case S_START :
       if ( x == mTextQuote ) {
-        state = S_QUOTED_FIELD;
+        state = S_TQUOTED_FIELD;
       } else if ( x == mDelimiter ) {
         if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
           ++column;
@@ -530,9 +530,9 @@ void CSVImportDialog::fillTable()
         state = S_MAYBE_NORMAL_FIELD;
       }
       break;
-     case S_QUOTED_FIELD :
+     case S_TQUOTED_FIELD :
       if ( x == mTextQuote ) {
-        state = S_MAYBE_END_OF_QUOTED_FIELD;
+        state = S_MAYBE_END_OF_TQUOTED_FIELD;
       } else if ( x == '\n' &&  mTextQuote.isNull() ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
@@ -549,10 +549,10 @@ void CSVImportDialog::fillTable()
         field += x;
       }
       break;
-     case S_MAYBE_END_OF_QUOTED_FIELD :
+     case S_MAYBE_END_OF_TQUOTED_FIELD :
       if ( x == mTextQuote ) {
         field += x;
-        state = S_QUOTED_FIELD;
+        state = S_TQUOTED_FIELD;
       } else if ( x == mDelimiter || x == '\n' ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
@@ -566,10 +566,10 @@ void CSVImportDialog::fillTable()
         }
         state = S_START;
       } else {
-        state = S_END_OF_QUOTED_FIELD;
+        state = S_END_OF_TQUOTED_FIELD;
       }
       break;
-     case S_END_OF_QUOTED_FIELD :
+     case S_END_OF_TQUOTED_FIELD :
       if ( x == mDelimiter || x == '\n' ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
@@ -583,13 +583,13 @@ void CSVImportDialog::fillTable()
         }
         state = S_START;
       } else {
-        state = S_END_OF_QUOTED_FIELD;
+        state = S_END_OF_TQUOTED_FIELD;
       }
       break;
      case S_MAYBE_NORMAL_FIELD :
       if ( x == mTextQuote ) {
         field = "";
-        state = S_QUOTED_FIELD;
+        state = S_TQUOTED_FIELD;
         break;
       }
      case S_NORMAL_FIELD :
@@ -707,11 +707,11 @@ void CSVImportDialog::resizeColumns()
 
   TQMap<TQString, uint>::ConstIterator it;
   for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) {
-    width = QMAX( width, fm.width( it.key() ) );
+    width = TQMAX( width, fm.width( it.key() ) );
   }
 
   for ( int i = 0; i < mTable->numCols(); ++i )
-    mTable->setColumnWidth( i, QMAX( width + 15, mTable->columnWidth( i ) ) );
+    mTable->setColumnWidth( i, TQMAX( width + 15, mTable->columnWidth( i ) ) );
 }
 
 void CSVImportDialog::returnPressed()
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index baa538e0..f3c953ba 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -41,9 +41,10 @@ class TQTable;
 class CSVImportDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+    CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent,
                      const char *name = 0 );
     ~CSVImportDialog();
 
diff --git a/kaddressbook/xxport/dateparser.cpp b/kaddressbook/xxport/dateparser.cpp
index 2052407a..387d731a 100644
--- a/kaddressbook/xxport/dateparser.cpp
+++ b/kaddressbook/xxport/dateparser.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqdatetime.h>
diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h
index 56996951..14fe1447 100644
--- a/kaddressbook/xxport/dateparser.h
+++ b/kaddressbook/xxport/dateparser.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef DATEPARSER_H
@@ -29,7 +29,7 @@
 /**
   This class parses the date out of a given string with the
   help of a pattern.
-  The pattern can tqcontains the following key characters:
+  The pattern can contains the following key characters:
     y = year (e.g. 82)
     Y = year (e.g. 1982)
     m = month (e.g. 7, 07 or 12)
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index d31cd111..ca804fe3 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -38,8 +38,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort )
 
-EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import Eudora Addressbook..." ) );
 }
@@ -124,22 +124,22 @@ TQString EudoraXXPort::key( const TQString& line) const
 {
   int e;
   TQString result;
-  int b = line.find( '\"', 0 );
+  int b = line.tqfind( '\"', 0 );
 
   if ( b == -1 ) {
-    b = line.find( ' ' );
+    b = line.tqfind( ' ' );
     if ( b == -1 )
       return result;
 
     b++;
-    e = line.find( ' ', b );
+    e = line.tqfind( ' ', b );
     result = line.mid( b, e - b );
 
     return result;
   }
 
   b++;
-  e = line.find( '\"', b );
+  e = line.tqfind( '\"', b );
   if ( e == -1 )
     return result;
 
@@ -191,14 +191,14 @@ TQString EudoraXXPort::get( const TQString& line, const TQString& key ) const
   uint i;
 
   // Find formatted key, return on error
-  b = line.find( fd );
+  b = line.tqfind( fd );
   if ( b == -1 )
-    return TQString::null;
+    return TQString();
 
   b += fd.length();
-  e = line.find( '>', b );
+  e = line.tqfind( '>', b );
   if ( e == -1 )
-    return TQString::null;
+    return TQString();
 
   e--;
   TQString result = line.mid( b, e - b + 1 );
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index 0181aa31..e8dcf939 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef EUDORA_XXPORT_H
@@ -29,9 +29,10 @@
 class EudoraXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "eudora"; }
 
@@ -43,7 +44,7 @@ class EudoraXXPort : public KAB::XXPort
     TQString comment( const TQString& line ) const;
     TQString email( const TQString& line ) const;
     TQString key( const TQString& line ) const;
-    int find( const TQString& key ) const;
+    int tqfind( const TQString& key ) const;
 };
 
 #endif
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index faf52707..343831a9 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -16,8 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 /*
     Description:
@@ -77,8 +77,8 @@ static KProgressDialog *m_progressDlg;
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort )
 
-GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
 	this_filter = this;
 	m_progressDlg = NULL;
@@ -94,7 +94,7 @@ static TQString makeValidPhone( const TQString &number )
 	TQString num = number.simplifyWhiteSpace();
 	TQString allowed("0123456789*+#pw");
 	for (unsigned int i=num.length(); i>=1; i--)
-		if (allowed.find(num[i-1])==-1)
+		if (allowed.tqfind(num[i-1])==-1)
 			num.remove(i-1,1);
 	if (num.isEmpty())
 		num = "0";
@@ -154,7 +154,7 @@ static TQString businit(void)
 	GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n")
 				.arg(manufacturer, model, revision, imei) );
 
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -242,7 +242,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.find(',') == -1) {
+		if (s.tqfind(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -548,9 +548,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->show();
   	processEvents();
 
-#if (QT_VERSION >= 0x030300)
-	m_progressDlg->setCursor( Qt::BusyCursor );
-#endif
+	m_progressDlg->setCursor( TQt::BusyCursor );
 	TQString errStr = businit();
 	m_progressDlg->unsetCursor();
 
@@ -605,9 +603,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	gn_error error;
 	bool deleteLabelInitialized = false;
 
-#if (QT_VERSION >= 0x030300)
-	m_progressDlg->setCursor( Qt::BusyCursor );
-#endif
+	m_progressDlg->setCursor( TQt::BusyCursor );
 	TQString errStr = businit();
 	m_progressDlg->unsetCursor();
 
@@ -645,7 +641,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
 			     "the current mobile phonebook or should they <b>tqreplace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
-			     "Please note, that in case you choose to tqreplace the phonebook "
+			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.</qt>"),
 			i18n("Export to Mobile Phone"),
@@ -805,7 +801,7 @@ static gn_data data;
 static void busterminate(void)
 {
 	gn_sm_functions(GN_OP_Terminate, NULL, &state);
-	if (lockfile) gn_device_unlock(lockfile);
+	if (lockfile) gn_tqdevice_unlock(lockfile);
 }
 
 static TQString businit(void)
@@ -834,7 +830,7 @@ static TQString businit(void)
 	aux = gn_cfg_get(gn_cfg_info, "global", "use_locking");
 	// Defaults to 'no'
 	if (aux && !strcmp(aux, "yes")) {
-		lockfile = gn_device_lock(state.config.port_device);
+		lockfile = gn_tqdevice_lock(state.config.port_tqdevice);
 		if (lockfile == NULL) {
 			return i18n("Gnokii reports a 'Lock File Error'.\n "
 			"Please exit all other running instances of gnokii, check if you have "
@@ -872,7 +868,7 @@ static TQString businit(void)
 	qstrncpy(imei, unknown, sizeof(imei)-1);
 
 	if (m_progressDlg->wasCancelled())
-		return TQString::null;
+		return TQString();
 	else
 		error = gn_sm_functions(GN_OP_Identify, &data, &state);
 	GNOKII_CHECK_ERROR(error);
@@ -882,7 +878,7 @@ static TQString businit(void)
 
 	PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei);
 
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -895,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 	memset(memstat, 0, sizeof(*memstat));
 	memstat->memory_type = memtype;
 	data.memory_status = memstat;
-	error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state);
+	error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state);
 	GNOKII_CHECK_ERROR(error);
 	if (error != GN_ERR_NONE) {
 		switch (memtype) {
@@ -1019,7 +1015,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(entry.name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.find(',') == -1) {
+		if (s.tqfind(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -1343,9 +1339,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->show();
   	processEvents();
 
-#if (QT_VERSION >= 0x030300)
-	m_progressDlg->setCursor( Qt::BusyCursor );
-#endif
+	m_progressDlg->setCursor( TQt::BusyCursor );
 	TQString errStr = businit();
 	m_progressDlg->unsetCursor();
 
@@ -1400,9 +1394,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	gn_error error;
 	bool deleteLabelInitialized = false;
 
-#if (QT_VERSION >= 0x030300)
-	m_progressDlg->setCursor( Qt::BusyCursor );
-#endif
+	m_progressDlg->setCursor( TQt::BusyCursor );
 	TQString errStr = businit();
 	m_progressDlg->unsetCursor();
 
@@ -1440,7 +1432,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
 			     "the current mobile phonebook or should they <b>tqreplace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
-			     "Please note, that in case you choose to tqreplace the phonebook "
+			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.</qt>"),
 			i18n("Export to Mobile Phone"),
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index edee6abb..a78ca233 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef GNOKII_XXPORT_H
@@ -29,9 +29,10 @@
 class GNOKIIXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "gnokii"; }
 
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index fb03e2c3..b0e44c3d 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -39,8 +39,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort )
 
-KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
 }
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index a56bc028..895a09a4 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KDE2_XXPORT_H
@@ -29,9 +29,10 @@
 class KDE2XXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "kde2"; }
 
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 799e4ca3..307fb682 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 /*
@@ -50,8 +50,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort )
 
-LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import LDIF Addressbook..." ) );
   createExportAction( i18n( "Export LDIF Addressbook..." ) );
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 72c047d6..2d1e9e04 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LDIF_XXPORT_H
@@ -30,9 +30,10 @@
 class LDIFXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "ldif"; }
 
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index c10a2852..9ddbcb39 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -38,8 +38,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort )
 
-OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import Opera Addressbook..." ) );
 }
@@ -84,7 +84,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
     }
 
     if ( parseContact == true ) {
-      int sep = line.find( '=' );
+      int sep = line.tqfind( '=' );
       key = line.left( sep ).lower();
       value = line.mid( sep + 1 );
       if ( key == TQString::tqfromLatin1( "name" ) )
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index 7730dde5..b33c9152 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef OPERA_XXPORT_H
@@ -30,9 +30,10 @@
 class OperaXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "opera"; }
 
diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp
index 6d61cb33..b1ab4e5f 100644
--- a/kaddressbook/xxport/pab_mapihd.cpp
+++ b/kaddressbook/xxport/pab_mapihd.cpp
@@ -151,7 +151,7 @@ pabrec_entry e=pr_unknown;
 return e;
 }
 
-pabfields_t::pabfields_t(pabrec & R, TQWidget * /*parent*/)
+pabfields_t::pabfields_t(pabrec & R, TQWidget * /*tqparent*/)
 {
   // Skip the first two words, because they're always the
   // same 000c 0014 ==> 0014 gives us the types, so we
diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h
index c54be450..7db97873 100644
--- a/kaddressbook/xxport/pab_mapihd.h
+++ b/kaddressbook/xxport/pab_mapihd.h
@@ -105,7 +105,7 @@
      word_t        literal(int k);
      content_t     order(int k);
    public:
-     pabfields_t(pabrec & R, TQWidget *parent);
+     pabfields_t(pabrec & R, TQWidget *tqparent);
    public:
      KABC::Addressee get( );
      bool isOK(void)     { return OK; }
diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h
index c26cbdf2..13f2b720 100644
--- a/kaddressbook/xxport/pab_pablib.h
+++ b/kaddressbook/xxport/pab_pablib.h
@@ -36,7 +36,7 @@ class pab
     TQFile in;
     const char *pabfile;
     TQString     cap;
-    TQWidget    *parent;
+    TQWidget    *tqparent;
   public:
     pab(const char *pabFile);
    ~pab();
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 6aa81850..1b5b3c6f 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
@@ -40,8 +40,8 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort )
 
-PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") );
 }
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index e98b56bf..70eef1a3 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PAB_XXPORT_H
@@ -30,9 +30,10 @@
 class PABXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "pab"; }
 
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 69f854f3..e66016a1 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -56,7 +56,7 @@ class VCardViewerDialog : public KDialogBase
 {
   public:
     VCardViewerDialog( const KABC::Addressee::List &list,
-                       TQWidget *parent, const char *name = 0 );
+                       TQWidget *tqparent, const char *name = 0 );
 
     KABC::Addressee::List contacts() const;
 
@@ -78,7 +78,7 @@ class VCardViewerDialog : public KDialogBase
 class VCardExportSelectionDialog : public KDialogBase
 {
   public:
-    VCardExportSelectionDialog( TQWidget *parent, const char *name = 0 );
+    VCardExportSelectionDialog( TQWidget *tqparent, const char *name = 0 );
     ~VCardExportSelectionDialog();
 
     bool exportPrivateFields() const;
@@ -93,8 +93,8 @@ class VCardExportSelectionDialog : public KDialogBase
     TQCheckBox *mEncryptionKeys;
 };
 
-VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createImportAction( i18n( "Import vCard..." ) );
   createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
@@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
     TQString msg = i18n( "You have selected a list of contacts, shall they be "
                         "exported to several files?" );
 
-    switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) {
+    switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) {
       case KMessageBox::Yes: {
         KURL baseUrl = KFileDialog::getExistingURL();
         if ( baseUrl.isEmpty() )
@@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 #endif
   } else {
     if ( XXPortManager::importURL.isEmpty() )
-      urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(),
+      urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(),
                                        i18n( "Select vCard to Import" ) );
     else
       urls.append( XXPortManager::importURL );
@@ -445,7 +445,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
   context->setArmor( false );
   context->setTextMode( false );
 
-  QGpgME::QByteArrayDataProvider dataProvider;
+  QGpgME::TQByteArrayDataProvider dataProvider;
   GpgME::Data dataObj( &dataProvider );
   GpgME::Error error = context->exportPublicKeys( fingerprint.latin1(), dataObj );
   delete context;
@@ -465,9 +465,9 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
 // ---------- VCardViewer Dialog ---------------- //
 
 VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
-                                      TQWidget *parent, const char *name )
+                                      TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes,
-                 parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
+                 tqparent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
     mContacts( list )
 {
   TQFrame *page = plainPage();
@@ -537,10 +537,10 @@ void VCardViewerDialog::slotCancel()
 
 // ---------- VCardExportSelection Dialog ---------------- //
 
-VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
+VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *tqparent,
                                                         const char *name )
   : KDialogBase( Plain, i18n( "Select vCard Fields" ), Ok | Cancel, Ok,
-                 parent, name, true, true )
+                 tqparent, name, true, true )
 {
   TQFrame *page = plainPage();
 
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index 191d37a3..e051d53f 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VCARD_XXPORT_H
@@ -30,9 +30,10 @@
 class VCardXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "vcard"; }
 
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index aee87fd4..0f8332ed 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -41,8 +41,8 @@
 KURL XXPortManager::importURL = KURL();
 TQString XXPortManager::importData = TQString();
 
-XXPortManager::XXPortManager( KAB::Core *core, TQObject *parent, const char *name )
-  : TQObject( parent, name ), mCore( core )
+XXPortManager::XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mCore( core )
 {
   loadPlugins();
 }
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index 92bc48fa..fb179d6e 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef XXPORTMANAGER_H
@@ -37,12 +37,13 @@ namespace KAB {
 class Core;
 }
 
-class KDE_EXPORT XXPortManager : public QObject
+class KDE_EXPORT XXPortManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 );
+    XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name = 0 );
     ~XXPortManager();
 
     void restoreSettings();
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 9b84961d..f7badeaa 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kabc/addressbook.h>
@@ -44,9 +44,9 @@
 #include "xxportselectdialog.h"
 
 XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
-                                        TQWidget* parent, const char* name )
+                                        TQWidget* tqparent, const char* name )
     : KDialogBase( Plain, i18n( "Choose Which Contacts to Export" ), Help | Ok | Cancel,
-                   Ok, parent, name, true, true ), mCore( core ),
+                   Ok, tqparent, name, true, true ), mCore( core ),
       mUseSorting( sort )
 {
   initGUI();
@@ -94,7 +94,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
   if ( mUseSelection->isChecked() ) {
     TQStringList::ConstIterator it;
     for ( it = selection.begin(); it != selection.end(); ++it ) {
-      KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
+      KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
       if ( !addr.isEmpty() )
         list.append( addr );
     }
@@ -186,12 +186,12 @@ void XXPortSelectDialog::initGUI()
   topLayout->addWidget( label );
 
   mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
-  mButtonGroup->setColumnLayout( 0, Qt::Vertical );
+  mButtonGroup->setColumnLayout( 0, TQt::Vertical );
   mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  groupLayout->tqsetAlignment( TQt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
@@ -210,7 +210,7 @@ void XXPortSelectDialog::initGUI()
   mUseCategories = new TQRadioButton( i18n( "Category &members" ), mButtonGroup );
   TQWhatsThis::add( mUseCategories, i18n( "Only export contacts who are members of a category that is checked on the list to the left.\n"
                                        "This option is disabled if you have no categories." ) );
-  groupLayout->addWidget( mUseCategories, 3, 0, Qt::AlignTop );
+  groupLayout->addWidget( mUseCategories, 3, 0, TQt::AlignTop );
 
   mFiltersCombo = new TQComboBox( false, mButtonGroup );
   TQWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to export." ) );
@@ -225,10 +225,10 @@ void XXPortSelectDialog::initGUI()
   topLayout->addWidget( mButtonGroup );
 
   TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
-  sortingGroup->setColumnLayout( 0, Qt::Vertical );
+  sortingGroup->setColumnLayout( 0, TQt::Vertical );
   TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->tqsetAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( TQt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index cb620fd3..10c311b1 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef XXPORTSELECTDIALOG_H
 #define XXPORTSELECTDIALOG_H
@@ -45,9 +45,10 @@ class KComboBox;
 class XXPortSelectDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent,
+    XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* tqparent,
                         const char* name = 0 );
 
     KABC::AddresseeList contacts();
diff --git a/kalarm/COPYING b/kalarm/COPYING
index 54754ab4..b55fa146 100644
--- a/kalarm/COPYING
+++ b/kalarm/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kalarm/Changelog b/kalarm/Changelog
index a3a1c659..c76cad45 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -142,7 +142,7 @@ KAlarm Change Log
 - Add context help for sound file fade options.
 
 === Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 ===
-- Improve alarm edit dialogue layout (Reminder controls moved to below Time box).
+- Improve alarm edit dialogue tqlayout (Reminder controls moved to below Time box).
 
 === Version 1.4.4 --- 11 July 2006 ===
 - Use an alarm's previous deferral time interval as default for its next deferral.
@@ -260,8 +260,8 @@ KAlarm Change Log
 - Align times in alarm list.
 - Fix crash when the last recurrence of an alarm is reached.
 - Fix random limit on expired alarm discard time if stepping with spinbox buttons.
-- Fix dialog layouts for right-to-left languages.
-- Fix time spin box layout for right-to-left languages.
+- Fix dialog tqlayouts for right-to-left languages.
+- Fix time spin box tqlayout for right-to-left languages.
 
 === Version 1.2.2 --- 27 November 2004 ===
 - Make alarm daemon (kalarmd) exclusive to KAlarm.
@@ -640,7 +640,7 @@ KAlarm Change Log
 - Add dialog option to set an alarm's time as an interval from the current time.
 - Add defer option to alarm message window.
 - Provide button in alarm message window to activate KAlarm.
-- Make dialogs modal only for their parent window.
+- Make dialogs modal only for their tqparent window.
 
 === Version 0.2 --- 20 October 2001 ===
 - Implement repeating alarms.
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 274bf0c8..2d4e962d 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -64,7 +64,7 @@ TQString AlarmCalendar::icalProductId()
 	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
 }
 
-static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = {
+static const KAEvent::tqStatus eventTypes[AlarmCalendar::NCALS] = {
 	KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE
 };
 static const TQString calendarNames[AlarmCalendar::NCALS] = {
@@ -83,7 +83,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 * There are 4 calendars:
 *  1) A user-independent one containing the active alarms;
 *  2) A historical one containing expired alarms;
-*  3) A user-specific one which tqcontains details of alarms which are currently
+*  3) A user-specific one which contains details of alarms which are currently
 *     being displayed to that user and which have not yet been acknowledged;
 *  4) One containing alarm templates.
 * Reply = true if success, false if calendar name error.
@@ -206,7 +206,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID)
 	if (uniqueID.isEmpty())
 		return 0;
 	CalID calID;
-	switch (KAEvent::uidStatus(uniqueID))
+	switch (KAEvent::uidtqStatus(uniqueID))
 	{
 		case KAEvent::ACTIVE:      calID = ACTIVE;  break;
 		case KAEvent::TEMPLATE:    calID = TEMPLATE;  break;
@@ -231,7 +231,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID)
 AlarmCalendar::AlarmCalendar(const TQString& path, CalID type, const TQString& icalPath,
                              const TQString& configKey)
 	: mCalendar(0),
-	  mConfigKey(icalPath.isNull() ? TQString::null : configKey),
+	  mConfigKey(icalPath.isNull() ? TQString() : configKey),
 	  mType(eventTypes[type]),
 	  mPurgeDays(-1),      // default to not purging
 	  mOpen(false),
@@ -325,7 +325,7 @@ int AlarmCalendar::load()
 		return -1;
 	}
 	kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl;
-	mCalendar->setTimeZoneId(TQString::null);   // default to the local time zone for reading
+	mCalendar->setTimeZoneId(TQString());   // default to the local time zone for reading
 	bool loaded = mCalendar->load(tmpFile);
 	mCalendar->setLocalTime();                 // write using local time (i.e. no time zone)
 	if (!loaded)
@@ -439,14 +439,14 @@ void AlarmCalendar::close()
 /******************************************************************************
 * Import alarms from an external calendar and merge them into KAlarm's calendar.
 * The alarms are given new unique event IDs.
-* Parameters: parent = parent widget for error message boxes
+* Parameters: tqparent = tqparent widget for error message boxes
 * Reply = true if all alarms in the calendar were successfully imported
 *       = false if any alarms failed to be imported.
 */
-bool AlarmCalendar::importAlarms(TQWidget* parent)
+bool AlarmCalendar::importAlarms(TQWidget* tqparent)
 {
 	KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
-	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
+	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), tqparent);
 	if (url.isEmpty())
 	{
 		kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 		if (!KStandardDirs::exists(filename))
 		{
 			kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
-			KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+			KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
 			return false;
 		}
 	}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 		if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
 		{
 			kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
-			KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
+			KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
 			return false;
 		}
 		kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 	if (!success)
 	{
 		kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
-		KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+		KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
 	}
 	else
 	{
@@ -508,7 +508,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 			const Event* event = *it;
 			if (event->alarms().isEmpty()  ||  !KAEvent(*event).valid())
 				continue;    // ignore events without alarms, or usable alarms
-			KAEvent::Status type = KAEvent::uidStatus(event->uid());
+			KAEvent::tqStatus type = KAEvent::uidtqStatus(event->uid());
 			switch (type)
 			{
 				case KAEvent::ACTIVE:
@@ -544,7 +544,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 					if (alarm->type() == Alarm::Display  &&  alarm->text().isEmpty())
 						alarm->setText(newev->summary());
 				}
-				newev->setSummary(TQString::null);   // KAlarm only uses summary for template names
+				newev->setSummary(TQString());   // KAlarm only uses summary for template names
 			}
 			// Give the event a new ID and add it to the calendar
 			newev->setUid(KAEvent::uid(CalFormat::createUniqueId(), type));
@@ -807,9 +807,9 @@ bool AlarmCalendar::deleteEvent(const TQString& eventID, bool saveit)
 /******************************************************************************
 * Emit a signal to indicate whether the calendar is empty.
 */
-void AlarmCalendar::emitEmptyStatus()
+void AlarmCalendar::emitEmptytqStatus()
 {
-	emit emptyStatus(events().isEmpty());
+	emit emptytqStatus(events().isEmpty());
 }
 
 /******************************************************************************
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index be96c387..47d59f3e 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -33,13 +33,14 @@ class KConfig;
  *  Either vCalendar or iCalendar files may be read, but the calendar is saved
  *  only in iCalendar format to avoid information loss.
  */
-class AlarmCalendar : public QObject
+class AlarmCalendar : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		virtual ~AlarmCalendar();
 		bool                  valid() const                       { return mUrl.isValid(); }
-		KAEvent::Status       type() const                        { return mType; }
+		KAEvent::tqStatus       type() const                        { return mType; }
 		bool                  open();
 		int                   load();
 		bool                  reload();
@@ -53,7 +54,7 @@ class AlarmCalendar : public QObject
 		KCal::Event*          addEvent(KAEvent&, bool useEventID = false);
 		void                  updateEvent(const KAEvent&);
 		bool                  deleteEvent(const TQString& eventID, bool save = false);
-		void                  emitEmptyStatus();
+		void                  emitEmptytqStatus();
 		void                  purgeAll()                          { purge(0); }
 		void                  setPurgeDays(int days);
 		void                  purgeIfQueued();    // must only be called from KAlarmApp::processQueue()
@@ -80,19 +81,19 @@ class AlarmCalendar : public QObject
 	signals:
 		void                  calendarSaved(AlarmCalendar*);
 		void                  purged();
-		void                  emptyStatus(bool empty);
+		void                  emptytqStatus(bool empty);
 
 	private slots:
 		void                  slotPurge();
 
 	private:
-		AlarmCalendar(const TQString& file, CalID, const TQString& icalFile = TQString::null,
-		              const TQString& configKey = TQString::null);
+		AlarmCalendar(const TQString& file, CalID, const TQString& icalFile = TQString(),
+		              const TQString& configKey = TQString());
 		bool                  create();
-		bool                  saveCal(const TQString& newFile = TQString::null);
+		bool                  saveCal(const TQString& newFile = TQString());
 		void                  purge(int daysToKeep);
 		void                  startPurgeTimer();
-		static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString::null);
+		static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString());
 		static AlarmCalendar* calendarOpen(CalID);
 
 		static AlarmCalendar* mCalendars[NCALS];   // the calendars
@@ -102,7 +103,7 @@ class AlarmCalendar : public QObject
 		KURL                  mICalUrl;            // URL of iCalendar file
 		TQString               mLocalFile;          // calendar file, or local copy if it's a remote file
 		TQString               mConfigKey;          // config file key for this calendar's URL
-		KAEvent::Status       mType;               // what type of events the calendar file is for
+		KAEvent::tqStatus       mType;               // what type of events the calendar file is for
 		int                   mPurgeDays;          // how long to keep alarms, 0 = don't keep, -1 = keep indefinitely
 		bool                  mOpen;               // true if the calendar file is open
 		int                   mPurgeDaysQueued;    // >= 0 to purge the calendar when called from KAlarmApp::processLoop()
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 52206342..66534b69 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -211,8 +211,8 @@ void KAEvent::set(const Event& event)
 	// Extract status from the event
 	mEventID                = event.uid();
 	mRevision               = event.revision();
-	mTemplateName           = TQString::null;
-	mLogFile                = TQString::null;
+	mTemplateName           = TQString();
+	mLogFile                = TQString();
 	mTemplateAfterTime      = -1;
 	mBeep                   = false;
 	mSpeak                  = false;
@@ -334,7 +334,7 @@ void KAEvent::set(const Event& event)
 	}
  	mNextMainDateTime = readDateTime(event, dateOnly, mStartDateTime);
 	mSaveDateTime = event.created();
-	if (uidStatus() == TEMPLATE)
+	if (uidtqStatus() == TEMPLATE)
 		mTemplateName = event.summary();
 	if (event.statusStr() == DISABLED_STATUS)
 		mEnabled = false;
@@ -789,10 +789,10 @@ void KAEvent::set(const TQDateTime& dateTime, const TQString& text, const TQColo
 			break;
 	}
 	mText                   = (mActionType == T_COMMAND) ? text.stripWhiteSpace() : text;
-	mEventID                = TQString::null;
-	mTemplateName           = TQString::null;
-	mPreAction              = TQString::null;
-	mPostAction             = TQString::null;
+	mEventID                = TQString();
+	mTemplateName           = TQString();
+	mPreAction              = TQString();
+	mPostAction             = TQString();
 	mAudioFile              = "";
 	mSoundVolume            = -1;
 	mFadeVolume             = -1;
@@ -877,7 +877,7 @@ DateTime KAEvent::displayDateTime() const
 	{
 		if (mMainExpired)
 			return mDeferralTime;
-		return QMIN(mDeferralTime, dt);
+		return TQMIN(mDeferralTime, dt);
 	}
 	return dt;
 }
@@ -885,38 +885,38 @@ DateTime KAEvent::displayDateTime() const
 /******************************************************************************
  * Convert a unique ID to indicate that the event is in a specified calendar file.
  */
-TQString KAEvent::uid(const TQString& id, Status status)
+TQString KAEvent::uid(const TQString& id, tqStatus status)
 {
 	TQString result = id;
-	Status oldStatus;
+	tqStatus oldtqStatus;
 	int i, len;
-	if ((i = result.find(EXPIRED_UID)) > 0)
+	if ((i = result.tqfind(EXPIRED_UID)) > 0)
 	{
-		oldStatus = EXPIRED;
+		oldtqStatus = EXPIRED;
 		len = EXPIRED_UID.length();
 	}
-	else if ((i = result.find(DISPLAYING_UID)) > 0)
+	else if ((i = result.tqfind(DISPLAYING_UID)) > 0)
 	{
-		oldStatus = DISPLAYING;
+		oldtqStatus = DISPLAYING;
 		len = DISPLAYING_UID.length();
 	}
-	else if ((i = result.find(TEMPLATE_UID)) > 0)
+	else if ((i = result.tqfind(TEMPLATE_UID)) > 0)
 	{
-		oldStatus = TEMPLATE;
+		oldtqStatus = TEMPLATE;
 		len = TEMPLATE_UID.length();
 	}
-	else if ((i = result.find(KORGANIZER_UID)) > 0)
+	else if ((i = result.tqfind(KORGANIZER_UID)) > 0)
 	{
-		oldStatus = KORGANIZER;
+		oldtqStatus = KORGANIZER;
 		len = KORGANIZER_UID.length();
 	}
 	else
 	{
-		oldStatus = ACTIVE;
+		oldtqStatus = ACTIVE;
 		i = result.findRev('-');
 		len = 1;
 	}
-	if (status != oldStatus  &&  i > 0)
+	if (status != oldtqStatus  &&  i > 0)
 	{
 		TQString part;
 		switch (status)
@@ -935,15 +935,15 @@ TQString KAEvent::uid(const TQString& id, Status status)
 /******************************************************************************
  * Get the calendar type for a unique ID.
  */
-KAEvent::Status KAEvent::uidStatus(const TQString& uid)
+KAEvent::tqStatus KAEvent::uidtqStatus(const TQString& uid)
 {
-	if (uid.find(EXPIRED_UID) > 0)
+	if (uid.tqfind(EXPIRED_UID) > 0)
 		return EXPIRED;
-	if (uid.find(DISPLAYING_UID) > 0)
+	if (uid.tqfind(DISPLAYING_UID) > 0)
 		return DISPLAYING;
-	if (uid.find(TEMPLATE_UID) > 0)
+	if (uid.tqfind(TEMPLATE_UID) > 0)
 		return TEMPLATE;
-	if (uid.find(KORGANIZER_UID) > 0)
+	if (uid.tqfind(KORGANIZER_UID) > 0)
 		return KORGANIZER;
 	return ACTIVE;
 }
@@ -1046,7 +1046,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 			cats.append(ARCHIVE_CATEGORY);
 	}
 	ev.setCategories(cats);
-	ev.setCustomStatus(mEnabled ? TQString::null : DISABLED_STATUS);
+	ev.setCustomtqStatus(mEnabled ? TQString() : DISABLED_STATUS);
 	ev.setRevision(mRevision);
 	ev.clearAlarms();
 
@@ -1279,7 +1279,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 					alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
 						      TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name())
 										     .arg(mFgColour.name())
-										     .arg(mDefaultFont ? TQString::null : mFont.toString()));
+										     .arg(mDefaultFont ? TQString() : mFont.toString()));
 					break;
 				case T_COMMAND:
 					if (mCommandScript)
@@ -2108,7 +2108,7 @@ TQString KAEvent::recurrenceText(bool brief) const
 				break;
 		}
 	}
-	return brief ? TQString::null : i18n("None");
+	return brief ? TQString() : i18n("None");
 }
 
 /******************************************************************************
@@ -2131,7 +2131,7 @@ TQString KAEvent::repetitionText(bool brief) const
 			return i18n("1 Day", "%n Days", mRepeatInterval/1440);
 		return i18n("1 Week", "%n Weeks", mRepeatInterval/(7*1440));
 	}
-	return brief ? TQString::null : i18n("None");
+	return brief ? TQString() : i18n("None");
 }
 
 /******************************************************************************
@@ -2551,7 +2551,7 @@ bool KAEvent::adjustStartOfDay(const Event::List& events)
 	{
 		Event* event = *evit;
 		const TQStringList cats = event->categories();
-		if (cats.find(DATE_ONLY_CATEGORY) != cats.end())
+		if (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end())
 		{
 			// It's an untimed event, so fix it
 			TQTime oldTime = event->dtStart().time();
@@ -2694,9 +2694,9 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * All alarms were of type DISPLAY. Instead of the X-KDE-KALARM-TYPE
 			 * alarm property, characteristics were stored as a prefix to the
 			 * alarm DESCRIPTION property, as follows:
-			 *   SEQNO;[FLAGS];TYPE:TEXT
+			 *   SETQNO;[FLAGS];TYPE:TEXT
 			 * where
-			 *   SEQNO = sequence number of alarm within the event
+			 *   SETQNO = sequence number of alarm within the event
 			 *   FLAGS = C for late-cancel, L for repeat-at-login, D for deferral
 			 *   TYPE = TEXT or FILE or CMD
 			 *   TEXT = message text, file name/URL or command
@@ -2732,14 +2732,14 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 					else
 						i = 0;     // invalid prefix
 				}
-				if (txt.find(TEXT_PREFIX, i) == i)
+				if (txt.tqfind(TEXT_PREFIX, i) == i)
 					i += TEXT_PREFIX.length();
-				else if (txt.find(FILE_PREFIX, i) == i)
+				else if (txt.tqfind(FILE_PREFIX, i) == i)
 				{
 					action = T_FILE;
 					i += FILE_PREFIX.length();
 				}
-				else if (txt.find(COMMAND_PREFIX, i) == i)
+				else if (txt.tqfind(COMMAND_PREFIX, i) == i)
 				{
 					action = T_COMMAND;
 					i += COMMAND_PREFIX.length();
@@ -2818,7 +2818,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * X-KDE-KALARM-FONTCOLOUR property.
 			 * Convert BEEP category into an audio alarm with no audio file.
 			 */
-			if (uidStatus(event->uid()) == EXPIRED)
+			if (uidtqStatus(event->uid()) == EXPIRED)
 				event->setCreated(event->dtEnd());
 			TQDateTime start = event->dtStart();
 			if (event->doesFloat())
@@ -2882,7 +2882,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple LATECANCEL category to LATECANCEL:n where n = minutes late.
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.find(LATE_CANCEL_CAT)) != cats.end())
+			while ((it = cats.tqfind(LATE_CANCEL_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				addLateCancel = true;
@@ -2915,7 +2915,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple TMPLDEFTIME category to TMPLAFTTIME:n where n = minutes after.
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end())
+			while ((it = cats.tqfind(TEMPL_DEF_TIME_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0));
@@ -2929,7 +2929,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple XTERM category to LOG:xterm:
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.find(EXEC_IN_XTERM_CAT)) != cats.end())
+			while ((it = cats.tqfind(EXEC_IN_XTERM_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				cats.append(LOG_CATEGORY + xtermURL);
@@ -2952,7 +2952,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * alarm offsets to zero and deferral alarm offsets to be relative to
 			 * the next recurrence.
 			 */
-			bool dateOnly = (cats.find(DATE_ONLY_CATEGORY) != cats.end());
+			bool dateOnly = (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end());
 			DateTime startDateTime(event->dtStart(), dateOnly);
 			// Convert the main alarm and get the next main trigger time from it
 			DateTime nextMainDateTime;
@@ -3431,8 +3431,8 @@ TQString EmailAddressList::join(const TQString& separator) const
  */
 static void setProcedureAlarm(Alarm* alarm, const TQString& commandLine)
 {
-	TQString command   = TQString::null;
-	TQString arguments = TQString::null;
+	TQString command   = TQString();
+	TQString arguments = TQString();
 	TQChar quoteChar;
 	bool quoted = false;
 	uint posMax = commandLine.length();
diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h
index 0436d3fb..75ff7cbe 100644
--- a/kalarm/alarmevent.h
+++ b/kalarm/alarmevent.h
@@ -58,9 +58,9 @@ class KAAlarmEventBase
 	public:
 		~KAAlarmEventBase()  { }
 		const TQString&     cleanText() const           { return mText; }
-		TQString            message() const             { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString::null; }
-		TQString            fileName() const            { return (mActionType == T_FILE) ? mText : TQString::null; }
-		TQString            command() const             { return (mActionType == T_COMMAND) ? mText : TQString::null; }
+		TQString            message() const             { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString(); }
+		TQString            fileName() const            { return (mActionType == T_FILE) ? mText : TQString(); }
+		TQString            command() const             { return (mActionType == T_COMMAND) ? mText : TQString(); }
 		uint               emailFromId() const         { return mEmailFromIdentity; }
 		const EmailAddressList& emailAddresses() const { return mEmailAddresses; }
 		TQString            emailAddresses(const TQString& sep) const  { return mEmailAddresses.join(sep); }
@@ -200,7 +200,7 @@ class KAAlarm : public KAAlarmEventBase
 		                                                    ? mNextMainDateTime.addSecs(mNextRepeat * mRepeatInterval * 60) : mNextMainDateTime; }
 		TQDate              date() const                 { return mNextMainDateTime.date(); }
 		TQTime              time() const                 { return mNextMainDateTime.time(); }
-		TQString            audioFile() const            { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString::null; }
+		TQString            audioFile() const            { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString(); }
 		float              soundVolume() const          { return (mActionType == T_AUDIO) && !mBeep && !mText.isEmpty() ? mSoundVolume : -1; }
 		float              fadeVolume() const           { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeSeconds && !mBeep && !mText.isEmpty() ? mFadeVolume : -1; }
 		int                fadeSeconds() const          { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeVolume >= 0 && !mBeep && !mText.isEmpty() ? mFadeSeconds : 0; }
@@ -266,7 +266,7 @@ class KAEvent : public KAAlarmEventBase
 			READ_ONLY_FLAGS = 0xF0000   // tqmask for all read-only internal values
 		};
 		/** The category of an event, indicated by the middle part of its UID. */
-		enum Status
+		enum tqStatus
 		{
 			ACTIVE,      // the event is currently active
 			EXPIRED,     // the event has expired
@@ -331,7 +331,7 @@ class KAEvent : public KAAlarmEventBase
 		void               setLateCancel(int lc)                             { mLateCancel = lc;  mUpdated = true; }
 		void               setAutoClose(bool ac)                             { mAutoClose = ac;  mUpdated = true; }
 		void               setRepeatAtLogin(bool rl)                         { mRepeatAtLogin = rl;  mUpdated = true; }
-		void               setUid(Status s)                                  { mEventID = uid(mEventID, s);  mUpdated = true; }
+		void               setUid(tqStatus s)                                  { mEventID = uid(mEventID, s);  mUpdated = true; }
 		void               setKMailSerialNumber(unsigned long n)             { mKMailSerialNumber = n; }
 		void               setLogFile(const TQString& logfile);
 		void               setReminder(int minutes, bool onceOnly);
@@ -408,10 +408,10 @@ class KAEvent : public KAAlarmEventBase
 		bool               enabled() const                { return mEnabled; }
 		bool               updated() const                { return mUpdated; }
 		bool               mainExpired() const            { return mMainExpired; }
-		bool               expired() const                { return mDisplaying && mMainExpired  ||  uidStatus(mEventID) == EXPIRED; }
-		Status             uidStatus() const              { return uidStatus(mEventID); }
-		static Status      uidStatus(const TQString& uid);
-		static TQString     uid(const TQString& id, Status);
+		bool               expired() const                { return mDisplaying && mMainExpired  ||  uidtqStatus(mEventID) == EXPIRED; }
+		tqStatus             uidtqStatus() const              { return uidtqStatus(mEventID); }
+		static tqStatus      uidtqStatus(const TQString& uid);
+		static TQString     uid(const TQString& id, tqStatus);
 		static KAEvent     findTemplateName(AlarmCalendar&, const TQString& name);
 
 		struct MonthPos
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 2d4e39d6..4ef40f56 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -41,10 +41,10 @@
 #include "alarmlistview.moc"
 
 
-class AlarmListTooltip : public QToolTip
+class AlarmListTooltip : public TQToolTip
 {
 	public:
-		AlarmListTooltip(TQWidget* parent) : TQToolTip(parent) { }
+		AlarmListTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
 		virtual ~AlarmListTooltip() {}
 	protected:
 		virtual void maybeTip(const TQPoint&);
@@ -59,8 +59,8 @@ TQValueList<EventListViewBase*>  AlarmListView::mInstanceList;
 bool                            AlarmListView::mDragging = false;
 
 
-AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, const char* name)
-	: EventListViewBase(parent, name),
+AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* tqparent, const char* name)
+	: EventListViewBase(tqparent, name),
 	  mMousePressed(false),
 	  mDrawMessageInColour(false),
 	  mShowExpired(false)
@@ -69,8 +69,8 @@ AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, co
 		i18n("Time"),
 		i18n("Time To"),
 		i18n("Repeat"),
-		TQString::null,
-		TQString::null,
+		TQString(),
+		TQString(),
 		i18n("Message, File or Command")
 	};
 
@@ -133,7 +133,7 @@ AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, co
 	setSorting(mColumn[TIME_COLUMN]);           // sort initially by date/time
 	mTimeColumnHeaderWidth   = columnWidth(mColumn[TIME_COLUMN]);
 	mTimeToColumnHeaderWidth = columnWidth(mColumn[TIME_TO_COLUMN]);
-	setColumnAlignment(mColumn[REPEAT_COLUMN], Qt::AlignHCenter);
+	setColumnAlignment(mColumn[REPEAT_COLUMN], TQt::AlignHCenter);
 	setColumnWidthMode(mColumn[REPEAT_COLUMN], TQListView::Maximum);
 
 	// Set the width of the colour column in proportion to height
@@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const
 void AlarmListView::contentsMousePressEvent(TQMouseEvent* e)
 {
 	TQListView::contentsMousePressEvent(e);
-	if (e->button() == Qt::LeftButton)
+	if (e->button() == TQt::LeftButton)
 	{
 		TQPoint p(contentsToViewport(e->pos()));
 		if (itemAt(p))
@@ -414,20 +414,20 @@ void AlarmListView::contentsMouseReleaseEvent(TQMouseEvent *e)
 int AlarmListViewItem::mTimeHourPos = -2;
 int AlarmListViewItem::mDigitWidth  = -1;
 
-AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event, const TQDateTime& now)
-	: EventListViewItemBase(parent, event),
+AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& event, const TQDateTime& now)
+	: EventListViewItemBase(tqparent, event),
 	  mMessageTruncated(false),
 	  mTimeToAlarmShown(false)
 {
 	setLastColumnText();     // set the message column text
 
 	DateTime dateTime = event.expired() ? event.startDateTime() : event.displayDateTime();
-	if (parent->column(AlarmListView::TIME_COLUMN) >= 0)
-		setText(parent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
-	if (parent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
+	if (tqparent->column(AlarmListView::TIME_COLUMN) >= 0)
+		setText(tqparent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
+	if (tqparent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
 	{
 		TQString tta = timeToAlarmText(now);
-		setText(parent->column(AlarmListView::TIME_TO_COLUMN), tta);
+		setText(tqparent->column(AlarmListView::TIME_TO_COLUMN), tta);
 		mTimeToAlarmShown = !tta.isNull();
 	}
 	TQTime t = dateTime.time();
@@ -468,7 +468,7 @@ AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event
 				break;
 		}
 	}
-	setText(parent->column(AlarmListView::REPEAT_COLUMN), repeatText);
+	setText(tqparent->column(AlarmListView::REPEAT_COLUMN), repeatText);
 	mRepeatOrder.sprintf("%c%08d", '0' + repeatOrder, repeatInterval);
 
 	bool showColour = (event.action() == KAEvent::MESSAGE || event.action() == KAEvent::FILE);
@@ -507,8 +507,8 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 			if (!TQApplication::reverseLayout())    // don't try to align right-to-left languages
 			{
 				TQString fmt = locale->timeFormat();
-				int i = fmt.find(TQRegExp("%[kl]"));   // check if leading zeroes are omitted
-				if (i >= 0  &&  i == fmt.find('%'))   // and whether the hour is first
+				int i = fmt.tqfind(TQRegExp("%[kl]"));   // check if leading zeroes are omitted
+				if (i >= 0  &&  i == fmt.tqfind('%'))   // and whether the hour is first
 					mTimeHourPos = i;             // yes, so need to align
 			}
 		}
@@ -526,7 +526,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
 {
 	if (event().expired())
-		return TQString::null;
+		return TQString();
 	DateTime dateTime = event().displayDateTime();
 	if (dateTime.isDateOnly())
 	{
@@ -535,7 +535,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
 	}
 	int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60;
 	if (mins < 0)
-		return TQString::null;
+		return TQString();
 	char minutes[3] = "00";
 	minutes[0] = (mins%60) / 10 + '0';
 	minutes[1] = (mins%60) % 10 + '0';
@@ -557,7 +557,7 @@ void AlarmListViewItem::updateTimeToAlarm(const TQDateTime& now, bool forceDispl
 	{
 		if (forceDisplay  ||  mTimeToAlarmShown)
 		{
-			setText(alarmListView()->column(AlarmListView::TIME_TO_COLUMN), TQString::null);
+			setText(alarmListView()->column(AlarmListView::TIME_TO_COLUMN), TQString());
 			mTimeToAlarmShown = false;
 		}
 	}
@@ -593,7 +593,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in
 		if (mTimeHourPos >= 0)
 		{
 			// Need to pad out spacing to align times without leading zeroes
-			i = str.find(" ~");
+			i = str.tqfind(" ~");
 			if (i >= 0)
 			{
 				if (mDigitWidth < 0)
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index a722ac23..56b5c589 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -31,7 +31,7 @@ class AlarmListTooltip;
 class AlarmListViewItem : public EventListViewItemBase
 {
 	public:
-		AlarmListViewItem(AlarmListView* parent, const KAEvent&, const TQDateTime& now);
+		AlarmListViewItem(AlarmListView* tqparent, const KAEvent&, const TQDateTime& now);
 		TQTime               showTimeToAlarm(bool show);
 		void                updateTimeToAlarm(const TQDateTime& now, bool forceDisplay = false);
 		virtual void        paintCell(TQPainter*, const TQColorGroup&, int column, int width, int align);
@@ -63,14 +63,15 @@ class AlarmListViewItem : public EventListViewItemBase
 
 class AlarmListView : public EventListViewBase
 {
-		Q_OBJECT       // needed by TQObject::isA() calls
+		Q_OBJECT
+		TQ_OBJECT       // needed by TQObject::isA() calls
 	public:
 		enum ColumnIndex {    // default column order
 			TIME_COLUMN, TIME_TO_COLUMN, REPEAT_COLUMN, COLOUR_COLUMN, TYPE_COLUMN, MESSAGE_COLUMN,
 			COLUMN_COUNT
 		};
 
-		AlarmListView(const TQValueList<int>& order, TQWidget* parent = 0, const char* name = 0);
+		AlarmListView(const TQValueList<int>& order, TQWidget* tqparent = 0, const char* name = 0);
 		~AlarmListView();
 		void                   showExpired(bool show)      { mShowExpired = show; }
 		bool                   showingExpired() const      { return mShowExpired; }
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp
index 5be991f0..6cf07c34 100644
--- a/kalarm/alarmtext.cpp
+++ b/kalarm/alarmtext.cpp
@@ -44,7 +44,7 @@ void AlarmText::setText(const TQString& text)
 	mBody     = text;
 	mIsScript = text.startsWith(TQString::tqfromLatin1("#!"));
 	mIsEmail  = false;
-	mTo = mFrom = mCc = mTime = mSubject = TQString::null;
+	mTo = mFrom = mCc = mTime = mSubject = TQString();
 	mKMailSerialNum = 0;
 }
 
@@ -136,14 +136,14 @@ int AlarmText::emailHeaderCount(const TQStringList& lines)
 /******************************************************************************
 *  Check whether a text is an email, and if so return its headers or optionally
 *  only its subject line.
-*  Reply = headers/subject line, or TQString::null if not the text of an email.
+*  Reply = headers/subject line, or TQString() if not the text of an email.
 */
 TQString AlarmText::emailHeaders(const TQString& text, bool subjectOnly)
 {
 	TQStringList lines = TQStringList::split('\n', text);
 	int n = emailHeaderCount(lines);
 	if (!n)
-		return TQString::null;
+		return TQString();
 	if (subjectOnly)
 		return lines[n-1].mid(mSubjectPrefix.length()).stripWhiteSpace();
 	TQString h = lines[0];
@@ -184,8 +184,8 @@ TQString AlarmText::fromCalendarText(const TQString& text, bool& email)
 				dispText += mCcPrefix + lines[2].mid(mCcPrefixEn.length()) + '\n';
 			dispText += mDatePrefix + lines[n].mid(mDatePrefixEn.length()) + '\n';
 			dispText += mSubjectPrefix + lines[n+1].mid(mSubjectPrefixEn.length());
-			int i = text.find(mSubjectPrefixEn);
-			i = text.find('\n', i);
+			int i = text.tqfind(mSubjectPrefixEn);
+			i = text.tqfind('\n', i);
 			if (i > 0)
 				dispText += text.mid(i);
 			email = true;
@@ -224,8 +224,8 @@ TQString AlarmText::toCalendarText(const TQString& text)
 				calText += mCcPrefixEn + lines[2].mid(mCcPrefix.length()) + '\n';
 			calText += mDatePrefixEn + lines[n].mid(mDatePrefix.length()) + '\n';
 			calText += mSubjectPrefixEn + lines[n+1].mid(mSubjectPrefix.length());
-			int i = text.find(mSubjectPrefix);
-			i = text.find('\n', i);
+			int i = text.tqfind(mSubjectPrefix);
+			i = text.tqfind('\n', i);
 			if (i > 0)
 				calText += text.mid(i);
 			return calText;
@@ -276,7 +276,7 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated)
 	int newline = -1;
 	for (int i = 0;  i < maxLines;  ++i)
 	{
-		newline = text.find('\n', newline + 1);
+		newline = text.tqfind('\n', newline + 1);
 		if (newline < 0)
 			return text;       // not truncated after all !?!
 	}
diff --git a/kalarm/alarmtext.h b/kalarm/alarmtext.h
index b839ace2..e5eb7d97 100644
--- a/kalarm/alarmtext.h
+++ b/kalarm/alarmtext.h
@@ -29,7 +29,7 @@ class KAEvent;
 class AlarmText
 {
 	public:
-		AlarmText(const TQString& text = TQString::null)  { setText(text); }
+		AlarmText(const TQString& text = TQString())  { setText(text); }
 		void           setText(const TQString&);
 		void           setScript(const TQString& text)   { setText(text);  mIsScript = true; }
 		void           setEmail(const TQString& to, const TQString& from, const TQString& cc, const TQString& time,
@@ -41,7 +41,7 @@ class AlarmText
 		TQString        cc() const                 { return mCc; }
 		TQString        time() const               { return mTime; }
 		TQString        subject() const            { return mSubject; }
-		TQString        body() const               { return mIsEmail ? mBody : TQString::null; }
+		TQString        body() const               { return mIsEmail ? mBody : TQString(); }
 		bool           isEmpty() const;
 		bool           isEmail() const            { return mIsEmail; }
 		bool           isScript() const           { return mIsScript; }
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 2e426330..4ce88148 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -55,8 +55,8 @@ TQString AlarmTimeWidget::i18n_TimeAfterPeriod()
 /******************************************************************************
 * Construct a widget with a group box and title.
 */
-AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent, const char* name)
-	: ButtonGroup(groupBoxTitle, parent, name),
+AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent, const char* name)
+	: ButtonGroup(groupBoxTitle, tqparent, name),
 	  mMinDateTimeIsNow(false),
 	  mPastMax(false),
 	  mMinMaxTimeSet(false)
@@ -67,8 +67,8 @@ AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidg
 /******************************************************************************
 * Construct a widget without a group box or title.
 */
-AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* parent, const char* name)
-	: ButtonGroup(parent, name),
+AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* tqparent, const char* name)
+	: ButtonGroup(tqparent, name),
 	  mMinDateTimeIsNow(false),
 	  mPastMax(false),
 	  mMinMaxTimeSet(false)
@@ -156,8 +156,8 @@ void AlarmTimeWidget::init(int mode)
 	{
 		TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint());
 		grid->addWidget(mAtTimeRadio, 0, 0);
-		grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto);
-		grid->addWidget(timeBox, 1, 1, Qt::AlignAuto);
+		grid->addWidget(mDateEdit, 0, 1, TQt::AlignAuto);
+		grid->addWidget(timeBox, 1, 1, TQt::AlignAuto);
 		grid->setColStretch(2, 1);
 		topLayout->addStretch();
 		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
@@ -168,12 +168,12 @@ void AlarmTimeWidget::init(int mode)
 	else
 	{
 		TQGridLayout* grid = new TQGridLayout(topLayout, 2, 3, KDialog::spacingHint());
-		grid->addWidget(mAtTimeRadio, 0, 0, Qt::AlignAuto);
-		grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto);
-		grid->addWidget(timeBox, 0, 2, Qt::AlignAuto);
+		grid->addWidget(mAtTimeRadio, 0, 0, TQt::AlignAuto);
+		grid->addWidget(mDateEdit, 0, 1, TQt::AlignAuto);
+		grid->addWidget(timeBox, 0, 2, TQt::AlignAuto);
 		grid->setRowStretch(0, 1);
-		grid->addWidget(mAfterTimeRadio, 1, 0, Qt::AlignAuto);
-		grid->addWidget(mDelayTimeEdit, 1, 1, Qt::AlignAuto);
+		grid->addWidget(mAfterTimeRadio, 1, 0, TQt::AlignAuto);
+		grid->addWidget(mDelayTimeEdit, 1, 1, TQt::AlignAuto);
 		grid->setColStretch(3, 1);
 		topLayout->addStretch();
 	}
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index e3580d73..0b8d6d4f 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -34,14 +34,15 @@ class TimeSpinBox;
 class AlarmTimeWidget : public ButtonGroup
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum {       // 'mode' values for constructor. May be OR'ed together.
 			AT_TIME      = 0x00,   // "At ..."
 			DEFER_TIME   = 0x01,   // "Defer to ..."
 			NARROW       = 0x02    // make a narrow widget
 		};
-		AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0);
-		AlarmTimeWidget(int mode, TQWidget* parent = 0, const char* name = 0);
+		AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent = 0, const char* name = 0);
+		AlarmTimeWidget(int mode, TQWidget* tqparent = 0, const char* name = 0);
 		DateTime         getDateTime(int* minsFromNow = 0, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = 0) const;
 		void             setDateTime(const DateTime&);
 		void             setMinDateTimeIsCurrent();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 2e299785..5ed43275 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -54,11 +54,11 @@
 using namespace KCal;
 
 
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public TQListViewItem
 {
 	public:
 		enum columns { NAME = 0, BIRTHDAY = 1 };
-		AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday);
+		AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday);
 		TQDate birthday() const   { return mBirthday; }
 		virtual TQString key(int column, bool ascending) const;
 	private:
@@ -70,8 +70,8 @@ class AddresseeItem : public QListViewItem
 const KABC::AddressBook* BirthdayDlg::mAddressBook = 0;
 
 
-BirthdayDlg::BirthdayDlg(TQWidget* parent)
-	: KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"),
+BirthdayDlg::BirthdayDlg(TQWidget* tqparent)
+	: KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, tqparent, "BirthdayDlg"),
 	  mSpecialActionsButton(0)
 {
 	TQWidget* topWidget = plainPage();
@@ -85,7 +85,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: "));
 	mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix"));
 
-	TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget);
+	TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget);
 	topLayout->addWidget(textGroup);
 	TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup);
 	mPrefix = new BLineEdit(mPrefixText, textGroup);
@@ -105,7 +105,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	      i18n("Enter text to appear after the person's name in the alarm message, "
 	           "including any necessary leading spaces."));
 
-	TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget);
+	TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget);
 	topLayout->addWidget(group);
 	mAddresseeList = new BListView(group);
 	mAddresseeList->setMultiSelection(true);
@@ -134,7 +134,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	// Sound checkbox and file selector
 	mSoundPicker = new SoundPicker(group);
 	mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint());
-	groupLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto);
+	groupLayout->addWidget(mSoundPicker, 0, TQt::AlignAuto);
 
 	// How much to advance warning to give
 	mReminder = new Reminder(i18n("&Reminder"),
@@ -145,7 +145,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	mReminder->setFixedSize(mReminder->tqsizeHint());
 	mReminder->setMaximum(0, 364);
 	mReminder->setMinutes(0, true);
-	groupLayout->addWidget(mReminder, 0, Qt::AlignAuto);
+	groupLayout->addWidget(mReminder, 0, TQt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
 	TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint());
@@ -256,7 +256,7 @@ void BirthdayDlg::updateSelectionList()
 				name = addressee.realName();
 			// Check if the birthday already has an alarm
 			TQString text = mPrefixText + name + mSuffixText;
-			bool alarmExists = (messageList.find(text) != messageList.end());
+			bool alarmExists = (messageList.tqfind(text) != messageList.end());
 			// Check if the birthday is already in the selection list
 			bool inSelectionList = false;
 			AddresseeItem* item = 0;
@@ -396,8 +396,8 @@ void BirthdayDlg::slotTextLostFocus()
 = Class: AddresseeItem
 =============================================================================*/
 
-AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday)
-	: TQListViewItem(parent),
+AddresseeItem::AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday)
+	: TQListViewItem(tqparent),
 	  mBirthday(birthday)
 {
 	setText(NAME, name);
@@ -417,8 +417,8 @@ TQString AddresseeItem::key(int column, bool) const
 = Class: BListView
 =============================================================================*/
 
-BListView::BListView(TQWidget* parent, const char* name)
-	: KListView(parent, name)
+BListView::BListView(TQWidget* tqparent, const char* name)
+	: KListView(tqparent, name)
 {
 	KAccel* accel = new KAccel(this);
 	accel->insert(KStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll()));
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 321288ea..776b5f1b 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -43,8 +43,9 @@ class BListView;
 class BirthdayDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		BirthdayDlg(TQWidget* parent = 0);
+		BirthdayDlg(TQWidget* tqparent = 0);
 		TQValueList<KAEvent> events() const;
 		static void close();
 
@@ -76,14 +77,15 @@ class BirthdayDlg : public KDialogBase
 };
 
 
-class BLineEdit : public QLineEdit
+class BLineEdit : public TQLineEdit
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		BLineEdit(TQWidget* parent = 0, const char* name = 0)
-			     : TQLineEdit(parent, name) {}
-		BLineEdit(const TQString& text, TQWidget* parent = 0, const char* name = 0)
-			     : TQLineEdit(text, parent, name) {}
+		BLineEdit(TQWidget* tqparent = 0, const char* name = 0)
+			     : TQLineEdit(tqparent, name) {}
+		BLineEdit(const TQString& text, TQWidget* tqparent = 0, const char* name = 0)
+			     : TQLineEdit(text, tqparent, name) {}
 	signals:
 		void         focusLost();
 	protected:
@@ -93,8 +95,9 @@ class BLineEdit : public QLineEdit
 class BListView : public KListView
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		BListView(TQWidget* parent = 0, const char* name = 0);
+		BListView(TQWidget* tqparent = 0, const char* name = 0);
 	public slots:
 		virtual void slotSelectAll()   { selectAll(true); }
 		virtual void slotDeselect()    { selectAll(false); }
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index f0a34919..134436a2 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -76,31 +76,31 @@ void CalendarCompat::fix(KCal::Calendar& calendar, const TQString& localFile)
 */
 int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVersion)
 {
-	subVersion = TQString::null;
+	subVersion = TQString();
 	const TQString& prodid = calendar.productId();
 
 	// Find the KAlarm identifier
 	TQString progname = TQString::tqfromLatin1(" KAlarm ");
-	int i = prodid.find(progname, 0, false);
+	int i = prodid.tqfind(progname, 0, false);
 	if (i < 0)
 	{
 		// Older versions used KAlarm's translated name in the product ID, which
 		// could have created problems using a calendar in different locales.
 		progname = TQString(" ") + kapp->aboutData()->programName() + ' ';
-		i = prodid.find(progname, 0, false);
+		i = prodid.tqfind(progname, 0, false);
 		if (i < 0)
 			return 0;    // calendar wasn't created by KAlarm
 	}
 
 	// Extract the KAlarm version string
 	TQString ver = prodid.mid(i + progname.length()).stripWhiteSpace();
-	i = ver.find('/');
-	int j = ver.find(' ');
+	i = ver.tqfind('/');
+	int j = ver.tqfind(' ');
 	if (j >= 0  &&  j < i)
 		i = j;
 	if (i <= 0)
 		return 0;    // missing version string
-	ver = ver.left(i);     // ver now tqcontains the KAlarm version string
+	ver = ver.left(i);     // ver now contains the KAlarm version string
 	if (ver == KAlarm::currentCalendarVersionString())
 		return 0;      // the calendar is in the current KAlarm format
 	return KAlarm::getVersionNumber(ver, &subVersion);
@@ -114,7 +114,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
  */
 bool CalendarCompat::isUTC(const TQString& localFile)
 {
-	// Read the calendar file into a QString
+	// Read the calendar file into a TQString
 	TQFile file(localFile);
 	if (!file.open(IO_ReadOnly))
 		return false;
diff --git a/kalarm/calendarcompat.h b/kalarm/calendarcompat.h
index ec79ea80..c095bff1 100644
--- a/kalarm/calendarcompat.h
+++ b/kalarm/calendarcompat.h
@@ -30,7 +30,7 @@ namespace KCal { class Calendar; }
 class CalendarCompat
 {
 	public:
-		static void fix(KCal::Calendar&, const TQString& localFile = TQString::null);
+		static void fix(KCal::Calendar&, const TQString& localFile = TQString());
 
 	private:
 		static int  readKAlarmVersion(KCal::Calendar&, TQString& subVersion);
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index a129de8a..f3a466ea 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -58,7 +58,7 @@ class NotificationHandler : public TQObject, virtual public AlarmGuiIface
 		NotificationHandler();
 	private:
 		// DCOP interface
-		void  alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL);
+		void  alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL);
 		void  handleEvent(const TQString& calendarURL, const TQString& eventID);
 		void  registered(bool reregister, int result, int version);
 };
@@ -74,7 +74,7 @@ TQTimer*              Daemon::mStatusTimer = 0;
 int                  Daemon::mStatusTimerCount = 0;
 int                  Daemon::mStatusTimerInterval;
 int                  Daemon::mStartTimeout = 0;
-Daemon::Status       Daemon::mStatus = Daemon::STOPPED;
+Daemon::tqStatus       Daemon::mtqStatus = Daemon::STOPPED;
 bool                 Daemon::mRunning = false;
 bool                 Daemon::mCalendarDisabled = false;
 bool                 Daemon::mEnableCalPending = false;
@@ -125,8 +125,8 @@ void Daemon::createDcopHandler()
 bool Daemon::start()
 {
 	kdDebug(5950) << "Daemon::start()\n";
-	updateRegisteredStatus();
-	switch (mStatus)
+	updateRegisteredtqStatus();
+	switch (mtqStatus)
 	{
 		case STOPPED:
 		{
@@ -173,7 +173,7 @@ bool Daemon::registerWith(bool reregister)
 {
 	if (mRegisterTimer)
 		return true;
-	switch (mStatus)
+	switch (mtqStatus)
 	{
 		case STOPPED:
 		case RUNNING:
@@ -258,8 +258,8 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 	{
 		if (!errmsg.isEmpty())
 		{
-			if (mStatus == REGISTERED)
-				mStatus = READY;
+			if (mtqStatus == REGISTERED)
+				mtqStatus = READY;
 			if (!mRegisterFailMsg)
 			{
 				mRegisterFailMsg = true;
@@ -272,7 +272,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 	if (!reregister)
 	{
 		// The alarm daemon has loaded the calendar
-		mStatus = REGISTERED;
+		mtqStatus = REGISTERED;
 		mRegisterFailMsg = false;
 		kdDebug(5950) << "Daemon::start(): daemon startup complete" << endl;
 	}
@@ -283,9 +283,9 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 */
 void Daemon::checkIfStarted()
 {
-	updateRegisteredStatus();
+	updateRegisteredtqStatus();
 	bool err = false;
-	switch (mStatus)
+	switch (mtqStatus)
 	{
 		case STOPPED:
 			if (--mStartTimeout > 0)
@@ -312,27 +312,27 @@ void Daemon::checkIfStarted()
 * Check whether the alarm daemon has started yet, and if so, whether it is
 * ready to accept DCOP calls.
 */
-void Daemon::updateRegisteredStatus(bool timeout)
+void Daemon::updateRegisteredtqStatus(bool timeout)
 {
 	if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 	{
-		mStatus = STOPPED;
+		mtqStatus = STOPPED;
 		mRegisterFailMsg = false;
 	}
 	else
 	{
-		switch (mStatus)
+		switch (mtqStatus)
 		{
 			case STOPPED:
 				// The daemon has newly been detected as registered with DCOP.
 				// Wait for a short time to ensure that it is ready for DCOP calls.
-				mStatus = RUNNING;
+				mtqStatus = RUNNING;
 				TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted()));
 				break;
 			case RUNNING:
 				if (timeout)
 				{
-					mStatus = READY;
+					mtqStatus = READY;
 					start();
 				}
 				break;
@@ -341,7 +341,7 @@ void Daemon::updateRegisteredStatus(bool timeout)
 				break;
 		}
 	}
-	kdDebug(5950) << "Daemon::updateRegisteredStatus() -> " << mStatus << endl;
+	kdDebug(5950) << "Daemon::updateRegisteredtqStatus() -> " << mtqStatus << endl;
 }
 
 /******************************************************************************
@@ -491,8 +491,8 @@ bool Daemon::monitoringAlarms()
 bool Daemon::isRunning(bool startdaemon)
 {
 	static bool runState = false;
-	updateRegisteredStatus();
-	bool newRunState = (mStatus == READY  ||  mStatus == REGISTERED);
+	updateRegisteredtqStatus();
+	bool newRunState = (mtqStatus == READY  ||  mtqStatus == REGISTERED);
 	if (newRunState != runState)
 	{
 		// Daemon's status has changed
@@ -500,7 +500,7 @@ bool Daemon::isRunning(bool startdaemon)
 		if (runState  &&  startdaemon)
 			start();      // re-register with the daemon
 	}
-	return runState  &&  (mStatus == REGISTERED);
+	return runState  &&  (mtqStatus == REGISTERED);
 }
 
 /******************************************************************************
@@ -666,10 +666,10 @@ NotificationHandler::NotificationHandler()
  * The daemon notifies calendar statuses when we first register as a GUI, and whenever
  * a calendar status changes. So we don't need to read its config files.
  */
-void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL)
+void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL)
 {
-	kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")\n";
-	KAlarmd::CalendarStatus status = KAlarmd::CalendarStatus(calendarStatus);
+	kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendartqStatus << ")\n";
+	KAlarmd::CalendartqStatus status = KAlarmd::CalendartqStatus(calendartqStatus);
 	if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString())
 		return;     // it's not a notification about KAlarm's calendar
 	bool enabled = false;
@@ -723,8 +723,8 @@ void NotificationHandler::registered(bool reregister, int result, int version)
 =  Class: AlarmEnableAction
 =============================================================================*/
 
-AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name)
-	: KToggleAction(i18n("Enable &Alarms"), accel, parent, name),
+AlarmEnableAction::AlarmEnableAction(int accel, TQObject* tqparent, const char* name)
+	: KToggleAction(i18n("Enable &Alarms"), accel, tqparent, name),
 	  mInitialised(false)
 {
 	setCheckedState(i18n("Disable &Alarms"));
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index 58b34ecd..fff7c755 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -34,9 +34,10 @@ class AlarmEnableAction;
 class NotificationHandler;
 
 
-class Daemon : public QObject
+class Daemon : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		static void      initialise();
 		static void      createDcopHandler();
@@ -50,11 +51,11 @@ class Daemon : public QObject
 		static void      enableAutoStart(bool enable);
 		static void      notifyTimeChanged();
 		static void      setAlarmsEnabled()      { mInstance->setAlarmsEnabled(true); }
-		static void      checkStatus()           { checkIfRunning(); }
+		static void      checktqStatus()           { checkIfRunning(); }
 		static bool      monitoringAlarms();
 		static bool      isRunning(bool startDaemon = true);
 		static int       maxTimeSinceCheck();
-		static bool      isRegistered()          { return mStatus == REGISTERED; }
+		static bool      isRegistered()          { return mtqStatus == REGISTERED; }
 		static void      allowRegisterFailMsg()  { mRegisterFailMsg = false; }
 
 		static void      queueEvent(const TQString& eventID);
@@ -67,15 +68,15 @@ class Daemon : public QObject
 	private slots:
 		void             slotCalendarSaved(AlarmCalendar*);
 		void             checkIfStarted();
-		void             slotStarted()           { updateRegisteredStatus(true); }
-		void             registerTimerExpired()  { registrationResult((mStatus == REGISTERED), KAlarmd::FAILURE); }
+		void             slotStarted()           { updateRegisteredtqStatus(true); }
+		void             registerTimerExpired()  { registrationResult((mtqStatus == REGISTERED), KAlarmd::FAILURE); }
 
 		void             setAlarmsEnabled(bool enable);
 		void             timerCheckIfRunning();
 		void             slotPreferencesChanged();
 
 	private:
-		enum Status    // daemon status.  KEEP IN THIS ORDER!!
+		enum tqStatus    // daemon status.  KEEP IN THIS ORDER!!
 		{
 			STOPPED,     // daemon is not registered with DCOP
 			RUNNING,     // daemon is newly registered with DCOP
@@ -87,7 +88,7 @@ class Daemon : public QObject
 		static void      registrationResult(bool reregister, int result, int version = 0);
 		static void      reload();
 		static void      notifyEventHandled(const TQString& eventID, bool reloadCal);
-		static void      updateRegisteredStatus(bool timeout = false);
+		static void      updateRegisteredtqStatus(bool timeout = false);
 		static void      enableCalendar(bool enable);
 		static void      calendarIsEnabled(bool enabled);
 		static bool      checkIfRunning();
@@ -103,7 +104,7 @@ class Daemon : public QObject
 		static int       mStatusTimerCount;    // countdown for fast status checking
 		static int       mStatusTimerInterval; // timer interval (seconds) for checking daemon status
 		static int       mStartTimeout;        // remaining number of times to check if alarm daemon has started
-		static Status    mStatus;              // daemon status
+		static tqStatus    mtqStatus;              // daemon status
 		static bool      mRunning;             // whether the alarm daemon is currently running
 		static bool      mCalendarDisabled;    // monitoring of calendar is currently disabled by daemon
 		static bool      mEnableCalPending;    // waiting to tell daemon to enable calendar
@@ -119,8 +120,9 @@ class Daemon : public QObject
 class AlarmEnableAction : public KToggleAction
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		AlarmEnableAction(int accel, TQObject* parent, const char* name = 0);
+		AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0);
 	public slots:
 		void         setCheckedActual(bool);  // set state and emit switched() signal
 		virtual void setChecked(bool);        // request state change and emit userClicked() signal
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 42af4ce9..5f6e8507 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -256,7 +256,7 @@ bool DcopHandler::scheduleFile(const KURL& file,
 	TQColor bg = convertBgColour(bgColor);
 	if (!bg.isValid())
 		return false;
-	return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, Qt::black, TQFont(),
+	return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, TQt::black, TQFont(),
 	                               audioFile.url(), -1, reminderMins, recurrence, subRepeatInterval, subRepeatCount);
 }
 
@@ -268,8 +268,8 @@ bool DcopHandler::scheduleCommand(const TQString& commandLine,
                                   const KARecurrence& recurrence, int subRepeatInterval, int subRepeatCount)
 {
 	unsigned kaEventFlags = convertStartFlags(start, flags);
-	return theApp()->scheduleEvent(KAEvent::COMMAND, commandLine, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, TQFont(),
-	                               TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount);
+	return theApp()->scheduleEvent(KAEvent::COMMAND, commandLine, start.dateTime(), lateCancel, kaEventFlags, TQt::black, TQt::black, TQFont(),
+	                               TQString(), -1, 0, recurrence, subRepeatInterval, subRepeatCount);
 }
 
 /******************************************************************************
@@ -310,8 +310,8 @@ bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresse
 		kdError(5950) << "DCOP call scheduleEmail(): invalid email attachment: " << bad << endl;
 		return false;
 	}
-	return theApp()->scheduleEvent(KAEvent::EMAIL, message, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, TQFont(),
-	                               TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts);
+	return theApp()->scheduleEvent(KAEvent::EMAIL, message, start.dateTime(), lateCancel, kaEventFlags, TQt::black, TQt::black, TQFont(),
+	                               TQString(), -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts);
 }
 
 
@@ -325,7 +325,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
 	if (startDateTime.length() > 10)
 	{
 		// Both a date and a time are specified
-		start = TQDateTime::fromString(startDateTime, Qt::ISODate);
+		start = TQDateTime::fromString(startDateTime, TQt::ISODate);
 	}
 	else
 	{
@@ -339,12 +339,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
 		if (t.isEmpty())
 		{
 			// It's a date
-			start = TQDate::fromString(startDateTime, Qt::ISODate);
+			start = TQDate::fromString(startDateTime, TQt::ISODate);
 		}
 		else
 		{
 			// It's a time, so use today as the date
-			start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate));
+			start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, TQt::ISODate));
 		}
 	}
 	if (!start.isValid())
@@ -419,14 +419,14 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
 	if (!start.isValid())
 		return false;
 	TQDateTime end;
-	if (endDateTime.find('T') < 0)
+	if (endDateTime.tqfind('T') < 0)
 	{
 		if (!start.isDateOnly())
 		{
 			kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl;
 			return false;
 		}
-		end.setDate(TQDate::fromString(endDateTime, Qt::ISODate));
+		end.setDate(TQDate::fromString(endDateTime, TQt::ISODate));
 	}
 	else
 	{
@@ -435,7 +435,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
 			kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl;
 			return false;
 		}
-		end = TQDateTime::fromString(endDateTime, Qt::ISODate);
+		end = TQDateTime::fromString(endDateTime, TQt::ISODate);
 	}
 	if (!end.isValid())
 	{
@@ -675,7 +675,7 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 			TQStringList  mailAttachments;
 			TQDateTime    dateTime, endTime;
 			TQColor       bgColour;
-			TQColor       fgColour(Qt::black);
+			TQColor       fgColour(TQt::black);
 			TQFont        font;
 			TQ_UINT32     flags;
 			int          lateCancel = 0;
diff --git a/kalarm/dcophandler.h b/kalarm/dcophandler.h
index f14f4cda..42a36d6a 100644
--- a/kalarm/dcophandler.h
+++ b/kalarm/dcophandler.h
@@ -97,6 +97,7 @@ class DcopHandler : public TQWidget, virtual public KAlarmIface
 class DcopHandlerOld : public TQWidget, public DCOPObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		DcopHandlerOld();
 		~DcopHandlerOld()  { }
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 9df852a9..75b95b8f 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -40,8 +40,8 @@
 
 
 DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
-                             bool cancelButton, TQWidget* parent, const char* name)
-	: KDialogBase(parent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
+                             bool cancelButton, TQWidget* tqparent, const char* name)
+	: KDialogBase(tqparent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
 {
 	if (!cancelButton)
 		showButton(User1, false);
@@ -135,7 +135,7 @@ void DeferAlarmDlg::slotPastLimit()
 */
 void DeferAlarmDlg::setLimit(const DateTime& limit)
 {
-	mLimitEventID  = TQString::null;
+	mLimitEventID  = TQString();
 	mLimitDateTime = limit;
 	mTimeWidget->setMaxDateTime(mLimitDateTime);
 }
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index 999eccf4..4ab2c9cb 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -30,9 +30,10 @@ class AlarmTimeWidget;
 class DeferAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
-		              bool cancelButton, TQWidget* parent = 0, const char* name = 0);
+		              bool cancelButton, TQWidget* tqparent = 0, const char* name = 0);
 		void             setLimit(const DateTime&);
 		DateTime         setLimit(const TQString& eventID);
 		const DateTime&  getDateTime() const   { return mAlarmDateTime; }
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index e5cd07dc..b93f681e 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -97,12 +97,12 @@ static const int  maxDelayTime = 99*60 + 59;    // < 100 hours
 class PickAlarmFileRadio : public PickFileRadio
 {
     public:
-	PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0)
-		: PickFileRadio(text, parent, name) { }
+	PickAlarmFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
+		: PickFileRadio(text, tqparent, name) { }
 	virtual TQString pickFile()    // called when browse button is pressed to select a file to display
 	{
 		return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(),
-		                          TQString::null, KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile");
+		                          TQString(), KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile");
 	}
     private:
 	TQString mDefaultDir;   // default directory for file browse button
@@ -114,11 +114,11 @@ class PickAlarmFileRadio : public PickFileRadio
 class PickLogFileRadio : public PickFileRadio
 {
     public:
-	PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0)
-		: PickFileRadio(b, e, text, parent, name) { }
+	PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
+		: PickFileRadio(b, e, text, tqparent, name) { }
 	virtual TQString pickFile()    // called when browse button is pressed to select a log file
 	{
-		return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString::null,
+		return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString(),
 		                          KFile::LocalOnly, tqparentWidget(), "pickLogFile");
 	}
     private:
@@ -165,9 +165,9 @@ TQString EditAlarmDlg::i18n_j_EmailSubject()     { return i18n("Email subject",
  *            = false to edit/create an alarm.
  *   event   != to initialise the dialogue to show the specified event's data.
  */
-EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent, const char* name,
+EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent, const char* name,
                            const KAEvent* event, bool readOnly)
-	: KDialogBase(parent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
+	: KDialogBase(tqparent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
 	              (readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default),
 	              (readOnly ? Cancel : Ok)),
 	  mMainPageShown(false),
@@ -217,7 +217,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	// Recurrence tab
 	TQVBox* recurTab = new TQVBox(mTabs);
 	mainPageBox->setSpacing(spacingHint());
-	mTabs->addTab(recurTab, TQString::null);
+	mTabs->addTab(recurTab, TQString());
 	mRecurPageIndex = 1;
 	mRecurrenceEdit = new RecurrenceEdit(readOnly, recurTab, "recurPage");
 	connect(mRecurrenceEdit, TQT_SIGNAL(shown()), TQT_SLOT(slotShowRecurrenceEdit()));
@@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	tqlayout->addWidget(mEmailFrame);
 
 	// Deferred date/time: visible only for a deferred recurring event.
-	mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
+	mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
 	topLayout->addWidget(mDeferGroup);
 	TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup);
 	label->setFixedSize(label->tqsizeHint());
@@ -296,7 +296,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
 		grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 		// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-		int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+		int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 		mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton");
 		mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint());
@@ -366,11 +366,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	                         TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
 	                         true, true, mainPage);
 	mReminder->setFixedSize(mReminder->tqsizeHint());
-	topLayout->addWidget(mReminder, 0, Qt::AlignAuto);
+	topLayout->addWidget(mReminder, 0, TQt::AlignAuto);
 
 	// Late cancel selector - default = allow late display
 	mLateCancel = new LateCancelSelector(true, mainPage);
-	topLayout->addWidget(mLateCancel, 0, Qt::AlignAuto);
+	topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
 	tqlayout = new TQHBoxLayout(topLayout, 0);
@@ -414,9 +414,9 @@ EditAlarmDlg::~EditAlarmDlg()
 /******************************************************************************
  * Set up the dialog controls common to display alarms.
  */
-void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
+void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent)
 {
-	mDisplayAlarmsFrame = new TQFrame(parent);
+	mDisplayAlarmsFrame = new TQFrame(tqparent);
 	mDisplayAlarmsFrame->setFrameStyle(TQFrame::NoFrame);
 	TQBoxLayout* frameLayout = new TQVBoxLayout(mDisplayAlarmsFrame, 0, spacingHint());
 
@@ -481,9 +481,9 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
 /******************************************************************************
  * Set up the command alarm dialog controls.
  */
-void EditAlarmDlg::initCommand(TQWidget* parent)
+void EditAlarmDlg::initCommand(TQWidget* tqparent)
 {
-	mCommandFrame = new TQFrame(parent);
+	mCommandFrame = new TQFrame(tqparent);
 	mCommandFrame->setFrameStyle(TQFrame::NoFrame);
 	TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint());
 
@@ -491,7 +491,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	mCmdTypeScript->setFixedSize(mCmdTypeScript->tqsizeHint());
 	connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool)));
 	TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line"));
-	frameLayout->addWidget(mCmdTypeScript, 0, Qt::AlignAuto);
+	frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto);
 
 	mCmdCommandEdit = new LineEdit(LineEdit::Url, mCommandFrame);
 	TQWhatsThis::add(mCmdCommandEdit, i18n("Enter a shell command to execute."));
@@ -513,7 +513,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window"));
 	mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL);
-	tqlayout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, TQt::AlignAuto);
 
 	// Log file name edit box
 	TQHBox* box = new TQHBox(mCmdOutputGroup);
@@ -537,7 +537,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	TQWhatsThis::add(button,
 	      i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file."));
 	mCmdOutputGroup->insert(button, LOG_TO_FILE);
-	tqlayout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, TQt::AlignAuto);
 	tqlayout->addWidget(box);
 
 	// Discard output
@@ -545,7 +545,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to discard command output."));
 	mCmdOutputGroup->insert(button, DISCARD_OUTPUT);
-	tqlayout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, TQt::AlignAuto);
 
 	// Top-adjust the controls
 	mCmdPadding = new TQHBox(mCommandFrame);
@@ -556,9 +556,9 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 /******************************************************************************
  * Set up the email alarm dialog controls.
  */
-void EditAlarmDlg::initEmail(TQWidget* parent)
+void EditAlarmDlg::initEmail(TQWidget* tqparent)
 {
-	mEmailFrame = new TQFrame(parent);
+	mEmailFrame = new TQFrame(tqparent);
 	mEmailFrame->setFrameStyle(TQFrame::NoFrame);
 	TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
 	TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
@@ -649,7 +649,7 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
 	mEmailBcc->setFixedSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc,
 	      i18n("If checked, the email will be blind copied to you."));
-	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignAuto);
+	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, TQt::AlignAuto);
 }
 
 /******************************************************************************
@@ -728,7 +728,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 			else
 			{
 				mExpiredRecurrence = recurs && event->mainExpired();
-				mTimeWidget->setDateTime(recurs || event->uidStatus() == KAEvent::EXPIRED ? event->startDateTime()
+				mTimeWidget->setDateTime(recurs || event->uidtqStatus() == KAEvent::EXPIRED ? event->startDateTime()
 				                         : event->mainExpired() ? event->deferDateTime() : event->mainDateTime());
 			}
 		}
@@ -894,7 +894,7 @@ void EditAlarmDlg::setReadOnly()
 	mCmdCommandEdit->setReadOnly(mReadOnly);
 	mCmdScriptEdit->setReadOnly(mReadOnly);
 	for (int id = DISCARD_OUTPUT;  id < EXEC_IN_TERMINAL;  ++id)
-		((RadioButton*)mCmdOutputGroup->find(id))->setReadOnly(mReadOnly);
+		((RadioButton*)mCmdOutputGroup->tqfind(id))->setReadOnly(mReadOnly);
 
 	// Email alarm controls
 	mEmailToEdit->setReadOnly(mReadOnly);
@@ -972,9 +972,9 @@ void EditAlarmDlg::setAction(KAEvent::Action action, const AlarmText& alarmText)
 /******************************************************************************
  * Create an "acknowledgement confirmation required" checkbox.
  */
-CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* name)
+CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* tqparent, const char* name)
 {
-	CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), parent, name);
+	CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), tqparent, name);
 	TQWhatsThis::add(widget,
 	      i18n("Check to be prompted for confirmation when you acknowledge the alarm."));
 	return widget;
@@ -1565,7 +1565,7 @@ void EditAlarmDlg::slotEditDeferral()
 	if (deferDlg.exec() == TQDialog::Accepted)
 	{
 		mDeferDateTime = deferDlg.getDateTime();
-		mDeferTimeLabel->setText(mDeferDateTime.isValid() ? mDeferDateTime.formatLocale() : TQString::null);
+		mDeferTimeLabel->setText(mDeferDateTime.isValid() ? mDeferDateTime.formatLocale() : TQString());
 	}
 }
 
@@ -1895,8 +1895,8 @@ void EditAlarmDlg::openAddressBook()
  */
 void EditAlarmDlg::slotAddAttachment()
 {
-	TQString url = KAlarm::browseFile(i18n("Choose File to Attach"), mAttachDefaultDir, TQString::null,
-	                                 TQString::null, KFile::ExistingOnly, this, "pickAttachFile");
+	TQString url = KAlarm::browseFile(i18n("Choose File to Attach"), mAttachDefaultDir, TQString(),
+	                                 TQString(), KFile::ExistingOnly, this, "pickAttachFile");
 	if (!url.isEmpty())
 	{
 		mEmailAttachList->insertItem(url);
@@ -1948,7 +1948,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 		enum Err { NONE = 0, BLANK, NONEXISTENT, DIRECTORY, UNREADABLE, NOT_TEXT_IMAGE };
 		Err err = NONE;
 		KURL url;
-		int i = alarmtext.find(TQString::tqfromLatin1("/"));
+		int i = alarmtext.tqfind(TQString::tqfromLatin1("/"));
 		if (i > 0  &&  alarmtext[i - 1] == ':')
 		{
 			url = alarmtext;
@@ -2027,8 +2027,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 = A text edit field with a minimum height of 3 text lines.
 = Provides KDE 2 compatibility.
 =============================================================================*/
-TextEdit::TextEdit(TQWidget* parent, const char* name)
-	: KTextEdit(parent, name)
+TextEdit::TextEdit(TQWidget* tqparent, const char* name)
+	: KTextEdit(tqparent, name)
 {
 	TQSize tsize = tqsizeHint();
 	tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth());
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 500eccb2..272deaa3 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -58,17 +58,18 @@ class PickAlarmFileRadio;
 class EditAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum MessageType { MESSAGE, FILE };
 		enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL };
 
-		EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 0, const char* name = 0,
+		EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent = 0, const char* name = 0,
                      const KAEvent* = 0, bool readOnly = false);
 		virtual ~EditAlarmDlg();
 		bool            getEvent(KAEvent&);
 		void            setAction(KAEvent::Action, const AlarmText& = AlarmText());
 
-		static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0);
+		static CheckBox* createConfirmAckCheckbox(TQWidget* tqparent, const char* name = 0);
 
 		static TQString  i18n_ConfirmAck();         // plain text of 'Confirm acknowledgement' checkbox
 		static TQString  i18n_k_ConfirmAck();       // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut
@@ -125,9 +126,9 @@ class EditAlarmDlg : public KDialogBase
 		bool            checkCommandData();
 		bool            checkEmailData();
 
-		void            initDisplayAlarms(TQWidget* parent);
-		void            initCommand(TQWidget* parent);
-		void            initEmail(TQWidget* parent);
+		void            initDisplayAlarms(TQWidget* tqparent);
+		void            initCommand(TQWidget* tqparent);
+		void            initEmail(TQWidget* tqparent);
 		void            saveState(const KAEvent*);
 		bool            stateChanged() const;
 
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index 6cf66400..6dffba7e 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -24,11 +24,12 @@
 #include <ktextedit.h>
 
 
-class PageFrame : public QFrame
+class PageFrame : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
+		PageFrame(TQWidget* tqparent = 0, const char* name = 0) : TQFrame(tqparent, name) { }
 	protected:
 		virtual void     showEvent(TQShowEvent*)    { emit shown(); }
 	signals:
@@ -38,8 +39,9 @@ class PageFrame : public QFrame
 class TextEdit : public KTextEdit
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		TextEdit(TQWidget* parent, const char* name = 0);
+		TextEdit(TQWidget* tqparent, const char* name = 0);
 	protected:
 		virtual void dragEnterEvent(TQDragEnterEvent*);
 };
diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp
index baa8c210..20b0ad19 100644
--- a/kalarm/emailidcombo.cpp
+++ b/kalarm/emailidcombo.cpp
@@ -21,8 +21,8 @@
 #include "emailidcombo.moc"
 
 
-EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* parent, const char* name)
-	: KPIM::IdentityCombo(manager, parent, name),
+EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* tqparent, const char* name)
+	: KPIM::IdentityCombo(manager, tqparent, name),
 	  mReadOnly(false)
 { }
 
@@ -51,7 +51,7 @@ void EmailIdCombo::mouseMoveEvent(TQMouseEvent* e)
 
 void EmailIdCombo::keyPressEvent(TQKeyEvent* e)
 {
-	if (!mReadOnly  ||  e->key() == Qt::Key_Escape)
+	if (!mReadOnly  ||  e->key() == TQt::Key_Escape)
 		KPIM::IdentityCombo::keyPressEvent(e);
 }
 
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index 378f5c6b..6e5294d8 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -28,8 +28,9 @@
 class EmailIdCombo : public KPIM::IdentityCombo
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0);
+		explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* tqparent = 0, const char* name = 0);
 		void  setReadOnly(bool ro)    { mReadOnly = ro; }
 	protected:
 		virtual void mousePressEvent(TQMouseEvent*);
diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp
index 23af4aaf..ce025730 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -30,7 +30,7 @@
 #include "eventlistviewbase.moc"
 
 
-class EventListWhatsThisBase : public QWhatsThis
+class EventListWhatsThisBase : public TQWhatsThis
 {
 	public:
 		EventListWhatsThisBase(EventListViewBase* lv) : TQWhatsThis(lv), mListView(lv) { }
@@ -45,8 +45,8 @@ class EventListWhatsThisBase : public QWhatsThis
 =  Base class for displaying a list of events.
 =============================================================================*/
 
-EventListViewBase::EventListViewBase(TQWidget* parent, const char* name)
-	: KListView(parent, name),
+EventListViewBase::EventListViewBase(TQWidget* tqparent, const char* name)
+	: KListView(tqparent, name),
 	  mFind(0),
 	  mLastColumn(-1),
 	  mLastColumnHeaderWidth(0)
@@ -370,7 +370,7 @@ int EventListViewBase::itemHeight()
 	if (!item)
 	{
 		// The list is empty, so create a temporary item to find its height
-		TQListViewItem* item = new TQListViewItem(this, TQString::null);
+		TQListViewItem* item = new TQListViewItem(this, TQString());
 		int height = item->height();
 		delete item;
 		return height;
@@ -392,8 +392,8 @@ TQPixmap* EventListViewItemBase::mEmailIcon;
 int      EventListViewItemBase::mIconWidth = 0;
 
 
-EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KAEvent& event)
-	: TQListViewItem(parent),
+EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const KAEvent& event)
+	: TQListViewItem(tqparent),
 	  mEvent(event)
 {
 	iconWidth();    // load the icons
@@ -404,9 +404,9 @@ EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KA
 */
 void EventListViewItemBase::setLastColumnText()
 {
-	EventListViewBase* parent = (EventListViewBase*)listView();
-	setText(parent->lastColumn(), lastColumnText());
-	mLastColumnWidth = width(parent->fontMetrics(), parent, parent->lastColumn());
+	EventListViewBase* tqparent = (EventListViewBase*)listView();
+	setText(tqparent->lastColumn(), lastColumnText());
+	mLastColumnWidth = width(tqparent->fontMetrics(), tqparent, tqparent->lastColumn());
 }
 
 /******************************************************************************
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index d9b2b097..6fe74f4f 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -36,12 +36,13 @@ class Find;
 class EventListViewBase : public KListView
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		typedef TQValueList<EventListViewBase*>              InstanceList;
 		typedef TQValueListIterator<EventListViewBase*>      InstanceListIterator;
 		typedef TQValueListConstIterator<EventListViewBase*> InstanceListConstIterator;
 
-		EventListViewBase(TQWidget* parent = 0, const char* name = 0);
+		EventListViewBase(TQWidget* tqparent = 0, const char* name = 0);
 		virtual ~EventListViewBase()  { }
 		EventListViewItemBase* getEntry(const TQString& eventID) const;
 		void                   addEvent(const KAEvent& e)  { addEvent(e, instances(), this); }
@@ -103,10 +104,10 @@ class EventListViewBase : public KListView
 };
 
 
-class EventListViewItemBase : public QListViewItem
+class EventListViewItemBase : public TQListViewItem
 {
 	public:
-		EventListViewItemBase(EventListViewBase* parent, const KAEvent&);
+		EventListViewItemBase(EventListViewBase* tqparent, const KAEvent&);
 		const KAEvent&         event() const             { return mEvent; }
 		TQPixmap*               eventIcon() const;
 		int                    lastColumnWidth() const   { return mLastColumnWidth; }
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index 1bec3c7a..77e84140 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -49,9 +49,9 @@ enum {
 static long FIND_KALARM_OPTIONS = FIND_LIVE | FIND_EXPIRED | FIND_MESSAGE | FIND_FILE | FIND_COMMAND | FIND_EMAIL;
 
 
-Find::Find(EventListViewBase* parent)
-	: TQObject(parent),
-	  mListView(parent),
+Find::Find(EventListViewBase* tqparent)
+	: TQObject(tqparent),
+	  mListView(tqparent),
 	  mDialog(0),
 	  mFind(0),
 	  mOptions(0)
@@ -90,7 +90,7 @@ void Find::display()
 		mDialog = new KFindDialog(false, mListView, "FindDlg", mOptions, mHistory, (mListView->selectedCount() > 1));
 #endif
 		mDialog->setHasSelection(false);
-		TQWidget* kalarmWidgets = mDialog->tqfindExtension();
+		TQWidget* kalarmWidgets = mDialog->findExtension();
 
 		// Alarm types
 		TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint());
@@ -104,16 +104,16 @@ void Find::display()
 		mLive = new TQCheckBox(i18n("Acti&ve"), group);
 		mLive->setFixedSize(mLive->tqsizeHint());
 		TQWhatsThis::add(mLive, i18n("Check to include active alarms in the search."));
-		grid->addWidget(mLive, 1, 0, Qt::AlignAuto);
+		grid->addWidget(mLive, 1, 0, TQt::AlignAuto);
 
 		mExpired = new TQCheckBox(i18n("Ex&pired"), group);
 		mExpired->setFixedSize(mExpired->tqsizeHint());
 		TQWhatsThis::add(mExpired,
 		      i18n("Check to include expired alarms in the search. "
 		           "This option is only available if expired alarms are currently being displayed."));
-		grid->addWidget(mExpired, 1, 2, Qt::AlignAuto);
+		grid->addWidget(mExpired, 1, 2, TQt::AlignAuto);
 
-		mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets);
+		mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets);
 		grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2);
 
 		// Alarm actions
@@ -211,7 +211,7 @@ void Find::slotFind()
 {
 	if (!mDialog)
 		return;
-	mHistory = mDialog->tqfindHistory();    // save search history so that it can be displayed again
+	mHistory = mDialog->findHistory();    // save search history so that it can be displayed again
 	mOptions = mDialog->options() & ~FIND_KALARM_OPTIONS;
 	mOptions |= (mLive->isEnabled()        && mLive->isChecked()        ? FIND_LIVE : 0)
 	         |  (mExpired->isEnabled()     && mExpired->isChecked()     ? FIND_EXPIRED : 0)
@@ -250,7 +250,7 @@ void Find::slotFind()
 	}
 
 	// Set the starting point for the search
-	mStartID       = TQString::null;
+	mStartID       = TQString();
 	mNoCurrentItem = newPattern;
 	bool checkEnd = false;
 	if (newPattern)
@@ -307,40 +307,40 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent)
 				if (!(mOptions & FIND_MESSAGE))
 					break;
 				mFind->setData(event.cleanText());
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				break;
 
 			case KAEvent::FILE:
 				if (!(mOptions & FIND_FILE))
 					break;
 				mFind->setData(event.cleanText());
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				break;
 
 			case KAEvent::COMMAND:
 				if (!(mOptions & FIND_COMMAND))
 					break;
 				mFind->setData(event.cleanText());
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				break;
 
 			case KAEvent::EMAIL:
 				if (!(mOptions & FIND_EMAIL))
 					break;
 				mFind->setData(event.emailAddresses(", "));
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				if (found)
 					break;
 				mFind->setData(event.emailSubject());
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				if (found)
 					break;
 				mFind->setData(event.emailAttachments().join(", "));
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				if (found)
 					break;
 				mFind->setData(event.cleanText());
-				found = (mFind->find() == KFind::Match);
+				found = (mFind->tqfind() == KFind::Match);
 				break;
 		}
 		if (found)
@@ -365,7 +365,7 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent)
 		{
 			TQString msg = forward ? i18n("End of alarm list reached.\nContinue from the beginning?")
 			                      : i18n("Beginning of alarm list reached.\nContinue from the end?");
-			if (KMessageBox::questionYesNo(mListView, msg, TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()) == KMessageBox::Yes)
+			if (KMessageBox::questionYesNo(mListView, msg, TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()) == KMessageBox::Yes)
 			{
 				mNoCurrentItem = true;
 				findNext(forward, false);
diff --git a/kalarm/find.h b/kalarm/find.h
index 3dba48d9..f7170a29 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -33,11 +33,12 @@ class EventListViewBase;
 class EventListViewItemBase;
 
 
-class Find : public QObject
+class Find : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit Find(EventListViewBase* parent);
+		explicit Find(EventListViewBase* tqparent);
 		~Find();
 		void         display();
 		void         findNext(bool forward)     { findNext(forward, true); }
@@ -53,7 +54,7 @@ class Find : public QObject
 		void         findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false);
 		EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const;
 
-		EventListViewBase* mListView;        // parent list view
+		EventListViewBase* mListView;        // tqparent list view
 		TQGuardedPtr<KFindDialog> mDialog;
 		TQCheckBox*         mExpired;
 		TQCheckBox*         mLive;
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 94497b96..3b45dbc4 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -38,11 +38,11 @@
 #include "fontcolour.moc"
 
 
-FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
+FontColourChooser::FontColourChooser(TQWidget *tqparent, const char *name,
           bool onlyFixed, const TQStringList &fontList,
           const TQString& frameLabel, bool editColours, bool fg, bool defaultFont,
           int visibleListSize)
-	: TQWidget(parent, name),
+	: TQWidget(tqparent, name),
 	  mFgColourButton(0),
 	  mRemoveColourButton(0),
 	  mColourList(Preferences::messageColours()),
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index 1c91bfa2..b7205602 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -32,11 +32,12 @@ class TQPushButton;
 class CheckBox;
 
 
-class FontColourChooser : public QWidget
+class FontColourChooser : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0,
+	explicit FontColourChooser(TQWidget* tqparent = 0, const char* name = 0,
 	       bool onlyFixed = false,
 	       const TQStringList& fontList = TQStringList(),
 	       const TQString& frameLabel = i18n("Requested font"),
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 62888d46..ca62d101 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -38,8 +38,8 @@
 = Font/colour selection button.
 =============================================================================*/
 
-FontColourButton::FontColourButton(TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+FontColourButton::FontColourButton(TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mReadOnly(false)
 {
 	setFrameStyle(NoFrame);
@@ -54,11 +54,11 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name)
 
 	// Font and colour sample display
 	mSample = new TQLineEdit(this);
-	mSample->setMinimumHeight(QMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2));
+	mSample->setMinimumHeight(TQMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2));
 	mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding);
 	mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
 	mSample->setCursorPosition(0);
-	mSample->tqsetAlignment(Qt::AlignCenter);
+	mSample->tqsetAlignment(TQt::AlignCenter);
 	TQWhatsThis::add(mSample,
 	      i18n("This sample text illustrates the current font and color settings. "
 	           "You may edit it to test special characters."));
@@ -119,14 +119,14 @@ void FontColourButton::slotButtonPressed()
 =============================================================================*/
 
 FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, const TQFont& font,
-                             bool defaultFont, const TQString& caption, TQWidget* parent, const char* name)
-	: KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
+                             bool defaultFont, const TQString& caption, TQWidget* tqparent, const char* name)
+	: KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
 	  mReadOnly(false)
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
 	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
-	mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString::null, false, true, true);
+	mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true);
 	mChooser->setBgColour(bgColour);
 	mChooser->setFgColour(fgColour);
 	if (defaultFont)
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index f49942ee..55713605 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -31,11 +31,12 @@ class FontColourChooser;
 class PushButton;
 
 
-class FontColourButton : public QFrame
+class FontColourButton : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		FontColourButton(TQWidget* parent = 0, const char* name = 0);
+		FontColourButton(TQWidget* tqparent = 0, const char* name = 0);
 		void          setDefaultFont();
 		void          setFont(const TQFont&);
 		void          setBgColour(const TQColor&);
@@ -67,9 +68,10 @@ class FontColourButton : public QFrame
 class FontColourDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
-		              const TQString& caption, TQWidget* parent = 0, const char* name = 0);
+		              const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
 		bool         defaultFont() const   { return mDefaultFont; }
 		TQFont        font() const          { return mFont; }
 		TQColor       bgColour() const      { return mBgColour; }
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index db0ff7d3..97d04689 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -129,10 +129,10 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject*
 * event in that listView instance.
 * 'event' is updated with the actual event ID.
 */
-UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate)
+UpdatetqStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate)
 {
 	kdDebug(5950) << "KAlarm::addEvent(): " << event.id() << endl;
-	UpdateStatus status = UPDATE_OK;
+	UpdatetqStatus status = UPDATE_OK;
 	if (!theApp()->checkCalendarDaemon())    // ensure calendar is open and daemon started
 		return UPDATE_FAILED;
 	else
@@ -172,7 +172,7 @@ bool addExpiredEvent(KAEvent& event)
 	AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen();
 	if (!cal)
 		return false;
-	bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE);
+	bool archiving = (KAEvent::uidtqStatus(event.id()) == KAEvent::ACTIVE);
 	if (archiving)
 		event.setSaveDateTime(TQDateTime::tqcurrentDateTime());   // time stamp to control purging
 	KCal::Event* kcalEvent = cal->addEvent(event);
@@ -193,10 +193,10 @@ bool addExpiredEvent(KAEvent& event)
 * event in that listView instance.
 * 'event' is updated with the actual event ID.
 */
-UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
+UpdatetqStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
 {
 	kdDebug(5950) << "KAlarm::addTemplate(): " << event.id() << endl;
-	UpdateStatus status = UPDATE_OK;
+	UpdatetqStatus status = UPDATE_OK;
 
 	// Add the template to the calendar file
 	AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen();
@@ -206,7 +206,7 @@ UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidg
 		status = SAVE_FAILED;
 	else
 	{
-		cal->emitEmptyStatus();
+		cal->emitEmptytqStatus();
 
 		// Update the window lists
 		TemplateListView::addEvent(event, selectionView);
@@ -225,11 +225,11 @@ UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidg
 * If 'selectionView' is non-null, the selection highlight is moved to the
 * modified event in that listView instance.
 */
-UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent)
+UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent)
 {
 	kdDebug(5950) << "KAlarm::modifyEvent(): '" << oldEvent.id() << endl;
 
-	UpdateStatus status = UPDATE_OK;
+	UpdatetqStatus status = UPDATE_OK;
 	if (!newEvent.valid())
 	{
 		deleteEvent(oldEvent, true);
@@ -280,7 +280,7 @@ UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListVi
 * The event is not updated in KOrganizer, since this function is called when an
 * existing alarm is rescheduled (due to recurrence or deferral).
 */
-UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision)
+UpdatetqStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision)
 {
 	kdDebug(5950) << "KAlarm::updateEvent(): " << event.id() << endl;
 
@@ -311,9 +311,9 @@ UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget*
 * If 'selectionView' is non-null, the selection highlight is moved to the
 * updated event in that listView instance.
 */
-UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
+UpdatetqStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
 {
-	UpdateStatus status = UPDATE_OK;
+	UpdatetqStatus status = UPDATE_OK;
 	AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen();
 	if (!cal)
 		status = UPDATE_FAILED;
@@ -338,7 +338,7 @@ UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionVie
 * Delete an alarm from the calendar file and from every main window instance.
 * If the event is archived, the event's ID is changed to an expired ID if necessary.
 */
-UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent)
+UpdatetqStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent)
 {
 	TQString id = event.id();
 	kdDebug(5950) << "KAlarm::deleteEvent(): " << id << endl;
@@ -346,11 +346,11 @@ UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent)
 	// Update the window lists
 	AlarmListView::deleteEvent(id);
 
-	UpdateStatus status = UPDATE_OK;
+	UpdatetqStatus status = UPDATE_OK;
 	AlarmCalendar* cal;
 
 	// Delete the event from the calendar file
-	if (KAEvent::uidStatus(id) == KAEvent::EXPIRED)
+	if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED)
 	{
 		cal = AlarmCalendar::expiredCalendarOpen();
 		if (!cal)
@@ -383,7 +383,7 @@ UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent)
 /******************************************************************************
 * Delete a template from the calendar file and from every template list view.
 */
-UpdateStatus deleteTemplate(const KAEvent& event)
+UpdatetqStatus deleteTemplate(const KAEvent& event)
 {
 	TQString id = event.id();
 
@@ -393,7 +393,7 @@ UpdateStatus deleteTemplate(const KAEvent& event)
 		return UPDATE_FAILED;
 	if (!cal->deleteEvent(id, true))    // save calendar after deleting
 		return SAVE_FAILED;
-	cal->emitEmptyStatus();
+	cal->emitEmptytqStatus();
 
 	// Update the window lists
 	TemplateListView::deleteEvent(id);
@@ -407,7 +407,7 @@ void deleteDisplayEvent(const TQString& eventID)
 {
 	kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")\n";
 
-	if (KAEvent::uidStatus(eventID) == KAEvent::DISPLAYING)
+	if (KAEvent::uidtqStatus(eventID) == KAEvent::DISPLAYING)
 	{
 		AlarmCalendar* cal = AlarmCalendar::displayCalendarOpen();
 		if (cal)
@@ -421,13 +421,13 @@ void deleteDisplayEvent(const TQString& eventID)
 * If 'selectionView' is non-null, the selection highlight is moved to the
 * restored event in that listView instance.
 */
-UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID)
+UpdatetqStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID)
 {
 	TQString id = event.id();
 	kdDebug(5950) << "KAlarm::reactivateEvent(): " << id << endl;
 
 	// Delete the event from the expired calendar file
-	if (KAEvent::uidStatus(id) == KAEvent::EXPIRED)
+	if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED)
 	{
 		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		if (event.occursAfter(now, true))
@@ -443,7 +443,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool
 			if (!cal->save())
 				return SAVE_FAILED;
 
-			UpdateStatus status = UPDATE_OK;
+			UpdatetqStatus status = UPDATE_OK;
 			if (event.copyToKOrganizer())
 			{
 				if (!sendToKOrganizer(event))    // tell KOrganizer to show the event
@@ -468,7 +468,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool
 * If 'selectionView' is non-null, the selection highlight is moved to the
 * updated event in that listView instance.
 */
-UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable)
+UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable)
 {
 	kdDebug(5950) << "KAlarm::enableEvent(" << enable << "): " << event.id() << endl;
 
@@ -498,7 +498,7 @@ UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enab
 /******************************************************************************
 * Display an error message about an error saving an event.
 */
-void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nAlarms)
+void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, int nAlarms)
 {
 	TQString errmsg;
 	switch (code)
@@ -519,13 +519,13 @@ void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nA
 			errmsg = i18n("Error saving alarm template");
 			break;
 	}
-	KMessageBox::error(parent, errmsg);
+	KMessageBox::error(tqparent, errmsg);
 }
 
 /******************************************************************************
 * Display an error message corresponding to a specified alarm update error code.
 */
-void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
+void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarms)
 {
 	TQString errmsg;
 	switch (code)
@@ -542,7 +542,7 @@ void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
 			                       : i18n("Unable to delete alarm from KOrganizer");
 			break;
 	}
-	KMessageBox::error(parent, errmsg);
+	KMessageBox::error(tqparent, errmsg);
 }
 
 /******************************************************************************
@@ -551,7 +551,7 @@ void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
 bool edit(const TQString& eventID)
 {
 	AlarmCalendar* cal;
-	switch (KAEvent::uidStatus(eventID))
+	switch (KAEvent::uidtqStatus(eventID))
 	{
 		case KAEvent::ACTIVE:
 			cal = AlarmCalendar::activeCalendar();
@@ -628,17 +628,17 @@ TQValueList<KAEvent> templateList()
 * Prompt the user to re-enable alarms if they are currently disabled, and if
 * it's an email alarm, warn if no 'From' email address is configured.
 */
-void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
+void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event)
 {
 	if (event  &&  event->action() == KAEvent::EMAIL
 	&&  Preferences::emailAddress().isEmpty())
-		KMessageBox::information(parent, i18n("Please set the 'From' email address...",
+		KMessageBox::information(tqparent, i18n("Please set the 'From' email address...",
 		                                      "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress()));
 
 	if (!Daemon::monitoringAlarms())
 	{
-		if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
-		                              TQString::null, i18n("Enable"), i18n("Keep Disabled"),
+		if (KMessageBox::warningYesNo(tqparent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
+		                              TQString(), i18n("Enable"), i18n("Keep Disabled"),
 		                              TQString::tqfromLatin1("EditEnableAlarms"))
 		                == KMessageBox::Yes)
 			Daemon::setAlarmsEnabled();
@@ -706,14 +706,14 @@ TQString runKMail(bool minimise)
 	TQString errmsg;
 	if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg))
 		return i18n("Unable to start KMail\n(%1)").arg(errmsg);
-	return TQString::null;
+	return TQString();
 }
 
 /******************************************************************************
 *  Start another program for DCOP access if it isn't already running.
 *  If 'windowName' is not empty, the program's window of that name is iconised.
-*  On exit, 'dcopName' tqcontains the DCOP name to access the application, and
-*  'errorMessage' tqcontains an error message if failure.
+*  On exit, 'dcopName' contains the DCOP name to access the application, and
+*  'errorMessage' contains an error message if failure.
 *  Reply = true if the program is now running.
 */
 bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
@@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 	if (!kapp->dcopClient()->isApplicationRegistered(program))
 	{
 		// KOrganizer is not already running, so start it
-		if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString::null, &errorMessage, &dcopName))
+		if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString(), &errorMessage, &dcopName))
 		{
 			kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
 			return false;
@@ -729,11 +729,11 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 		// Minimise its window - don't use hide() since this would remove all
 		// trace of it from the panel if it is not configured to be docked in
 		// the system tray.
-		kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString::null);
+		kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString());
 	}
 	else if (dcopName.isEmpty())
 		dcopName = program;
-	errorMessage = TQString::null;
+	errorMessage = TQString();
 	return true;
 }
 
@@ -792,7 +792,7 @@ int getVersionNumber(const TQString& version, TQString* subVersion)
 	// N.B. Remember to change  Version(int major, int minor, int rev)
 	//      if the representation returned by this method changes.
 	if (subVersion)
-		*subVersion = TQString::null;
+		*subVersion = TQString();
 	int count = version.tqcontains('.') + 1;
 	if (count < 2)
 		return 0;
@@ -836,7 +836,7 @@ FileType fileType(const TQString& mimetype)
 
 	if (mimetype.startsWith(TQString::tqfromLatin1("image/")))
 		return Image;
-	int slash = mimetype.find('/');
+	int slash = mimetype.tqfind('/');
 	if (slash < 0)
 		return Unknown;
 	TQString type = mimetype.mid(slash + 1);
@@ -868,19 +868,19 @@ FileType fileType(const TQString& mimetype)
 * Reply = URL selected. If none is selected, URL.isEmpty() is true.
 */
 TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile,
-                   const TQString& filter, int mode, TQWidget* parent, const char* name)
+                   const TQString& filter, int mode, TQWidget* tqparent, const char* name)
 {
 	TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$"))
 	                   : !defaultDir.isEmpty()  ? defaultDir
 	                   :                          TQDir::homeDirPath();
-	KFileDialog fileDlg(initialDir, filter, parent, name, true);
+	KFileDialog fileDlg(initialDir, filter, tqparent, name, true);
 	fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving);
 	fileDlg.setMode(KFile::File | mode);
 	fileDlg.setCaption(caption);
 	if (!initialFile.isEmpty())
 		fileDlg.setSelection(initialFile);
 	if (fileDlg.exec() != TQDialog::Accepted)
-		return TQString::null;
+		return TQString();
 	KURL url = fileDlg.selectedURL();
 	defaultDir = url.path();
 	return (mode & KFile::LocalOnly) ? url.path() : url.prettyURL();
@@ -959,17 +959,17 @@ bool sendToKOrganizer(const KAEvent& event)
 			             ? KAMail::identityManager()->identityForUoid(event.emailFromId()).fullEmailAddr()
 			             : Preferences::emailAddress();
 			AlarmText atext;
-			atext.setEmail(event.emailAddresses(", "), from, TQString::null, TQString::null, event.emailSubject(), TQString::null);
+			atext.setEmail(event.emailAddresses(", "), from, TQString(), TQString(), event.emailSubject(), TQString());
 			kcalEvent->setSummary(atext.displayText());
 			userEmail = from;
 			break;
 		}
 	}
-	kcalEvent->setOrganizer(KCal::Person(TQString::null, userEmail));
+	kcalEvent->setOrganizer(KCal::Person(TQString(), userEmail));
 
 	// Translate the event into string format
 	KCal::ICalFormat format;
-	format.setTimeZone(TQString::null, false);
+	format.setTimeZone(TQString(), false);
 	TQString iCal = format.toICalString(kcalEvent);
 kdDebug(5950)<<"Korg->"<<iCal<<endl;
 	delete kcalEvent;
@@ -1032,7 +1032,7 @@ bool runKOrganizer()
 {
 	TQString error;
 	TQCString dcopService;
-	int result = KDCOPServiceStarter::self()->tqfindServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
+	int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString(), TQString(), &error, &dcopService);
 	if (result)
 	{
 		kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl;
@@ -1042,7 +1042,7 @@ bool runKOrganizer()
 	// to load KOrganizer into Kontact. But if KOrganizer is running independently,
 	// the load() method doesn't exist.
 	TQCString dummy;
-	if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+	if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 	{
 		DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper
 		DCOPReply reply = ref.call("load()");
@@ -1051,7 +1051,7 @@ bool runKOrganizer()
 			kdWarning(5950) << "Error loading " << dcopService << endl;
 			return false;
 		}
-		if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+		if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 		{
 			kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
 			return false;
diff --git a/kalarm/functions.h b/kalarm/functions.h
index 37041f6f..5a679864 100644
--- a/kalarm/functions.h
+++ b/kalarm/functions.h
@@ -48,7 +48,7 @@ enum FileType { Unknown, TextPlain, TextFormatted, TextApplication, Image };
 /** Return codes from calendar update functions.
  *  The codes are ordered by severity.
  */
-enum UpdateStatus {
+enum UpdatetqStatus {
 	UPDATE_OK,          // update succeeded
 	UPDATE_KORG_ERR,    // update succeeded, but KOrganizer update failed
 	UPDATE_ERROR,       // update failed partially
@@ -62,7 +62,7 @@ enum KOrgUpdateError { KORG_ERR_ADD, KORG_ERR_MODIFY, KORG_ERR_DELETE };
 
 
 /** Display a main window with the specified event selected */
-MainWindow*         displayMainWindowSelected(const TQString& eventID = TQString::null);
+MainWindow*         displayMainWindowSelected(const TQString& eventID = TQString());
 bool                readConfigWindowSize(const char* window, TQSize&);
 void                writeConfigWindowSize(const char* window, const TQSize&);
 /** Check from its mime type whether a file appears to be a text or image file.
@@ -76,10 +76,10 @@ int                 getVersionNumber(const TQString& version, TQString* subVersi
 /** Return which version of KAlarm was the first to use the current calendar/event format */
 inline int          currentCalendarVersion()        { return KAEvent::calVersion(); }
 inline TQString      currentCalendarVersionString()  { return KAEvent::calVersionString(); }
-TQString             browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString::null,
-                               const TQString& filter = TQString::null, int mode = 0, TQWidget* parent = 0, const char* name = 0);
+TQString             browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(),
+                               const TQString& filter = TQString(), int mode = 0, TQWidget* tqparent = 0, const char* name = 0);
 bool                edit(const TQString& eventID);
-bool                editNew(const TQString& templateName = TQString::null);
+bool                editNew(const TQString& templateName = TQString());
 /** Create a "New Alarm" KAction */
 KAction*            createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name);
 /** Create a "New From Template" KAction */
@@ -88,25 +88,25 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject*
  *  If shell commands are disabled, command alarm templates are omitted.
  */
 TQValueList<KAEvent> templateList();
-void                outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0);
+void                outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0);
 void                resetDaemon();
 void                resetDaemonIfQueued();    // must only be called from KAlarmApp::processQueue()
 TQString             runKMail(bool minimise);
 bool                runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage);
 
-UpdateStatus        addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true);
+UpdatetqStatus        addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true);
 bool                addExpiredEvent(KAEvent&);
-UpdateStatus        addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0);
-UpdateStatus        modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0);
-UpdateStatus        updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true);
-UpdateStatus        updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0);
-UpdateStatus        deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0);
-UpdateStatus        deleteTemplate(const KAEvent&);
+UpdatetqStatus        addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0);
+UpdatetqStatus        modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0);
+UpdatetqStatus        updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true);
+UpdatetqStatus        updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0);
+UpdatetqStatus        deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0);
+UpdatetqStatus        deleteTemplate(const KAEvent&);
 void                deleteDisplayEvent(const TQString& eventID);
-UpdateStatus        reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false);
-UpdateStatus        enableEvent(KAEvent&, AlarmListView* selectionView, bool enable);
-void                displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError, int nAlarms);
-void                displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms);
+UpdatetqStatus        reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false);
+UpdatetqStatus        enableEvent(KAEvent&, AlarmListView* selectionView, bool enable);
+void                displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError, int nAlarms);
+void                displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError, int nAlarms);
 
 TQString             stripAccel(const TQString&);
 
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index a0f008f0..fd81aed4 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -436,7 +436,7 @@ int KAlarmApp::newInstance()
 						TQString addr = TQString::fromLocal8Bit(*i);
 						if (!KAMail::checkAddress(addr))
 							USAGE(i18n("%1: invalid email address").arg(TQString::tqfromLatin1("--mail")))
-						alAddresses += KCal::Person(TQString::null, addr);
+						alAddresses += KCal::Person(TQString(), addr);
 					}
 					params = args->getOptionList("attach");
 					for (QCStringList::Iterator i = params.begin();  i != params.end();  ++i)
@@ -788,7 +788,7 @@ void KAlarmApp::quitIf(int exitCode, bool force)
 		MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0;
 		if (mwcount > 1  ||  mwcount && (!mw->isHidden() || !mw->isTrayParent()))
 			return;
-		// There are no windows left except perhaps a main window which is a hidden tray icon parent
+		// There are no windows left except perhaps a main window which is a hidden tray icon tqparent
 		if (mTrayWindow)
 		{
 			// There is a system tray icon.
@@ -816,13 +816,13 @@ void KAlarmApp::quitIf(int exitCode, bool force)
 * Closes the system tray window and all main windows, but does not exit the
 * program if other windows are still open.
 */
-void KAlarmApp::doQuit(TQWidget* parent)
+void KAlarmApp::doQuit(TQWidget* tqparent)
 {
 	kdDebug(5950) << "KAlarmApp::doQuit()\n";
 	if (mDisableAlarmsIfStopped
-	&&  MessageBox::warningContinueCancel(parent, KMessageBox::Cancel,
+	&&  MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel,
 	                                      i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."),
-	                                      TQString::null, KStdGuiItem::quit(), Preferences::QUIT_WARN
+	                                      TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN
 	                                     ) != KMessageBox::Yes)
 		return;
 	quitIf(0, true);
@@ -831,7 +831,7 @@ void KAlarmApp::doQuit(TQWidget* parent)
 /******************************************************************************
 * Called when the session manager is about to close down the application.
 */
-void KAlarmApp::commitData(QSessionManager& sm)
+void KAlarmApp::commitData(TQSessionManager& sm)
 {
 	mSessionClosingDown = true;
 	KUniqueApplication::commitData(sm);
@@ -901,7 +901,7 @@ void KAlarmApp::processQueue()
 		// Process DCOP calls
 		while (!mDcopQueue.isEmpty())
 		{
-			DcopQEntry& entry = mDcopQueue.first();
+			DcopTQEntry& entry = mDcopQueue.first();
 			if (entry.eventId.isEmpty())
 			{
 				// It's a new alarm
@@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*)
 /******************************************************************************
 *  Display or close the system tray icon.
 */
-bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
+bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
 {
 	static bool creating = false;
 	if (show)
@@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
 			if (!MainWindow::count()  &&  wantRunInSystemTray())
 			{
 				creating = true;    // prevent main window constructor from creating an additional tray icon
-				parent = MainWindow::create();
+				tqparent = MainWindow::create();
 				creating = false;
 			}
-			mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow());
+			mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow());
 			connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled()));
 			mTrayWindow->show();
 			emit trayIconToggled();
@@ -1199,7 +1199,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons
 		// Alarm is due for display already.
 		// First execute it once without adding it to the calendar file.
 		if (!mInitialised)
-			mDcopQueue.append(DcopQEntry(event, EVENT_TRIGGER));
+			mDcopQueue.append(DcopTQEntry(event, EVENT_TRIGGER));
 		else
 			execAlarm(event, event.firstAlarm(), false);
 		// If it's a recurring alarm, reschedule it for its next occurrence
@@ -1210,7 +1210,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons
 	}
 
 	// Queue the alarm for insertion into the calendar file
-	mDcopQueue.append(DcopQEntry(event));
+	mDcopQueue.append(DcopTQEntry(event));
 	if (mInitialised)
 		TQTimer::singleShot(0, this, TQT_SLOT(processQueue()));
 	return true;
@@ -1232,7 +1232,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID,
 		Daemon::eventHandled(eventID, false);
 		return false;
 	}
-	mDcopQueue.append(DcopQEntry(function, eventID));
+	mDcopQueue.append(DcopTQEntry(function, eventID));
 	if (mInitialised)
 		TQTimer::singleShot(0, this, TQT_SLOT(processQueue()));
 	return true;
@@ -1592,9 +1592,9 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 			MessageWin* win = MessageWin::findEvent(event.id());
 			// Find if we're changing a reminder message to the real message
 			bool reminder = (alarm.type() & KAAlarm::REMINDER_ALARM);
-			bool tqreplaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
+			bool replaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
 			if (!reminder  &&  !event.deferred()
-			&&  (tqreplaceReminder || !win)  &&  !noPreAction
+			&&  (replaceReminder || !win)  &&  !noPreAction
 			&&  !event.preAction().isEmpty()  &&  ShellProcess::authorised())
 			{
 				// It's not a reminder or a deferred alarm, and there is no message window
@@ -1622,11 +1622,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 				delete win;        // event is disabled - close its window
 			else if (!win
 			     ||  !win->hasDefer() && !alarm.repeatAtLogin()
-			     ||  tqreplaceReminder)
+			     ||  replaceReminder)
 			{
 				// Either there isn't already a message for this event,
 				// or there is a repeat-at-login message with no Defer
-				// button, which needs to be tqreplaced with a new message,
+				// button, which needs to be replaced with a new message,
 				// or the caption needs to be changed from "Reminder" to "Message".
 				if (win)
 					win->setRecreating();    // prevent post-alarm actions
@@ -1705,7 +1705,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 		// Execute the command in a terminal window.
 		cmd = Preferences::cmdXTermCommand();
 		cmd.tqreplace("%t", aboutData()->programName());     // set the terminal window title
-		if (cmd.find("%C") >= 0)
+		if (cmd.tqfind("%C") >= 0)
 		{
 			// Execute the command from a temporary script file
 			if (flags & ProcData::TEMP_FILE)
@@ -1718,7 +1718,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 				cmd.tqreplace("%C", tmpXtermFile);    // %C indicates where to insert the command
 			}
 		}
-		else if (cmd.find("%W") >= 0)
+		else if (cmd.tqfind("%W") >= 0)
 		{
 			// Execute the command from a temporary script file,
 			// with a sleep after the command is executed
@@ -1727,19 +1727,19 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 				return 0;
 			cmd.tqreplace("%W", tmpXtermFile);    // %w indicates where to insert the command
 		}
-		else if (cmd.find("%w") >= 0)
+		else if (cmd.tqfind("%w") >= 0)
 		{
 			// Append a sleep to the command.
-			// Quote the command in case it tqcontains characters such as [>|;].
+			// Quote the command in case it contains characters such as [>|;].
 			TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400"));
 			cmd.tqreplace("%w", exec);    // %w indicates where to insert the command string
 		}
 		else
 		{
 			// Set the command to execute.
-			// Put it in quotes in case it tqcontains characters such as [>|;].
+			// Put it in quotes in case it contains characters such as [>|;].
 			TQString exec = KShellProcess::quote(command);
-			if (cmd.find("%c") >= 0)
+			if (cmd.tqfind("%c") >= 0)
 				cmd.tqreplace("%c", exec);    // %c indicates where to insert the command string
 			else
 				cmd.append(exec);           // otherwise, simply append the command string
@@ -1797,7 +1797,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 */
 TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShell, const KAEvent& event, const KAAlarm& alarm)
 {
-	KTempFile tmpFile(TQString::null, TQString::null, 0700);
+	KTempFile tmpFile(TQString(), TQString(), 0700);
 	tmpFile.setAutoDelete(false);     // don't delete file when it is destructed
 	TQTextStream* stream = tmpFile.textStream();
 	if (!stream)
@@ -1816,7 +1816,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe
 
 	TQStringList errmsgs(i18n("Error creating temporary script file"));
 	(new MessageWin(event, alarm.dateTime(), errmsgs))->show();
-	return TQString::null;
+	return TQString();
 }
 
 /******************************************************************************
@@ -1917,7 +1917,7 @@ void KAlarmApp::commandErrorMsg(const ShellProcess* proc, const KAEvent& event,
 /******************************************************************************
 * Notes that an informational KMessageBox is displayed for this process.
 */
-void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent)
+void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent)
 {
 	// Find this command in the command list
 	for (TQValueList<ProcData*>::Iterator it = mCommandProcesses.begin();  it != mCommandProcesses.end();  ++it)
@@ -1925,7 +1925,7 @@ void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent)
 		ProcData* pd = *it;
 		if (pd->process == proc)
 		{
-			pd->messageBoxParent = parent;
+			pd->messageBoxParent = tqparent;
 			break;
 		}
 	}
@@ -2118,7 +2118,7 @@ static bool convInterval(const TQCString& timeParam, KARecurrence::Type& recurTy
 			break;
 		case 'M':
 		{
-			int i = timeString.find('H');
+			int i = timeString.tqfind('H');
 			if (i < 0)
 			{
 				if (!allowMonthYear)
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index ce1787ff..0aa81b1b 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -48,6 +48,7 @@ class ShellProcess;
 class KAlarmApp : public KUniqueApplication
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		~KAlarmApp();
 		virtual int        newInstance();
@@ -61,7 +62,7 @@ class KAlarmApp : public KUniqueApplication
 		bool               restoreSession();
 		bool               sessionClosingDown() const      { return mSessionClosingDown; }
 		void               quitIf()                        { quitIf(0); }
-		void               doQuit(TQWidget* parent);
+		void               doQuit(TQWidget* tqparent);
 		static void        displayFatalError(const TQString& message);
 		void               addWindow(TrayWindow* w)        { mTrayWindow = w; }
 		void               removeWindow(TrayWindow*);
@@ -70,13 +71,13 @@ class KAlarmApp : public KUniqueApplication
 		bool               displayTrayIcon(bool show, MainWindow* = 0);
 		bool               trayIconDisplayed() const       { return !!mTrayWindow; }
 		bool               editNewAlarm(MainWindow* = 0);
-		virtual void       commitData(QSessionManager&);
+		virtual void       commitData(TQSessionManager&);
 
 		void*              execAlarm(KAEvent&, const KAAlarm&, bool reschedule, bool allowDefer = true, bool noPreAction = false);
 		void               alarmShowing(KAEvent&, KAAlarm::Type, const DateTime&);
 		void               alarmCompleted(const KAEvent&);
 		bool               deleteEvent(const TQString& eventID)         { return handleEvent(eventID, EVENT_CANCEL); }
-		void               commandMessage(ShellProcess*, TQWidget* parent);
+		void               commandMessage(ShellProcess*, TQWidget* tqparent);
 		// Methods called indirectly by the DCOP interface
 		bool               scheduleEvent(KAEvent::Action, const TQString& text, const TQDateTime&,
 		                                 int lateCancel, int flags, const TQColor& bg, const TQColor& fg,
@@ -84,7 +85,7 @@ class KAlarmApp : public KUniqueApplication
 		                                 int reminderMinutes, const KARecurrence& recurrence,
 						 int repeatInterval, int repeatCount,
 		                                 uint mailFromID = 0, const EmailAddressList& mailAddresses = EmailAddressList(),
-		                                 const TQString& mailSubject = TQString::null,
+		                                 const TQString& mailSubject = TQString(),
 		                                 const TQStringList& mailAttachments = TQStringList());
 		bool               handleEvent(const TQString& calendarFile, const TQString& eventID)    { return handleEvent(calendarFile, eventID, EVENT_HANDLE); }
 		bool               triggerEvent(const TQString& calendarFile, const TQString& eventID)   { return handleEvent(calendarFile, eventID, EVENT_TRIGGER); }
@@ -130,11 +131,11 @@ class KAlarmApp : public KUniqueApplication
 			TQStringList               tempFiles;
 			int                       flags;
 		};
-		struct DcopQEntry
+		struct DcopTQEntry
 		{
-			DcopQEntry(EventFunc f, const TQString& id) : function(f), eventId(id) { }
-			DcopQEntry(const KAEvent& e, EventFunc f = EVENT_HANDLE) : function(f), event(e) { }
-			DcopQEntry() { }
+			DcopTQEntry(EventFunc f, const TQString& id) : function(f), eventId(id) { }
+			DcopTQEntry(const KAEvent& e, EventFunc f = EVENT_HANDLE) : function(f), event(e) { }
+			DcopTQEntry() { }
 			EventFunc  function;
 			TQString    eventId;
 			KAEvent    event;
@@ -159,16 +160,16 @@ class KAlarmApp : public KUniqueApplication
 		static int            mFatalError;          // a fatal error has occurred - just wait to exit
 		static TQString        mFatalMessage;        // fatal error message to output
 		bool                  mInitialised;         // initialisation complete: ready to handle DCOP calls
-		DcopHandler*          mDcopHandler;         // the parent of the main DCOP receiver object
+		DcopHandler*          mDcopHandler;         // the tqparent of the main DCOP receiver object
 #ifdef OLD_DCOP
-		DcopHandlerOld*       mDcopHandlerOld;      // the parent of the old main DCOP receiver object
+		DcopHandlerOld*       mDcopHandlerOld;      // the tqparent of the old main DCOP receiver object
 #endif
 		TrayWindow*           mTrayWindow;          // active system tray icon
 		TQTime                 mStartOfDay;          // start-of-day time currently in use
 		TQColor                mPrefsExpiredColour;  // expired alarms text colour
 		int                   mPrefsExpiredKeepDays;// how long expired alarms are being kept
 		TQValueList<ProcData*> mCommandProcesses;    // currently active command alarm processes
-		TQValueList<DcopQEntry> mDcopQueue;          // DCOP command queue
+		TQValueList<DcopTQEntry> mDcopQueue;          // DCOP command queue
 		int                   mPendingQuitCode;     // exit code for a pending quit
 		bool                  mPendingQuit;         // quit once the DCOP command and shell command queues have been processed
 		bool                  mProcessingQueue;     // a mDcopQueue entry is currently being processed
diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h
index 83d11d29..9e0cdc1d 100644
--- a/kalarm/kalarmd/adapp.h
+++ b/kalarm/kalarmd/adapp.h
@@ -31,6 +31,7 @@ class AlarmDaemon;
 class AlarmDaemonApp : public KUniqueApplication
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		AlarmDaemonApp();
 		virtual int  newInstance();
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 1b738b04..2752a368 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -115,7 +115,7 @@ void ADCalendar::slotDownloadJobResult(KIO::Job *job)
 		loadLocalFile(mTempFileName);
 	}
 	unlink(TQFile::encodeName(mTempFileName));
-	mTempFileName = TQString::null;
+	mTempFileName = TQString();
 	emit loaded(this, mLoaded);
 }
 
@@ -142,7 +142,7 @@ bool ADCalendar::setLoadedConnected()
 */
 bool ADCalendar::eventHandled(const KCal::Event* event, const TQValueList<TQDateTime>& alarmtimes)
 {
-	EventsMap::ConstIterator it = mEventsHandled.find(EventKey(event->uid(), mUrlIndex));
+	EventsMap::ConstIterator it = mEventsHandled.tqfind(EventKey(event->uid(), mUrlIndex));
 	if (it == mEventsHandled.end())
 		return false;
 
@@ -170,7 +170,7 @@ void ADCalendar::setEventHandled(const TQString& eventID)
 	EventKey key(eventID, mUrlIndex);
 
 	// Remove it from the pending list, and add it to the handled list
-	EventsMap::Iterator it = mEventsPending.find(key);
+	EventsMap::Iterator it = mEventsPending.tqfind(key);
 	if (it != mEventsPending.end())
 	{
 		setEventInMap(mEventsHandled, key, it.data().alarmTimes, it.data().eventSequence);
@@ -197,7 +197,7 @@ void ADCalendar::setEventPending(const KCal::Event* event, const TQValueList<TQD
 */
 void ADCalendar::setEventInMap(EventsMap& map, const EventKey& key, const TQValueList<TQDateTime>& alarmtimes, int sequence)
 {
-	EventsMap::Iterator it = map.find(key);
+	EventsMap::Iterator it = map.tqfind(key);
 	if (it != map.end())
 	{
 		// Update the existing entry for the event
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 67e2fac9..51506d46 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -30,6 +30,7 @@ class ADCalendar;
 class ADCalendar : public KCal::CalendarLocal
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator;
 
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 4b649572..c14a1bf5 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -58,9 +58,9 @@ static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
 static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
 
 
-AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
+AlarmDaemon::AlarmDaemon(bool autostart, TQObject *tqparent, const char *name)
 	: DCOPObject(name),
-	  TQObject(parent, name),
+	  TQObject(tqparent, name),
 	  mAlarmTimer(0)
 {
 	kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl;
@@ -138,7 +138,7 @@ void AlarmDaemon::startMonitoring()
 	// Set up the alarm timer
 	mAlarmTimer = new TQTimer(this);
 	connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot()));
-	setTimerStatus();
+	setTimertqStatus();
 
 	// Start monitoring calendar files.
 	// They are monitored until their client application registers, upon which
@@ -156,7 +156,7 @@ void AlarmDaemon::enableCal(const TQString& urlString, bool enable)
 	if (cal)
 	{
 		cal->setEnabled(enable);
-		notifyCalStatus(cal);    // notify KAlarm
+		notifyCaltqStatus(cal);    // notify KAlarm
 	}
 }
 
@@ -196,8 +196,8 @@ void AlarmDaemon::calendarLoaded(ADCalendar* cal, bool success)
 {
 	if (success)
 		kdDebug(5900) << "Calendar reloaded" << endl;
-	notifyCalStatus(cal);       // notify KAlarm
-	setTimerStatus();
+	notifyCaltqStatus(cal);       // notify KAlarm
+	setTimertqStatus();
 	checkAlarms(cal);
 }
 
@@ -262,8 +262,8 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle
 		ADConfigData::writeClient(appName, client);
 
 		ADConfigData::enableAutoStart(true);
-		setTimerStatus();
-		notifyCalStatus(client->calendar());
+		setTimertqStatus();
+		notifyCaltqStatus(client->calendar());
 		result = KAlarmd::SUCCESS;
 	}
 
@@ -373,8 +373,8 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 	TQValueList<KCal::Event*> eventsDone;
 	for (TQValueList<KCal::Alarm*>::ConstIterator it = alarms.begin();  it != alarms.end();  ++it)
 	{
-		KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->parent());
-		if (!event  ||  eventsDone.find(event) != eventsDone.end())
+		KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->tqparent());
+		if (!event  ||  eventsDone.tqfind(event) != eventsDone.end())
 			continue;   // either not an event, or the event has already been processed
 		eventsDone += event;
 		const TQString& eventID = event->uid();
@@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 		// The times for non-due alarms are set invalid in 'alarmtimes'.
 		bool recurs = event->doesRecur();
 		const TQStringList cats = event->categories();
-		bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end());
+		bool floats = (cats.tqfind(TQString::tqfromLatin1("DATE")) != cats.end());
 		TQDateTime nextDateTime = event->dtStart();
 		if (recurs)
 		{
@@ -487,7 +487,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 	{
 		// It's running, but check if it has created our DCOP interface yet
 		QCStringList objects = kapp->dcopClient()->remoteObjects(appname);
-		if (objects.find(client->dcopObject()) == objects.end())
+		if (objects.tqfind(client->dcopObject()) == objects.end())
 			ready = false;
 	}
 	if (!ready)
@@ -531,7 +531,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 /******************************************************************************
 * Starts or stops the alarm timer as necessary after a calendar is enabled/disabled.
 */
-void AlarmDaemon::setTimerStatus()
+void AlarmDaemon::setTimertqStatus()
 {
 #ifdef AUTOSTART_KALARM
 	if (!mAlarmTimer)
@@ -569,7 +569,7 @@ void AlarmDaemon::setTimerStatus()
 * Send a DCOP message to to the client which owns the specified calendar,
 * notifying it of a change in calendar status.
 */
-void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
+void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal)
 {
 	ClientInfo* client = ClientInfo::get(cal);
 	if (!client)
@@ -577,13 +577,13 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 	TQCString appname = client->appName();
 	if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
 	{
-		KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
+		KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
 		                                                  : KAlarmd::CALENDAR_UNAVAILABLE;
-		kdDebug(5900) << "AlarmDaemon::notifyCalStatus() sending:" << appname << " -> " << change << endl;
+		kdDebug(5900) << "AlarmDaemon::notifyCaltqStatus() sending:" << appname << " -> " << change << endl;
 		AlarmGuiIface_stub stub(appname, client->dcopObject());
 		stub.alarmDaemonUpdate(change, cal->urlString());
 		if (!stub.ok())
-			kdError(5900) << "AlarmDaemon::notifyCalStatus(): dcop send failed:" << appname << endl;
+			kdError(5900) << "AlarmDaemon::notifyCaltqStatus(): dcop send failed:" << appname << endl;
 	}
 }
 
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index 54e7980a..c05a4725 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -32,8 +32,9 @@ class ADCalendar;
 class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
+		AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0);
 
 	private slots:
 //#ifdef AUTOSTART_KALARM
@@ -66,8 +67,8 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
 		void    reloadCal(ADCalendar*, bool reset);
 		void    checkAlarms(ADCalendar*);
 		bool    notifyEvent(ADCalendar*, const TQString& eventID);
-		void    notifyCalStatus(const ADCalendar*);
-		void    setTimerStatus();
+		void    notifyCaltqStatus(const ADCalendar*);
+		void    setTimertqStatus();
 		static TQString expandURL(const TQString& urlString);
 
 		TQTimer* mAlarmTimer;
diff --git a/kalarm/kalarmd/alarmguiiface.h b/kalarm/kalarmd/alarmguiiface.h
index d221fd34..49a46700 100644
--- a/kalarm/kalarmd/alarmguiiface.h
+++ b/kalarm/kalarmd/alarmguiiface.h
@@ -35,7 +35,7 @@ namespace KAlarmd
 		NOT_FOUND = 2    // notification type requires client start, but client executable not found
 	};
 
-	enum CalendarStatus    // parameters to client notification
+	enum CalendartqStatus    // parameters to client notification
 	{
 		CALENDAR_ENABLED,        // calendar is now being monitored
 		CALENDAR_DISABLED,       // calendar is available but not being monitored
@@ -53,9 +53,9 @@ class AlarmGuiIface : virtual public DCOPObject
 		K_DCOP
 	k_dcop:
 		/** Called to notify a change in status of the calendar.
-		    @param calendarStatus new calendar status. Value is of type CalendarStatus.
+		    @param calendartqStatus new calendar status. Value is of type CalendartqStatus.
 		 */
-		virtual ASYNC alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) = 0;
+		virtual ASYNC alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) = 0;
 
 		/** Called to notify that an alarm is due.
 		 */
diff --git a/kalarm/kalarmd/clientinfo.cpp b/kalarm/kalarmd/clientinfo.cpp
index e8c5ea6c..5475cce5 100644
--- a/kalarm/kalarmd/clientinfo.cpp
+++ b/kalarm/kalarmd/clientinfo.cpp
@@ -72,7 +72,7 @@ ClientInfo* ClientInfo::get(const TQCString& appName)
 {
 	if (appName.isEmpty())
 		return 0;
-	TQMap<TQCString, ClientInfo*>::ConstIterator it = mClients.find(appName);
+	TQMap<TQCString, ClientInfo*>::ConstIterator it = mClients.tqfind(appName);
 	if (it == mClients.end())
 		return 0;
 	return it.data();
@@ -104,7 +104,7 @@ void ClientInfo::clear()
 */
 void ClientInfo::remove(const TQCString& appName)
 {
-	TQMap<TQCString, ClientInfo*>::Iterator it = mClients.find(appName);
+	TQMap<TQCString, ClientInfo*>::Iterator it = mClients.tqfind(appName);
 	if (it != mClients.end())
 		delete it.data();
 }
diff --git a/kalarm/kalarmiface.h b/kalarm/kalarmiface.h
index 9f74e282..7ea53c44 100644
--- a/kalarm/kalarmiface.h
+++ b/kalarm/kalarmiface.h
@@ -103,15 +103,15 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param fgColor        The foreground colour for the alarm message, or TQString::null for the current
+	 *  @param fgColor        The foreground colour for the alarm message, or TQString() for the current
 	 *                        default foreground colour. The format of the string is the same as for @p bgColor.
-	 *  @param font           The font for the alarm message, or TQString::null for the default message font
+	 *  @param font           The font for the alarm message, or TQString() for the default message font
 	 *                        current at the time the message is displayed. The string should be in format
 	 *                        returned by TQFont::toString().
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param recurrence     Recurrence specification using iCalendar syntax (defined in RFC2445).
@@ -128,15 +128,15 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param fgColor        The foreground colour for the alarm message, or TQString::null for the current
+	 *  @param fgColor        The foreground colour for the alarm message, or TQString() for the current
 	 *                        default foreground colour. The format of the string is the same as for @p bgColor.
-	 *  @param font           The font for the alarm message, or TQString::null for the default message font
+	 *  @param font           The font for the alarm message, or TQString() for the default message font
 	 *                        current at the time the message is displayed. The string should be in format
 	 *                        returned by TQFont::toString().
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param repeatType     The time units to use for recurrence. The actual recurrence interval is equal to 
@@ -155,15 +155,15 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param fgColor        The foreground colour for the alarm message, or TQString::null for the current
+	 *  @param fgColor        The foreground colour for the alarm message, or TQString() for the current
 	 *                        default foreground colour. The format of the string is the same as for @p bgColor.
-	 *  @param font           The font for the alarm message, or TQString::null for the default message font
+	 *  @param font           The font for the alarm message, or TQString() for the default message font
 	 *                        current at the time the message is displayed. The string should be in format
 	 *                        returned by TQFont::toString().
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param repeatType     The time units to use for recurrence. The actual recurrence interval is equal to 
@@ -183,10 +183,10 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param recurrence     Recurrence specification using iCalendar syntax (defined in RFC2445).
@@ -202,10 +202,10 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param repeatType     The time units to use for recurrence. The actual recurrence interval is equal to 
@@ -222,10 +222,10 @@ class KAlarmIface : virtual public DCOPObject
 	 *  @param startDateTime  Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS]
 	 *  @param lateCancel     Late-cancellation period in minutes, or 0 for no cancellation.
 	 *  @param flags          OR of flag bits defined in Flags enum.
-	 *  @param bgColor        The background colour for the alarm message window, or TQString::null for the
+	 *  @param bgColor        The background colour for the alarm message window, or TQString() for the
 	 *                        current default background colour. The string may be in any of the formats
 	 *                        accepted by TQColor::TQColor(const TQString&).
-	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString::null for none.
+	 *  @param audioFile      The audio file to play when the alarm is displayed, or TQString() for none.
 	 *  @param reminderMins   The number of minutes in advance of the main alarm and its recurrences to display
 	 *                        a reminder alarm, or 0 for no reminder.
 	 *  @param repeatType     The time units to use for recurrence. The actual recurrence interval is equal to 
@@ -281,7 +281,7 @@ class KAlarmIface : virtual public DCOPObject
 	                             int repeatType, int repeatInterval, const TQString& endDateTime) = 0;
 
 	/** Schedule an email alarm.
-	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID.
+	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID.
 	 *  @param addresses      Comma-separated list of addresses to send the email to.
 	 *  @param subject        Subject line of the email.
 	 *  @param message        Email message's body text.
@@ -299,7 +299,7 @@ class KAlarmIface : virtual public DCOPObject
 	                           const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags,
 	                           const TQString& recurrence, int repeatInterval, int repeatCount) = 0;
 	/** Schedule an email alarm.
-	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID.
+	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID.
 	 *  @param addresses      Comma-separated list of addresses to send the email to.
 	 *  @param subject        Subject line of the email.
 	 *  @param message        Email message's body text.
@@ -319,7 +319,7 @@ class KAlarmIface : virtual public DCOPObject
 	                           const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags,
 	                           int repeatType, int repeatInterval, int repeatCount) = 0;
 	/** Schedule an email alarm.
-	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID.
+	 *  @param fromID         The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID.
 	 *  @param addresses      Comma-separated list of addresses to send the email to.
 	 *  @param subject        Subject line of the email.
 	 *  @param message        Email message's body text.
@@ -339,12 +339,12 @@ class KAlarmIface : virtual public DCOPObject
 	                           const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags,
 	                           int repeatType, int repeatInterval, const TQString& endDateTime) = 0;
 	/** Open the alarm edit dialog to edit an existing alarm.
-	 *  @param eventId       The unique ID of the event to be edited, or TQString::null to create a new alarm.
+	 *  @param eventId       The unique ID of the event to be edited, or TQString() to create a new alarm.
 	 *  @return false if the alarm could not be found or is read-only, true otherwise.
 	 */
 	virtual bool edit(const TQString& eventID) = 0;
 	/** Open the alarm edit dialog to edit a new alarm.
-	 *  @param templateName  Name of the alarm template to base the new alarm on, or TQString::null if none.
+	 *  @param templateName  Name of the alarm template to base the new alarm on, or TQString() if none.
 	 *                       If a template is specified but cannot be found, the alarm edit dialog is still
 	 *                       opened but is (obviously) not preset with the template.
 	 *  @return false if an alarm template was specified but could not be found, true otherwise.
diff --git a/kalarm/kalarmui.rc b/kalarm/kalarmui.rc
index 68627170..97d05056 100644
--- a/kalarm/kalarmui.rc
+++ b/kalarm/kalarmui.rc
@@ -11,7 +11,7 @@
   <Action name="edit_undo" />
   <Action name="edit_redo" />
   <Separator />
-  <Action name="edit_find"/>
+  <Action name="edit_tqfind"/>
  </ToolBar>
  <MenuBar>
   <Menu name="file" >
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index ab4747e3..98647d93 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -100,7 +100,7 @@ KPIM::IdentityManager* KAMail::identityManager()
 /******************************************************************************
 * Send the email message specified in an event.
 * Reply = true if the message was sent - 'errmsgs' may contain copy error messages.
-*       = false if the message was not sent - 'errmsgs' tqcontains the error messages.
+*       = false if the message was not sent - 'errmsgs' contains the error messages.
 */
 bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 {
@@ -144,7 +144,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 		return false;
 	}
 	KAMailData data(event, from,
-	                (event.emailBcc() ? Preferences::emailBccAddress() : TQString::null),
+	                (event.emailBcc() ? Preferences::emailBccAddress() : TQString()),
 	                allowNotify);
 	kdDebug(5950) << "KAlarmApp::sendEmail(): To: " << event.emailAddresses(", ")
 	              << "\nSubject: " << event.emailSubject() << endl;
@@ -281,7 +281,7 @@ TQString KAMail::sendKMail(const KAMailData& data)
 	}
 	if (data.allowNotify)
 		notifyQueued(data.event);
-	return TQString::null;
+	return TQString();
 }
 
 /******************************************************************************
@@ -323,7 +323,7 @@ TQString KAMail::addToKMailFolder(const KAMailData& data, const char* folder, bo
 		TQDataStream arg(callData, IO_WriteOnly);
 		arg << TQString::tqfromLatin1(folder) << tmpFile.name();
 		if (callKMail(callData, "KMailIface", "dcopAddMessage(TQString,TQString)", "int"))
-			return TQString::null;
+			return TQString();
 		err = i18n("Error calling KMail");
 	}
 	kdError(5950) << "KAMail::addToKMailFolder(" << folder << "): " << err << endl;
@@ -385,7 +385,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
 		char buff[64];
 		strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow));
 		TQString from = data.from;
-		from.tqreplace(TQRegExp("^.*<"), TQString::null).tqreplace(TQRegExp(">.*$"), TQString::null);
+		from.tqreplace(TQRegExp("^.*<"), TQString()).tqreplace(TQRegExp(">.*$"), TQString());
 		message = TQString::tqfromLatin1(buff);
 		message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
 	}
@@ -513,7 +513,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 		}
 		message += TQString::tqfromLatin1("\n--%1--\n.\n").arg(boundary);
 	}
-	return TQString::null;
+	return TQString();
 }
 
 /******************************************************************************
@@ -539,7 +539,7 @@ void KAMail::notifyQueued(const KAEvent& event)
 				TQString text = (Preferences::emailClient() == Preferences::KMAIL)
 				             ? i18n("An email has been queued to be sent by KMail")
 				             : i18n("An email has been queued to be sent");
-				KMessageBox::information(0, text, TQString::null, Preferences::EMAIL_QUEUED_NOTIFY);
+				KMessageBox::information(0, text, TQString(), Preferences::EMAIL_TQUEUED_NOTIFY);
 				return;
 			}
 		}
@@ -611,7 +611,7 @@ TQString KAMail::convertAddresses(const TQString& items, EmailAddressList& list)
 		if (!bad.isEmpty())
 			return bad;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 #if 0
@@ -654,7 +654,7 @@ TQString KAMail::convertAddress(KMime::Types::Address addr, EmailAddressList& li
 		}
 		list += KCal::Person((*mb).displayName, addrPart);
 	}
-	return TQString::null;
+	return TQString();
 }
 
 /*
@@ -678,7 +678,7 @@ TQString KAMail::convertAddresses(const TQString& items, TQStringList& list)
 				return item;
 		}
 	}
-	return TQString::null;
+	return TQString();
 }*/
 
 /******************************************************************************
@@ -691,7 +691,7 @@ int KAMail::checkAddress(TQString& address)
 {
 	address = address.stripWhiteSpace();
 	// Check that there are no list separator characters present
-	if (address.find(',') >= 0  ||  address.find(';') >= 0)
+	if (address.tqfind(',') >= 0  ||  address.tqfind(';') >= 0)
 		return -1;
 	int n = address.length();
 	if (!n)
@@ -701,16 +701,16 @@ int KAMail::checkAddress(TQString& address)
 	if (address[end] == '>')
 	{
 		// The email address is in <...>
-		if ((start = address.find('<')) < 0)
+		if ((start = address.tqfind('<')) < 0)
 			return -1;
 		++start;
 		--end;
 	}
-	int i = address.find('@', start);
+	int i = address.tqfind('@', start);
 	if (i >= 0)
 	{
 		if (i == start  ||  i == end)          // check @ isn't the first or last character
-//		||  address.find('@', i + 1) >= 0)    // check for multiple @ characters
+//		||  address.tqfind('@', i + 1) >= 0)    // check for multiple @ characters
 			return -1;
 	}
 /*	else
@@ -744,10 +744,10 @@ TQString KAMail::convertAttachments(const TQString& items, TQStringList& list)
 	for (int next = 0;  next < length;  )
 	{
 		// Find the first delimiter character (, or ;)
-		int i = items.find(',', next);
+		int i = items.tqfind(',', next);
 		if (i < 0)
 			i = items.length();
-		int sc = items.find(';', next);
+		int sc = items.tqfind(';', next);
 		if (sc < 0)
 			sc = items.length();
 		if (sc < i)
@@ -762,7 +762,7 @@ TQString KAMail::convertAttachments(const TQString& items, TQStringList& list)
 		}
 		next = i + 1;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 #if 0
@@ -780,10 +780,10 @@ TQString KAMail::convertAttachments(const TQString& items, KURL::List& list)
 	for (int next = 0;  next < length;  )
 	{
 		// Find the first delimiter character (, or ;)
-		int i = items.find(',', next);
+		int i = items.tqfind(',', next);
 		if (i < 0)
 			i = items.length();
-		int sc = items.find(';', next);
+		int sc = items.tqfind(';', next);
 		if (sc < 0)
 			sc = items.length();
 		if (sc < i)
@@ -798,7 +798,7 @@ TQString KAMail::convertAttachments(const TQString& items, KURL::List& list)
 		}
 		next = i + 1;
 	}
-	return TQString::null;
+	return TQString();
 }
 #endif
 
@@ -944,7 +944,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
 	arg << (int)0;
 	TQString body;
 	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
-	&&  replyType == "TQString")
+	&&  replyType == TQSTRING_OBJECT_NAME_STRING)
 	{
 		TQDataStream reply_stream(replyData, IO_ReadOnly);
 		reply_stream >> body;
@@ -963,7 +963,7 @@ TQString getHostName()
 {
         char hname[256];
         if (gethostname(hname, sizeof(hname)))
-                return TQString::null;
+                return TQString();
         return TQString::fromLocal8Bit(hname);
 }
 }
@@ -1005,7 +1005,7 @@ bool parseUserName( const char* & scursor, const char * const send,
 
     default: // atom
       scursor--; // re-set scursor to point to ch again
-      tmp = TQString::null;
+      tmp = TQString();
       if ( parseAtom( scursor, send, result, false /* no 8bit */ ) ) {
         if (getpwnam(result.local8Bit()))
           return true;
@@ -1033,7 +1033,7 @@ bool parseAddress( const char* & scursor, const char * const send,
   const char * oldscursor = scursor;
   if ( parseMailbox( scursor, send, maybeMailbox, isCRLF ) ) {
     // yes, it is:
-    result.displayName = TQString::null;
+    result.displayName = TQString();
     result.mailboxList.append( maybeMailbox );
     return true;
   }
@@ -1044,10 +1044,10 @@ bool parseAddress( const char* & scursor, const char * const send,
   TQString maybeUserName;
   if ( parseUserName( scursor, send, maybeUserName, isCRLF ) ) {
     // yes, it is:
-    maybeMailbox.displayName = TQString::null;
+    maybeMailbox.displayName = TQString();
     maybeMailbox.addrSpec.localPart = maybeUserName;
-    maybeMailbox.addrSpec.domain = TQString::null;
-    result.displayName = TQString::null;
+    maybeMailbox.addrSpec.domain = TQString();
+    result.displayName = TQString();
     result.mailboxList.append( maybeMailbox );
     return true;
   }
diff --git a/kalarm/kamail.h b/kalarm/kamail.h
index 6e2d0300..e62ab8f6 100644
--- a/kalarm/kamail.h
+++ b/kalarm/kamail.h
@@ -59,7 +59,7 @@ class KAMail
 		static TQString     convertAddress(KMime::Types::Address, EmailAddressList&);
 		static void        notifyQueued(const KAEvent&);
 		static char*       base64Encode(const char* in, TQIODevice::Offset size, TQIODevice::Offset& outSize);
-		static TQStringList errors(const TQString& error = TQString::null, bool sendfail = true);
+		static TQStringList errors(const TQString& error = TQString(), bool sendfail = true);
 };
 
 #endif // KAMAIL_H
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 274ad9b7..51c127d6 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -39,8 +39,8 @@ TQString LateCancelSelector::i18n_AutoCloseWinLC()     { return i18n("Auto-close
 TQString LateCancelSelector::i18n_i_AutoCloseWinLC()   { return i18n("Auto-close w&indow after late-cancelation time"); }
 
 
-LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mDateOnly(false),
 	  mReadOnly(false),
 	  mAutoCloseShown(false)
@@ -63,13 +63,13 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c
 	mCheckbox->setFixedSize(mCheckbox->tqsizeHint());
 	connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
 	TQWhatsThis::add(mCheckbox, whatsThis);
-	tqlayout->addWidget(mCheckbox, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mCheckbox, 0, TQt::AlignAuto);
 
 	mTimeSelectorFrame = new TQFrame(mStack);
 	mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame);
 	mStack->addWidget(mTimeSelectorFrame, 2);
 	tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0);
-	mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString::null,
+	mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(),
 	                                 whatsThis, i18n("Enter how late will cause the alarm to be canceled"),
 	                                 allowHourMinute, mTimeSelectorFrame);
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 5b914648..1d5b5363 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -30,11 +30,12 @@ class TQWidgetStack;
 class CheckBox;
 
 
-class LateCancelSelector : public QFrame
+class LateCancelSelector : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
+		LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
 		int            minutes() const;
 		void           setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits);
 		void           setDateOnly(bool dateOnly);
@@ -55,7 +56,7 @@ class LateCancelSelector : public QFrame
 
 	private:
 		TQBoxLayout*    mLayout;            // overall tqlayout for the widget
-		TQWidgetStack*  mStack;             // tqcontains mCheckboxFrame and mTimeSelectorFrame
+		TQWidgetStack*  mStack;             // contains mCheckboxFrame and mTimeSelectorFrame
 		TQFrame*        mCheckboxFrame;
 		CheckBox*      mCheckbox;          // displayed when late cancellation is not selected
 		TQFrame*        mTimeSelectorFrame;
diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp
index 01864012..b8528316 100644
--- a/kalarm/lib/buttongroup.cpp
+++ b/kalarm/lib/buttongroup.cpp
@@ -26,26 +26,26 @@
 #include "buttongroup.moc"
 
 
-ButtonGroup::ButtonGroup(TQWidget* parent, const char* name)
-	: TQButtonGroup(parent, name)
+ButtonGroup::ButtonGroup(TQWidget* tqparent, const char* name)
+	: TQButtonGroup(tqparent, name)
 {
 	connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
 }
 
-ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name)
-	: TQButtonGroup(title, parent, name)
+ButtonGroup::ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name)
+	: TQButtonGroup(title, tqparent, name)
 {
 	connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
 }
 
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name)
-	: TQButtonGroup(strips, orient, parent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name)
+	: TQButtonGroup(strips, orient, tqparent, name)
 {
 	connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
 }
 
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
-	: TQButtonGroup(strips, orient, title, parent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name)
+	: TQButtonGroup(strips, orient, title, tqparent, name)
 {
 	connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
 }
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index 8fbadae7..9d4a8886 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -1,5 +1,5 @@
 /*
- *  buttongroup.h  -  TQButtonGroup with an extra signal and Qt 2 compatibility
+ *  buttongroup.h  -  TQButtonGroup with an extra signal and TQt 2 compatibility
  *  Program:  kalarm
  *  Copyright © 2002,2004,2006 by David Jarvie <software@astrojar.org.uk>
  *
@@ -24,47 +24,48 @@
 
 
 /**
- *  @short A TQButtonGroup with signal on new selection, plus Qt 2 compatibility.
+ *  @short A TQButtonGroup with signal on new selection, plus TQt 2 compatibility.
  *
  *  The ButtonGroup class provides an enhanced version of the TQButtonGroup class.
  *
  *  It emits an additional signal, buttonSet(int), whenever any of its buttons
  *  changes state, for whatever reason, including programmatic control. (The
  *  TQButtonGroup class only emits signals when buttons are clicked on by the user.)
- *  The class also provides Qt 2 compatibility.
+ *  The class also provides TQt 2 compatibility.
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class ButtonGroup : public QButtonGroup
+class ButtonGroup : public TQButtonGroup
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit ButtonGroup(TQWidget* parent, const char* name = 0);
+		explicit ButtonGroup(TQWidget* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  @param title The title displayed for this button group.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0);
+		ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  @param strips The number of rows or columns of buttons.
-		 *  @param orient The orientation (Qt::Horizontal or Qt::Vertical) of the button group.
-		 *  @param parent The parent object of this widget.
+		 *  @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0);
+		ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  @param strips The number of rows or columns of buttons.
-		 *  @param orient The orientation (Qt::Horizontal or Qt::Vertical) of the button group.
+		 *  @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
 		 *  @param title The title displayed for this button group.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
+		ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name = 0);
 		/** Inserts a button in the group.
 		 *  This overrides the insert() method of TQButtonGroup, which should really be a virtual method...
 		 *  @param button The button to insert.
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index dde0d10f..cff6cdb1 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -21,15 +21,15 @@
 #include "checkbox.moc"
 
 
-CheckBox::CheckBox(TQWidget* parent, const char* name)
-	: TQCheckBox(parent, name),
+CheckBox::CheckBox(TQWidget* tqparent, const char* name)
+	: TQCheckBox(tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mFocusWidget(0),
 	  mReadOnly(false)
 { }
 
-CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name)
-	: TQCheckBox(text, parent, name),
+CheckBox::CheckBox(const TQString& text, TQWidget* tqparent, const char* name)
+	: TQCheckBox(text, tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mFocusWidget(0),
 	  mReadOnly(false)
@@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQCheckBox::mousePressEvent(e);
@@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQCheckBox::mouseReleaseEvent(e);
@@ -114,10 +114,10 @@ void CheckBox::keyPressEvent(TQKeyEvent* e)
 	if (mReadOnly)
 		switch (e->key())
 		{
-			case Qt::Key_Up:
-			case Qt::Key_Left:
-			case Qt::Key_Right:
-			case Qt::Key_Down:
+			case TQt::Key_Up:
+			case TQt::Key_Left:
+			case TQt::Key_Right:
+			case TQt::Key_Down:
 				// Process keys which shift the focus
 				break;
 			default:
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 389e6623..6b6985cd 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -39,21 +39,22 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class CheckBox : public QCheckBox
+class CheckBox : public TQCheckBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit CheckBox(TQWidget* parent, const char* name = 0);
+		explicit CheckBox(TQWidget* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  @param text Text to display.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		CheckBox(const TQString& text, TQWidget* parent, const char* name = 0);
+		CheckBox(const TQString& text, TQWidget* tqparent, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool         isReadOnly() const          { return mReadOnly; }
 		/** Sets whether the check box is read-only for the user. If read-only,
@@ -79,7 +80,7 @@ class CheckBox : public QCheckBox
 	protected slots:
 		void         slotClicked();
 	private:
-		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the QCheckBox
+		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the TQCheckBox
 		TQWidget*             mFocusWidget;       // widget to receive focus when button is clicked on
 		bool                 mFocusWidgetEnable; // enable focus widget before setting focus
 		bool                 mReadOnly;          // value cannot be changed
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 0345104e..769e6518 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -30,8 +30,8 @@
 #include "colourcombo.moc"
 
 
-ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defaultColour)
-	: TQComboBox(parent, name),
+ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& defaultColour)
+	: TQComboBox(tqparent, name),
 	  mColourList(Preferences::messageColours()),
 	  mSelectedColour(defaultColour),
 	  mCustomColour(255, 255, 255),
@@ -169,9 +169,9 @@ void ColourCombo::drawCustomItem(TQRect& rect, bool insert)
 {
 	TQPen pen;
 	if (tqGray(mCustomColour.rgb()) < 128)
-		pen.setColor(Qt::white);
+		pen.setColor(TQt::white);
 	else
-		pen.setColor(Qt::black);
+		pen.setColor(TQt::black);
 
 	TQPainter painter;
 	TQFontMetrics fm = TQFontMetrics(painter.font());
@@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQComboBox::mousePressEvent(e);
@@ -228,7 +228,7 @@ void ColourCombo::mouseMoveEvent(TQMouseEvent* e)
 
 void ColourCombo::keyPressEvent(TQKeyEvent* e)
 {
-	if (!mReadOnly  ||  e->key() == Qt::Key_Escape)
+	if (!mReadOnly  ||  e->key() == TQt::Key_Escape)
 		TQComboBox::keyPressEvent(e);
 }
 
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index b05f7882..31fcdbdc 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -40,17 +40,18 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class ColourCombo : public QComboBox
+class ColourCombo : public TQComboBox
 {
 		Q_OBJECT
-		Q_PROPERTY(TQColor color READ color WRITE setColor)
+  TQ_OBJECT
+		TQ_PROPERTY(TQColor color READ color WRITE setColor)
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 *  @param defaultColour The colour which is selected by default.
 		 */
-		explicit ColourCombo(TQWidget* parent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF);
+		explicit ColourCombo(TQWidget* tqparent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF);
 		/** Returns the selected colour. */
 		TQColor       color() const               { return mSelectedColour; }
 		/** Returns the selected colour. */
diff --git a/kalarm/lib/colourlist.cpp b/kalarm/lib/colourlist.cpp
index 93886b5f..77bdaa9d 100644
--- a/kalarm/lib/colourlist.cpp
+++ b/kalarm/lib/colourlist.cpp
@@ -29,8 +29,8 @@ ColourList::ColourList(const TQColor* colours)
 
 void ColourList::insert(const TQColor& colour)
 {
-	QRgb rgb = colour.rgb();
-	for (TQValueListIterator<QRgb> it = mList.begin();  it != mList.end();  ++it)
+	TQRgb rgb = colour.rgb();
+	for (TQValueListIterator<TQRgb> it = mList.begin();  it != mList.end();  ++it)
 	{
 		if (rgb <= *it)
 		{
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index 8ec2b2a9..7bee8d14 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -32,7 +32,7 @@
  *  The ColourList class holds a list of colours, sorted in RGB value order.
  *
  *  It provides a sorted TQValueList of colours in RGB value order, with iterators
- *  and other access methods which return either QRgb or TQColor objects.
+ *  and other access methods which return either TQRgb or TQColor objects.
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
@@ -40,14 +40,14 @@ class ColourList
 {
 	public:
 		typedef size_t  size_type;
-		typedef TQValueListConstIterator<QRgb>  const_iterator;
+		typedef TQValueListConstIterator<TQRgb>  const_iterator;
 
 		/** Constructs an empty list. */
 		ColourList()  { }
 		/** Copy constructor. */
 		ColourList(const ColourList& l)       : mList(l.mList) { }
 		/** Constructs a list whose values are preset to the colours in @p list. */
-		ColourList(const TQValueList<QRgb>& list) : mList(list) { qHeapSort(mList); }
+		ColourList(const TQValueList<TQRgb>& list) : mList(list) { qHeapSort(mList); }
 		/** Constructs a list whose values are preset to the colours in the @p list.
 		 *  Terminate @p list by an invalid colour.
 		 */
@@ -55,7 +55,7 @@ class ColourList
 		/** Assignment operator. */
 		ColourList&    operator=(const ColourList& l)        { mList = l.mList;  return *this; }
 		/** Sets the list to comprise the colours in @p list. */
-		ColourList&    operator=(const TQValueList<QRgb>& list) { mList = list;  qHeapSort(mList);  return *this; }
+		ColourList&    operator=(const TQValueList<TQRgb>& list) { mList = list;  qHeapSort(mList);  return *this; }
 		/** Removes all values from the list. */
 		void           clear()                               { mList.clear(); }
 		/** Adds the specified colour @p c to the list. */
@@ -82,16 +82,16 @@ class ColourList
 		const_iterator fromLast() const                      { return mList.fromLast(); }
 		/** Returns an iterator pointing to the colour at position @p i in the list. */
 		const_iterator at(size_type i) const                 { return mList.at(i); }
-		/** Returns true if the list tqcontains the colour @p c. */
+		/** Returns true if the list contains the colour @p c. */
 		size_type      tqcontains(const TQColor& c) const       { return mList.tqcontains(c.rgb()); }
 		/** Returns an iterator pointing to the first occurrence of colour @p c in the list.
 		 *  Returns end() if colour @p c is not in the list.
 		 */
-		const_iterator find(const TQColor& c) const           { return mList.find(c.rgb()); }
+		const_iterator tqfind(const TQColor& c) const           { return mList.tqfind(c.rgb()); }
 		/** Returns an iterator pointing to the first occurrence of colour @p c in the list, starting.
 		 *  from position @p it. Returns end() if colour @p c is not in the list.
 		 */
-		const_iterator find(const_iterator it, const TQColor& c) const   { return mList.find(it, c.rgb()); }
+		const_iterator tqfind(const_iterator it, const TQColor& c) const   { return mList.tqfind(it, c.rgb()); }
 		/** Returns the index to the first occurrence of colour @p c in the list.
 		 *  Returns -1 if colour @p c is not in the list.
 		 */
@@ -104,7 +104,7 @@ class ColourList
 		TQColor         operator[](size_type i) const         { return TQColor(mList[i]); }
 	private:
 		void              sort();
-		TQValueList<QRgb>  mList;
+		TQValueList<TQRgb>  mList;
 };
 
 #endif // COLOURLIST_H
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index bb232ffe..0c526cae 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -22,13 +22,13 @@
 #include "combobox.moc"
 
 
-ComboBox::ComboBox(TQWidget* parent, const char* name)
-	: TQComboBox(parent, name),
+ComboBox::ComboBox(TQWidget* tqparent, const char* name)
+	: TQComboBox(tqparent, name),
 	  mReadOnly(false)
 { }
 
-ComboBox::ComboBox(bool rw, TQWidget* parent, const char* name)
-	: TQComboBox(rw, parent, name),
+ComboBox::ComboBox(bool rw, TQWidget* tqparent, const char* name)
+	: TQComboBox(rw, tqparent, name),
 	  mReadOnly(false)
 { }
 
@@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQComboBox::mousePressEvent(e);
@@ -67,7 +67,7 @@ void ComboBox::mouseMoveEvent(TQMouseEvent* e)
 
 void ComboBox::keyPressEvent(TQKeyEvent* e)
 {
-	if (!mReadOnly  ||  e->key() == Qt::Key_Escape)
+	if (!mReadOnly  ||  e->key() == TQt::Key_Escape)
 		TQComboBox::keyPressEvent(e);
 }
 
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index 3f33a63d..5f8f4cc3 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -34,21 +34,22 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class ComboBox : public QComboBox
+class ComboBox : public TQComboBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit ComboBox(TQWidget* parent = 0, const char* name = 0);
+		explicit ComboBox(TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor.
 		 *  @param rw True for a read-write combo box, false for a read-only combo box.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit ComboBox(bool rw, TQWidget* parent = 0, const char* name = 0);
+		explicit ComboBox(bool rw, TQWidget* tqparent = 0, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool         isReadOnly() const          { return mReadOnly; }
 		/** Sets whether the combo box is read-only for the user. If read-only,
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 2cc10698..38a6a5cb 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -25,8 +25,8 @@
 #include "dateedit.moc"
 
 
-DateEdit::DateEdit(TQWidget* parent, const char* name)
-	: KDateEdit(parent, name)
+DateEdit::DateEdit(TQWidget* tqparent, const char* name)
+	: KDateEdit(tqparent, name)
 {
 	connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&)));
 }
@@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e)
 	if (isReadOnly())
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	KDateEdit::mousePressEvent(e);
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 7ea09e01..7ad0a7a0 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -37,13 +37,14 @@
 class DateEdit : public KDateEdit
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit DateEdit(TQWidget* parent = 0, const char* name = 0);
-		/** Returns true if the widget tqcontains a valid date. */
+		explicit DateEdit(TQWidget* tqparent = 0, const char* name = 0);
+		/** Returns true if the widget contains a valid date. */
 		bool         isValid() const              { return date().isValid(); }
 		/** Returns the earliest date which can be entered.
 		 *  If there is no minimum date, returns an invalid date.
@@ -56,15 +57,15 @@ class DateEdit : public KDateEdit
 		/** Sets the earliest date which can be entered.
 		 *  @param date Earliest date allowed. If invalid, any minimum limit is removed.
 		 *  @param errorDate Error message to be displayed when a date earlier than
-		 *         @p date is entered. Set to TQString::null to use the default error message.
+		 *         @p date is entered. Set to TQString() to use the default error message.
 		 */
-		void         setMinDate(const TQDate& date, const TQString& errorDate = TQString::null);
+		void         setMinDate(const TQDate& date, const TQString& errorDate = TQString());
 		/** Sets the latest date which can be entered.
 		 *  @param date Latest date allowed. If invalid, any maximum limit is removed.
 		 *  @param errorDate Error message to be displayed when a date later than
-		 *         @p date is entered. Set to TQString::null to use the default error message.
+		 *         @p date is entered. Set to TQString() to use the default error message.
 		 */
-		void         setMaxDate(const TQDate& date, const TQString& errorDate = TQString::null);
+		void         setMaxDate(const TQDate& date, const TQString& errorDate = TQString());
 		/** Sets the date held in the widget to an invalid date. */
 		void         setInvalid();
 
diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp
index 3ebaccd3..e9dae414 100644
--- a/kalarm/lib/datetime.cpp
+++ b/kalarm/lib/datetime.cpp
@@ -43,7 +43,7 @@ TQString DateTime::formatLocale(bool shortFormat) const
 	else if (mTimeValid)
 		return KGlobal::locale()->formatDateTime(mDateTime, shortFormat);
 	else
-		return TQString::null;
+		return TQString();
 }
 
 bool operator==(const DateTime& dt1, const DateTime& dt2)
diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h
index eb40d6b5..976bada9 100644
--- a/kalarm/lib/datetime.h
+++ b/kalarm/lib/datetime.h
@@ -169,14 +169,14 @@ class DateTime
 		 *  If it is a date-time, both time and date are included in the output.
 		 *  If it is date-only, only the date is included in the output.
 		 */
-		TQString   toString(Qt::DateFormat f = Qt::TextDate) const
+		TQString   toString(TQt::DateFormat f = TQt::TextDate) const
 				{
 					if (mDateOnly)
 						return mDateTime.date().toString(f);
 					else if (mTimeValid)
 						return mDateTime.toString(f);
 					else
-						return TQString::null;
+						return TQString();
 				}
 		/** Returns the value as a string.
 		 *  If it is a date-time, both time and date are included in the output.
@@ -189,7 +189,7 @@ class DateTime
 					else if (mTimeValid)
 						return mDateTime.toString(format);
 					else
-						return TQString::null;
+						return TQString();
 				}
 		/** Returns the value as a string, formatted according to the user's locale.
 		 *  If it is a date-time, both time and date are included in the output.
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index ad6fd783..d2b18ba1 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -23,20 +23,20 @@
 #include "label.moc"
 
 
-Label::Label(TQWidget* parent, const char* name, WFlags f)
-	: TQLabel(parent, name, f),
+Label::Label(TQWidget* tqparent, const char* name, WFlags f)
+	: TQLabel(tqparent, name, f),
 	  mRadioButton(0),
 	  mFocusWidget(0)
 { }
 
-Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f)
-	: TQLabel(text, parent, name, f),
+Label::Label(const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
+	: TQLabel(text, tqparent, name, f),
 	  mRadioButton(0),
 	  mFocusWidget(0)
 { }
 
-Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f)
-	: TQLabel(buddy, text, parent, name, f),
+Label::Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
+	: TQLabel(buddy, text, tqparent, name, f),
 	  mRadioButton(0),
 	  mFocusWidget(0)
 { }
@@ -103,8 +103,8 @@ void Label::activated()
 * Class: LabelFocusWidget
 =============================================================================*/
 
-LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
-	: TQWidget(parent, name)
+LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
+	: TQWidget(tqparent, name)
 {
 	setFocusPolicy(ClickFocus);
 	setFixedSize(TQSize(1,1));
@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
 
 void LabelFocusWidget::focusInEvent(TQFocusEvent*)
 {
-	Label* parent = (Label*)tqparentWidget();
-	parent->activated();
+	Label* tqparent = (Label*)tqparentWidget();
+	tqparent->activated();
 
 }
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index d5f46c4f..bd0e3903 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -38,35 +38,36 @@ class LabelFocusWidget;
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class Label : public QLabel
+class Label : public TQLabel
 {
 		Q_OBJECT
+  TQ_OBJECT
 		friend class LabelFocusWidget;
 	public:
 		/** Constructs an empty label.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 *  @param f    Flags. See TQWidget constructor for details.
 		 */
-		explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0);
+		explicit Label(TQWidget* tqparent, const char* name = 0, WFlags f = 0);
 		/** Constructs a label that displays @p text.
 		 *  @param text   Text string to display.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name   The name of this widget.
 		 *  @param f      Flags. See TQWidget constructor for details.
 		 */
-		Label(const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0);
+		Label(const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0);
 		/** Constructs a label, with a buddy widget, that displays @p text.
 		 *  @param buddy  Buddy widget which receives the keyboard focus when the
 		 *                label's accelerator key is pressed. If @p buddy is a radio
 		 *                button, @p buddy is in addition selected when the
 		 *                accelerator key is pressed.
 		 *  @param text   Text string to display.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name   The name of this widget.
 		 *  @param f      Flags. See TQWidget constructor for details.
 		 */
-		Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0);
+		Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0);
 		/** Sets the label's buddy widget which receives the keyboard focus when the
 		 *  label's accelerator key is pressed. If @p buddy is a radio button,
 		 *  @p buddy is in addition selected when the accelerator key is pressed.
@@ -84,11 +85,12 @@ class Label : public QLabel
 
 
 // Private class for use by Label
-class LabelFocusWidget : public QWidget
+class LabelFocusWidget : public TQWidget
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		LabelFocusWidget(TQWidget* parent, const char* name = 0);
+		LabelFocusWidget(TQWidget* tqparent, const char* name = 0);
 	protected:
 		virtual void focusInEvent(TQFocusEvent*);
 };
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 4dcdc15f..d85a9945 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -39,8 +39,8 @@
 * It has an option to prevent its contents being selected when it receives
 = focus.
 =============================================================================*/
-LineEdit::LineEdit(Type type, TQWidget* parent, const char* name)
-	: KLineEdit(parent, name),
+LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name)
+	: KLineEdit(tqparent, name),
 	  mType(type),
 	  mNoSelect(false),
 	  mSetCursorAtEnd(false)
@@ -48,8 +48,8 @@ LineEdit::LineEdit(Type type, TQWidget* parent, const char* name)
 	init();
 }
 
-LineEdit::LineEdit(TQWidget* parent, const char* name)
-	: KLineEdit(parent, name),
+LineEdit::LineEdit(TQWidget* tqparent, const char* name)
+	: KLineEdit(tqparent, name),
 	  mType(Text),
 	  mNoSelect(false),
 	  mSetCursorAtEnd(false)
@@ -122,7 +122,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 			if (mType == Emails)
 				newText = mailList.first().from();
 			else
-				setText(mailList.first().subject());    // tqreplace any existing text
+				setText(mailList.first().subject());    // replace any existing text
 		}
 	}
 	// This must come before KURLDrag
@@ -144,7 +144,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		{
 			case Url:
 				// URL entry field - ignore all but the first dropped URL
-				setText(files.first().prettyURL());    // tqreplace any existing text
+				setText(files.first().prettyURL());    // replace any existing text
 				break;
 			case Emails:
 			{
@@ -181,7 +181,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		}
 		else
 		{
-			int newline = txt.find('\n');
+			int newline = txt.tqfind('\n');
 			newText = (newline >= 0) ? txt.left(newline) : txt;
 		}
 	}
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 5d36de3c..0da53683 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -43,16 +43,17 @@
 class LineEdit : public KLineEdit
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Types of drag and drop content which will be accepted.
-		 *  @li Text   - the line edit tqcontains general text. It accepts text, a URL
+		 *  @li Text   - the line edit contains general text. It accepts text, a URL
 		 *               or an email from KMail (the subject line is used). If multiple
 		 *               URLs or emails are dropped, only the first is used; the
 		 *               rest are ignored.
-		 *  @li Url    - the line edit tqcontains a URL. It accepts text or a URL. If
+		 *  @li Url    - the line edit contains a URL. It accepts text or a URL. If
 		 *               multiple URLs are dropped, only the first URL is used; the
 		 *               rest are ignored.
-		 *  @li Emails - the line edit tqcontains email addresses. It accepts text,
+		 *  @li Emails - the line edit contains email addresses. It accepts text,
 		 *               mailto: URLs, emails from KMail (the From address is used)
 		 *               or vcard data (e.g. from KAddressBook). If multiple emails
 		 *               are dropped, only the first is used; the rest are ignored.
@@ -61,15 +62,15 @@ class LineEdit : public KLineEdit
 		enum Type { Text, Url, Emails };
 		/** Constructor.
 		 *  @param type The content type for the line edit.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0);
+		explicit LineEdit(Type type, TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructs a line edit whose content type is Text.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit LineEdit(TQWidget* parent = 0, const char* name = 0);
+		explicit LineEdit(TQWidget* tqparent = 0, const char* name = 0);
 		/** Prevents the line edit's contents being selected when the widget receives focus. */
 		void         setNoSelect()   { mNoSelect = true; }
 		/** Sets whether the cursor should be set at the beginning or end of the text when
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 3345c9c4..dced4ce6 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -45,7 +45,7 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg
 	ButtonCode defaultButton = Continue;
 	if (!dontAskAgainName.isEmpty())
 	{
-		TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.find(dontAskAgainName);
+		TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.tqfind(dontAskAgainName);
 		if (it != mContinueDefaults.end())
 			defaultButton = it.data();
 	}
@@ -60,11 +60,11 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg
 *      warningContinueCancel() for that 'dontAskAgainName' value. If neither method
 *      has set a default button, Continue is the default.
 */
-int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption,
+int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption,
                                       const KGuiItem& buttonContinue, const TQString& dontAskAgainName)
 {
 	ButtonCode defaultButton = getContinueDefault(dontAskAgainName);
-	return warningContinueCancel(parent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
+	return warningContinueCancel(tqparent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
 }
 
 /******************************************************************************
@@ -72,13 +72,13 @@ int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, co
 * If 'dontAskAgainName' is specified, the message box will only be suppressed
 * if the user chose Continue last time.
 */
-int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
+int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text,
                                       const TQString& caption, const KGuiItem& buttonContinue,
                                       const TQString& dontAskAgainName)
 {
 	setContinueDefault(dontAskAgainName, defaultButton);
 	if (defaultButton != Cancel)
-		return KMessageBox::warningContinueCancel(parent, text, caption, buttonContinue, dontAskAgainName);
+		return KMessageBox::warningContinueCancel(tqparent, text, caption, buttonContinue, dontAskAgainName);
 
 	// Cancel is the default button, so we have to use KMessageBox::warningYesNo()
 	if (!dontAskAgainName.isEmpty())
@@ -92,7 +92,7 @@ int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton
 			saveDontShowAgain(dontAskAgainName, true, false);
 		}
 	}
-	return warningYesNo(parent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
+	return warningYesNo(tqparent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
 }
 
 /******************************************************************************
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 6d65b093..21d321b1 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -58,7 +58,7 @@ class MessageBox : public KMessageBox
 		 */
 		static void setContinueDefault(const TQString& dontAskAgainName, ButtonCode defaultButton);
 		/** Displays a Continue/Cancel message box with the option as to which button is the default.
-		 *  @param parent Parent widget
+		 *  @param tqparent Parent widget
 		 *  @param defaultButton The default button for the message box. Valid values are Continue or Cancel.
 		 *  @param text Message string
 		 *  @param caption Caption (window title) of the message box
@@ -66,12 +66,12 @@ class MessageBox : public KMessageBox
 		 *  @param dontAskAgainName If specified, the message box will only be suppressed
 		 *    if the user chose Continue last time.
 		 */
-		static int  warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
-		                                  const TQString& caption = TQString::null,
+		static int  warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text,
+		                                  const TQString& caption = TQString(),
 		                                  const KGuiItem& buttonContinue = KStdGuiItem::cont(),
-		                                  const TQString& dontAskAgainName = TQString::null);
+		                                  const TQString& dontAskAgainName = TQString());
 		/** Displays a Continue/Cancel message box.
-		 *  @param parent Parent widget
+		 *  @param tqparent Parent widget
 		 *  @param text Message string
 		 *  @param caption Caption (window title) of the message box
 		 *  @param buttonContinue The text for the first button (default = i18n("Continue"))
@@ -81,9 +81,9 @@ class MessageBox : public KMessageBox
 		 *    @p dontAskAgainName value. If neither method has been used to set a default button,
 		 *    Continue is the default.
 		 */
-		static int  warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption = TQString::null,
+		static int  warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(),
 		                                  const KGuiItem& buttonContinue = KStdGuiItem::cont(),
-		                                  const TQString& dontAskAgainName = TQString::null);
+		                                  const TQString& dontAskAgainName = TQString());
 		/** If there is no current setting for whether a non-Yes/No message box should be
 		 *  shown, sets it to @p defaultShow.
 		 *  If a Continue/Cancel message box has Cancel as the default button, either
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index ed8440a0..e1e04099 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -21,20 +21,20 @@
 #include "pushbutton.moc"
 
 
-PushButton::PushButton(TQWidget* parent, const char* name)
-	: TQPushButton(parent, name),
+PushButton::PushButton(TQWidget* tqparent, const char* name)
+	: TQPushButton(tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mReadOnly(false)
 { }
 
-PushButton::PushButton(const TQString& text, TQWidget* parent, const char* name)
-	: TQPushButton(text, parent, name),
+PushButton::PushButton(const TQString& text, TQWidget* tqparent, const char* name)
+	: TQPushButton(text, tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mReadOnly(false)
 { }
 
-PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name)
-	: TQPushButton(icon, text, parent, name),
+PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name)
+	: TQPushButton(icon, text, tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mReadOnly(false)
 { }
@@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQPushButton::mousePressEvent(e);
@@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQPushButton::mouseReleaseEvent(e);
@@ -83,10 +83,10 @@ void PushButton::keyPressEvent(TQKeyEvent* e)
 	if (mReadOnly)
 		switch (e->key())
 		{
-			case Qt::Key_Up:
-			case Qt::Key_Left:
-			case Qt::Key_Right:
-			case Qt::Key_Down:
+			case TQt::Key_Up:
+			case TQt::Key_Left:
+			case TQt::Key_Right:
+			case TQt::Key_Down:
 				// Process keys which shift the focus
 				break;
 			default:
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 8d82ac96..615ea10c 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -34,29 +34,30 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class PushButton : public QPushButton
+class PushButton : public TQPushButton
 {
 		Q_OBJECT
-		Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+  TQ_OBJECT
+		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit PushButton(TQWidget* parent, const char* name = 0);
+		explicit PushButton(TQWidget* tqparent, const char* name = 0);
 		/** Constructor for a push button which displays a text.
 		 *  @param text The text to show on the button.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		PushButton(const TQString& text, TQWidget* parent, const char* name = 0);
+		PushButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
 		/** Constructor for a push button which displays an icon and a text.
 		 *  @param icon The icon to show on the button.
 		 *  @param text The text to show on the button.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = 0);
+		PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name = 0);
 		/** Sets whether the push button is read-only for the user.
 		 *  @param readOnly True to set the widget read-only, false to enable its action.
 		 */
@@ -70,7 +71,7 @@ class PushButton : public QPushButton
 		virtual void keyPressEvent(TQKeyEvent*);
 		virtual void keyReleaseEvent(TQKeyEvent*);
 	private:
-		TQWidget::FocusPolicy mFocusPolicy;   // default focus policy for the QPushButton
+		TQWidget::FocusPolicy mFocusPolicy;   // default focus policy for the TQPushButton
 		bool                 mReadOnly;      // value cannot be changed
 };
 
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index 7cf58f08..d0809788 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -21,15 +21,15 @@
 #include "radiobutton.moc"
 
 
-RadioButton::RadioButton(TQWidget* parent, const char* name)
-	: TQRadioButton(parent, name),
+RadioButton::RadioButton(TQWidget* tqparent, const char* name)
+	: TQRadioButton(tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mFocusWidget(0),
 	  mReadOnly(false)
 { }
 
-RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name)
-	: TQRadioButton(text, parent, name),
+RadioButton::RadioButton(const TQString& text, TQWidget* tqparent, const char* name)
+	: TQRadioButton(text, tqparent, name),
 	  mFocusPolicy(focusPolicy()),
 	  mFocusWidget(0),
 	  mReadOnly(false)
@@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQRadioButton::mousePressEvent(e);
@@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQRadioButton::mouseReleaseEvent(e);
@@ -114,12 +114,12 @@ void RadioButton::keyPressEvent(TQKeyEvent* e)
 	if (mReadOnly)
 		switch (e->key())
 		{
-			case Qt::Key_Up:
-			case Qt::Key_Left:
-			case Qt::Key_Right:
-			case Qt::Key_Down:
+			case TQt::Key_Up:
+			case TQt::Key_Left:
+			case TQt::Key_Right:
+			case TQt::Key_Down:
 				// Process keys which shift the focus
-			case Qt::Key_Escape:
+			case TQt::Key_Escape:
 				break;
 			default:
 				return;
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index d95d13fa..9395be60 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -39,21 +39,22 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class RadioButton : public QRadioButton
+class RadioButton : public TQRadioButton
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit RadioButton(TQWidget* parent, const char* name = 0);
+		explicit RadioButton(TQWidget* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  @param text Text to display.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		RadioButton(const TQString& text, TQWidget* parent, const char* name = 0);
+		RadioButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool     isReadOnly() const          { return mReadOnly; }
 		/** Sets whether the radio button is read-only for the user. If read-only,
@@ -79,7 +80,7 @@ class RadioButton : public QRadioButton
 	protected slots:
 		void         slotClicked();
 	private:
-		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the QRadioButton
+		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the TQRadioButton
 		TQWidget*             mFocusWidget;       // widget to receive focus when button is clicked on
 		bool                 mFocusWidgetEnable; // enable focus widget before setting focus
 		bool                 mReadOnly;          // value cannot be changed
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 209f1aad..09daf91d 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -40,7 +40,7 @@ bool      ShellProcess::mAuthorised  = false;
 ShellProcess::ShellProcess(const TQString& command)
 	: KShellProcess(shellName()),
 	  mCommand(command),
-	  mStatus(INACTIVE),
+	  mtqStatus(INACTIVE),
 	  mStdinExit(false)
 {
 }
@@ -52,7 +52,7 @@ bool ShellProcess::start(Communication comm)
 {
 	if (!authorised())
 	{
-		mStatus = UNAUTHORISED;
+		mtqStatus = UNAUTHORISED;
 		return false;
 	}
 	KShellProcess::operator<<(mCommand);
@@ -60,10 +60,10 @@ bool ShellProcess::start(Communication comm)
 	connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*)));
 	if (!KShellProcess::start(KProcess::NotifyOnExit, comm))
 	{
-		mStatus = START_FAIL;
+		mtqStatus = START_FAIL;
 		return false;
 	}
-	mStatus = RUNNING;
+	mtqStatus = RUNNING;
 	return true;
 }
 
@@ -76,11 +76,11 @@ void ShellProcess::slotExited(KProcess* proc)
 {
 	kdDebug(5950) << "ShellProcess::slotExited()\n";
 	mStdinQueue.clear();
-	mStatus = SUCCESS;
+	mtqStatus = SUCCESS;
 	if (!proc->normalExit())
 	{
 		kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n";
-		mStatus = DIED;
+		mtqStatus = DIED;
 	}
 	else
 	{
@@ -90,7 +90,7 @@ void ShellProcess::slotExited(KProcess* proc)
 		||  mShellName == "ksh"  &&  status == 127)
 		{
 			kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable\n";
-			mStatus = NOT_FOUND;
+			mtqStatus = NOT_FOUND;
 		}
 	}
 	emit shellExited(this);
@@ -140,7 +140,7 @@ void ShellProcess::stdinExit()
 */
 TQString ShellProcess::errorMessage() const
 {
-	switch (mStatus)
+	switch (mtqStatus)
 	{
 		case UNAUTHORISED:
 			return i18n("Failed to execute command (shell access not authorized):");
@@ -153,7 +153,7 @@ TQString ShellProcess::errorMessage() const
 		case RUNNING:
 		case SUCCESS:
 		default:
-			return TQString::null;
+			return TQString();
 	}
 }
 
@@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath()
 			struct stat fileinfo;
 			if (stat(envshell.data(), &fileinfo) != -1  // ensure file exists
 			&&  !S_ISDIR(fileinfo.st_mode)              // and it's not a directory
-			&&  !S_ISCHR(fileinfo.st_mode)              // and it's not a character device
-			&&  !S_ISBLK(fileinfo.st_mode)              // and it's not a block device
+			&&  !S_ISCHR(fileinfo.st_mode)              // and it's not a character tqdevice
+			&&  !S_ISBLK(fileinfo.st_mode)              // and it's not a block tqdevice
 #ifdef S_ISSOCK
 			&&  !S_ISSOCK(fileinfo.st_mode)             // and it's not a socket
 #endif
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index a3b8a574..fd303bea 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -50,6 +50,7 @@
 class ShellProcess : public KShellProcess
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Current status of the shell process.
 		 *  @li INACTIVE - start() has not yet been called to run the command.
@@ -60,7 +61,7 @@ class ShellProcess : public KShellProcess
 		 *  @li NOT_FOUND - the command was either not found or not executable.
 		 *  @li START_FAIL - the command couldn't be started for other reasons.
 		 */
-		enum Status {
+		enum tqStatus {
 			INACTIVE,     // start() has not yet been called to run the command
 			RUNNING,      // command is currently running
 			SUCCESS,      // command appears to have exited successfully
@@ -79,11 +80,11 @@ class ShellProcess : public KShellProcess
 		 */
 		bool            start(Communication comm = NoCommunication);
 		/** Returns the current status of the shell process. */
-		Status          status() const       { return mStatus; }
+		tqStatus          status() const       { return mtqStatus; }
 		/** Returns whether the command was run successfully.
 		 *  @return True if the command has been run and appears to have exited successfully.
 		 */
-		bool            normalExit() const   { return mStatus == SUCCESS; }
+		bool            normalExit() const   { return mtqStatus == SUCCESS; }
 		/** Returns the command configured to be run. */
 		const TQString&  command() const      { return mCommand; }
 		/** Returns the error message corresponding to the command exit status.
@@ -131,7 +132,7 @@ class ShellProcess : public KShellProcess
 		static bool          mAuthorised;   // true if shell commands are authorised
 		TQString              mCommand;      // copy of command to be executed
 		TQValueList<TQCString> mStdinQueue;   // queued strings to send to STDIN
-		Status               mStatus;       // current execution status
+		tqStatus               mtqStatus;       // current execution status
 		bool                 mStdinExit;    // exit once STDIN queue has been written
 };
 
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index afe7d679..0b30f744 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -21,18 +21,18 @@
 #include "slider.moc"
 
 
-Slider::Slider(TQWidget* parent, const char* name)
-	: TQSlider(parent, name),
+Slider::Slider(TQWidget* tqparent, const char* name)
+	: TQSlider(tqparent, name),
 	  mReadOnly(false)
 { }
 
-Slider::Slider(Orientation o, TQWidget* parent, const char* name)
-	: TQSlider(o, parent, name),
+Slider::Slider(Qt::Orientation o, TQWidget* tqparent, const char* name)
+	: TQSlider(o, tqparent, name),
 	  mReadOnly(false)
 { }
 
-Slider::Slider(int minval, int maxval, int pageStep, int value, Orientation o, TQWidget* parent, const char* name)
-	: TQSlider(minval, maxval, pageStep, value, o, parent, name),
+Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* tqparent, const char* name)
+	: TQSlider(minval, maxval, pageStep, value, o, tqparent, name),
 	  mReadOnly(false)
 { }
 
@@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e)
 	if (mReadOnly)
 	{
 		// Swallow up the event if it's the left button
-		if (e->button() == Qt::LeftButton)
+		if (e->button() == TQt::LeftButton)
 			return;
 	}
 	TQSlider::mousePressEvent(e);
@@ -74,7 +74,7 @@ void Slider::mouseMoveEvent(TQMouseEvent* e)
 
 void Slider::keyPressEvent(TQKeyEvent* e)
 {
-	if (!mReadOnly  ||  e->key() == Qt::Key_Escape)
+	if (!mReadOnly  ||  e->key() == TQt::Key_Escape)
 		TQSlider::keyPressEvent(e);
 }
 
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index 8fa54d45..f79ac015 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -34,33 +34,34 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class Slider : public QSlider
+class Slider : public TQSlider
 {
 		Q_OBJECT
-		Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+  TQ_OBJECT
+		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit Slider(TQWidget* parent = 0, const char* name = 0);
+		explicit Slider(TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor.
-		 *  @param orient The orientation of the slider, either Qt::Horizonal or Qt::Vertical.
-		 *  @param parent The parent object of this widget.
+		 *  @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit Slider(Orientation orient, TQWidget* parent = 0, const char* name = 0);
+		explicit Slider(Qt::Orientation orient, TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor.
 		 *  @param minValue The minimum value which the slider can have.
 		 *  @param maxValue The maximum value which the slider can have.
 		 *  @param pageStep The page step increment.
 		 *  @param value The initial value for the slider.
-		 *  @param orient The orientation of the slider, either Qt::Horizonal or Qt::Vertical.
-		 *  @param parent The parent object of this widget.
+		 *  @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		Slider(int minValue, int maxValue, int pageStep, int value, Orientation orient,
-		       TQWidget* parent = 0, const char* name = 0);
+		Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient,
+		       TQWidget* tqparent = 0, const char* name = 0);
 		/** Returns true if the slider is read only. */
 		bool         isReadOnly() const  { return mReadOnly; }
 		/** Sets whether the slider is read-only for the user.
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 8ae5962a..19608eab 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -24,16 +24,16 @@
 #include "spinbox.moc"
 
 
-SpinBox::SpinBox(TQWidget* parent, const char* name)
-	: TQSpinBox(0, 99999, 1, parent, name),
+SpinBox::SpinBox(TQWidget* tqparent, const char* name)
+	: TQSpinBox(0, 99999, 1, tqparent, name),
 	  mMinValue(TQSpinBox::minValue()),
 	  mMaxValue(TQSpinBox::maxValue())
 {
 	init();
 }
 
-SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name)
-	: TQSpinBox(minValue, maxValue, step, parent, name),
+SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name)
+	: TQSpinBox(minValue, maxValue, step, tqparent, name),
 	  mMinValue(minValue),
 	  mMaxValue(maxValue)
 {
@@ -212,18 +212,18 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 				// Up and down arrow keys step the value
 				TQKeyEvent* ke = (TQKeyEvent*)e;
 				int key = ke->key();
-				if (key == Qt::Key_Up)
+				if (key == TQt::Key_Up)
 					step = 1;
-				else if (key == Qt::Key_Down)
+				else if (key == TQt::Key_Down)
 					step = -1;
-				shift = ((ke->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton);
+				shift = ((ke->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton);
 				break;
 			}
 			case TQEvent::Wheel:
 			{
 				TQWheelEvent* we = (TQWheelEvent*)e;
 				step = (we->delta() > 0) ? 1 : -1;
-				shift = ((we->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton);
+				shift = ((we->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton);
 				break;
 			}
 #if KDE_IS_VERSION(3,1,90)
@@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 			case TQEvent::MouseButtonDblClick:
 			{
 				TQMouseEvent* me = (TQMouseEvent*)e;
-				if (me->button() == Qt::LeftButton)
+				if (me->button() == TQt::LeftButton)
 				{
 					// It's a left button press. Set normal or shift stepping as appropriate.
 					if (mReadOnly)
@@ -271,7 +271,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 					mCurrentButton = whichButton(me->pos());
 					if (mCurrentButton == NO_BUTTON)
 						return true;
-					bool shift = (me->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton;
+					bool shift = (me->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton;
 					if (setShiftStepping(shift, mCurrentButton))
 						return true;     // hide the event from the spin widget
 					return false;    // forward event to the destination widget
@@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 			case TQEvent::MouseButtonRelease:
 			{
 				TQMouseEvent* me = (TQMouseEvent*)e;
-				if (me->button() == Qt::LeftButton  &&  mShiftMouse)
+				if (me->button() == TQt::LeftButton  &&  mShiftMouse)
 				{
 					setShiftStepping(false, mCurrentButton);    // cancel shift stepping
 					return false;    // forward event to the destination widget
@@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 			case TQEvent::MouseMove:
 			{
 				TQMouseEvent* me = (TQMouseEvent*)e;
-				if (me->state() & Qt::LeftButton)
+				if (me->state() & TQt::LeftButton)
 				{
 					// The left button is down. Track which spin button it's in.
 					if (mReadOnly)
@@ -302,7 +302,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 						// The mouse has moved to a new spin button.
 						// Set normal or shift stepping as appropriate.
 						mCurrentButton = newButton;
-						bool shift = (me->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton;
+						bool shift = (me->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton;
 						if (setShiftStepping(shift, mCurrentButton))
 							return true;     // hide the event from the spin widget
 					}
@@ -313,7 +313,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 			case TQEvent::Wheel:
 			{
 				TQWheelEvent* we = (TQWheelEvent*)e;
-				bool shift = (we->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton;
+				bool shift = (we->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton;
 				if (setShiftStepping(shift, (we->delta() > 0 ? UP : DOWN)))
 					return true;     // hide the event from the spin widget
 				return false;    // forward event to the destination widget
@@ -325,14 +325,14 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
 				TQKeyEvent* ke = (TQKeyEvent*)e;
 				int key   = ke->key();
 				int state = ke->state();
-				if ((state & Qt::LeftButton)
-				&&  (key == Qt::Key_Shift  ||  key == Qt::Key_Alt))
+				if ((state & TQt::LeftButton)
+				&&  (key == TQt::Key_Shift  ||  key == TQt::Key_Alt))
 				{
 					// The left mouse button is down, and the Shift or Alt key has changed
 					if (mReadOnly)
 						return true;   // discard the event
-					state ^= (key == Qt::Key_Shift) ? Qt::ShiftButton : Qt::AltButton;    // new state
-					bool shift = (state & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton;
+					state ^= (key == TQt::Key_Shift) ? TQt::ShiftButton : TQt::AltButton;    // new state
+					bool shift = (state & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton;
 					if ((!shift && mShiftMouse)  ||  (shift && !mShiftMouse))
 					{
 						// The effective shift state has changed.
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index cf74e9de..4b269d6a 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -39,23 +39,24 @@
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class SpinBox : public QSpinBox
+class SpinBox : public TQSpinBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit SpinBox(TQWidget* parent = 0, const char* name = 0);
+		explicit SpinBox(TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor.
 		 *  @param minValue The minimum value which the spin box can have.
 		 *  @param maxValue The maximum value which the spin box can have.
 		 *  @param step The (unshifted) step interval.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 0, const char* name = 0);
+		SpinBox(int minValue, int maxValue, int step = 1, TQWidget* tqparent = 0, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool         isReadOnly() const                    { return mReadOnly; }
 		/** Sets whether the spin box can be changed by the user.
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 8b3faa70..8627838b 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -1,5 +1,5 @@
 /*
- *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
+ *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for TQt 3)
  *  Program:  kalarm
  *  Copyright © 2001-2005,2008 by David Jarvie <djarvie@kde.org>
  *
@@ -48,8 +48,8 @@ static bool mirrorStyle(const TQStyle&);
 
 int SpinBox2::mReverseLayout = -1;
 
-SpinBox2::SpinBox2(TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+SpinBox2::SpinBox2(TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mReverseWithLayout(true)
 {
 	mUpdown2Frame = new TQFrame(this);
@@ -60,8 +60,8 @@ SpinBox2::SpinBox2(TQWidget* parent, const char* name)
 	init();
 }
 
-SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mReverseWithLayout(true)
 {
 	mUpdown2Frame = new TQFrame(this);
@@ -371,7 +371,7 @@ int SpinBox2::MainSpinBox::shiftStepAdjustment(int oldValue, int shiftStep)
 
 /******************************************************************************
 * Repaint the widget.
-* If it's the first time since a style change, tell the parent SpinBox2 to
+* If it's the first time since a style change, tell the tqparent SpinBox2 to
 * update the SpinMirror with the new unpressed button image. We make the
 * presumably reasonable assumption that when a style change occurs, the spin
 * buttons are unpressed.
@@ -391,8 +391,8 @@ void ExtraSpinBox::paintEvent(TQPaintEvent* e)
 = Class SpinMirror
 =============================================================================*/
 
-SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, const char* name)
-	: TQCanvasView(new TQCanvas, parent, name),
+SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* tqparent, const char* name)
+	: TQCanvasView(new TQCanvas, tqparent, name),
 	  mSpinbox(spinbox),
 	  mSpinFrame(spinFrame),
 	  mReadOnly(false)
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index b1d2927d..f83db252 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -1,5 +1,5 @@
 /*
- *  spinbox2.h  -  spin box with extra pair of spin buttons (for Qt 3)
+ *  spinbox2.h  -  spin box with extra pair of spin buttons (for TQt 3)
  *  Program:  kalarm
  *  Copyright © 2001-2007 by David Jarvie <software@astrojar.org.uk>
  *
@@ -53,25 +53,26 @@ class ExtraSpinBox;
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class SpinBox2 : public QFrame
+class SpinBox2 : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit SpinBox2(TQWidget* parent = 0, const char* name = 0);
+		explicit SpinBox2(TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor.
 		 *  @param minValue The minimum value which the spin box can have.
 		 *  @param maxValue The maximum value which the spin box can have.
 		 *  @param step The (unshifted) step interval for the right-hand spin buttons.
 		 *  @param step2 The (unshifted) step interval for the left-hand spin buttons.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
 		SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1,
-		         TQWidget* parent = 0, const char* name = 0);
+		         TQWidget* tqparent = 0, const char* name = 0);
 		/** Sets whether the spin box can be changed by the user.
 		 *  @param readOnly True to set the widget read-only, false to set it read-write.
 		 */
@@ -281,10 +282,10 @@ class SpinBox2 : public QFrame
 		class MainSpinBox : public SpinBox
 		{
 			public:
-				MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = 0)
-				                : SpinBox(parent, name), owner(sb2) { }
-				MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0)
-				                : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { }
+				MainSpinBox(SpinBox2* sb2, TQWidget* tqparent, const char* name = 0)
+				                : SpinBox(tqparent, name), owner(sb2) { }
+				MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* tqparent, const char* name = 0)
+				                : SpinBox(minValue, maxValue, step, tqparent, name), owner(sb2) { }
 				void            tqsetAlignment(int a)       { editor()->tqsetAlignment(a); }
 				virtual TQString mapValueToText(int v)     { return owner->mapValueToText(v); }
 				virtual int     mapTextToValue(bool* ok)  { return owner->mapTextToValue(ok); }
@@ -298,8 +299,8 @@ class SpinBox2 : public QFrame
 		enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 };
 
 		static int       mReverseLayout;  // widgets are mirrored right to left
-		TQFrame*          mUpdown2Frame;   // tqcontains visible part of the extra pair of spin buttons
-		TQFrame*          mSpinboxFrame;   // tqcontains the main spin box
+		TQFrame*          mUpdown2Frame;   // contains visible part of the extra pair of spin buttons
+		TQFrame*          mSpinboxFrame;   // contains the main spin box
 		ExtraSpinBox*    mUpdown2;        // the extra pair of spin buttons
 		MainSpinBox*     mSpinbox;        // the visible spin box
 		SpinMirror*      mSpinMirror;     // image of the extra pair of spin buttons
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index d25579f9..ec7d2d16 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -1,5 +1,5 @@
 /*
- *  spinbox2private.h  -  private classes for SpinBox2 (for Qt 3)
+ *  spinbox2private.h  -  private classes for SpinBox2 (for TQt 3)
  *  Program:  kalarm
  *  Copyright © 2005,2006,2008 by David Jarvie <djarvie@kde.org>
  *
@@ -34,11 +34,12 @@
 class ExtraSpinBox : public SpinBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit ExtraSpinBox(TQWidget* parent, const char* name = 0)
-		             : SpinBox(parent, name), mNewStylePending(false) { }
-		ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = 0)
-		             : SpinBox(minValue, maxValue, step, parent, name), mNewStylePending(false) { }
+		explicit ExtraSpinBox(TQWidget* tqparent, const char* name = 0)
+		             : SpinBox(tqparent, name), mNewStylePending(false) { }
+		ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name = 0)
+		             : SpinBox(minValue, maxValue, step, tqparent, name), mNewStylePending(false) { }
 	signals:
 		void         styleUpdated();
 	protected:
@@ -57,11 +58,12 @@ class ExtraSpinBox : public SpinBox
 * Mirroring in this way allows styles with rounded corners to display correctly.
 =============================================================================*/
 
-class SpinMirror : public QCanvasView
+class SpinMirror : public TQCanvasView
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0);
+		explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* tqparent = 0, const char* name = 0);
 		void         setReadOnly(bool ro)        { mReadOnly = ro; }
 		bool         isReadOnly() const          { return mReadOnly; }
 		void         setNormalButtons(const TQPixmap&);
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index caed93d7..7be3c17c 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -46,7 +46,7 @@ SynchTimer::~SynchTimer()
 void SynchTimer::connecT(TQObject* receiver, const char* member)
 {
 	Connection connection(receiver, member);
-	if (mConnections.find(connection) != mConnections.end())
+	if (mConnections.tqfind(connection) != mConnections.end())
 		return;           // the slot is already connected, so ignore request
 	connect(mTimer, TQT_SIGNAL(timeout()), receiver, member);
 	mConnections.append(connection);
diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h
index bbb3ae83..144c8a83 100644
--- a/kalarm/lib/synchtimer.h
+++ b/kalarm/lib/synchtimer.h
@@ -34,9 +34,10 @@ class TQTimer;
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class SynchTimer : public QObject
+class SynchTimer : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		virtual ~SynchTimer();
 
@@ -76,6 +77,7 @@ class SynchTimer : public QObject
 class MinuteTimer : public SynchTimer
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		virtual ~MinuteTimer()  { mInstance = 0; }
 		/** Connect to the timer signal.
@@ -115,6 +117,7 @@ class MinuteTimer : public SynchTimer
 class DailyTimer : public SynchTimer
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		virtual ~DailyTimer();
 		/** Connect to the timer signal which triggers at the given fixed time of day.
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 17091492..923bef8b 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -28,8 +28,8 @@
 #include "timeedit.moc"
 
 
-TimeEdit::TimeEdit(TQWidget* parent, const char* name)
-	: TQHBox(parent, name),
+TimeEdit::TimeEdit(TQWidget* tqparent, const char* name)
+	: TQHBox(tqparent, name),
 	  mAmPm(0),
 	  mAmIndex(-1),
 	  mPmIndex(-1),
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 45c0abd8..7be73c1f 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -47,15 +47,16 @@ class TimeSpinBox;
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class TimeEdit : public QHBox
+class TimeEdit : public TQHBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit TimeEdit(TQWidget* parent = 0, const char* name = 0);
+		explicit TimeEdit(TQWidget* tqparent = 0, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool          isReadOnly() const           { return mReadOnly; }
 		/** Sets whether the widget is read-only for the user. If read-only,
@@ -64,7 +65,7 @@ class TimeEdit : public QHBox
 		 *  @param readOnly True to set the widget read-only, false to set it read-write.
 		 */
 		virtual void  setReadOnly(bool readOnly);
-		/** Returns true if the widget tqcontains a valid value. */
+		/** Returns true if the widget contains a valid value. */
 		bool          isValid() const;
 		/** Sets whether the edit value is valid.
 		 *  If newly invalid, the value is displayed as asterisks.
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 291ba087..9b41e40d 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -50,8 +50,8 @@ static const int maxMinutes = 1000*60-1;   // absolute maximum value for hours:m
 = Contains a time unit combo box, plus a time spinbox, to select a time period.
 =============================================================================*/
 
-TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
-	: TQHBox(parent, name),
+TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* tqparent, const char* name)
+	: TQHBox(tqparent, name),
 	  mMaxDays(9999),
 	  mNoHourMinute(!allowHourMinute),
 	  mReadOnly(false)
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index f6f6304f..86b66379 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -47,9 +47,10 @@ class TimeSpinBox;
  *
  *  @author David Jarvie <software@astrojar.org.uk>
  */
-class TimePeriod : public QHBox
+class TimePeriod : public TQHBox
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Units for the time period.
 		 *  @li MINUTES - the time period is entered as a number of minutes.
@@ -64,10 +65,10 @@ class TimePeriod : public QHBox
 		 *         being allowed as units; only days and weeks can ever be used,
 		 *         regardless of other method calls. Set true to allow minutes,
 		 *         hours/minutes, days or weeks as units.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		TimePeriod(bool allowMinute, TQWidget* parent, const char* name = 0);
+		TimePeriod(bool allowMinute, TQWidget* tqparent, const char* name = 0);
 		/** Returns true if the widget is read only. */
 		bool          isReadOnly() const             { return mReadOnly; }
 		/** Sets whether the widget is read-only for the user. If read-only,
@@ -103,7 +104,7 @@ class TimePeriod : public QHBox
 		/** Sets separate WhatsThis texts for the count spin boxes and the units combo box.
 		 *  If @p hourMin is omitted, both spin boxes are set to the same WhatsThis text.
 		 */
-		void          setWhatsThis(const TQString& units, const TQString& dayWeek, const TQString& hourMin = TQString::null);
+		void          setWhatsThis(const TQString& units, const TQString& dayWeek, const TQString& hourMin = TQString());
 
 		static TQString i18n_minutes();     // text of 'minutes' units, lower case
 		static TQString i18n_Minutes();     // text of 'Minutes' units, initial capitals
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index ea10cb1a..f8700a50 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -27,11 +27,11 @@
 #include "timespinbox.moc"
 
 
-class TimeSpinBox::TimeValidator : public QValidator
+class TimeSpinBox::TimeValidator : public TQValidator
 {
 	public:
-		TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0)
-			: TQValidator(parent, name),
+		TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0)
+			: TQValidator(tqparent, name),
 		          minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
 		virtual State validate(TQString&, int&) const;
 		int  minMinute, maxMinute;
@@ -54,8 +54,8 @@ class TimeSpinBox::TimeValidator : public QValidator
 /******************************************************************************
  * Construct a wrapping 00:00 - 23:59, or 12:00 - 11:59 time spin box.
  */
-TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
-	: SpinBox2(0, 1439, 1, 60, parent, name),
+TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name)
+	: SpinBox2(0, 1439, 1, 60, tqparent, name),
 	  mMinimumValue(0),
 	  m12Hour(!use24hour),
 	  mPm(false),
@@ -69,15 +69,15 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 360);    // shift-left button increments 5 min / 6 hours
 	setSelectOnStep(false);
-	tqsetAlignment(Qt::AlignHCenter);
+	tqsetAlignment(TQt::AlignHCenter);
 	connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
 }
 
 /******************************************************************************
  * Construct a non-wrapping time spin box.
  */
-TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const char* name)
-	: SpinBox2(minMinute, maxMinute, 1, 60, parent, name),
+TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent, const char* name)
+	: SpinBox2(minMinute, maxMinute, 1, 60, tqparent, name),
 	  mMinimumValue(minMinute),
 	  m12Hour(false),
 	  mInvalid(false),
@@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 300);    // shift-left button increments 5 min / 5 hours
 	setSelectOnStep(false);
-	tqsetAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight);
+	tqsetAlignment(TQApplication::reverseLayout() ? TQt::AlignLeft : TQt::AlignRight);
 }
 
 TQString TimeSpinBox::shiftWhatsThis()
@@ -124,7 +124,7 @@ TQString TimeSpinBox::mapValueToText(int v)
 int TimeSpinBox::mapTextToValue(bool* ok)
 {
 	TQString text = cleanText();
-	int colon = text.find(':');
+	int colon = text.tqfind(':');
 	if (colon >= 0)
 	{
 		// [h]:m format for any time value
@@ -309,7 +309,7 @@ TQValidator::State TimeSpinBox::TimeValidator::validate(TQString& text, int& /*c
 	bool ok;
 	int hr = 0;
 	int mn = 0;
-	int colon = cleanText.find(':');
+	int colon = cleanText.tqfind(':');
 	if (colon >= 0)
 	{
 		TQString minute = cleanText.mid(colon + 1);
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 901c97e2..4bacd494 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -45,21 +45,22 @@
 class TimeSpinBox : public SpinBox2
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor for a wrapping time spin box which can be used to enter a time of day.
 		 *  @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59).
 		 *                   False for entry of 12-hour clock times (range 12:00 to 11:59).
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit TimeSpinBox(bool use24hour, TQWidget* parent = 0, const char* name = 0);
+		explicit TimeSpinBox(bool use24hour, TQWidget* tqparent = 0, const char* name = 0);
 		/** Constructor for a non-wrapping time spin box which can be used to enter a length of time.
 		 *  @param minMinute The minimum value which the spin box can hold, in minutes.
 		 *  @param maxMinute  The maximum value which the spin box can hold, in minutes.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 0, const char* name = 0);
+		TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent = 0, const char* name = 0);
 		/** Returns true if the spin box holds a valid value.
 		 *  An invalid value is displayed as asterisks.
 		 */
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 6ebe19c8..07e976c6 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -221,7 +221,7 @@ void MainWindow::readProperties(KConfig* config)
 }
 
 /******************************************************************************
-* Get the main main window, i.e. the parent of the system tray icon, or if
+* Get the main main window, i.e. the tqparent of the system tray icon, or if
 * none, the first main window to be created. Visible windows take precedence
 * over hidden ones.
 */
@@ -241,7 +241,7 @@ MainWindow* MainWindow::mainMainWindow()
 }
 
 /******************************************************************************
-* Check whether this main window is the parent of the system tray icon.
+* Check whether this main window is the tqparent of the system tray icon.
 */
 bool MainWindow::isTrayParent() const
 {
@@ -330,17 +330,17 @@ void MainWindow::initActions()
 	mActionNew             = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new");
 	mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
 	mActionCreateTemplate  = new KAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
-	mActionCopy            = new KAction(i18n("&Copy..."), "editcopy", Qt::SHIFT+Qt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy");
-	mActionModify          = new KAction(i18n("&Edit..."), "edit", Qt::CTRL+Qt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify");
-	mActionDelete          = new KAction(i18n("&Delete"), "editdelete", Qt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete");
-	mActionReactivate      = new KAction(i18n("Reac&tivate"), 0, Qt::CTRL+Qt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete");
-	mActionEnable          = new KAction(TQString::null, 0, Qt::CTRL+Qt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable");
-	mActionView            = new KAction(i18n("&View"), "viewmag", Qt::CTRL+Qt::Key_W, this, TQT_SLOT(slotView()), actions, "view");
-	mActionShowTime        = new KToggleAction(i18n_a_ShowAlarmTimes(), Qt::CTRL+Qt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
+	mActionCopy            = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy");
+	mActionModify          = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify");
+	mActionDelete          = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete");
+	mActionReactivate      = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete");
+	mActionEnable          = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable");
+	mActionView            = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view");
+	mActionShowTime        = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
 	mActionShowTime->setCheckedState(i18n("Hide &Alarm Times"));
-	mActionShowTimeTo      = new KToggleAction(i18n_o_ShowTimeToAlarms(), Qt::CTRL+Qt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
+	mActionShowTimeTo      = new KToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
 	mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms"));
-	mActionShowExpired     = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", Qt::CTRL+Qt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
+	mActionShowExpired     = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
 	mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms());
 	mActionToggleTrayIcon  = new KToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
 	mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray"));
@@ -366,9 +366,9 @@ void MainWindow::initActions()
 	}
 	mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo");
 	mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo");
-	KStdAction::find(mListView, TQT_SLOT(slotFind()), actions);
-	mActionFindNext = KStdAction::tqfindNext(mListView, TQT_SLOT(slotFindNext()), actions);
-	mActionFindPrev = KStdAction::tqfindPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
+	KStdAction::tqfind(mListView, TQT_SLOT(slotFind()), actions);
+	mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
+	mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
 	KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions);
 	KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions);
 	KStdAction::quit(this, TQT_SLOT(slotQuit()), actions);
@@ -386,7 +386,7 @@ void MainWindow::initActions()
 	connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int)));
 	connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu()));
 	connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int)));
-	connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&)));
+	connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndotqStatus(const TQString&, const TQString&)));
 	connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
 	Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged()));
 	connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction()));
@@ -415,7 +415,7 @@ void MainWindow::initActions()
 		tb->applySettings(KGlobal::config(), "Toolbars");
 
 	Undo::emitChanged();     // set the Undo/Redo menu texts
-	Daemon::checkStatus();
+	Daemon::checktqStatus();
 	Daemon::monitoringAlarms();
 }
 
@@ -947,7 +947,7 @@ void MainWindow::updateTrayIconAction()
 */
 void MainWindow::updateActionsMenu()
 {
-	Daemon::checkStatus();   // update the Alarms Enabled item status
+	Daemon::checktqStatus();   // update the Alarms Enabled item status
 }
 
 /******************************************************************************
@@ -1033,7 +1033,7 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type)
 *  Called when the status of the Undo or Redo list changes.
 *  Change the Undo or Redo text to include the action which would be undone/redone.
 */
-void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo)
+void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo)
 {
 	if (undo.isNull())
 	{
@@ -1118,7 +1118,7 @@ void MainWindow::closeEvent(TQCloseEvent* ce)
 	if (!theApp()->sessionClosingDown()  &&  isTrayParent())
 	{
 		// The user (not the session manager) wants to close the window.
-		// It's the parent window of the system tray icon, so just hide
+		// It's the tqparent window of the system tray icon, so just hide
 		// it to prevent the system tray icon closing.
 		hide();
 		theApp()->quitIf();
@@ -1181,7 +1181,7 @@ void MainWindow::dropEvent(TQDropEvent* e)
 static TQString getMailHeader(const char* header, KMime::Content& content)
 {
 	KMime::Headers::Base* hd = content.getHeaderByType(header);
-	return hd ? hd->asUnicodeString() : TQString::null;
+	return hd ? hd->asUnicodeString() : TQString();
 }
 
 /******************************************************************************
@@ -1257,7 +1257,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 		TQDateTime dt;
 		dt.setTime_t(summary.date());
 		TQString body = KAMail::getMailBody(summary.serialNumber());
-		alarmText.setEmail(summary.to(), summary.from(), TQString::null,
+		alarmText.setEmail(summary.to(), summary.from(), TQString(),
 		                   KGlobal::locale()->formatDateTime(dt), summary.subject(),
 		                   body, summary.serialNumber());
 	}
@@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p
 */
 void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int)
 {
-	if (button != Qt::RightButton  &&  !item)
+	if (button != TQt::RightButton  &&  !item)
 	{
 		kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl;
 		mListView->clearSelection();
@@ -1397,7 +1397,7 @@ void MainWindow::setEnableText(bool enable)
 */
 MainWindow* MainWindow::toggleWindow(MainWindow* win)
 {
-	if (win  &&  mWindowList.find(win) != mWindowList.end())
+	if (win  &&  mWindowList.tqfind(win) != mWindowList.end())
 	{
 		// A window is specified (and it exists)
 		if (win->isVisible())
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 0faaa75e..cb070e9a 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -42,6 +42,7 @@ class TemplateMenuAction;
 class MainWindow : public MainWindowBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		static MainWindow* create(bool restored = false);
@@ -125,7 +126,7 @@ class MainWindow : public MainWindowBase
 		void           slotRedoItem(int id);
 		void           slotInitUndoMenu();
 		void           slotInitRedoMenu();
-		void           slotUndoStatus(const TQString&, const TQString&);
+		void           slotUndotqStatus(const TQString&, const TQString&);
 		void           slotFindActive(bool);
 		void           slotPrefsChanged();
 		void           updateTrayIconAction();
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index 63467258..45bb7fb6 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -34,10 +34,11 @@
 class MainWindowBase : public KMainWindow
 {
 		Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
-		                    : KMainWindow(parent, name, f), disableQuit(false) { }
+		explicit MainWindowBase(TQWidget* tqparent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
+		                    : KMainWindow(tqparent, name, f), disableQuit(false) { }
 
 	protected:
 		virtual void closeEvent(TQCloseEvent*);
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 0b527ac3..c6a0916c 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -90,11 +90,11 @@ static const int proximityMultiple = 10;         // multiple of button height di
 static bool wantModal();
 
 // A text label widget which can be scrolled and copied with the mouse
-class MessageText : public QTextEdit
+class MessageText : public TQTextEdit
 {
 	public:
-		MessageText(const TQString& text, const TQString& context = TQString::null, TQWidget* parent = 0, const char* name = 0)
-		: TQTextEdit(text, context, parent, name)
+		MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* tqparent = 0, const char* name = 0)
+		: TQTextEdit(text, context, tqparent, name)
 		{
 			setReadOnly(true);
 			setWordWrap(TQTextEdit::NoWrap);
@@ -105,7 +105,7 @@ class MessageText : public QTextEdit
 };
 
 
-class MWMimeSourceFactory : public QMimeSourceFactory
+class MWMimeSourceFactory : public TQMimeSourceFactory
 {
 	public:
 		MWMimeSourceFactory(const TQString& absPath, KTextBrowser*);
@@ -123,7 +123,7 @@ class MWMimeSourceFactory : public QMimeSourceFactory
 
 
 // Basic flags for the window
-static const Qt::WFlags WFLAGS = Qt::WStyle_StaysOnTop | Qt::WDestructiveClose;
+static const TQt::WFlags WFLAGS = TQt::WStyle_StaysOnTop | TQt::WDestructiveClose;
 
 // Error message bit tqmasks
 enum {
@@ -144,8 +144,8 @@ TQMap<TQString, unsigned> MessageWin::mErrorMessages;
 *  displayed.
 */
 MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedule_event, bool allowDefer)
-	: MainWindowBase(0, "MessageWin", WFLAGS | Qt::WGroupLeader | Qt::WStyle_ContextHelp
-	                                         | (wantModal() ? 0 : Qt::WX11BypassWM)),
+	: MainWindowBase(0, "MessageWin", WFLAGS | TQt::WGroupLeader | TQt::WStyle_ContextHelp
+	                                         | (wantModal() ? 0 : TQt::WX11BypassWM)),
 	  mMessage(event.cleanText()),
 	  mFont(event.font()),
 	  mBgColour(event.bgColour()),
@@ -155,7 +155,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu
 	  mAudioFile(event.audioFile()),
 	  mVolume(event.soundVolume()),
 	  mFadeVolume(event.fadeVolume()),
-	  mFadeSeconds(QMIN(event.fadeSeconds(), 86400)),
+	  mFadeSeconds(TQMIN(event.fadeSeconds(), 86400)),
 	  mDefaultDeferMinutes(event.deferDefaultMinutes()),
 	  mAlarmType(alarm.type()),
 	  mAction(event.action()),
@@ -202,7 +202,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu
 *  Construct the message window for a specified error message.
 */
 MessageWin::MessageWin(const KAEvent& event, const DateTime& alarmDateTime, const TQStringList& errmsgs)
-	: MainWindowBase(0, "MessageWin", WFLAGS | Qt::WGroupLeader | Qt::WStyle_ContextHelp),
+	: MainWindowBase(0, "MessageWin", WFLAGS | TQt::WGroupLeader | TQt::WStyle_ContextHelp),
 	  mMessage(event.cleanText()),
 	  mDateTime(alarmDateTime),
 	  mEventID(event.id()),
@@ -303,7 +303,7 @@ void MessageWin::initView()
 		{
 			frame = new TQFrame(topWidget);
 			frame->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-			topLayout->addWidget(frame, 0, Qt::AlignHCenter);
+			topLayout->addWidget(frame, 0, TQt::AlignHCenter);
 			tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading);
 		}
 
@@ -315,7 +315,7 @@ void MessageWin::initView()
 		if (!frame)
 			label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 		label->setFixedSize(label->tqsizeHint());
-		tqlayout->addWidget(label, 0, Qt::AlignHCenter);
+		tqlayout->addWidget(label, 0, TQt::AlignHCenter);
 		TQWhatsThis::add(label,
 		      i18n("The scheduled date/time for the message (as opposed to the actual time of display)."));
 
@@ -324,7 +324,7 @@ void MessageWin::initView()
 			label = new TQLabel(frame);
 			label->setText(i18n("Reminder"));
 			label->setFixedSize(label->tqsizeHint());
-			tqlayout->addWidget(label, 0, Qt::AlignHCenter);
+			tqlayout->addWidget(label, 0, TQt::AlignHCenter);
 			frame->setFixedSize(frame->tqsizeHint());
 		}
 	}
@@ -341,7 +341,7 @@ void MessageWin::initView()
 				label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 				label->setFixedSize(label->tqsizeHint());
 				TQWhatsThis::add(label, i18n("The file whose contents are displayed below"));
-				topLayout->addWidget(label, 0, Qt::AlignHCenter);
+				topLayout->addWidget(label, 0, TQt::AlignHCenter);
 
 				// Display contents of file
 				bool opened = false;
@@ -382,7 +382,7 @@ void MessageWin::initView()
 			{
 				// Message label
 				// Using MessageText instead of TQLabel allows scrolling and mouse copying
-				MessageText* text = new MessageText(mMessage, TQString::null, topWidget);
+				MessageText* text = new MessageText(mMessage, TQString(), topWidget);
 				text->setFrameStyle(TQFrame::NoFrame);
 				text->setPaper(mBgColour);
 				text->setPaletteForegroundColor(mFgColour);
@@ -391,7 +391,7 @@ void MessageWin::initView()
 				TQSize s = text->tqsizeHint();
 				int h = s.height();
 				text->setMaximumHeight(h + text->scrollBarHeight());
-				text->setMinimumHeight(QMIN(h, lineSpacing*4));
+				text->setMinimumHeight(TQMIN(h, lineSpacing*4));
 				text->setMaximumWidth(s.width() + text->scrollBarWidth());
 				TQWhatsThis::add(text, i18n("The alarm message"));
 				int vspace = lineSpacing/2;
@@ -402,12 +402,12 @@ void MessageWin::initView()
 				if (!mWinModule)
 					mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
 				if (text->tqsizeHint().width() >= mWinModule->workArea().width()*2/3)
-					topLayout->addWidget(text, 1, Qt::AlignHCenter);
+					topLayout->addWidget(text, 1, TQt::AlignHCenter);
 				else
 				{
 					TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
 					tqlayout->addSpacing(hspace);
-					tqlayout->addWidget(text, 1, Qt::AlignHCenter);
+					tqlayout->addWidget(text, 1, TQt::AlignHCenter);
 					tqlayout->addSpacing(hspace);
 				}
 				if (!reminder)
@@ -436,7 +436,7 @@ void MessageWin::initView()
 				setRemainingTextMinute();
 				MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute()));   // update every minute
 			}
-			topLayout->addWidget(mRemainingText, 0, Qt::AlignHCenter);
+			topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter);
 			topLayout->addSpacing(KDialog::spacingHint());
 			topLayout->addStretch();
 		}
@@ -452,22 +452,22 @@ void MessageWin::initView()
 				TQFrame* frame = new TQFrame(topWidget);
 				frame->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 				TQWhatsThis::add(frame, i18n("The email to send"));
-				topLayout->addWidget(frame, 0, Qt::AlignHCenter);
+				topLayout->addWidget(frame, 0, TQt::AlignHCenter);
 				TQGridLayout* grid = new TQGridLayout(frame, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 
 				TQLabel* label = new TQLabel(i18n("Email addressee", "To:"), frame);
 				label->setFixedSize(label->tqsizeHint());
-				grid->addWidget(label, 0, 0, Qt::AlignLeft);
+				grid->addWidget(label, 0, 0, TQt::AlignLeft);
 				label = new TQLabel(mEvent.emailAddresses("\n"), frame);
 				label->setFixedSize(label->tqsizeHint());
-				grid->addWidget(label, 0, 1, Qt::AlignLeft);
+				grid->addWidget(label, 0, 1, TQt::AlignLeft);
 
 				label = new TQLabel(i18n("Email subject", "Subject:"), frame);
 				label->setFixedSize(label->tqsizeHint());
-				grid->addWidget(label, 1, 0, Qt::AlignLeft);
+				grid->addWidget(label, 1, 0, TQt::AlignLeft);
 				label = new TQLabel(mEvent.emailSubject(), frame);
 				label->setFixedSize(label->tqsizeHint());
-				grid->addWidget(label, 1, 1, Qt::AlignLeft);
+				grid->addWidget(label, 1, 1, TQt::AlignLeft);
 				break;
 			}
 			case KAEvent::COMMAND:
@@ -490,13 +490,13 @@ void MessageWin::initView()
 		TQLabel* label = new TQLabel(topWidget);
 		label->setPixmap(DesktopIcon("error"));
 		label->setFixedSize(label->tqsizeHint());
-		tqlayout->addWidget(label, 0, Qt::AlignRight);
+		tqlayout->addWidget(label, 0, TQt::AlignRight);
 		TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout);
 		for (TQStringList::Iterator it = mErrorMsgs.begin();  it != mErrorMsgs.end();  ++it)
 		{
 			label = new TQLabel(*it, topWidget);
 			label->setFixedSize(label->tqsizeHint());
-			vtqlayout->addWidget(label, 0, Qt::AlignLeft);
+			vtqlayout->addWidget(label, 0, TQt::AlignLeft);
 		}
 		tqlayout->addStretch();
 	}
@@ -600,7 +600,7 @@ void MessageWin::initView()
 	topLayout->activate();
 	setMinimumSize(TQSize(grid->tqsizeHint().width() + 2*KDialog::marginHint(), tqsizeHint().height()));
 
-	bool modal = !(getWFlags() & Qt::WX11BypassWM);
+	bool modal = !(getWFlags() & TQt::WX11BypassWM);
 
 	unsigned long wstate = (modal ? NET::Modal : 0) | NET::Sticky | NET::KeepAbove;
 	WId winid = winId();
@@ -883,7 +883,7 @@ void MessageWin::slotPlayAudio()
 			if (!haveErrorMessage(ErrMsg_Volume))
 			{
 				KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
-				                         TQString::null, TQString::tqfromLatin1("KMixError"));
+				                         TQString(), TQString::tqfromLatin1("KMixError"));
 				clearErrorMessage(ErrMsg_Volume);
 			}
 		}
@@ -1058,7 +1058,7 @@ void MessageWin::stopPlay()
 	if (!mLocalAudioFile.isEmpty())
 	{
 		KIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
-		mLocalAudioFile = TQString::null;
+		mLocalAudioFile = TQString();
 	}
 	if (mSilenceButton)
 		mSilenceButton->setEnabled(false);
@@ -1249,7 +1249,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 				 * N.B. This can't be done in show(), since the tqgeometry of the window
 				 *      is not known until it is displayed. Unfortunately by moving the
 				 *      window in showEvent(), a flicker is unavoidable.
-				 *      See the Qt documentation on window tqgeometry for more details.
+				 *      See the TQt documentation on window tqgeometry for more details.
 				 */
 				// PROBLEM: The frame size is not known yet!
 
@@ -1437,7 +1437,7 @@ void MessageWin::slotShowKMailMessage()
 	TQCString    replyType;
 	TQByteArray  data, replyData;
 	TQDataStream arg(data, IO_WriteOnly);
-	arg << (TQ_UINT32)mKMailSerialNumber << TQString::null;
+	arg << (TQ_UINT32)mKMailSerialNumber << TQString();
 	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
@@ -1465,10 +1465,10 @@ void MessageWin::slotEdit()
 		editDlg.getEvent(event);
 
 		// Update the displayed lists and the calendar file
-		KAlarm::UpdateStatus status;
+		KAlarm::UpdatetqStatus status;
 		if (AlarmCalendar::activeCalendar()->event(mEventID))
 		{
-			// The old alarm hasn't expired yet, so tqreplace it
+			// The old alarm hasn't expired yet, so replace it
 			status = KAlarm::modifyEvent(mEvent, event, 0, &editDlg);
 			Undo::saveEdit(mEvent, event);
 		}
@@ -1673,7 +1673,7 @@ MWMimeSourceFactory::MWMimeSourceFactory(const TQString& absPath, KTextBrowser*
 	  mLast(0)
 {
 	view->setMimeSourceFactory(this);
-	TQString type = KMimeType::tqfindByPath(absPath)->name();
+	TQString type = KMimeType::findByPath(absPath)->name();
 	switch (KAlarm::fileType(type))
 	{
 		case KAlarm::TextPlain:
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index 52c86c5f..f39d2a71 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -44,6 +44,7 @@ namespace KDE { class PlayObject; }
 class MessageWin : public MainWindowBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		MessageWin();     // for session management restoration only
 		MessageWin(const KAEvent&, const KAAlarm&, bool reschedule_event = true, bool allowDefer = true);
diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp
index 15b56d94..dfe0f41a 100644
--- a/kalarm/pickfileradio.cpp
+++ b/kalarm/pickfileradio.cpp
@@ -30,15 +30,15 @@
 #include "pickfileradio.moc"
 
 
-PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)
-	: RadioButton(text, parent, name),
-	  mGroup(parent),
+PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name)
+	: RadioButton(text, tqparent, name),
+	  mGroup(tqparent),
 	  mEdit(edit),
 	  mButton(button),
 	  mLastId(-1),     // set to an invalid value
 	  mRevertId(false)
 {
-	Q_ASSERT(parent);
+	Q_ASSERT(tqparent);
 	Q_ASSERT(button);
 	mButton->setEnabled(false);
 	connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
@@ -47,15 +47,15 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin
 	connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int)));
 }
 
-PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name)
-	: RadioButton(text, parent, name),
-	  mGroup(parent),
+PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name)
+	: RadioButton(text, tqparent, name),
+	  mGroup(tqparent),
 	  mEdit(0),
 	  mButton(0),
 	  mLastId(-1),     // set to an invalid value
 	  mRevertId(false)
 {
-	Q_ASSERT(parent);
+	Q_ASSERT(tqparent);
 }
 
 void PickFileRadio::init(TQPushButton* button, LineEdit* edit)
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index 6d989d5c..a8d12383 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -38,7 +38,7 @@ class LineEdit;
  *  To achieve this, whenever the button is newly selected and the
  *  file name is currently blank, the file picker dialogue is displayed to choose a
  *  file. If the dialogue exits without a file being chosen, the radio button selection
- *  is reverted to the previously selected button in the parent button group.
+ *  is reverted to the previously selected button in the tqparent button group.
  *
  *  The class handles the activation of the file picker dialogue (via a virtual method
  *  which must be supplied by deriving a class from this one). It also handles all
@@ -50,22 +50,23 @@ class LineEdit;
 class PickFileRadio : public RadioButton
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Constructor.
 		 *  @param button Push button to invoke the file picker dialogue.
 		 *  @param edit File name edit widget, or null if there is none.
 		 *  @param text Radio button's text.
-		 *  @param parent Button group which is to be the parent object for the radio button.
+		 *  @param tqparent Button group which is to be the tqparent object for the radio button.
 		 *  @param name The name of this widget.
 		 */
-		PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name = 0);
+		PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
 		/** Constructor.
 		 *  The init() method must be called before the widget can be used.
 		 *  @param text Radio button's text.
-		 *  @param parent Button group which is to be the parent object for the radio button.
+		 *  @param tqparent Button group which is to be the tqparent object for the radio button.
 		 *  @param name The name of this widget.
 		 */
-		PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0);
+		PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
 		/** Initialises the widget.
 		 *  @param button Push button to invoke the file picker dialogue.
 		 *  @param edit File name edit widget, or null if there is none.
@@ -79,7 +80,7 @@ class PickFileRadio : public RadioButton
 		/** Chooses a file, for example by displaying a file selection dialogue.
 		 *  This method is called when the push button is clicked - the client
 		 *  should not activate a file selection dialogue directly.
-		 *  @return Selected file name, or TQString::null if no selection made.
+		 *  @return Selected file name, or TQString() if no selection made.
 		 */
 		virtual TQString pickFile() = 0;
 		/** Notifies the widget of the currently selected file name.
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 70e720dc..ec6aa483 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -43,7 +43,7 @@
 #include <kiconloader.h>
 #include <kcolorcombo.h>
 #include <kstdguiitem.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <kwin.h>
 #endif
 #include <kdebug.h>
@@ -87,7 +87,7 @@ static TQString xtermCommands[] = {
 	TQString::tqfromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
 	TQString::tqfromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
 	TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
-	TQString::null       // end of list indicator - don't change!
+	TQString()       // end of list indicator - don't change!
 };
 
 
@@ -106,7 +106,7 @@ void KAlarmPrefDlg::display()
 	}
 	else
 	{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		KWin::WindowInfo info = KWin::windowInfo(mInstance->winId(), static_cast<unsigned long>(NET::WMGeometry | NET::WMDesktop));
 		KWin::setCurrentDesktop(info.desktop());
 #endif
@@ -119,7 +119,7 @@ void KAlarmPrefDlg::display()
 KAlarmPrefDlg::KAlarmPrefDlg()
 	: KDialogBase(IconList, i18n("Preferences"), Help | Default | Ok | Apply | Cancel, Ok, 0, "PrefDlg", false, true)
 {
-	setWFlags(Qt::WDestructiveClose);
+	setWFlags(TQt::WDestructiveClose);
 	setIconListAllVisible(true);
 
 	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc"));
@@ -251,7 +251,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
 	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
 	TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -405,12 +405,12 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		cmd.tqreplace("%C", "[command]");
 		cmd.tqreplace("%W", "[command; sleep]");
 		TQWhatsThis::add(radio, whatsThis.arg(cmd));
-		grid->addWidget(radio, (row = index/3 + 1), index % 3, Qt::AlignAuto);
+		grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
 		++index;
 	}
 
 	box = new TQHBox(group);
-	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto);
 	TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
 	radio->setFixedSize(radio->tqsizeHint());
 	connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
@@ -444,7 +444,7 @@ void MiscPrefTab::restore()
 	{
 		for ( ;  id < mXtermCount;  ++id)
 		{
-			if (mXtermType->find(id)  &&  xtermCmd == xtermCommands[id])
+			if (mXtermType->tqfind(id)  &&  xtermCmd == xtermCommands[id])
 				break;
 		}
 	}
@@ -466,7 +466,7 @@ void MiscPrefTab::apply(bool syncToDisc)
 		else
 		{
 			TQStringList args = KShell::splitArgs(cmd);
-			cmd = args.isEmpty() ? TQString::null : args[0];
+			cmd = args.isEmpty() ? TQString() : args[0];
 			if (KStandardDirs::findExe(cmd).isEmpty())
 			{
 				mXtermCommand->setFocus();
@@ -526,7 +526,7 @@ void MiscPrefTab::slotAutostartDaemonClicked()
 	if (!mAutostartDaemon->isChecked()
 	&&  KMessageBox::warningYesNo(this,
 		                      i18n("You should not uncheck this option unless you intend to discontinue use of KAlarm"),
-		                      TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()
+		                      TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()
 		                     ) != KMessageBox::Yes)
 		mAutostartDaemon->setChecked(true);	
 }
@@ -659,7 +659,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms."));
-	grid->addMultiCellWidget(radio, 2, 2, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 2, 2, 1, 2, TQt::AlignAuto);
 
 	// 'From' email address to be picked from KMail's identities when the email alarm is configured
 	radio = new RadioButton(i18n("Use KMail &identities"), group);
@@ -669,7 +669,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	      i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. "
 	           "For existing email alarms, KMail's default identity will be used. "
 	           "For new email alarms, you will be able to pick which of KMail's identities to use."));
-	grid->addMultiCellWidget(radio, 3, 3, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 3, 3, 1, 2, TQt::AlignAuto);
 
 	// 'Bcc' email address controls ...
 	grid->addRowSpacing(4, KDialog::spacingHint());
@@ -700,7 +700,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself."));
-	grid->addMultiCellWidget(radio, 6, 6, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto);
 
 	group->setFixedHeight(group->tqsizeHint().height());
 
@@ -788,7 +788,7 @@ TQString EmailPrefTab::validate()
 		mBccAddressChanged = false;
 		return validateAddr(mBccAddressGroup, mEmailBccAddress, i18n("No valid 'Bcc' email address is specified."));
 	}
-	return TQString::null;
+	return TQString();
 }
 
 TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
@@ -798,17 +798,17 @@ TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const
 	{
 		case Preferences::MAIL_FROM_CONTROL_CENTRE:
 			if (!KAMail::controlCentreAddress().isEmpty())
-				return TQString::null;
+				return TQString();
 			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_KMAIL:
 			if (KAMail::identitiesExist())
-				return TQString::null;
+				return TQString();
 			errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_ADDR:
 			if (!addr->text().stripWhiteSpace().isEmpty())
-				return TQString::null;
+				return TQString();
 			break;
 	}
 	return errmsg;
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
 EditPrefTab::EditPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | Qt::WordBreak)
+	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | TQt::WordBreak)
 	// (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	int groupTopMargin = fontMetrics().lineSpacing()/2;
 	TQString defsetting   = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -903,12 +903,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
 	mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint());
 	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
-	tqlayout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
 	mAutoClose->setMinimumSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
-	tqlayout->addWidget(mAutoClose, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
@@ -996,7 +996,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
 	mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
-	tqlayout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
@@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQVBox* vbox = new TQVBox(mPage);   // this is to control the TQWhatsThis text display area
 	vbox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
-	label->tqsetAlignment(tqalignment | Qt::WordBreak);
+	label->tqsetAlignment(tqalignment | TQt::WordBreak);
 	itemBox = new TQHBox(vbox);
 	itemBox->setSpacing(2*KDialog::spacingHint());
 	mFeb29 = new TQButtonGroup(itemBox);
@@ -1181,7 +1181,7 @@ TQString EditPrefTab::validate()
 		mSoundFile->setFocus();
 		return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -1204,7 +1204,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
 	TQWhatsThis::add(mTooltipShowAlarms,
 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
-	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
@@ -1217,21 +1217,21 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
 	           "Check to enter an upper limit on the number to be displayed."));
-	grid->addMultiCellWidget(box, 2, 2, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(box, 2, 2, 1, 2, TQt::AlignAuto);
 
 	mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
 	mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint());
 	connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTime,
 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
-	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto);
 
 	mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
 	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint());
 	connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTimeTo,
 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
-	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto);
 
 	box = new TQHBox(group);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
@@ -1242,7 +1242,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip"));
 	box->setFixedHeight(box->tqsizeHint().height());
-	grid->addWidget(box, 5, 2, Qt::AlignAuto);
+	grid->addWidget(box, 5, 2, TQt::AlignAuto);
 	group->setMaximumHeight(group->tqsizeHint().height());
 
 	mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg");
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index 6e7c30c5..5f8f5543 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -54,6 +54,7 @@ class MiscPrefTab;
 class KAlarmPrefDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		static void display();
 		~KAlarmPrefDlg();
@@ -80,9 +81,10 @@ class KAlarmPrefDlg : public KDialogBase
 };
 
 // Base class for each tab in the Preferences dialog
-class PrefsTabBase : public QWidget
+class PrefsTabBase : public TQWidget
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		PrefsTabBase(TQVBox*);
 
@@ -104,6 +106,7 @@ class PrefsTabBase : public QWidget
 class MiscPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		MiscPrefTab(TQVBox*);
 
@@ -149,6 +152,7 @@ class MiscPrefTab : public PrefsTabBase
 class EmailPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		EmailPrefTab(TQVBox*);
 
@@ -184,6 +188,7 @@ class EmailPrefTab : public PrefsTabBase
 class EditPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		EditPrefTab(TQVBox*);
 
@@ -222,6 +227,7 @@ class EditPrefTab : public PrefsTabBase
 class ViewPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		ViewPrefTab(TQVBox*);
 
@@ -254,6 +260,7 @@ class ViewPrefTab : public PrefsTabBase
 class FontColourPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		FontColourPrefTab(TQVBox*);
 
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 93e6a60b..be1e5e6a 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -42,10 +42,10 @@ static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write
 Preferences* Preferences::mInstance = 0;
 
 // Default config file settings
-TQColor defaultMessageColours[] = { Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::white, Qt::lightGray, Qt::black, TQColor() };
+TQColor defaultMessageColours[] = { TQt::red, TQt::green, TQt::blue, TQt::cyan, TQt::magenta, TQt::yellow, TQt::white, TQt::lightGray, TQt::black, TQColor() };
 const ColourList                 Preferences::default_messageColours(defaultMessageColours);
-const TQColor                     Preferences::default_defaultBgColour(Qt::red);
-const TQColor                     Preferences::default_defaultFgColour(Qt::black);
+const TQColor                     Preferences::default_defaultBgColour(TQt::red);
+const TQColor                     Preferences::default_defaultFgColour(TQt::black);
 TQFont                            Preferences::mDefault_messageFont;    // initialised in constructor
 const TQTime                      Preferences::default_startOfDay(0, 0);
 const bool                       Preferences::default_runInSystemTray         = true;
@@ -62,10 +62,10 @@ const TQString                    Preferences::default_tooltipTimeToPrefix     =
 const int                        Preferences::default_daemonTrayCheckInterval = 10;     // (seconds)
 const bool                       Preferences::default_emailCopyToKMail        = false;
 const bool                       Preferences::default_emailQueuedNotify       = false;
-const TQColor                     Preferences::default_disabledColour(Qt::lightGray);
-const TQColor                     Preferences::default_expiredColour(Qt::darkRed);
+const TQColor                     Preferences::default_disabledColour(TQt::lightGray);
+const TQColor                     Preferences::default_expiredColour(TQt::darkRed);
 const int                        Preferences::default_expiredKeepDays         = 7;
-const TQString                    Preferences::default_defaultSoundFile        = TQString::null;
+const TQString                    Preferences::default_defaultSoundFile        = TQString();
 const float                      Preferences::default_defaultSoundVolume      = -1;
 const int                        Preferences::default_defaultLateCancel       = 0;
 const bool                       Preferences::default_defaultAutoClose        = false;
@@ -76,8 +76,8 @@ const bool                       Preferences::default_defaultConfirmAck       =
 const bool                       Preferences::default_defaultCmdScript        = false;
 const EditAlarmDlg::CmdLogType   Preferences::default_defaultCmdLogType       = EditAlarmDlg::DISCARD_OUTPUT;
 const bool                       Preferences::default_defaultEmailBcc         = false;
-const TQString                    Preferences::default_emailAddress            = TQString::null;
-const TQString                    Preferences::default_emailBccAddress         = TQString::null;
+const TQString                    Preferences::default_emailAddress            = TQString();
+const TQString                    Preferences::default_emailBccAddress         = TQString();
 const Preferences::MailClient    Preferences::default_emailClient             = KMAIL;
 const Preferences::MailFrom      Preferences::default_emailBccFrom            = MAIL_FROM_CONTROL_CENTRE;
 const RecurrenceEdit::RepeatType Preferences::default_defaultRecurPeriod      = RecurrenceEdit::NO_RECUR;
@@ -195,9 +195,9 @@ static const TQString FROM_CONTROL_CENTRE      = TQString::tqfromLatin1("@Contro
 static const TQString FROM_KMAIL               = TQString::tqfromLatin1("@KMail");
 
 // Config file entry names for notification messages
-const TQString Preferences::QUIT_WARN              = TQString::tqfromLatin1("QuitWarn");
+const TQString Preferences::TQUIT_WARN              = TQString::tqfromLatin1("QuitWarn");
 const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion");
-const TQString Preferences::EMAIL_QUEUED_NOTIFY    = TQString::tqfromLatin1("EmailQueuedNotify");
+const TQString Preferences::EMAIL_TQUEUED_NOTIFY    = TQString::tqfromLatin1("EmailQueuedNotify");
 
 static const int SODxor = 0x82451630;
 inline int Preferences::startOfDayCheck()
@@ -222,9 +222,9 @@ void Preferences::initialise()
 		read();
 
 		// Set the default button for the Quit warning message box to Cancel
-		MessageBox::setContinueDefault(QUIT_WARN, KMessageBox::Cancel);
-		MessageBox::setDefaultShouldBeShownContinue(QUIT_WARN, default_quitWarn);
-		MessageBox::setDefaultShouldBeShownContinue(EMAIL_QUEUED_NOTIFY, default_emailQueuedNotify);
+		MessageBox::setContinueDefault(TQUIT_WARN, KMessageBox::Cancel);
+		MessageBox::setDefaultShouldBeShownContinue(TQUIT_WARN, default_quitWarn);
+		MessageBox::setDefaultShouldBeShownContinue(EMAIL_TQUEUED_NOTIFY, default_emailQueuedNotify);
 		MessageBox::setDefaultShouldBeShownContinue(CONFIRM_ALARM_DELETION, default_confirmAlarmDeletion);
 	}
 }
@@ -410,7 +410,7 @@ void Preferences::save(bool syncToDisc)
 		case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break;
 		case TimePeriod::DAYS:          value = TQString::tqfromLatin1("Days");         break;
 		case TimePeriod::WEEKS:         value = TQString::tqfromLatin1("Weeks");        break;
-		default:                        value = TQString::null; break;
+		default:                        value = TQString(); break;
 	}
 	config->writeEntry(DEF_REMIND_UNITS, value);
 	config->writeEntry(DEF_PRE_ACTION, mDefaultPreAction);
@@ -449,9 +449,9 @@ TQString Preferences::emailFrom(Preferences::MailFrom from, bool useAddress, boo
 		case MAIL_FROM_CONTROL_CENTRE:
 			return FROM_CONTROL_CENTRE;
 		case MAIL_FROM_ADDR:
-			return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString::null;
+			return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString();
 		default:
-			return TQString::null;
+			return TQString();
 	}
 }
 
@@ -478,7 +478,7 @@ TQString Preferences::emailAddress()
 		case MAIL_FROM_ADDR:
 			return mEmailAddress;
 		default:
-			return TQString::null;
+			return TQString();
 	}
 }
 
@@ -491,7 +491,7 @@ TQString Preferences::emailBccAddress()
 		case MAIL_FROM_ADDR:
 			return mEmailBccAddress;
 		default:
-			return TQString::null;
+			return TQString();
 	}
 }
 
@@ -607,8 +607,8 @@ void Preferences::convertOldPrefs()
 		static const TQString EMAIL_USE_CTRL_CENTRE     = TQString::tqfromLatin1("EmailUseControlCenter");
 		static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter");
 		TQMap<TQString, TQString> entries = config->entryMap(GENERAL_SECTION);
-		if (entries.find(EMAIL_FROM) == entries.end()
-		&&  entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end())
+		if (entries.tqfind(EMAIL_FROM) == entries.end()
+		&&  entries.tqfind(EMAIL_USE_CTRL_CENTRE) != entries.end())
 		{
 			// Preferences were written by KAlarm pre-1.2.1
 			config->setGroup(GENERAL_SECTION);
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index de3e0491..4b3042d2 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -39,9 +39,10 @@ class TQWidget;
 
 
 // Settings configured in the Preferences dialog
-class Preferences : public QObject
+class Preferences : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum MailClient { SENDMAIL, KMAIL };
 		enum MailFrom   { MAIL_FROM_KMAIL, MAIL_FROM_CONTROL_CENTRE, MAIL_FROM_ADDR };
@@ -62,8 +63,8 @@ class Preferences : public QObject
 		static bool              hasStartOfDayChanged()           { return mStartOfDayChanged; }
 		static bool              runInSystemTray()                { return mRunInSystemTray; }
 		static bool              disableAlarmsIfStopped()         { return mDisableAlarmsIfStopped; }
-		static bool              quitWarn()                       { return notifying(QUIT_WARN); }
-		static void              setQuitWarn(bool yes)            { setNotify(QUIT_WARN, yes); }
+		static bool              quitWarn()                       { return notifying(TQUIT_WARN); }
+		static void              setQuitWarn(bool yes)            { setNotify(TQUIT_WARN, yes); }
 		static bool              autostartTrayIcon()              { return mAutostartTrayIcon; }
 		static bool              confirmAlarmDeletion()           { return notifying(CONFIRM_ALARM_DELETION); }
 		static void              setConfirmAlarmDeletion(bool yes){ setNotify(CONFIRM_ALARM_DELETION, yes); }
@@ -76,8 +77,8 @@ class Preferences : public QObject
 		static int               daemonTrayCheckInterval()        { return mDaemonTrayCheckInterval; }
 		static MailClient        emailClient()                    { return mEmailClient; }
 		static bool              emailCopyToKMail()               { return mEmailCopyToKMail  &&  mEmailClient == SENDMAIL; }
-		static bool              emailQueuedNotify()              { return notifying(EMAIL_QUEUED_NOTIFY); }
-		static void              setEmailQueuedNotify(bool yes)   { setNotify(EMAIL_QUEUED_NOTIFY, yes); }
+		static bool              emailQueuedNotify()              { return notifying(EMAIL_TQUEUED_NOTIFY); }
+		static void              setEmailQueuedNotify(bool yes)   { setNotify(EMAIL_TQUEUED_NOTIFY, yes); }
 		static MailFrom          emailFrom()                      { return mEmailFrom; }
 		static bool              emailBccUseControlCentre()       { return mEmailBccFrom == MAIL_FROM_CONTROL_CENTRE; }
 		static TQString           emailAddress();
@@ -108,9 +109,9 @@ class Preferences : public QObject
 		static const TQString&    defaultPostAction()              { return mDefaultPostAction; }
 
 		// Config file entry names for notification messages
-		static const TQString     QUIT_WARN;
+		static const TQString     TQUIT_WARN;
 		static const TQString     CONFIRM_ALARM_DELETION;
-		static const TQString     EMAIL_QUEUED_NOTIFY;
+		static const TQString     EMAIL_TQUEUED_NOTIFY;
 
 		// Default values for settings
 		static const ColourList                 default_messageColours;
@@ -169,7 +170,7 @@ class Preferences : public QObject
 		static void                read();
 		static void                convertOldPrefs();
 		static int                 startOfDayCheck();
-		static QString	           emailFrom(MailFrom, bool useAddress, bool bcc);
+		static TQString	           emailFrom(MailFrom, bool useAddress, bool bcc);
 		static MailFrom            emailFrom(const TQString&);
 		static void                setNotify(const TQString& messageID, bool notify);
 		static bool                notifying(const TQString& messageID);
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 3924d428..5ac3c9bf 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -82,8 +82,8 @@ TQString RecurrenceEdit::i18n_Yearly()            { return i18n("Yearly"); }
 TQString RecurrenceEdit::i18n_y_Yearly()          { return i18n("&Yearly"); }
 
 
-RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mRule(0),
 	  mRuleButtonType(INVALID_RECUR),
 	  mDailyShown(false),
@@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	 * selection of its corresponding radio button.
 	 */
 
-	TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
+	TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
 	topLayout->addWidget(recurGroup);
 	TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
 	tqlayout = new TQVBoxLayout(ruleFrame, 0);
@@ -111,7 +111,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 
 	tqlayout = new TQHBoxLayout(tqlayout, 0);
 	TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0);
-	mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
+	mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame);
 	mRuleButtonGroup->setInsideMargin(0);
 	mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
 	lay->addWidget(mRuleButtonGroup);
@@ -213,7 +213,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	mRuleStack->addWidget(mYearlyRule, 5);
 	tqlayout->addSpacing(KDialog::marginHint());
 
-	// Create the recurrence range group which tqcontains the controls
+	// Create the recurrence range group which contains the controls
 	// which specify how long the recurrence is to last.
 
 	mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup");
@@ -226,7 +226,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint());
 	mNoEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely"));
-	vtqlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
+	vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto);
 	TQSize size = mNoEndDateButton->size();
 
 	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
@@ -1019,8 +1019,8 @@ bool RecurrenceEdit::stateChanged() const
 = Base class for rule widgets, including recurrence frequency.
 =============================================================================*/
 
-Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* parent, const char* name)
-	: NoRule(parent, name)
+Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* tqparent, const char* name)
+	: NoRule(tqparent, name)
 {
 	mLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQHBox* freqBox = new TQHBox(this);
@@ -1095,10 +1095,10 @@ bool Rule::stateChanged() const
 = Sub-daily rule widget.
 =============================================================================*/
 
-SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name)
+SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name)
 	: Rule(i18n("hours:minutes"),
 	       i18n("Enter the number of hours and minutes between repetitions of the alarm"),
-	       true, readOnly, parent, name)
+	       true, readOnly, tqparent, name)
 { }
 
 
@@ -1108,8 +1108,8 @@ SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name)
 =============================================================================*/
 
 DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
-                         bool readOnly, TQWidget* parent, const char* name)
-	: Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
+                         bool readOnly, TQWidget* tqparent, const char* name)
+	: Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
 	  mSavedDays(7)
 {
 	TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
@@ -1117,7 +1117,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 
 	TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this);
 	label->setFixedSize(label->tqsizeHint());
-	grid->addWidget(label, 0, 0, Qt::AlignRight | Qt::AlignTop);
+	grid->addWidget(label, 0, 0, TQt::AlignRight | TQt::AlignTop);
 	grid->addColSpacing(1, KDialog::spacingHint());
 
 	// List the days of the week starting at the user's start day of the week.
@@ -1131,11 +1131,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 		mDayBox[i] = new CheckBox(calendar->weekDayName(day), box);
 		mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint());
 		mDayBox[i]->setReadOnly(readOnly);
-		dgrid->addWidget(mDayBox[i], i%4, i/4, Qt::AlignAuto);
+		dgrid->addWidget(mDayBox[i], i%4, i/4, TQt::AlignAuto);
 	}
 	box->setFixedSize(box->tqsizeHint());
 	TQWhatsThis::add(box, daysWhatsThis);
-	grid->addWidget(box, 0, 2, Qt::AlignAuto);
+	grid->addWidget(box, 0, 2, TQt::AlignAuto);
 	label->setBuddy(mDayBox[0]);
 	grid->setColStretch(3, 1);
 }
@@ -1221,11 +1221,11 @@ bool DayWeekRule::stateChanged() const
 = Daily rule widget.
 =============================================================================*/
 
-DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name)
+DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name)
 	: DayWeekRule(i18n("day(s)"),
 	              i18n("Enter the number of days between repetitions of the alarm"),
 	              i18n("Select the days of the week on which the alarm is allowed to occur"),
-	              readOnly, parent, name)
+	              readOnly, tqparent, name)
 { }
 
 
@@ -1234,11 +1234,11 @@ DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name)
 = Weekly rule widget.
 =============================================================================*/
 
-WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name)
+WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name)
 	: DayWeekRule(i18n("week(s)"),
 	              i18n("Enter the number of weeks between repetitions of the alarm"),
 	              i18n("Select the days of the week on which to repeat the alarm"),
-	              readOnly, parent, name)
+	              readOnly, tqparent, name)
 { }
 
 
@@ -1248,8 +1248,8 @@ WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name)
 =============================================================================*/
 
 MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
-                             bool readOnly, TQWidget* parent, const char* name)
-	: Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
+                             bool readOnly, TQWidget* tqparent, const char* name)
+	: Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
 	  mEveryWeek(allowEveryWeek)
 {
 	mButtonGroup = new ButtonGroup(this);
@@ -1438,10 +1438,10 @@ bool MonthYearRule::stateChanged() const
 = Monthly rule widget.
 =============================================================================*/
 
-MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name)
+MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name)
 	: MonthYearRule(i18n("month(s)"),
 	       i18n("Enter the number of months between repetitions of the alarm"),
-	       false, readOnly, parent, name)
+	       false, readOnly, tqparent, name)
 { }
 
 
@@ -1450,20 +1450,20 @@ MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name)
 = Yearly rule widget.
 =============================================================================*/
 
-YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
+YearlyRule::YearlyRule(bool readOnly, TQWidget* tqparent, const char* name)
 	: MonthYearRule(i18n("year(s)"),
 	       i18n("Enter the number of years between repetitions of the alarm"),
-	       true, readOnly, parent, name)
+	       true, readOnly, tqparent, name)
 {
 	// Set up the month selection widgets
 	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this);
 	label->setFixedSize(label->tqsizeHint());
-	htqlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop);
+	htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop);
 
 	// List the months of the year.
 	TQWidget* w = new TQWidget(this);   // this is to control the TQWhatsThis text display area
-	htqlayout->addWidget(w, 1, Qt::AlignAuto);
+	htqlayout->addWidget(w, 1, TQt::AlignAuto);
 	TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint());
 	const KCalendarSystem* calendar = KGlobal::locale()->calendar();
 	int year = TQDate::tqcurrentDate().year();
@@ -1472,7 +1472,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
 		mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w);
 		mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint());
 		mMonthBox[i]->setReadOnly(readOnly);
-		grid->addWidget(mMonthBox[i], i%3, i/3, Qt::AlignAuto);
+		grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto);
 	}
 	connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29()));
 	w->setFixedHeight(w->tqsizeHint().height());
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index ca428645..893b4456 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -53,14 +53,15 @@ class MonthlyRule;
 class YearlyRule;
 
 
-class RecurrenceEdit : public QFrame
+class RecurrenceEdit : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		// Don't alter the order of these recurrence types
 		enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL };
 
-		RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name = 0);
+		RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name = 0);
 		virtual ~RecurrenceEdit()  { }
 
 		/** Set widgets to default values */
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 51a7085d..659921d5 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -36,10 +36,10 @@ class TimeSpinBox;
 class TQString;
 
 
-class NoRule : public QFrame
+class NoRule : public TQFrame
 {
 	public:
-		NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name)
+		NoRule(TQWidget* tqparent, const char* name = 0) : TQFrame(tqparent, name)
 		                                                 { setFrameStyle(TQFrame::NoFrame); }
 		virtual int      frequency() const       { return 0; }
 };
@@ -47,9 +47,10 @@ class NoRule : public QFrame
 class Rule : public NoRule
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
-		     TQWidget* parent, const char* name = 0);
+		     TQWidget* tqparent, const char* name = 0);
 		int              frequency() const;
 		void             setFrequency(int);
 		virtual void     setFrequencyFocus()     { mSpinBox->setFocus(); }
@@ -72,17 +73,19 @@ class Rule : public NoRule
 class SubDailyRule : public Rule
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
+		SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
 };
 
 // Daily/weekly rule choices base class
 class DayWeekRule : public Rule
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
-		            bool readOnly, TQWidget* parent, const char* name = 0);
+		            bool readOnly, TQWidget* tqparent, const char* name = 0);
 		TQBitArray        days() const;
 		void             setDays(bool);
 		void             setDays(const TQBitArray& days);
@@ -100,25 +103,26 @@ class DayWeekRule : public Rule
 class DailyRule : public DayWeekRule
 {
 	public:
-		DailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
+		DailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
 };
 
 // Weekly rule choices
 class WeeklyRule : public DayWeekRule
 {
 	public:
-		WeeklyRule(bool readOnly, TQWidget* parent, const char* name = 0);
+		WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
 };
 
 // Monthly/yearly rule choices base class
 class MonthYearRule : public Rule
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum DayPosType { DATE, POS };
 
 		MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
-		              bool readOnly, TQWidget* parent, const char* name = 0);
+		              bool readOnly, TQWidget* tqparent, const char* name = 0);
 		DayPosType       type() const;
 		int              date() const;       // if date in month is selected
 		int              week() const;       // if position is selected
@@ -161,15 +165,16 @@ class MonthYearRule : public Rule
 class MonthlyRule : public MonthYearRule
 {
 	public:
-		MonthlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
+		MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
 };
 
 // Yearly rule choices
 class YearlyRule : public MonthYearRule
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
+		YearlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
 		TQValueList<int>  months() const;
 		void             setMonths(const TQValueList<int>& months);
 		void             setDefaultValues(int dayOfMonth, int dayOfWeek, int month);
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index e10e04e2..ee197e73 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -41,8 +41,8 @@ TQString Reminder::i18n_u_first_recurrence_only() { return i18n("Reminder for fi
 
 
 Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
-                   bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+                   bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mReadOnly(false),
 	  mOnceOnlyEnabled(showOnceOnly)
 {
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index 2470a0c3..f9e2b57f 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -27,12 +27,13 @@ class TimeSelector;
 class CheckBox;
 
 
-class Reminder : public QFrame
+class Reminder : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
-		         bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0);
+		         bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name = 0);
 		bool           isReminder() const;
 		bool           isOnceOnly() const;
 		int            minutes() const;
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index b2241b71..5dac94dc 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -40,8 +40,8 @@
 = Button to display the Alarm Sub-Repetition dialogue.
 =============================================================================*/
 
-RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name)
-	: TQPushButton(caption, parent, name),
+RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name)
+	: TQPushButton(caption, tqparent, name),
 	  mDialog(0),
 	  mInterval(0),
 	  mCount(0),
@@ -149,8 +149,8 @@ void RepetitionButton::displayDialog()
 static const int MAX_COUNT = 9999;    // maximum range for count spinbox
 
 
-RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent, const char* name)
-	: KDialogBase(parent, name, true, caption, Ok|Cancel),
+RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent, const char* name)
+	: KDialogBase(tqparent, name, true, caption, Ok|Cancel),
 	  mMaxDuration(-1),
 	  mDateOnly(false),
 	  mReadOnly(readOnly)
@@ -160,7 +160,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	setMainWidget(page);
 	TQVBoxLayout* topLayout = new TQVBoxLayout(page, 0, spacing);
 
-	mTimeSelector = new TimeSelector(i18n("Repeat every 10 minutes", "&Repeat every"), TQString::null,
+	mTimeSelector = new TimeSelector(i18n("Repeat every 10 minutes", "&Repeat every"), TQString(),
 	                  i18n("Instead of the alarm triggering just once at each recurrence, "
 	                       "checking this option makes the alarm trigger multiple times at each recurrence."),
 	                  i18n("Enter the time between repetitions of the alarm"),
@@ -168,7 +168,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint());
 	connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool)));
-	topLayout->addWidget(mTimeSelector, 0, Qt::AlignAuto);
+	topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto);
 
 	mButtonGroup = new ButtonGroup(page, "buttonGroup");
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked()));
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index c8a32ce8..c2b0ebd6 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -32,11 +32,12 @@ class TimePeriod;
 class RepetitionDlg;
 
 
-class RepetitionButton : public QPushButton
+class RepetitionButton : public TQPushButton
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0);
+		RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name = 0);
 		void           set(int interval, int count);
 		void           set(int interval, int count, bool dateOnly, int maxDuration = -1);
 		void           initialise(int interval, int count, bool dateOnly, int maxDuration = -1);   // use only after needsInitialisation() signal
@@ -70,8 +71,9 @@ class RepetitionButton : public QPushButton
 class RepetitionDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0);
+		RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent = 0, const char* name = 0);
 		void           setReadOnly(bool);
 		void           set(int interval, int count, bool dateOnly = false, int maxDuration = -1);
 		int            interval() const;     // get the interval between repetitions, in minutes
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index 691ba936..02d3af55 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -69,8 +69,8 @@ static const char SOUND_DIALOG_NAME[] = "SoundDialog";
 
 
 SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
-                   const TQString& caption, TQWidget* parent, const char* name)
-	: KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
+                   const TQString& caption, TQWidget* tqparent, const char* name)
+	: KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
 	  mReadOnly(false),
 	  mArtsDispatcher(0),
 	  mPlayObject(0),
@@ -120,7 +120,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	grid->addColSpacing(0, indentWidth);
 	grid->addColSpacing(1, indentWidth);
 	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	// 'Set volume' checkbox
 	box = new TQHBox(group);
@@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	      i18n("Select to choose the volume for playing the sound file."));
 
 	// Volume slider
-	mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
+	mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box);
 	mVolumeSlider->setTickmarks(TQSlider::Below);
 	mVolumeSlider->setTickInterval(10);
 	mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	grid->addWidget(mFadeVolumeBox, 4, 2);
 	label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
 	label->setFixedSize(label->tqsizeHint());
-	mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
+	mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox);
 	mFadeSlider->setTickmarks(TQSlider::Below);
 	mFadeSlider->setTickInterval(10);
 	mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -370,7 +370,7 @@ void SoundDlg::stopPlay()
 	if (!mLocalAudioFile.isEmpty())
 	{
 		KIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
-		mLocalAudioFile = TQString::null;
+		mLocalAudioFile = TQString();
 	}
 	mFilePlay->setPixmap(SmallIcon("player_play"));
 	TQToolTip::add(mFilePlay, i18n("Test the sound"));
@@ -412,7 +412,7 @@ bool SoundDlg::checkFile()
 #endif
 	{
 		// It's a relative path.
-		// Find the first sound resource that tqcontains files.
+		// Find the first sound resource that contains files.
 		TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound");
 		if (!soundDirs.isEmpty())
 		{
@@ -443,7 +443,7 @@ bool SoundDlg::checkFile()
 	}
 #ifdef WITHOUT_ARTS
 	KMessageBox::sorry(this, i18n("File not found"));
-	mFileName = TQString::null;
+	mFileName = TQString();
 	return false;
 #else
 	return true;
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index 639a1c83..bcc8dd92 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -39,9 +39,10 @@ class Slider;
 class SoundDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
-		         const TQString& caption, TQWidget* parent, const char* name = 0);
+		         const TQString& caption, TQWidget* tqparent, const char* name = 0);
 		~SoundDlg();
 		void           setReadOnly(bool);
 		bool           isReadOnly() const    { return mReadOnly; }
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index ec09c2b8..25d871c4 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -55,8 +55,8 @@ TQString SoundPicker::i18n_Speak()       { return i18n("Speak"); }
 TQString SoundPicker::i18n_File()        { return i18n("Sound file"); }
 
 
-SoundPicker::SoundPicker(TQWidget* parent, const char* name)
-	: TQFrame(parent, name)
+SoundPicker::SoundPicker(TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name)
 {
 	setFrameStyle(TQFrame::NoFrame);
 	TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@@ -144,7 +144,7 @@ SoundPicker::Type SoundPicker::sound() const
 */
 TQString SoundPicker::file() const
 {
-	return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString::null;
+	return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString();
 }
 
 /******************************************************************************
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index a0a9b83c..eaf0ec16 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -30,9 +30,10 @@ class ComboBox;
 class PushButton;
 
 
-class SoundPicker : public QFrame
+class SoundPicker : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		/** Sound options which can be selected for when the alarm is displayed.
 		 *  @li NONE      - silence.
@@ -42,10 +43,10 @@ class SoundPicker : public QFrame
 		 */
 		enum Type { NONE = 0, BEEP, PLAY_FILE, SPEAK };
 		/** Constructor.
-		 *  @param parent The parent object of this widget.
+		 *  @param tqparent The tqparent object of this widget.
 		 *  @param name The name of this widget.
 		 */
-		explicit SoundPicker(TQWidget* parent, const char* name = 0);
+		explicit SoundPicker(TQWidget* tqparent, const char* name = 0);
 		/** Initialises the widget's state.
 		 *  @param type     The option to select.
 		 *  @param filename The full path or URL of the sound file to select. If the 'file' option is
@@ -103,7 +104,7 @@ class SoundPicker : public QFrame
 		 *                     If null, no file will be highlighted.
 		 *  @return URL selected, in human readable format. If none is selected, URL.isEmpty() is true.
 		 */
-		static TQString browseFile(TQString& initialDir, const TQString& initialFile = TQString::null);
+		static TQString browseFile(TQString& initialDir, const TQString& initialFile = TQString());
 
 		static TQString i18n_Sound();       // plain text of Sound label
 		static TQString i18n_None();        // plain text of None combo box item
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index fabff6ed..919524af 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -40,8 +40,8 @@
 = Button to display the Special Alarm Actions dialogue.
 =============================================================================*/
 
-SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* parent, const char* name)
-	: TQPushButton(caption, parent, name),
+SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* tqparent, const char* name)
+	: TQPushButton(caption, tqparent, name),
 	  mReadOnly(false)
 {
 	setToggleButton(true);
@@ -90,8 +90,8 @@ static const char SPEC_ACT_DIALOG_NAME[] = "SpecialActionsDialog";
 
 
 SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
-                                     const TQString& caption, TQWidget* parent, const char* name)
-	: KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false)
+                                     const TQString& caption, TQWidget* tqparent, const char* name)
+	: KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false)
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
@@ -134,8 +134,8 @@ void SpecialActionsDlg::resizeEvent(TQResizeEvent* re)
 = Pre- and post-alarm actions widget.
 =============================================================================*/
 
-SpecialActions::SpecialActions(TQWidget* parent, const char* name)
-	: TQWidget(parent, name),
+SpecialActions::SpecialActions(TQWidget* tqparent, const char* name)
+	: TQWidget(tqparent, name),
 	  mReadOnly(false)
 {
 	TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -143,7 +143,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 	// Pre-alarm action
 	TQLabel* label = new TQLabel(i18n("Pre-a&larm action:"), this);
 	label->setFixedSize(label->tqsizeHint());
-	topLayout->addWidget(label, 0, Qt::AlignAuto);
+	topLayout->addWidget(label, 0, TQt::AlignAuto);
 
 	mPreAction = new KLineEdit(this);
 	label->setBuddy(mPreAction);
@@ -157,7 +157,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 	// Post-alarm action
 	label = new TQLabel(i18n("Post-alar&m action:"), this);
 	label->setFixedSize(label->tqsizeHint());
-	topLayout->addWidget(label, 0, Qt::AlignAuto);
+	topLayout->addWidget(label, 0, TQt::AlignAuto);
 
 	mPostAction = new KLineEdit(this);
 	label->setBuddy(mPostAction);
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 4cc7b698..58f5c7d6 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -28,11 +28,12 @@
 class KLineEdit;
 
 
-class SpecialActionsButton : public QPushButton
+class SpecialActionsButton : public TQPushButton
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0);
+		SpecialActionsButton(const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
 		void           setActions(const TQString& pre, const TQString& post);
 		const TQString& preAction() const      { return mPreAction; }
 		const TQString& postAction() const     { return mPostAction; }
@@ -53,11 +54,12 @@ class SpecialActionsButton : public QPushButton
 
 
 // Pre- and post-alarm actions widget
-class SpecialActions : public QWidget
+class SpecialActions : public TQWidget
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		SpecialActions(TQWidget* parent = 0, const char* name = 0);
+		SpecialActions(TQWidget* tqparent = 0, const char* name = 0);
 		void         setActions(const TQString& pre, const TQString& post);
 		TQString      preAction() const;
 		TQString      postAction() const;
@@ -75,9 +77,10 @@ class SpecialActions : public QWidget
 class SpecialActionsDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
-		                  const TQString& caption, TQWidget* parent = 0, const char* name = 0);
+		                  const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
 		TQString      preAction() const     { return mActions->preAction(); }
 		TQString      postAction() const    { return mActions->postAction(); }
 		void         setReadOnly(bool ro)  { mActions->setReadOnly(ro); }
diff --git a/kalarm/startdaytimer.h b/kalarm/startdaytimer.h
index d8a305ac..ae0a5580 100644
--- a/kalarm/startdaytimer.h
+++ b/kalarm/startdaytimer.h
@@ -35,6 +35,7 @@
 class StartOfDayTimer : public DailyTimer
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		virtual ~StartOfDayTimer()  { }
 		/** Connect to the timer signal.
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index dab8b45d..6e493b91 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -43,8 +43,8 @@ static const char TMPL_DIALOG_NAME[] = "TemplateDialog";
 TemplateDlg* TemplateDlg::mInstance = 0;
 
 
-TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
-	: KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, parent, name, false, true)
+TemplateDlg::TemplateDlg(TQWidget* tqparent, const char* name)
+	: KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, tqparent, name, false, true)
 {
 	TQWidget* topWidget = plainPage();
 	TQBoxLayout* topLayout = new TQHBoxLayout(topWidget);
@@ -103,11 +103,11 @@ TemplateDlg::~TemplateDlg()
 /******************************************************************************
 *  Create an instance, if none already exists.
 */
-TemplateDlg* TemplateDlg::create(TQWidget* parent, const char* name)
+TemplateDlg* TemplateDlg::create(TQWidget* tqparent, const char* name)
 {
 	if (mInstance)
 		return 0;
-	mInstance = new TemplateDlg(parent, name);
+	mInstance = new TemplateDlg(tqparent, name);
 	return mInstance;
 }
 
@@ -138,9 +138,9 @@ void TemplateDlg::slotCopy()
 *  Create a new template.
 *  If 'event' is non-zero, base the new template on an existing event or template.
 */
-void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* parent, TemplateListView* view)
+void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* tqparent, TemplateListView* view)
 {
-	EditAlarmDlg editDlg(true, i18n("New Alarm Template"), parent, 0, event);
+	EditAlarmDlg editDlg(true, i18n("New Alarm Template"), tqparent, 0, event);
 	if (editDlg.exec() == TQDialog::Accepted)
 	{
 		KAEvent event;
@@ -192,14 +192,14 @@ void TemplateDlg::slotDelete()
 		return;
 
 	int warnErr = 0;
-	KAlarm::UpdateStatus status = KAlarm::UPDATE_OK;
+	KAlarm::UpdatetqStatus status = KAlarm::UPDATE_OK;
 	TQValueList<KAEvent> events;
 	AlarmCalendar::templateCalendar()->startUpdate();    // prevent multiple saves of the calendar until we're finished
 	for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin();  it != items.end();  ++it)
 	{
 		TemplateListViewItem* item = (TemplateListViewItem*)(*it);
 		events.append(item->event());
-		KAlarm::UpdateStatus st = KAlarm::deleteTemplate(item->event());
+		KAlarm::UpdatetqStatus st = KAlarm::deleteTemplate(item->event());
 		if (st != KAlarm::UPDATE_OK)
 		{
 			status = st;
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index 25b7b66f..18ff7224 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -30,10 +30,11 @@ class KAEvent;
 class TemplateDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		static TemplateDlg*  create(TQWidget* parent = 0, const char* name = 0);
+		static TemplateDlg*  create(TQWidget* tqparent = 0, const char* name = 0);
 		~TemplateDlg();
-		static void   createTemplate(const KAEvent* = 0, TQWidget* parent = 0, TemplateListView* = 0);
+		static void   createTemplate(const KAEvent* = 0, TQWidget* tqparent = 0, TemplateListView* = 0);
 
 	signals:
 		void          emptyToggled(bool notEmpty);
@@ -49,7 +50,7 @@ class TemplateDlg : public KDialogBase
 		void          slotSelectionChanged();
 
 	private:
-		TemplateDlg(TQWidget* parent, const char* name);
+		TemplateDlg(TQWidget* tqparent, const char* name);
 
 		static TemplateDlg* mInstance;   // the current instance, to prevent multiple dialogues
 
diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp
index 1c0dd504..435789ce 100644
--- a/kalarm/templatelistview.cpp
+++ b/kalarm/templatelistview.cpp
@@ -35,17 +35,17 @@
 TQValueList<EventListViewBase*>  TemplateListView::mInstanceList;
 
 
-TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent, const char* name)
-	: EventListViewBase(parent, name),
+TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent, const char* name)
+	: EventListViewBase(tqparent, name),
 	  mWhatsThisText(whatsThisText),
 	  mIconColumn(0),
 	  mNameColumn(1),
 	  mExcludeCmdAlarms(!includeCmdAlarms)
 {
-	addColumn(TQString::null);          // icon column
+	addColumn(TQString());          // icon column
 	addLastColumn(i18n("Name"));
 	setSorting(mNameColumn);           // sort initially by name
-	setColumnAlignment(mIconColumn, Qt::AlignHCenter);
+	setColumnAlignment(mIconColumn, TQt::AlignHCenter);
 	setColumnWidthMode(mIconColumn, TQListView::Maximum);
 
 	mInstanceList.append(this);
@@ -92,8 +92,8 @@ TQString TemplateListView::whatsThisText(int column) const
 =  Contains the details of one alarm for display in the TemplateListView.
 =============================================================================*/
 
-TemplateListViewItem::TemplateListViewItem(TemplateListView* parent, const KAEvent& event)
-	: EventListViewItemBase(parent, event)
+TemplateListViewItem::TemplateListViewItem(TemplateListView* tqparent, const KAEvent& event)
+	: EventListViewItemBase(tqparent, event)
 {
 	setLastColumnText();     // set the template name column text
 
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 0a629eb3..512b1ad9 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -34,7 +34,7 @@ class TemplateListView;
 class TemplateListViewItem : public EventListViewItemBase
 {
 	public:
-		TemplateListViewItem(TemplateListView* parent, const KAEvent&);
+		TemplateListViewItem(TemplateListView* tqparent, const KAEvent&);
 		TemplateListView*      templateListView() const  { return (TemplateListView*)listView(); }
 		// Overridden base class methods
 		TemplateListViewItem*  nextSibling() const       { return (TemplateListViewItem*)TQListViewItem::nextSibling(); }
@@ -49,8 +49,9 @@ class TemplateListViewItem : public EventListViewItemBase
 class TemplateListView : public EventListViewBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0);
+		explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent = 0, const char* name = 0);
 		~TemplateListView();
 		int                    iconColumn() const     { return mIconColumn; }
 		int                    nameColumn() const     { return mNameColumn; }
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index de715198..e3229369 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -28,9 +28,10 @@ class KAEvent;
 class TemplateMenuAction : public KActionMenu
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
-		                   const char* slot, KActionCollection* parent, const char* name = 0);
+		                   const char* slot, KActionCollection* tqparent, const char* name = 0);
 
 	signals:
 		void   selected(const KAEvent&);
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index 3df2d8dd..fd0a5ebf 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -34,8 +34,8 @@
 static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog";
 
 
-TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name)
-	: KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, parent, name)
+TemplatePickDlg::TemplatePickDlg(TQWidget* tqparent, const char* name)
+	: KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, tqparent, name)
 {
 	TQWidget* topWidget = plainPage();
 	TQBoxLayout* topLayout = new TQVBoxLayout(topWidget);
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index 2f003d91..7c99f6f3 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -29,8 +29,9 @@ class KAEvent;
 class TemplatePickDlg : public KDialogBase
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		TemplatePickDlg(TQWidget* parent = 0, const char* name = 0);
+		TemplatePickDlg(TQWidget* tqparent = 0, const char* name = 0);
 		const KAEvent*    selectedTemplate() const;
 	protected:
 		virtual void      resizeEvent(TQResizeEvent*);
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 31e69d74..0c88d93c 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -34,8 +34,8 @@
 
 
 TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
-                           const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name)
-	: TQFrame(parent, name),
+                           const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name)
+	: TQFrame(tqparent, name),
 	  mLabel(0),
 	  mReadOnly(false)
 {
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index a2b87242..1508194c 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -28,12 +28,13 @@ class TQLabel;
 class CheckBox;
 
 
-class TimeSelector : public QFrame
+class TimeSelector : public TQFrame
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
-		             const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0);
+		             const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
 		bool         isChecked() const;
 		void         setChecked(bool on);
 		int          minutes() const;
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 41fd9e4d..190cb538 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -50,10 +50,10 @@
 #include "traywindow.moc"
 
 
-class TrayTooltip : public QToolTip
+class TrayTooltip : public TQToolTip
 {
 	public:
-		TrayTooltip(TQWidget* parent) : TQToolTip(parent) { }
+		TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
 		virtual ~TrayTooltip() {}
 	protected:
 		virtual void maybeTip(const TQPoint&);
@@ -71,9 +71,9 @@ struct TipItem
 = The KDE system tray window.
 =============================================================================*/
 
-TrayWindow::TrayWindow(MainWindow* parent, const char* name)
-	: KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name),
-	  mAssocMainWindow(parent)
+TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
+	: KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name),
+	  mAssocMainWindow(tqparent)
 {
 	kdDebug(5950) << "TrayWindow::TrayWindow()\n";
 	// Set up GUI icons
@@ -87,7 +87,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
 	KActionCollection* actcol = actionCollection();
 	AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
 	a->plug(contextMenu());
-	connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool)));
+	connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool)));
 	KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
 	KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
 	KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
@@ -99,8 +99,8 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
 	KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol);
 
 	// Set icon to correspond with the alarms enabled menu status
-	Daemon::checkStatus();
-	setEnabledStatus(Daemon::monitoringAlarms());
+	Daemon::checktqStatus();
+	setEnabledtqStatus(Daemon::monitoringAlarms());
 
 	mTooltip = new TrayTooltip(this);
 }
@@ -121,7 +121,7 @@ TrayWindow::~TrayWindow()
 void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu)
 {
 	KSystemTray::contextMenuAboutToShow(menu);     // needed for KDE <= 3.1 compatibility
-	Daemon::checkStatus();
+	Daemon::checktqStatus();
 }
 
 /******************************************************************************
@@ -160,9 +160,9 @@ void TrayWindow::slotQuit()
 * Called when the Alarms Enabled action status has changed.
 * Updates the alarms enabled menu item check state, and the icon pixmap.
 */
-void TrayWindow::setEnabledStatus(bool status)
+void TrayWindow::setEnabledtqStatus(bool status)
 {
-	kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n";
+	kdDebug(5950) << "TrayWindow::setEnabledtqStatus(" << (int)status << ")\n";
 	setPixmap(status ? mPixmapEnabled : mPixmapDisabled);
 }
 
@@ -316,7 +316,7 @@ void TrayWindow::removeWindow(MainWindow* win)
 /******************************************************************************
 * Check whether the widget is in the system tray.
 * Note that it is only sometime AFTER the show event that the system tray
-* becomes the widget's parent. So for a definitive status, call this method
+* becomes the widget's tqparent. So for a definitive status, call this method
 * only after waiting a bit...
 * Reply = true if the widget is in the system tray, or its status can't be determined.
 *       = false if it is not currently in the system tray.
@@ -324,18 +324,18 @@ void TrayWindow::removeWindow(MainWindow* win)
 bool TrayWindow::inSystemTray() const
 {
 #ifdef HAVE_X11_HEADERS
-	Window  xParent;    // receives parent window
+	Window  xParent;    // receives tqparent window
 	Window  root;
-	Window* children = 0;
-	unsigned int nchildren;
-	// Find the X parent window of the widget. This is not the same as the Qt parent widget.
-	if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
-		return true;    // error determining its parent X window
-	if (children)
-		XFree(children);
-
-	// If it is in the system tray, the system tray window will be its X parent.
-	// Otherwise, the root window will be its X parent.
+	Window* tqchildren = 0;
+	unsigned int ntqchildren;
+	// Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget.
+	if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren))
+		return true;    // error determining its tqparent X window
+	if (tqchildren)
+		XFree(tqchildren);
+
+	// If it is in the system tray, the system tray window will be its X tqparent.
+	// Otherwise, the root window will be its X tqparent.
 	return xParent != root;
 #else
 	return true;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
 */
 void TrayTooltip::maybeTip(const TQPoint&)
 {
-	TrayWindow* parent = (TrayWindow*)tqparentWidget();
+	TrayWindow* tqparent = (TrayWindow*)tqparentWidget();
 	TQString text;
 	if (Daemon::monitoringAlarms())
 		text = kapp->aboutData()->programName();
@@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&)
 		text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
 	kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
 	if (Preferences::tooltipAlarmCount())
-		parent->tooltipAlarmText(text);
-	tip(parent->rect(), text);
+		tqparent->tooltipAlarmText(text);
+	tip(tqparent->rect(), text);
 }
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index 7ca5c6e6..371082cc 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -32,8 +32,9 @@ class TrayTooltip;
 class TrayWindow : public KSystemTray
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		TrayWindow(MainWindow* parent, const char* name = 0);
+		TrayWindow(MainWindow* tqparent, const char* name = 0);
 		~TrayWindow();
 		void         removeWindow(MainWindow*);
 		MainWindow*  assocMainWindow() const               { return mAssocMainWindow; }
@@ -58,7 +59,7 @@ class TrayWindow : public KSystemTray
 		void         slotNewAlarm();
 		void         slotNewFromTemplate(const KAEvent&);
 		void         slotPreferences();
-		void         setEnabledStatus(bool status);
+		void         setEnabledtqStatus(bool status);
 
 	private:
 		friend class TrayTooltip;
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index e1998e9c..c3b56612 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -41,19 +41,19 @@ class UndoItem
 {
 	public:
 		enum Operation { ADD, EDIT, DELETE, REACTIVATE, DEACTIVATE, MULTI };
-		UndoItem();           // needed by QValueList
+		UndoItem();           // needed by TQValueList
 		virtual ~UndoItem();
 		virtual Operation operation() const = 0;
 		virtual TQString   actionText() const = 0;
-		virtual TQString   description() const   { return TQString::null; }
-		virtual TQString   eventID() const       { return TQString::null; }
-		virtual TQString   oldEventID() const    { return TQString::null; }
-		virtual TQString   newEventID() const    { return TQString::null; }
+		virtual TQString   description() const   { return TQString(); }
+		virtual TQString   eventID() const       { return TQString(); }
+		virtual TQString   oldEventID() const    { return TQString(); }
+		virtual TQString   newEventID() const    { return TQString(); }
 		int               id() const            { return mId; }
 		Undo::Type        type() const          { return mType; }
 		void              setType(Undo::Type t) { mType = t; }
-		KAEvent::Status   calendar() const      { return mCalendar; }
-		virtual void      setCalendar(KAEvent::Status s) { mCalendar = s; }
+		KAEvent::tqStatus   calendar() const      { return mCalendar; }
+		virtual void      setCalendar(KAEvent::tqStatus s) { mCalendar = s; }
 		virtual UndoItem* restore() = 0;
 		virtual bool      deleteID(const TQString& /*id*/)  { return false; }
 
@@ -66,13 +66,13 @@ class UndoItem
 
 	protected:
 		UndoItem(Undo::Type);
-		static TQString    addDeleteActionText(KAEvent::Status, bool add);
+		static TQString    addDeleteActionText(KAEvent::tqStatus, bool add);
 		TQString           description(const KAEvent&) const;
-		void              tqreplaceWith(UndoItem* item)   { Undo::tqreplace(this, item); }
+		void              replaceWith(UndoItem* item)   { Undo::tqreplace(this, item); }
 
 		int               mId;     // unique identifier (only for mType = UNDO, REDO)
 		Undo::Type        mType;   // which list (if any) the object is in
-		KAEvent::Status   mCalendar;
+		KAEvent::tqStatus   mCalendar;
 };
 
 class UndoMultiBase : public UndoItem
@@ -101,7 +101,7 @@ class UndoAdd : public UndoItem
 {
 	public:
 		UndoAdd(Undo::Type, const KAEvent&);
-		UndoAdd(Undo::Type, const KAEvent&, KAEvent::Status);
+		UndoAdd(Undo::Type, const KAEvent&, KAEvent::tqStatus);
 		virtual Operation operation() const     { return ADD; }
 		virtual TQString   actionText() const;
 		virtual TQString   description() const   { return mDescription; }
@@ -298,7 +298,7 @@ void Undo::removeRedos(const TQString& eventID)
 		{
 			if (item->deleteID(id))
 			{
-				// The old multi-redo was tqreplaced with a new single redo
+				// The old multi-redo was replaced with a new single redo
 				delete item;
 			}
 			++it;
@@ -320,7 +320,7 @@ void Undo::removeRedos(const TQString& eventID)
 *  Undo or redo a specified item.
 *  Reply = true if success, or if the item no longer exists.
 */
-bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQString& action)
+bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQString& action)
 {
 	UndoItem::mRestoreError   = UndoItem::ERR_NONE;
 	UndoItem::mRestoreWarning = UndoItem::WARN_NONE;
@@ -347,7 +347,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt
 				default:
 					return true;
 			}
-			KAlarm::displayKOrgUpdateError(parent, errcode, UndoItem::mRestoreWarningCount);
+			KAlarm::displayKOrgUpdateError(tqparent, errcode, UndoItem::mRestoreWarningCount);
 			return true;
 		}
 		case UndoItem::ERR_NOT_FOUND:  err = i18n("Alarm not found");  break;
@@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt
 		case UndoItem::ERR_PROG:       err = i18n("Program error");  break;
 		default:                       err = i18n("Unknown error");  break;
 	}
-	KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err));
+	KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err));
 	return false;
 }
 
@@ -404,7 +404,7 @@ void Undo::tqreplace(UndoItem* old, UndoItem* New)
 	List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0;
 	if (!list)
 		return;
-	Iterator it = list->find(old);
+	Iterator it = list->tqfind(old);
 	if (it != list->end())
 	{
 		New->setType(type);    // ensure the item points to the correct list
@@ -419,7 +419,7 @@ void Undo::tqreplace(UndoItem* old, UndoItem* New)
 TQString Undo::actionText(Undo::Type type)
 {
 	List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0;
-	return (list && !list->isEmpty()) ? list->first()->actionText() : TQString::null;
+	return (list && !list->isEmpty()) ? list->first()->actionText() : TQString();
 }
 
 /******************************************************************************
@@ -428,7 +428,7 @@ TQString Undo::actionText(Undo::Type type)
 TQString Undo::actionText(Undo::Type type, int id)
 {
 	UndoItem* undo = getItem(id, type);
-	return undo ? undo->actionText() : TQString::null;
+	return undo ? undo->actionText() : TQString();
 }
 
 /******************************************************************************
@@ -437,7 +437,7 @@ TQString Undo::actionText(Undo::Type type, int id)
 TQString Undo::description(Undo::Type type, int id)
 {
 	UndoItem* undo = getItem(id, type);
-	return undo ? undo->description() : TQString::null;
+	return undo ? undo->description() : TQString();
 }
 
 /******************************************************************************
@@ -468,7 +468,7 @@ TQValueList<int> Undo::ids(Undo::Type type)
 			for (Undo::List::ConstIterator u = undos.begin();  u != undos.end();  ++u)
 			{
 				TQString evid = (*u)->eventID();
-				if (ignoreIDs.find(evid) != ignoreIDs.end())
+				if (ignoreIDs.tqfind(evid) != ignoreIDs.end())
 					omit = true;
 				else if (omit)
 					ignoreIDs.append(evid);
@@ -483,7 +483,7 @@ TQValueList<int> Undo::ids(Undo::Type type)
 		}
 		else
 		{
-			omit = (ignoreIDs.find(item->eventID()) != ignoreIDs.end());
+			omit = (ignoreIDs.tqfind(item->eventID()) != ignoreIDs.end());
 			if (!omit)
 				ignoreIDs.append(item->eventID());
 			if (item->operation() == UndoItem::EDIT)
@@ -586,7 +586,7 @@ TQString UndoItem::description(const KAEvent& event) const
 /******************************************************************************
 *  Return the action description of an add or delete Undo/Redo item for displaying.
 */
-TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add)
+TQString UndoItem::addDeleteActionText(KAEvent::tqStatus calendar, bool add)
 {
 	switch (calendar)
 	{
@@ -605,7 +605,7 @@ TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add)
 		default:
 			break;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -654,8 +654,8 @@ UndoItem* UndoMulti<T>::restore()
 /******************************************************************************
 *  If one of the multiple items has the specified ID, delete it.
 *  If an item is deleted and there is only one item left, the UndoMulti
-*  instance is removed from its list and tqreplaced by the remaining UndoItem instead.
-*  Reply = true if this instance was tqreplaced. The caller must delete it.
+*  instance is removed from its list and replaced by the remaining UndoItem instead.
+*  Reply = true if this instance was replaced. The caller must delete it.
 *        = false otherwise.
 */
 template <class T>
@@ -672,7 +672,7 @@ bool UndoMulti<T>::deleteID(const TQString& id)
 			{
 				// There is only one entry left after removal.
 				// Replace 'this' multi instance with the remaining single entry.
-				tqreplaceWith(item);
+				replaceWith(item);
 				return true;
 			}
 			else
@@ -695,11 +695,11 @@ UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event)
 	: UndoItem(type),
 	  mEventID(event.id())
 {
-	setCalendar(KAEvent::uidStatus(mEventID));
+	setCalendar(KAEvent::uidtqStatus(mEventID));
 	mDescription = UndoItem::description(event);    // calendar must be set before calling this
 }
 
-UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::Status cal)
+UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::tqStatus cal)
 	: UndoItem(type),
 	  mEventID(KAEvent::uid(event.id(), cal))
 {
@@ -793,7 +793,7 @@ UndoEdit::UndoEdit(Undo::Type type, const KAEvent& oldEvent, const TQString& new
 	  mNewEventID(newEventID),
 	  mDescription(description)
 {
-	setCalendar(KAEvent::uidStatus(mNewEventID));
+	setCalendar(KAEvent::uidtqStatus(mNewEventID));
 }
 
 UndoEdit::~UndoEdit()
@@ -867,7 +867,7 @@ TQString UndoEdit::actionText() const
 		default:
 			break;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -880,7 +880,7 @@ UndoDelete::UndoDelete(Undo::Type type, const KAEvent& event)
 	: UndoItem(type),
 	  mEvent(new KAEvent(event))
 {
-	setCalendar(KAEvent::uidStatus(mEvent->id()));
+	setCalendar(KAEvent::uidtqStatus(mEvent->id()));
 }
 
 UndoDelete::~UndoDelete()
@@ -998,7 +998,7 @@ UndoItem* UndoDeletes::createRedo(Undo::List& undos)
 TQString UndoDeletes::actionText() const
 {
 	if (mUndos.isEmpty())
-		return TQString::null;
+		return TQString();
 	for (Undo::List::ConstIterator it = mUndos.begin();  it != mUndos.end();  ++it)
 	{
 		switch ((*it)->calendar())
@@ -1010,7 +1010,7 @@ TQString UndoDeletes::actionText() const
 			case KAEvent::EXPIRED:
 				break;    // check if they are ALL expired
 			default:
-				return TQString::null;
+				return TQString();
 		}
 	}
 	return i18n("Delete multiple expired alarms");
diff --git a/kalarm/undo.h b/kalarm/undo.h
index cca197f8..0f65cb9f 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -30,9 +30,10 @@ class KAEvent;
 class UndoItem;
 
 
-class Undo : public QObject
+class Undo : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum Type { NONE, UNDO, REDO };
 
@@ -43,14 +44,14 @@ class Undo : public QObject
 		static void        saveDeletes(const TQValueList<KAEvent>&);
 		static void        saveReactivate(const KAEvent&);
 		static void        saveReactivates(const TQValueList<KAEvent>&);
-		static bool        undo(TQWidget* parent, const TQString& action)
-		                                      { return undo(mUndoList.begin(), UNDO, parent, action); }
-		static bool        undo(int id, TQWidget* parent, const TQString& action)
-		                                      { return undo(findItem(id, UNDO), UNDO, parent, action); }
-		static bool        redo(TQWidget* parent, const TQString& action)
-		                                      { return undo(mRedoList.begin(), REDO, parent, action); }
-		static bool        redo(int id, TQWidget* parent, const TQString& action)
-		                                      { return undo(findItem(id, REDO), REDO, parent, action); }
+		static bool        undo(TQWidget* tqparent, const TQString& action)
+		                                      { return undo(mUndoList.begin(), UNDO, tqparent, action); }
+		static bool        undo(int id, TQWidget* tqparent, const TQString& action)
+		                                      { return undo(findItem(id, UNDO), UNDO, tqparent, action); }
+		static bool        redo(TQWidget* tqparent, const TQString& action)
+		                                      { return undo(mRedoList.begin(), REDO, tqparent, action); }
+		static bool        redo(int id, TQWidget* tqparent, const TQString& action)
+		                                      { return undo(findItem(id, REDO), REDO, tqparent, action); }
 		static void        clear();
 		static bool        haveUndo()         { return !mUndoList.isEmpty(); }
 		static bool        haveRedo()         { return !mRedoList.isEmpty(); }
@@ -75,9 +76,9 @@ class Undo : public QObject
 	private:
 		typedef TQValueList<UndoItem*>::Iterator Iterator;
 
-		Undo(TQObject* parent)  : TQObject(parent) { }
+		Undo(TQObject* tqparent)  : TQObject(tqparent) { }
 		static void        removeRedos(const TQString& eventID);
-		static bool        undo(Iterator, Type, TQWidget* parent, const TQString& action);
+		static bool        undo(Iterator, Type, TQWidget* tqparent, const TQString& action);
 		static UndoItem*   getItem(int id, Type);
 		static Iterator    findItem(int id, Type);
 		void               emitChanged(const TQString& undo, const TQString& redo)
diff --git a/kandy/COPYING b/kandy/COPYING
index 0b84a43f..0a56ad07 100644
--- a/kandy/COPYING
+++ b/kandy/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kandy/RELEASENOTES b/kandy/RELEASENOTES
index f40c0f81..8527e34e 100644
--- a/kandy/RELEASENOTES
+++ b/kandy/RELEASENOTES
@@ -1,7 +1,7 @@
 Kandy 0.5.1 (18.11.2004)
 ------------------------
 
-+ Support of user-defined baud rates via setting in serial device configuration
++ Support of user-defined baud rates via setting in serial tqdevice configuration
   dialog.
 
 + Full support for SIM phone books starting with an entry != 1 and having an
@@ -65,7 +65,7 @@ Kandy 0.5 (16.11.2004)
 
 + The GUI is heavily restructured and simplified.
 
-+ All the improvements of Kandy 0.5 were tested with the following devices:
++ All the improvements of Kandy 0.5 were tested with the following tqdevices:
    + Phones:
       - Siemens ME45
       - Siemens C65
diff --git a/kandy/configure.in.in b/kandy/configure.in.in
index c21c2e30..7d1a00af 100644
--- a/kandy/configure.in.in
+++ b/kandy/configure.in.in
@@ -1,4 +1,4 @@
-# check for lockdev, optionally used to lock serial device
+# check for lockdev, optionally used to lock serial tqdevice
 AH_TEMPLATE(HAVE_LOCKDEV)
 AC_CHECK_HEADERS(lockdev.h, HAVE_LOCKDEV_H=1, HAVE_LOCKDEV_H=)
 AC_SUBST(HAVE_LOCKDEV_H)
diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index 87a2cfdc..e43814b4 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "atcommand.h"
@@ -112,7 +112,7 @@ TQString ATCommand::cmdString()
 TQString ATCommand::cmd()
 {
   if (mParameters.count() > 0) {
-    TQString cmd = cmdString().left(cmdString().find("=") + 1);
+    TQString cmd = cmdString().left(cmdString().tqfind("=") + 1);
 //    kdDebug() << "--1-cmd: " << cmd << endl;
     for(uint i=0;i<mParameters.count();++i) {
       cmd += mParameters.at(i)->value();
@@ -157,7 +157,7 @@ void ATCommand::setResultString(const TQString &resultString)
 
 void ATCommand::setResultFields( TQString fieldsString )
 {
-  TQString id = mId.upper().left( mId.find( '=' ) );
+  TQString id = mId.upper().left( mId.tqfind( '=' ) );
   
 
   // Truncate the command name prepended to the output by the modem.
@@ -267,7 +267,7 @@ void ATCommand::setParameter(int index,int value)
 TQString ATCommand::processOutput(const TQString &output)
 {
   if (hexOutput()) {
-    TQString hexString = output.mid(output.find('\n')+1);
+    TQString hexString = output.mid(output.tqfind('\n')+1);
     int i=0;
     TQString aChar = hexString.mid(i,2);
     TQString result;
@@ -295,7 +295,7 @@ void ATCommand::extractParameters()
 {
 //  kdDebug() << "Arg String: " << cmdString() << endl;
   
-  int pos = cmdString().find("=");
+  int pos = cmdString().tqfind("=");
   if (pos < 0) return;
   
   TQString paraString = cmdString().mid(pos+1);
diff --git a/kandy/src/atcommand.h b/kandy/src/atcommand.h
index f8f8f6a3..4e6e864a 100644
--- a/kandy/src/atcommand.h
+++ b/kandy/src/atcommand.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef ATCOMMAND_H
 #define ATCOMMAND_H
diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp
index f9667c26..b71a62f2 100644
--- a/kandy/src/cmdpropertiesdialog.cpp
+++ b/kandy/src/cmdpropertiesdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlistview.h>
@@ -36,8 +36,8 @@
 
 class ParameterItem : public TQCheckListItem {
   public:
-    ParameterItem(ATParameter *p,TQListView *parent) :
-        TQCheckListItem(parent,p->name(),CheckBox),mParameter(p)
+    ParameterItem(ATParameter *p,TQListView *tqparent) :
+        TQCheckListItem(tqparent,p->name(),CheckBox),mParameter(p)
     {
       setText(1,p->value());
       setOn(p->userInput());
@@ -56,16 +56,16 @@ class ParameterItem : public TQCheckListItem {
 
 
 /* 
- *  Constructs a CmdPropertiesDialog which is a child of 'parent', with the 
+ *  Constructs a CmdPropertiesDialog which is a child of 'tqparent', with the 
  *  name 'name' and widget flags set to 'f' 
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* parent,
+CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* tqparent,
                                          const char* name, bool modal,
                                          WFlags fl )
-    : CmdPropertiesDialog_base( parent, name, modal, fl )
+    : CmdPropertiesDialog_base( tqparent, name, modal, fl )
 {
   mCmd = cmd;
   
@@ -105,7 +105,7 @@ void CmdPropertiesDialog::editParameterName(TQListViewItem *item)
 {
   bool ok = false;
 
-  TQString newName = KInputDialog::getText(TQString::null,
+  TQString newName = KInputDialog::getText(TQString(),
                         i18n("Enter parameter name:"),item->text(0),&ok,this);
 
   if (ok) {
diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h
index ee37852a..05242515 100644
--- a/kandy/src/cmdpropertiesdialog.h
+++ b/kandy/src/cmdpropertiesdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef CMDPROPERTIESDIALOG_H
 #define CMDPROPERTIESDIALOG_H
@@ -31,8 +31,9 @@ class ATCommand;
 class CmdPropertiesDialog : public CmdPropertiesDialog_base
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
+    CmdPropertiesDialog(ATCommand *cmd,TQWidget* tqparent=0,const char* name=0,
                         bool modal=false,WFlags fl=0);
     ~CmdPropertiesDialog();
 
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 7231a6be..57359e3e 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CmdPropertiesDialog_base</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CmdPropertiesDialog_base</cstring>
     </property>
@@ -28,17 +28,17 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>mNameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>mStringEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <string>Name:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -54,7 +54,7 @@
                 <string>String:</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>mHexCheck</cstring>
             </property>
@@ -62,7 +62,7 @@
                 <string>Hex result</string>
             </property>
         </widget>
-        <widget class="QListView" row="2" column="0" rowspan="1" colspan="4">
+        <widget class="TQListView" row="2" column="0" rowspan="1" colspan="4">
             <column>
                 <property name="text">
                     <string>Position</string>
@@ -117,7 +117,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="4" column="2">
+        <widget class="TQPushButton" row="4" column="2">
             <property name="name">
                 <cstring>buttonOk</cstring>
             </property>
@@ -131,7 +131,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="3">
+        <widget class="TQPushButton" row="4" column="3">
             <property name="name">
                 <cstring>buttonCancel</cstring>
             </property>
@@ -164,9 +164,9 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>editParameterName(QListViewItem *)</slot>
     <slot access="protected">slotAccept()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/commanditem.cpp b/kandy/src/commanditem.cpp
index 4785e89f..f8eceb2c 100644
--- a/kandy/src/commanditem.cpp
+++ b/kandy/src/commanditem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqdom.h>
@@ -70,13 +70,13 @@ void CommandItem::load(TQDomElement *c)
   setItemText();
 }
 
-void CommandItem::save(TQDomDocument *doc,TQDomElement *parent)
+void CommandItem::save(TQDomDocument *doc,TQDomElement *tqparent)
 {
   TQDomElement c = doc->createElement("command");
   c.setAttribute("name",mCommand->cmdName());
   c.setAttribute("string",mCommand->cmdString());
   c.setAttribute("hexoutput",mCommand->hexOutput() ? "y" : "n");
-  parent->appendChild(c);
+  tqparent->appendChild(c);
   
   TQPtrList<ATParameter> paras = mCommand->parameters();
   for(uint i=0;i<paras.count();++i) {
@@ -85,13 +85,13 @@ void CommandItem::save(TQDomDocument *doc,TQDomElement *parent)
 }
 
 void CommandItem::saveParameter(ATParameter *p, TQDomDocument *doc,
-                                TQDomElement *parent)
+                                TQDomElement *tqparent)
 {
   TQDomElement e = doc->createElement("parameter");
   e.setAttribute("name",p->name());
   e.setAttribute("value",p->value());
   e.setAttribute("userinput",p->userInput() ? "y" : "n");
-  parent->appendChild(e);
+  tqparent->appendChild(e);
 }
 
 void CommandItem::setItemText()
diff --git a/kandy/src/commanditem.h b/kandy/src/commanditem.h
index 39d4a821..d92c9e74 100644
--- a/kandy/src/commanditem.h
+++ b/kandy/src/commanditem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _COMMAND_ITEM_H_
@@ -43,12 +43,12 @@ class CommandItem : public TQListViewItem {
     ATCommand *command();
 
     void load(TQDomElement *c);
-    void save(TQDomDocument *doc,TQDomElement *parent);
+    void save(TQDomDocument *doc,TQDomElement *tqparent);
     
     void setItemText();
 
   protected:
-    void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent);
+    void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent);
   
   private:
     ATCommand *mCommand;
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index bef11cac..3a1001ed 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kdebug.h>
@@ -30,9 +30,9 @@
 #include "commandscheduler.h"
 #include "commandscheduler.moc"
 
-CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent,
+CommandScheduler::CommandScheduler(Modem *modem,TQObject *tqparent,
                                    const char *name) :
-  TQObject(parent,name),
+  TQObject(tqparent,name),
   mModem(modem)
 {
   connect(mModem,TQT_SIGNAL(gotLine(const char *)),
diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h
index 231ad325..d18f82dc 100644
--- a/kandy/src/commandscheduler.h
+++ b/kandy/src/commandscheduler.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef COMMANDSCHEDULER_H
 #define COMMANDSCHEDULER_H
@@ -34,8 +34,9 @@ class Modem;
 
 class CommandScheduler : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
+    CommandScheduler (Modem *modem,TQObject *tqparent = 0, const char *name = 0);
 
     void execute(const TQString &command);
     void execute(ATCommand *command);
diff --git a/kandy/src/commandset.cpp b/kandy/src/commandset.cpp
index 17a50b81..d1bcc631 100644
--- a/kandy/src/commandset.cpp
+++ b/kandy/src/commandset.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqdom.h>
@@ -129,13 +129,13 @@ void CommandSet::loadCommand(ATCommand *command,TQDomElement *c)
 }
 
 void CommandSet::saveCommand(ATCommand *command,TQDomDocument *doc,
-                             TQDomElement *parent)
+                             TQDomElement *tqparent)
 {
   TQDomElement c = doc->createElement("command");
   c.setAttribute("name",command->cmdName());
   c.setAttribute("string",command->cmdString());
   c.setAttribute("hexoutput",command->hexOutput() ? "y" : "n");
-  parent->appendChild(c);
+  tqparent->appendChild(c);
   
   TQPtrList<ATParameter> paras = command->parameters();
   for(uint i=0;i<paras.count();++i) {
@@ -144,11 +144,11 @@ void CommandSet::saveCommand(ATCommand *command,TQDomDocument *doc,
 }
 
 void CommandSet::saveParameter(ATParameter *p, TQDomDocument *doc,
-                               TQDomElement *parent)
+                               TQDomElement *tqparent)
 {
   TQDomElement e = doc->createElement("parameter");
   e.setAttribute("name",p->name());
   e.setAttribute("value",p->value());
   e.setAttribute("userinput",p->userInput() ? "y" : "n");
-  parent->appendChild(e);
+  tqparent->appendChild(e);
 }
diff --git a/kandy/src/commandset.h b/kandy/src/commandset.h
index 8c3cbc42..d297fe63 100644
--- a/kandy/src/commandset.h
+++ b/kandy/src/commandset.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef COMMANDSET_H
 #define COMMANDSET_H
@@ -51,8 +51,8 @@ class CommandSet {
     
   protected:
     void loadCommand(ATCommand *,TQDomElement *c);
-    void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *parent);
-    void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent);
+    void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *tqparent);
+    void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent);
   
   private:
     TQPtrList<ATCommand> mList;
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 95bf20ac..4766947a 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlineedit.h>
@@ -175,7 +175,7 @@ void Kandy::dragEnterEvent(TQDragEnterEvent *event)
 void Kandy::dropEvent(TQDropEvent *event)
 {
     // this is a very simplistic implementation of a drop event.  we
-    // will only accept a dropped URL.  the Qt dnd code can do *much*
+    // will only accept a dropped URL.  the TQt dnd code can do *much*
     // much more, so please read the docs there
 
     // do nothing
@@ -227,7 +227,7 @@ void Kandy::filePrint()
     if (!mPrinter) mPrinter = new TQPrinter;
     if (TQPrintDialog::getPrinterSetup(mPrinter))
     {
-        // setup the printer.  with Qt, you always "print" to a
+        // setup the printer.  with TQt, you always "print" to a
         // TQPainter.. whether the output medium is a pixmap, a screen,
         // or paper
         TQPainter p;
@@ -300,7 +300,7 @@ bool Kandy::queryClose()
 {
   if (mView->isModified()) {
     switch (KMessageBox::warningYesNoCancel(this,
-        i18n("Save changes to profile %1?").arg(mFilename), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard())) {
+        i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
       case KMessageBox::Yes :
         fileSave();
         return true;
@@ -318,7 +318,7 @@ void Kandy::modemConnect()
 {
   if (!mScheduler->modem()->open()) {
     KMessageBox::sorry(this,
-        i18n("Cannot open modem device %1.")
+        i18n("Cannot open modem tqdevice %1.")
         .arg(KandyPrefs::serialDevice()), i18n("Modem Error"));
     return;
   }
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index e2a7754b..a81208de 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KANDY_H
 #define KANDY_H
@@ -48,6 +48,7 @@ class KandyPrefsDialog;
 class Kandy : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
      * Default Constructor
@@ -78,7 +79,7 @@ class Kandy : public KMainWindow
 
   protected:
     /**
-     * Overridden virtuals for Qt drag 'n drop (XDND)
+     * Overridden virtuals for TQt drag 'n drop (XDND)
      */
     virtual void dragEnterEvent(TQDragEnterEvent *event);
     virtual void dropEvent(TQDropEvent *event);
diff --git a/kandy/src/kandy.kcfg b/kandy/src/kandy.kcfg
index a93f674b..f8d44ab3 100644
--- a/kandy/src/kandy.kcfg
+++ b/kandy/src/kandy.kcfg
@@ -7,7 +7,7 @@
 
   <group name="Serial Port">
     <entry type="String" key="Serial Device">
-      <label>Serial device</label>
+      <label>Serial tqdevice</label>
       <default>/dev/ttyS1</default>
     </entry>
     <entry type="String" key="Baud Rate">
diff --git a/kandy/src/kandy_client.cpp b/kandy/src/kandy_client.cpp
index b927afc3..2aba3b35 100644
--- a/kandy/src/kandy_client.cpp
+++ b/kandy/src/kandy_client.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kapplication.h>
diff --git a/kandy/src/kandyiface.h b/kandy/src/kandyiface.h
index 3b45bd01..49c9484b 100644
--- a/kandy/src/kandyiface.h
+++ b/kandy/src/kandyiface.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KANDYIFACE_H
 #define KANDYIFACE_H
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index d98989dc..1e233aaa 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -54,8 +54,8 @@
 #include "kandyprefsdialog.moc"
 
 
-KandyPrefsDialog::KandyPrefsDialog(TQWidget *parent, char *name, bool modal) :
-  KPrefsDialog(KandyPrefs::self(),parent,name,modal)
+KandyPrefsDialog::KandyPrefsDialog(TQWidget *tqparent, char *name, bool modal) :
+  KPrefsDialog(KandyPrefs::self(),tqparent,name,modal)
 {
   setupSerialTab();
   setupAddressbookTab();
@@ -81,7 +81,7 @@ void KandyPrefsDialog::setupSerialTab()
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   
-  // Define serial device
+  // Define serial tqdevice
   serialDevice = addWidString( KandyPrefs::self()->serialDeviceItem(),
                                topFrame );
   topLayout->addWidget(serialDevice->label(),0,0);
diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h
index 7929e92d..886e3504 100644
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _KANDYPREFSDIALOG_H
@@ -42,9 +42,10 @@
 class KandyPrefsDialog : public KPrefsDialog
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /** Initialize dialog and pages */
-    KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false);
+    KandyPrefsDialog(TQWidget *tqparent=0,char *name=0,bool modal=false);
     ~KandyPrefsDialog();
 
   protected:
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 27d3b7b6..38fcb9cb 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <unistd.h>
@@ -57,8 +57,8 @@
 #include "kandyview.h"
 #include "kandyview.moc"
 
-KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
-    : TQWidget(parent)
+KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
+    : TQWidget(tqparent)
 {
   mModified = false;
   mScheduler = scheduler;
@@ -249,8 +249,8 @@ void KandyView::executeCommand()
       ATParameter *p = paraList.at(i);
       if (p->userInput()) {
         bool ok = false;
-        TQString value = KInputDialog::getText(TQString::null,
-            i18n("Enter value for %1:").arg(p->name()),TQString::null,&ok,this);
+        TQString value = KInputDialog::getText(TQString(),
+            i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this);
         if (!ok)
           return;
         p->setValue(value);
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index 7c1a1c7a..41153a54 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KANDYVIEW_H
 #define KANDYVIEW_H
@@ -48,14 +48,15 @@ class CmdPropertiesDialog;
   @short Main view
   @author Cornelius Schumacher <schumacher@kde.org>
 */
-class KandyView : public QWidget
+class KandyView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
 	/**
 	 * Default constructor
 	 */
-    KandyView(CommandScheduler *,TQWidget *parent);
+    KandyView(CommandScheduler *,TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index 982a1a7f..d323379c 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqfile.h>
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index fec40b7f..08cf54cc 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <time.h>
@@ -148,7 +148,7 @@ class AddressSyncer
 };
 
 
-class PhoneBookItem : public QCheckListItem
+class PhoneBookItem : public TQCheckListItem
 {
   public:
     PhoneBookItem( TQListView *v ) :
@@ -176,21 +176,21 @@ class PhoneBookItem : public QCheckListItem
 
 
 /* 
- *  Constructs a MobileGui which is a child of 'parent', with the 
+ *  Constructs a MobileGui which is a child of 'tqparent', with the 
  *  name 'name' and widget flags set to 'f' 
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs,
-                      TQWidget* parent, const char* name, WFlags fl ) :
-  DCOPObject( "KandyIface" ), MobileGui_base( parent, name, fl )
+                      TQWidget* tqparent, const char* name, WFlags fl ) :
+  DCOPObject( "KandyIface" ), MobileGui_base( tqparent, name, fl )
 {
   // Setup links to related classes
   mScheduler = scheduler;
   mSyncer = new AddressSyncer;
   mPrefs = kprefs;
-  mparent = parent;
+  mtqparent = tqparent;
 
   // Setup mobile phone specific data
   mMobManufacturer = "";
@@ -922,7 +922,7 @@ void MobileGui::writeKabc()
         *fields = TQStringList::split( ',', name );
 	
 	if ( fields->count() > 1 ) {
-	  // Name string tqcontains comma separated entry so that we
+	  // Name string contains comma separated entry so that we
 	  // need to build family and given names out of them.
 	  TQString givenName = "";
 	  
@@ -933,7 +933,7 @@ void MobileGui::writeKabc()
 	    givenName += stripWhiteSpaces( (*fields)[ i ] ) + " ";
 	  entry.setGivenName( stripWhiteSpaces( givenName ) );
 	} else
-	  // Name string tqcontains only one string without comma.
+	  // Name string contains only one string without comma.
 	  entry.setFamilyName( stripWhiteSpaces( name ) );
 
         entry.insertPhoneNumber( KABC::PhoneNumber( phoneNumber, phoneType ) );
@@ -954,7 +954,7 @@ void MobileGui::writeKabc()
 }
 
 
-void MobileGui::refreshStatus()
+void MobileGui::refreshtqStatus()
 {
   mScheduler->executeId( "+cbc" );
   mScheduler->executeId( "+csq" );
@@ -1453,7 +1453,7 @@ void MobileGui::toggleConnection()
     emit connectModem();
     
     readModelInformation();
-    refreshStatus();
+    refreshtqStatus();
     
     mConnectButton->setText( tr2i18n( "Disconnect" ) );
     PushButton1->setEnabled( true );
@@ -1463,7 +1463,7 @@ void MobileGui::toggleConnection()
     setKabState( UNLOADED );
     setMobState( UNLOADED );
 
-    ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Connected "), 1 );
+    ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Connected "), 1 );
   } else {
     warnKabState( UNLOADED );
 
@@ -1510,7 +1510,7 @@ void MobileGui::disconnectGUI()
   
   mPBIndexOccupied.resize( 0, false );
 
-  ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Disconnected "),
+  ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Disconnected "),
                                                      1 );
 }
 
@@ -1561,7 +1561,7 @@ void MobileGui::warnKabState( ABState newState )
 {
   if ( ( mKabState == MODIFIED ) && ( newState != MODIFIED ) ) {
     TQString text = "<qt><b>" + i18n( "Warning" ) + "</b><br>";
-    text += i18n( "The KDE address book tqcontains unsaved changes." ) +
+    text += i18n( "The KDE address book contains unsaved changes." ) +
             "<br></qt>";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
@@ -1646,7 +1646,7 @@ bool MobileGui::warnMobState( ABState newState )
   if ( ( mMobState == MODIFIED ) && ( newState != MODIFIED ) )
   {
     TQString text = "<qt><b>" + i18n( "Warning" ) + "</b><br>";
-    text += i18n( "The mobile phone book tqcontains unsaved changes." ) +
+    text += i18n( "The mobile phone book contains unsaved changes." ) +
             "<br></qt>";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index de698729..cb28f188 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef MOBILEGUI_H
 #define MOBILEGUI_H
@@ -39,9 +39,10 @@ class AddressSyncer;
 class MobileGui : public MobileGui_base, virtual public KandyIface
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0,
+    MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* tqparent=0,
                const char* name=0, WFlags fl=0 );
     ~MobileGui();
 
@@ -60,7 +61,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
     void readModelInformation();
     void readPhonebook();
     void savePhonebook();
-    void refreshStatus();
+    void refreshtqStatus();
     void writePhonebook();
     void readKabc();
     void writeKabc();
@@ -79,7 +80,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
     CommandScheduler *mScheduler;
     AddressSyncer *mSyncer;
     KandyPrefs *mPrefs;
-    TQWidget *mparent;
+    TQWidget *mtqparent;
     
     /* String Formatting Routines */
     TQString quote( const TQString & );
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 9379abab..ddb05499 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MobileGui_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MobileGui_base</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -42,7 +42,7 @@
             </property>
 	    <grid>
 
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -51,7 +51,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel3_2</cstring>
                     </property>
@@ -60,7 +60,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>mManufacturerLabel</cstring>
                     </property>
@@ -69,7 +69,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>mGSMVersionLabel</cstring>
                     </property>
@@ -78,7 +78,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>mSerialNumberLabel</cstring>
                     </property>
@@ -87,7 +87,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>mModelLabel</cstring>
                     </property>
@@ -96,7 +96,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -105,7 +105,7 @@
                     </property>
                 </widget>
 
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -133,11 +133,11 @@
                 </spacer>
 	    </grid>
         </widget>
-	<widget class="QTabWidget" row="1" column="0" colspan="2">
+	<widget class="TQTabWidget" row="1" column="0" colspan="2">
 	    <property name="name">
 	      <cstring>mTabWidget</cstring>
 	    </property>
-	    <widget class="QWidget">
+	    <widget class="TQWidget">
 	        <property name="name">
 		    <cstring>mABTab</cstring>
 		</property>
@@ -148,7 +148,7 @@
 		    <bool>false</bool>
 		</property>
 		<grid>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -159,7 +159,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView" row="0" column="0" rowspan="3" colspan="1">
+                            <widget class="TQListView" row="0" column="0" rowspan="3" colspan="1">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -189,7 +189,7 @@
                                     <enum>AllColumns</enum>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>mReadKabButton</cstring>
                                 </property>
@@ -214,7 +214,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>PushButton8</cstring>
                                 </property>
@@ -224,7 +224,7 @@
                             </widget>
                         </grid>
                     </widget>
-                     <widget class="QGroupBox" row="0" column="1">
+                     <widget class="TQGroupBox" row="0" column="1">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -235,7 +235,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>PushButton3</cstring>
                                 </property>
@@ -243,7 +243,7 @@
                                     <string>Read</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>PushButton12</cstring>
                                 </property>
@@ -268,7 +268,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton" row="2" column="1">
+                            <widget class="TQPushButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>PushButton4_2</cstring>
                                 </property>
@@ -276,7 +276,7 @@
                                     <string>Save to File...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="4" column="1">
+                            <widget class="TQPushButton" row="4" column="1">
                                 <property name="name">
                                     <cstring>MobDeleteButton</cstring>
                                 </property>
@@ -284,7 +284,7 @@
                                     <string>Delete</string>
                                 </property>
                             </widget>
-                            <widget class="QListView" row="0" column="0" rowspan="5" colspan="1">
+                            <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -316,7 +316,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>tqlayout21</cstring>
                         </property>
@@ -324,7 +324,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>PushButton8_3</cstring>
                                 </property>
@@ -353,7 +353,7 @@
                     </widget>
 		</grid>
 	    </widget>
-	    <widget class="QWidget">
+	    <widget class="TQWidget">
 	        <property name="name">
 		    <cstring>mTerminalTab</cstring>
 		</property>
@@ -361,7 +361,7 @@
 		    <string>Terminal</string>
 		</attribute>
 		<grid>
-		    <widget class="QTextEdit" row="0" column="0">
+		    <widget class="TQTextEdit" row="0" column="0">
 		        <property name="name">
 			    <cstring>mTermIO</cstring>
 			</property>
@@ -372,7 +372,7 @@
 		</grid>
 	    </widget>
 	</widget>
-        <widget class="QGroupBox" row="0" column="1">
+        <widget class="TQGroupBox" row="0" column="1">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -385,7 +385,7 @@
                 </sizepolicy>
             </property>
             <property name="title">
-                <string>Status</string>
+                <string>tqStatus</string>
             </property>
             <grid>
                 <property name="name">
@@ -397,15 +397,15 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
-                        <cstring>mStatus</cstring>
+                        <cstring>mtqStatus</cstring>
                     </property>
                     <property name="text">
                         <string>Battery charge:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -413,7 +413,7 @@
                         <string>Signal quality:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>mSignalQualityLabel</cstring>
                     </property>
@@ -421,7 +421,7 @@
                         <string>x</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>mBatteryChargeLabel</cstring>
                     </property>
@@ -445,7 +445,7 @@
                         </size>
                     </property>
                 </spacer>
-                        <widget class="QPushButton" row="3" column="0">
+                        <widget class="TQPushButton" row="3" column="0">
                             <property name="name">
                                 <cstring>mConnectButton</cstring>
                             </property>
@@ -464,7 +464,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                        <widget class="QPushButton" row="3" column="3">
+                        <widget class="TQPushButton" row="3" column="3">
                             <property name="name">
                                 <cstring>PushButton1</cstring>
                             </property>
@@ -475,7 +475,7 @@
 		                <bool>false</bool>
 		            </property>
                         </widget>
-                        <widget class="QPushButton" row="3" column="4">
+                        <widget class="TQPushButton" row="3" column="4">
                             <property name="name">
                                 <cstring>PushButton5_3</cstring>
                             </property>
@@ -537,7 +537,7 @@
         <sender>PushButton1</sender>
         <signal>clicked()</signal>
         <receiver>MobileGui_base</receiver>
-        <slot>refreshStatus()</slot>
+        <slot>refreshtqStatus()</slot>
     </connection>
     <connection>
         <sender>mConnectButton</sender>
@@ -565,11 +565,11 @@
     <tabstop>PushButton1</tabstop>
     <tabstop>PushButton8_3</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>readKabc()</slot>
     <slot>readModelInformation()</slot>
     <slot>readPhonebook()</slot>
-    <slot>refreshStatus()</slot>
+    <slot>refreshtqStatus()</slot>
     <slot>savePhonebook()</slot>
     <slot>setClock()</slot>
     <slot>syncPhonebooks()</slot>
@@ -578,6 +578,6 @@
     <slot>termAddOutput( const char *line )</slot>
     <slot>toggleConnection()</slot>
     <slot>deleteMobPhonebook()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 851b7829..7b39d8d3 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kglobal.h>
@@ -113,7 +113,7 @@ void MobileMain::dragEnterEvent(TQDragEnterEvent *event)
 void MobileMain::dropEvent(TQDropEvent *event)
 {
     // this is a very simplistic implementation of a drop event.  we
-    // will only accept a dropped URL.  the Qt dnd code can do *much*
+    // will only accept a dropped URL.  the TQt dnd code can do *much*
     // much more, so please read the docs there
 
     // do nothing
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index d414d15e..01ff1888 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef MOBILEMAIN_H
 #define MOBILEMAIN_H
@@ -46,6 +46,7 @@ class CommandScheduler;
 class MobileMain : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
      * Default Constructor
@@ -65,7 +66,7 @@ class MobileMain : public KMainWindow
 
   protected:
     /**
-     * Overridden virtuals for Qt drag 'n drop (XDND)
+     * Overridden virtuals for TQt drag 'n drop (XDND)
      */
     virtual void dragEnterEvent(TQDragEnterEvent *event);
     virtual void dropEvent(TQDropEvent *event);
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index a7d24695..4b085de6 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -74,8 +74,8 @@
 
 
 
-Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) :
-  TQObject(parent, name)
+Modem::Modem( KandyPrefs *kprefs, TQObject *tqparent, const char *name ) :
+  TQObject(tqparent, name)
 {
   mOpen = false;
   
@@ -194,7 +194,7 @@ bool Modem::open()
   TQCString dev = TQFile::encodeName( (*prefs).serialDevice() );
   const char *fdev = dev.data();
   if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) {
-    emit errorMessage( i18n( "Unable to open device '%1'. "
+    emit errorMessage( i18n( "Unable to open tqdevice '%1'. "
                              "Please check that you have sufficient permissions." )
                              .arg( fdev ) );
     return false;
@@ -279,7 +279,7 @@ bool Modem::lockDevice()
 #ifdef HAVE_LOCKDEV
   is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() );
   if (!is_locked)
-      emit errorMessage( i18n( "Unable to lock device '%1'." ).arg(
+      emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).arg(
                              (*prefs).serialDevice() ));
   return is_locked;
 #else
@@ -322,7 +322,7 @@ bool Modem::lockDevice()
     }
 
     if ( !kill( (pid_t) pid, 0 ) ) {
-       emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.")
+       emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.")
                                 .arg( pid ) );
        return false;
     }
diff --git a/kandy/src/modem.h b/kandy/src/modem.h
index 52321894..0b30a05b 100644
--- a/kandy/src/modem.h
+++ b/kandy/src/modem.h
@@ -43,11 +43,12 @@
 
 
 
-class Modem : public QObject
+class Modem : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);
+	Modem(KandyPrefs *kprefs, TQObject *tqparent = 0, const char *name = 0);
 	virtual ~Modem();
 
 	void setSpeed(int speed);
diff --git a/karm/TODO b/karm/TODO
index 12df8f5c..dd4b41a1 100644
--- a/karm/TODO
+++ b/karm/TODO
@@ -1,6 +1,6 @@
 * KarmWindow::makeMenus -> export KAction?  KarmWindow::contextMenuRequest
 * QPopupMenu should be static!  put connect( ..contextMenu at the right place
-* mainwindow: move tray signals into tray.cpp add mouse double-click action
+* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action
 * (start new timer, stop old) to "Configure
   Shortcuts" dialog.
 
diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp
index f1e0fce6..7cb7774f 100644
--- a/karm/csvexportdialog.cpp
+++ b/karm/csvexportdialog.cpp
@@ -33,10 +33,10 @@
 #include "reportcriteria.h"
 
 CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt,
-                                  TQWidget *parent, 
+                                  TQWidget *tqparent, 
                                   const char *name
                                   ) 
-  : CSVExportDialogBase( parent, name )
+  : CSVExportDialogBase( tqparent, name )
 {
   switch ( rt ) {
     case ReportCriteria::CSVTotalsExport:
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index fe13cf9c..51aaf3bd 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -27,10 +27,11 @@
 class CSVExportDialog : public CSVExportDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     CSVExportDialog( ReportCriteria::REPORTTYPE rt,
-                     TQWidget *parent = 0, 
+                     TQWidget *tqparent = 0, 
                      const char *name = 0
                      );
     
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 0c985127..8d4232af 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CSVExportDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CSVExportDialogBase</cstring>
     </property>
@@ -75,7 +75,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1_3</cstring>
             </property>
@@ -91,7 +91,7 @@
                 <string>The file where Karm will write the data.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>quotesLabel</cstring>
             </property>
@@ -110,7 +110,7 @@
                 <string>Quotes:</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="4" column="2" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="4" column="2" rowspan="1" colspan="2">
             <item>
                 <property name="text">
                     <string>"</string>
@@ -139,7 +139,7 @@
                 <string>All fields are quoted in the output.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>grpDateRange</cstring>
             </property>
@@ -156,7 +156,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -180,7 +180,7 @@
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -206,7 +206,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="4">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>grpTimeFormat</cstring>
             </property>
@@ -221,7 +221,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="1">
+                <widget class="TQRadioButton" row="0" column="1">
                     <property name="name">
                         <cstring>radioHoursMinutes</cstring>
                     </property>
@@ -232,7 +232,7 @@
                         <string>Hours:Minutes</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioDecimal</cstring>
                     </property>
@@ -245,7 +245,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="4">
+        <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>grpDelimiter</cstring>
             </property>
@@ -267,7 +267,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioTab</cstring>
                     </property>
@@ -275,7 +275,7 @@
                         <string>Tab</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="2">
+                <widget class="TQRadioButton" row="0" column="2">
                     <property name="name">
                         <cstring>radioOther</cstring>
                     </property>
@@ -283,7 +283,7 @@
                         <string>Other:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="1">
+                <widget class="TQRadioButton" row="1" column="1">
                     <property name="name">
                         <cstring>radioSpace</cstring>
                     </property>
@@ -291,7 +291,7 @@
                         <string>Space</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioComma</cstring>
                     </property>
@@ -302,7 +302,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="2">
+                <widget class="TQLineEdit" row="1" column="2">
                     <property name="name">
                         <cstring>txtOther</cstring>
                     </property>
@@ -330,7 +330,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="1">
+                <widget class="TQRadioButton" row="0" column="1">
                     <property name="name">
                         <cstring>radioSemicolon</cstring>
                     </property>
@@ -402,9 +402,9 @@
     <tabstop>btnExport</tabstop>
     <tabstop>btnCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>enableExportButton()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdateedit.h</includehint>
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 04f4d9d1..3c9e5e84 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>            // std::find
+#include <algorithm>            // std::tqfind
 
 #include <tqtimer.h>
 #include <kdebug.h>
@@ -84,7 +84,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
   if (desktopList.size()==0) {
     for (int i=0; i<maxDesktops; i++) {
       TaskVector *v = &(desktopTracker[i]);
-      TaskVector::iterator tit = std::find(v->begin(), v->end(), task);
+      TaskVector::iterator tit = std::tqfind(v->begin(), v->end(), task);
       if (tit != v->end())
         desktopTracker[i].erase(tit);
         // if the task was priviously tracking this desktop then
@@ -96,15 +96,15 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
     return;
   }
 
-  // If desktop tqcontains entries then configure desktopTracker
+  // If desktop contains entries then configure desktopTracker
   // If a desktop was disabled, it will not be stopped automatically.
   // If enabled: Start it now.
   if (desktopList.size()>0) {
     for (int i=0; i<maxDesktops; i++) {
       TaskVector& v = desktopTracker[i];
-      TaskVector::iterator tit = std::find(v.begin(), v.end(), task);
+      TaskVector::iterator tit = std::tqfind(v.begin(), v.end(), task);
       // Is desktop i in the desktop list?
-      if ( std::find( desktopList.begin(), desktopList.end(), i)
+      if ( std::tqfind( desktopList.begin(), desktopList.end(), i)
            != desktopList.end()) {
         if (tit == v.end())  // not yet in start vector
           v.push_back(task); // track in desk i
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index f7fdd69c..b24b7738 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -18,9 +18,10 @@ const int maxDesktops = 20;
  *  each task tracking that all tasks that want to track that desktop
  */
 
-class DesktopTracker: public QObject
+class DesktopTracker: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DesktopTracker();
@@ -33,7 +34,7 @@ class DesktopTracker: public QObject
     KWinModule kWinModule;
 
     // define vectors for at most 16 virtual desktops
-    // E.g.: desktopTrackerStop[3] tqcontains a vector with
+    // E.g.: desktopTrackerStop[3] contains a vector with
     // all tasks to be notified, when switching to/from desk 3.
     TaskVector desktopTracker[maxDesktops];
     int _previousDesktop;
diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox
index 7c8aee5f..4bb930f3 100644
--- a/karm/doc/Mainpage.dox
+++ b/karm/doc/Mainpage.dox
@@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same
 information.
 
 Preferences is a singleton that stores configuration options.  It raises
-signals when options change (for example, the location where the karm data is
+Q_SIGNALS when options change (for example, the location where the karm data is
 stored) so the application can react and adjust.
 
 KarmStorage is a singleton that creates an interface for storing KArm data.
@@ -35,7 +35,7 @@ format.
 
 /** \page sig_slot_index Index of Signals and Slots
 
-To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and
+To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and
 connections. See \see connections to get an index of what signal is connected to which slot.
 
 \section overview Summary of what each class provides
@@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to
     <tr><td>Task</td>             <td>&nbsp;</td> <td>&nbsp;</td> <td>Y     </td> <td>&nbsp;</td></tr>
 </table>
 
-\section signals Listing of all of the signals
+\section Q_SIGNALS Listing of all of the Q_SIGNALS
 
-These are the signals:
+These are the Q_SIGNALS:
 <ol>
     <li>IdleTimer::extractTime(int)
     <li>IdleTimer::stopTimer()
@@ -83,7 +83,7 @@ These are the signals:
     <li>Preferences::hideOnClose(bool)
 </ol>
 
-\section slots Listing of the slots
+\section Q_SLOTS Listing of the Q_SLOTS
 
 \subsection public Public Slots
 
diff --git a/karm/doc/design b/karm/doc/design
index be9a425f..fe37a300 100644
--- a/karm/doc/design
+++ b/karm/doc/design
@@ -35,24 +35,24 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
 > > Id  Description
 > > ---------------------------------------------------------------------
 > > 1   Karm shall provide a hierarchical structure of tasks. If a task
-> >     has at least one subtask it will be referred to as a parent task.
-> >     If a task has no children it will be referred to as a leaf task.
-> >     If a task has no parent tasks it will be referred to as a root
+> >     has at least one subtask it will be referred to as a tqparent task.
+> >     If a task has no tqchildren it will be referred to as a leaf task.
+> >     If a task has no tqparent tasks it will be referred to as a root
 > >     task.
 > > 2   A new task can be created as a child of any existing task.
-> > 2.1   If the parent had a timer active, it will continue to be active
+> > 2.1   If the tqparent had a timer active, it will continue to be active
 >
 > It depends on how you start it. If you double click it. Any other timer
 > will be stopped and the new task started. If you start it through the
 > start button, both tasks will be active. This a bug IMO. See at the bottom
 > for my proposal.
 >
-> > 2.2   The session time for the parent will not be changed by adding
+> > 2.2   The session time for the tqparent will not be changed by adding
 > >       the new child task.
-> > 2.3   The total time for the parent will not be changed by adding a
+> > 2.3   The total time for the tqparent will not be changed by adding a
 > >       the new child task.
-> > 3     Any task (parent, leaf, or root) may have an independent timer.
-> > 4     The time (both session and total) for a parent will be the sum
+> > 3     Any task (tqparent, leaf, or root) may have an independent timer.
+> > 4     The time (both session and total) for a tqparent will be the sum
 > >       of its independent timer and the sum of all of its child timers.
 > >
 > > Unstable Development
@@ -62,21 +62,21 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
 > > Id  Description
 > > ---------------------------------------------------------------------
 > > 1   Karm shall provide a hierarchical structure of tasks. If a task
-> >     has at least one subtask it will be referred to as a parent task.
-> >     If a task has no children it will be referred to as a leaf task.
-> >     If a task has no parent tasks it will be referred to as a root
+> >     has at least one subtask it will be referred to as a tqparent task.
+> >     If a task has no tqchildren it will be referred to as a leaf task.
+> >     If a task has no tqparent tasks it will be referred to as a root
 > >     task.
 > > 2   A new task can be created as a child of any existing task.
-> > 2.1 If the parent had a timer active, it will be deactivated
-> > 2.2 The session time for the parent will set to zero
+> > 2.1 If the tqparent had a timer active, it will be deactivated
+> > 2.2 The session time for the tqparent will set to zero
 > > 2.2.1       The session time for the child will be initialized to the last
-> >     session time of the parent.
-> > 2.3 The total time for the parent will be set to zero.
-> > 2.3.1       The total time for the parent will be initialized to the last
-> >     total time of the parent.
-> > 3   Only a leaf task may have a timer. A parent may not have its own
+> >     session time of the tqparent.
+> > 2.3 The total time for the tqparent will be set to zero.
+> > 2.3.1       The total time for the tqparent will be initialized to the last
+> >     total time of the tqparent.
+> > 3   Only a leaf task may have a timer. A tqparent may not have its own
 > >     timer.
-> > 4   The time (both session and total) for a parent will be the sum
+> > 4   The time (both session and total) for a tqparent will be the sum
 > >     only of its child timers.
 >
 > I see where you want to go, but I think it's not the right direction for
@@ -134,7 +134,7 @@ idea but can't quite see how the interface should work.
 
 Ok. So, I'll undo the changes related to:
 * summing only leaf tasks
-* disallowing edits on parent tasks
+* disallowing edits on tqparent tasks
 _______________________________________________
 kde-pim mailing list
 kde-pim@mail.kde.org
diff --git a/karm/doc/updating_parents.html b/karm/doc/updating_parents.html
index 3b55ce30..63587952 100644
--- a/karm/doc/updating_parents.html
+++ b/karm/doc/updating_parents.html
@@ -34,6 +34,6 @@ You should get something like this.</p>
 	<tr><td>&nbsp;</td> <td>Session: 3</td> <td>Total: 18</td></tr>
 </table>
 
-<p>Since a parent task can have a timer active on it, it needs to be included in the summary 
+<p>Since a tqparent task can have a timer active on it, it needs to be included in the summary 
 Session and Total times. So, in this example, the Session time will jump three minutes for every
 minute the timer is active.</p>
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index b7b1abe7..a556550a 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -148,7 +148,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
 
   desktopCount = kwinmodule.numberOfDesktops();
   
-  // If desktopList tqcontains higher numbered desktops than desktopCount then
+  // If desktopList contains higher numbered desktops than desktopCount then
   // delete those from desktopList. This may be the case if the user has
   // configured virtual desktops. The values in desktopList are sorted.
   if ( (desktopList != 0) && (desktopList->size() > 0) ) 
@@ -201,7 +201,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
     }
     enableDesktops = true;
   }
-  // if some desktops were specified, then enable the parent box
+  // if some desktops were specified, then enable the tqparent box
   _desktopCB->setChecked(enableDesktops);
 
   for (int i=0; i<desktopCount; i++)
diff --git a/karm/edittaskdialog.h b/karm/edittaskdialog.h
index 2586d491..6b928925 100644
--- a/karm/edittaskdialog.h
+++ b/karm/edittaskdialog.h
@@ -43,6 +43,7 @@ class KArmTimeWidget;
 class EditTaskDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     EditTaskDialog(TQString caption, bool editDlg, DesktopList* desktopList=0);
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 53f17c8c..46ae03e9 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -68,11 +68,11 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
   _timer->stop();
 
   TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds);
-  TQString idleStartQString = KGlobal::locale()->formatTime(idleStart.time());
+  TQString idleStartTQString = KGlobal::locale()->formatTime(idleStart.time());
 
   int id =  TQMessageBox::warning( 0, i18n("Idle Detection"),
                                      i18n("Desktop has been idle since %1."
-                                          " What should we do?").arg(idleStartQString),
+                                          " What should we do?").arg(idleStartTQString),
                                      i18n("Revert && Stop"),
                                      i18n("Revert && Continue"),
                                      i18n("Continue Timing"),0,2);
diff --git a/karm/idletimedetector.h b/karm/idletimedetector.h
index 42b41d08..185bc5f2 100644
--- a/karm/idletimedetector.h
+++ b/karm/idletimedetector.h
@@ -25,9 +25,10 @@ const int testInterval= secsPerMinute * 1000;
  * Keep track of how long the computer has been idle.
  */
 
-class IdleTimeDetector :public QObject
+class IdleTimeDetector :public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp
index ddabb1d8..75e4854e 100644
--- a/karm/kaccelmenuwatch.cpp
+++ b/karm/kaccelmenuwatch.cpp
@@ -9,8 +9,8 @@
 
 #include "kaccelmenuwatch.h"
 
-KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent )
-  : TQObject( parent ),
+KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *tqparent )
+  : TQObject( tqparent ),
   _accel( accel ),
   _menu ( 0 )
 {
diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h
index 042e4fda..4b9c3058 100644
--- a/karm/kaccelmenuwatch.h
+++ b/karm/kaccelmenuwatch.h
@@ -32,9 +32,10 @@ class TQPopupMenu;
  * @author Sirtaj Singh Kang (taj@kde.org)
  */
 
-class KAccelMenuWatch : public QObject
+class KAccelMenuWatch : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     enum AccelType { StdAccel, StringAccel };
@@ -63,7 +64,7 @@ class KAccelMenuWatch : public QObject
     /**
      * KAccelMenuWatch Constructor
      */
-    KAccelMenuWatch( KAccel *accel, TQObject *parent = 0 );
+    KAccelMenuWatch( KAccel *accel, TQObject *tqparent = 0 );
 
     /**
      * KAccelMenuWatch Destructor
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 85259fe8..d8982e2e 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -22,8 +22,8 @@
 #include "mainwindow.h"
 
 karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
-                                  TQObject *parent, const char *name )
-    : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), 
+                                  TQObject *tqparent, const char *name )
+    : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name), 
     _accel     ( new KAccel( tqparentWidget ) ),
     _watcher   ( new KAccelMenuWatch( _accel, tqparentWidget ) )
 {
@@ -312,7 +312,7 @@ void karmPart::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our parent to do it's thing
+    // in any event, we want our tqparent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
@@ -333,7 +333,7 @@ bool karmPart::saveFile()
     if (isReadWrite() == false)
         return false;
 
-    // m_file is always local, so we use QFile
+    // m_file is always local, so we use TQFile
     TQFile file(m_file);
     if (file.open(IO_WriteOnly) == false)
         return false;
@@ -388,11 +388,11 @@ karmPartFactory::~karmPartFactory()
 }
 
 KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
-                                                        TQObject *parent, const char *name,
+                                                        TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    karmPart* obj = new karmPart( tqparentWidget, widgetName, parent, name );
+    karmPart* obj = new karmPart( tqparentWidget, widgetName, tqparent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
@@ -509,11 +509,11 @@ TQString karmPart::setPerCentComplete( const TQString& taskName, int perCent )
     if ((_taskView->item_at_index(i)->name()==taskName))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) 
+  if (err==TQString()) 
   {
     _taskView->item_at_index(index)->setPercentComplete( perCent, _taskView->storage() );
   }
@@ -544,10 +544,10 @@ int karmPart::bookTime
   // Parse datetime
   if ( !rval ) 
   {
-    startDate = TQDate::fromString( datetime, Qt::ISODate );
+    startDate = TQDate::fromString( datetime, TQt::ISODate );
     if ( datetime.length() > 10 )  // "YYYY-MM-DD".length() = 10
     {
-      startTime = TQTime::fromString( datetime, Qt::ISODate );
+      startTime = TQTime::fromString( datetime, TQt::ISODate );
     }
     else startTime = TQTime( 12, 0 );
     if ( startDate.isValid() && startTime.isValid() )
diff --git a/karm/karm_part.desktop b/karm/karm_part.desktop
index 56667859..652d705d 100644
--- a/karm/karm_part.desktop
+++ b/karm/karm_part.desktop
@@ -10,7 +10,7 @@ Name[pt]=Componente KArm
 Name[pt_BR]=Componente do KArm
 Name[sv]=Karm-delprogram
 Name[tr]=karmpart
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkarmpart
 Type=Service
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 2d5b98bf..bca83e32 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -30,6 +30,7 @@ class TaskView;
 class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     void             makeMenus();
@@ -59,7 +60,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
 
 public:
     karmPart(TQWidget *tqparentWidget, const char *widgetName,
-             TQObject *parent, const char *name);
+             TQObject *tqparent, const char *name);
     // DCOP
     void quit();
     virtual bool save();
@@ -121,11 +122,12 @@ class KAboutData;
 class karmPartFactory : public KParts::Factory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     karmPartFactory();
     virtual ~karmPartFactory();
     virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+                                            TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/karm/karmdcopiface.h b/karm/karmdcopiface.h
index 6c048033..67e59938 100644
--- a/karm/karmdcopiface.h
+++ b/karm/karmdcopiface.h
@@ -38,7 +38,7 @@ class KarmDCOPIface : virtual public DCOPObject
   /** 
    * Add a new top-level task.
    *
-   * A top-level task is one that has no parent tasks.
+   * A top-level task is one that has no tqparent tasks.
    * 
    * @param taskName Name of new task.
    *
@@ -67,7 +67,7 @@ class KarmDCOPIface : virtual public DCOPObject
    *
    * @param iso8601StartDateTime Date and time the booking starts, in extended
    * ISO-8601 format; for example, YYYY-MM-DDTHH:MI:SS format (see
-   * Qt::ISODate).  No timezone support--time is interpreted as the local time.
+   * TQt::ISODate).  No timezone support--time is interpreted as the local time.
    * If just the date is passed in (i.e., YYYY-MM-DD) , then the time is set to
    * noon.
    *
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 7a6bfcb9..4a7dabc2 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -156,7 +156,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
     TQDict< Task > map;
 
     // Build dictionary to look up Task object from Todo uid.  Each task is a
-    // TQListViewItem, and is initially added with the view as the parent.
+    // TQListViewItem, and is initially added with the view as the tqparent.
     todoList = _calendar->rawTodos();
     kdDebug(5970) << "KarmStorage::load "
       << "rawTodo count (includes completed todos) ="
@@ -186,19 +186,19 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
       task->setPixmapProgress();
     }
 
-    // Load each task under it's parent task.
+    // Load each task under it's tqparent task.
     for( todo = todoList.begin(); todo != todoList.end(); ++todo )
     {
-      Task* task = map.find( (*todo)->uid() );
+      Task* task = map.tqfind( (*todo)->uid() );
 
       // No relatedTo incident just means this is a top-level task.
       if ( (*todo)->relatedTo() )
       {
-        Task* newParent = map.find( (*todo)->relatedToUid() );
+        Task* newParent = map.tqfind( (*todo)->relatedToUid() );
 
         // Complete the loading but return a message
         if ( !newParent )
-          err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
+          err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
             .arg(task->name())
             .arg((*todo)->relatedToUid());
 
@@ -245,7 +245,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
 
   // 1. insert tasks form rc into taskview
   // 1.1. Build dictionary to look up Task object from Todo uid.  Each task is a
-  // TQListViewItem, and is initially added with the view as the parent.
+  // TQListViewItem, and is initially added with the view as the tqparent.
   todoList = rc->rawTodos();
   for( todo = todoList.begin(); todo != todoList.end(); ++todo )
   {
@@ -255,19 +255,19 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
     task->setPixmapProgress();
   }
 
-  // 1.1. Load each task under it's parent task.
+  // 1.1. Load each task under it's tqparent task.
   for( todo = todoList.begin(); todo != todoList.end(); ++todo )
   {
-    Task* task = map.find( (*todo)->uid() );
+    Task* task = map.tqfind( (*todo)->uid() );
 
     // No relatedTo incident just means this is a top-level task.
     if ( (*todo)->relatedTo() )
     {
-      Task* newParent = map.find( (*todo)->relatedToUid() );
+      Task* newParent = map.tqfind( (*todo)->relatedToUid() );
 
       // Complete the loading but return a message
       if ( !newParent )
-        err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
+        err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
           .arg(task->name())
           .arg((*todo)->relatedToUid());
 
@@ -310,11 +310,11 @@ TQString KarmStorage::save(TaskView* taskview)
   kdDebug(5970) << "entering KarmStorage::save" << endl;
   TQString err=TQString();
 
-  TQPtrStack< KCal::Todo > parents;
+  TQPtrStack< KCal::Todo > tqparents;
 
   for (Task* task=taskview->first_child(); task; task = task->nextSibling())
   {
-    err=writeTaskAsTodo(task, 1, parents );
+    err=writeTaskAsTodo(task, 1, tqparents );
   }
 
   if ( !saveCalendar() )
@@ -337,7 +337,7 @@ TQString KarmStorage::save(TaskView* taskview)
 }
 
 TQString KarmStorage::writeTaskAsTodo(Task* task, const int level,
-    TQPtrStack< KCal::Todo >& parents )
+    TQPtrStack< KCal::Todo >& tqparents )
 {
   TQString err;
   KCal::Todo* todo;
@@ -349,16 +349,16 @@ TQString KarmStorage::writeTaskAsTodo(Task* task, const int level,
     return "Could not get todo from calendar";
   }
   task->asTodo(todo);
-  if ( !parents.isEmpty() ) todo->setRelatedTo( parents.top() );
-  parents.push( todo );
+  if ( !tqparents.isEmpty() ) todo->setRelatedTo( tqparents.top() );
+  tqparents.push( todo );
 
   for ( Task* nextTask = task->firstChild(); nextTask;
         nextTask = nextTask->nextSibling() )
   {
-    err = writeTaskAsTodo(nextTask, level+1, parents );
+    err = writeTaskAsTodo(nextTask, level+1, tqparents );
   }
 
-  parents.pop();
+  tqparents.pop();
   return err;
 }
 
@@ -439,17 +439,17 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview,
         task->setUid(addTask(task, 0));
       }
       else {
-        Task *parent = stack.top();
+        Task *tqparent = stack.top();
         kdDebug(5970) << "KarmStorage::loadFromFlatFile - task: " << name
-            << " min: " << minutes << " parent" << parent->name() << "\n";
-        task = new Task(name, minutes, 0, desktopList, parent);
+            << " min: " << minutes << " tqparent" << tqparent->name() << "\n";
+        task = new Task(name, minutes, 0, desktopList, tqparent);
 
-        task->setUid(addTask(task, parent));
+        task->setUid(addTask(task, tqparent));
 
         // Legacy File Format (!):
-        parent->changeTimes(0, -minutes);
+        tqparent->changeTimes(0, -minutes);
         taskview->setRootIsDecorated(true);
-        parent->setOpen(true);
+        tqparent->setOpen(true);
       }
       if (!task->uid().isNull())
         stack.push(task);
@@ -482,12 +482,12 @@ TQString KarmStorage::loadFromFlatFileCumulative(TaskView* taskview,
 bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
     int *level, DesktopList* desktopList)
 {
-  if (line.find('#') == 0) {
+  if (line.tqfind('#') == 0) {
     // A comment line
     return false;
   }
 
-  int index = line.find('\t');
+  int index = line.tqfind('\t');
   if (index == -1) {
     // This doesn't seem like a valid record
     return false;
@@ -496,7 +496,7 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
   TQString levelStr = line.left(index);
   TQString rest = line.remove(0,index+1);
 
-  index = rest.find('\t');
+  index = rest.tqfind('\t');
   if (index == -1) {
     // This doesn't seem like a valid record
     return false;
@@ -507,7 +507,7 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
 
   bool ok;
 
-  index = rest.find('\t'); // check for optional desktops string
+  index = rest.tqfind('\t'); // check for optional desktops string
   if (index >= 0) {
     *name = rest.left(index);
     TQString deskLine = rest.remove(0,index+1);
@@ -516,7 +516,7 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
     // an DesktopList
     TQString ds;
     int d;
-    int commaIdx = deskLine.find(',');
+    int commaIdx = deskLine.tqfind(',');
     while (commaIdx >= 0) {
       ds = deskLine.left(commaIdx);
       d = ds.toInt(&ok);
@@ -525,7 +525,7 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
 
       desktopList->push_back(d);
       deskLine.remove(0,commaIdx+1);
-      commaIdx = deskLine.find(',');
+      commaIdx = deskLine.tqfind(',');
     }
 
     d = deskLine.toInt(&ok);
@@ -556,12 +556,12 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
 
 void KarmStorage::adjustFromLegacyFileFormat(Task* task)
 {
-  // unless the parent is the listView
-  if ( task->parent() )
-    task->parent()->changeTimes(-task->sessionTime(), -task->time());
+  // unless the tqparent is the listView
+  if ( task->tqparent() )
+    task->tqparent()->changeTimes(-task->sessionTime(), -task->time());
 
   // traverse depth first -
-  // as soon as we're in a leaf, we'll substract it's time from the parent
+  // as soon as we're in a leaf, we'll substract it's time from the tqparent
   // then, while descending back we'll do the same for each node untill
   // we reach the root
   for ( Task* subtask = task->firstChild(); subtask;
@@ -639,7 +639,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
     if (to_quote)
       retval += dquote;
 
-    // Double quotes tqreplaced by a pair of consecutive double quotes
+    // Double quotes replaced by a pair of consecutive double quotes
     retval += task->name().tqreplace( dquote, double_dquote );
 
     if (to_quote)
@@ -701,7 +701,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
 // public routines:
 //
 
-TQString KarmStorage::addTask(const Task* task, const Task* parent)
+TQString KarmStorage::addTask(const Task* task, const Task* tqparent)
 {
   KCal::Todo* todo;
   TQString uid;
@@ -710,8 +710,8 @@ TQString KarmStorage::addTask(const Task* task, const Task* parent)
   if ( _calendar->addTodo( todo ) )
   {
     task->asTodo( todo  );
-    if (parent)
-      todo->setRelatedTo(_calendar->todo(parent->uid()));
+    if (tqparent)
+      todo->setRelatedTo(_calendar->todo(tqparent->uid()));
     uid = todo->uid();
   }
   else
@@ -850,7 +850,7 @@ long KarmStorage::printTaskHistory (
   if ( to_quote) cell.push_back(dquote);
 
 
-  // Double quotes tqreplaced by a pair of consecutive double quotes
+  // Double quotes replaced by a pair of consecutive double quotes
   cell.push_back(task->name().tqreplace( dquote, double_dquote ));
 
   if ( to_quote) cell.push_back(dquote);
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index af2d3be0..214dab53 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -132,7 +132,7 @@ class KarmStorage
      * Read tasks and their total times from a text file (legacy storage).
      *
      * This reads from one of the two legacy file formats.  In this version,
-     * the parent task times do not include the sum of all their children's
+     * the tqparent task times do not include the sum of all their tqchildren's
      * times.
      *
      * The format of the file is zero or more lines of:
@@ -147,7 +147,7 @@ class KarmStorage
      *  Reads tasks and their total times from text file (legacy).
      *
      *  This is the older legacy format, where the task totals included the
-     *  children totals.
+     *  tqchildren totals.
      *
      *  @see loadFromFlatFile
      */
@@ -266,15 +266,15 @@ class KarmStorage
      * Add this task from iCalendar file.
      *
      * Create a new KCal::Todo object and load with task information.  If
-     * parent is not zero, then set the RELATED-TO attribute for this Todo.
+     * tqparent is not zero, then set the RELATED-TO attribute for this Todo.
      *
      * @param task   The task to be removed.
-     * @param parent The parent of this task.  Must have a uid() that is in
+     * @param tqparent The tqparent of this task.  Must have a uid() that is in
      * the existing calendar.  If zero, this task is considered a root task.
      * @return The unique ID for the new VTODO.  Return an null TQString if
      * there was an error creating the new calendar object.
      */
-    TQString addTask(const Task* task, const Task* parent);
+    TQString addTask(const Task* task, const Task* tqparent);
 
     /**
      *  Check if the iCalendar file currently loaded has any Todos in it.
@@ -308,7 +308,7 @@ class KarmStorage
     bool parseLine(TQString line, long *time, TQString *name, int *level,
         DesktopList* desktopList);
     TQString writeTaskAsTodo
-      (Task* task, const int level, TQPtrStack< KCal::Todo >& parents);
+      (Task* task, const int level, TQPtrStack< KCal::Todo >& tqparents);
     bool saveCalendar();
 
     KCal::Event* baseEvent(const Task*);
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index dba305fe..b1f7790f 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -13,11 +13,11 @@
 
 enum ValidatorType { HOUR, MINUTE };
 
-class TimeValidator : public QValidator
+class TimeValidator : public TQValidator
 {
   public:
-    TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
-      : TQValidator(parent, name)
+    TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0)
+      : TQValidator(tqparent, name)
     {
       _tp = tp;
     }
@@ -42,12 +42,12 @@ class TimeValidator : public QValidator
 };
 
 
-class KarmLineEdit : public QLineEdit
+class KarmLineEdit : public TQLineEdit
 {
 
   public:
-    KarmLineEdit( TQWidget* parent, const char* name = 0 )
-      : TQLineEdit( parent, name ) {}
+    KarmLineEdit( TQWidget* tqparent, const char* name = 0 )
+      : TQLineEdit( tqparent, name ) {}
 
 protected:
 
@@ -60,8 +60,8 @@ protected:
 };
 
 
-KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
-  : TQWidget(parent, name)
+KArmTimeWidget::KArmTimeWidget( TQWidget* tqparent, const char* name )
+  : TQWidget(tqparent, name)
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
@@ -74,7 +74,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   TimeValidator *validator = new TimeValidator( HOUR, _hourLE,
                                                 "Validator for _hourLE");
   _hourLE->setValidator( validator );
-  _hourLE->tqsetAlignment( Qt::AlignRight );
+  _hourLE->tqsetAlignment( TQt::AlignRight );
 
 
   TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this );
@@ -89,7 +89,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE");
   _minuteLE->setValidator( validator );
   _minuteLE->setMaxLength(2);
-  _minuteLE->tqsetAlignment( Qt::AlignRight );
+  _minuteLE->tqsetAlignment( TQt::AlignRight );
 
   TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this );
   tqlayout->addWidget( min );
diff --git a/karm/ktimewidget.h b/karm/ktimewidget.h
index 88f298b2..62f81f77 100644
--- a/karm/ktimewidget.h
+++ b/karm/ktimewidget.h
@@ -13,7 +13,7 @@ class KarmLineEdit;
 class KArmTimeWidget : public TQWidget 
 {
   public:
-    KArmTimeWidget( TQWidget* parent = 0, const char* name = 0 );
+    KArmTimeWidget( TQWidget* tqparent = 0, const char* name = 0 );
     void setTime( long minutes );
     long time() const;
 
diff --git a/karm/main.cpp b/karm/main.cpp
index b075b55c..bc91e7cf 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -57,7 +57,7 @@ int main( int argc, char *argv[] )
   if ( args->count() > 0 ) 
   {
     TQString icsfile = TQString::fromLocal8Bit( args->arg( 0 ) );
-    // FIXME: there is probably a Qt or KDE fcn for this test
+    // FIXME: there is probably a TQt or KDE fcn for this test
     if ( icsfile.startsWith( "/" ) 
         || icsfile.lower().startsWith( "http://" ) 
         || icsfile.lower().startsWith( "ftp://" ) 
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 4440ab1a..2ab850aa 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -36,7 +36,7 @@
 
 MainWindow::MainWindow( const TQString &icsfile )
   : DCOPObject ( "KarmDCOPIface" ),
-    KParts::MainWindow(0,Qt::WStyle_ContextHelp), 
+    KParts::MainWindow(0,TQt::WStyle_ContextHelp), 
     _accel     ( new KAccel( this ) ),
     _watcher   ( new KAccelMenuWatch( _accel, this ) ),
     _totalSum  ( 0 ),
@@ -445,8 +445,8 @@ void MainWindow::loadGeometry()
     config.setGroup( TQString::tqfromLatin1("Main Window Geometry") );
     int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 );
     int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 );
-    w = QMAX( w, tqsizeHint().width() );
-    h = QMAX( h, tqsizeHint().height() );
+    w = TQMAX( w, tqsizeHint().width() );
+    h = TQMAX( h, tqsizeHint().height() );
     resize(w, h);
   }
 }
@@ -543,11 +543,11 @@ TQString MainWindow::setPerCentComplete( const TQString& taskName, int perCent )
     if ((_taskView->item_at_index(i)->name()==taskName))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) 
+  if (err==TQString()) 
   {
     _taskView->item_at_index(index)->setPercentComplete( perCent, _taskView->storage() );
   }
@@ -578,10 +578,10 @@ int MainWindow::bookTime
   // Parse datetime
   if ( !rval ) 
   {
-    startDate = TQDate::fromString( datetime, Qt::ISODate );
+    startDate = TQDate::fromString( datetime, TQt::ISODate );
     if ( datetime.length() > 10 )  // "YYYY-MM-DD".length() = 10
     {
-      startTime = TQTime::fromString( datetime, Qt::ISODate );
+      startTime = TQTime::fromString( datetime, TQt::ISODate );
     }
     else startTime = TQTime( 12, 0 );
     if ( startDate.isValid() && startTime.isValid() )
@@ -688,11 +688,11 @@ TQString MainWindow::starttimerfor( const TQString& taskname )
     if ((_taskView->item_at_index(i)->name()==taskname))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) _taskView->startTimerFor( _taskView->item_at_index(index) );
+  if (err==TQString()) _taskView->startTimerFor( _taskView->item_at_index(index) );
   return err;
 }
 
@@ -705,11 +705,11 @@ TQString MainWindow::stoptimerfor( const TQString& taskname )
     if ((_taskView->item_at_index(i)->name()==taskname))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) _taskView->stopTimerFor( _taskView->item_at_index(index) );
+  if (err==TQString()) _taskView->stopTimerFor( _taskView->item_at_index(index) );
   return err;
 }
 
@@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t
   ReportCriteria rc;
   rc.url=filename;
   rc.from=TQDate::fromString( from );
-  if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate );
+  if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
   kdDebug(5970) << "rc.from " << rc.from << endl;
   rc.to=TQDate::fromString( to );
-  if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
+  if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
   kdDebug(5970) << "rc.to " << rc.to << endl;
   rc.reportType=(ReportCriteria::REPORTTYPE) type;  // history report or totals report 
   rc.decimalMinutes=decimalMinutes;
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index 2f275be1..9ff525b0 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -26,6 +26,7 @@ class TaskView;
 class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     void             makeMenus();
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index 7ac13a5e..a1f83eb2 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -35,9 +35,9 @@ test cases:
     kdDebug() << "entering constructor to import planner tasks" << endl;
     _taskView=tv;
     level=0;
-    if (_taskView->current_item()) if (_taskView->current_item()->parent()) 
+    if (_taskView->current_item()) if (_taskView->current_item()->tqparent()) 
     {
-      task = _taskView->current_item()->parent(); 
+      task = _taskView->current_item()->tqparent(); 
       level=1;
     }
   }
@@ -67,13 +67,13 @@ test cases:
       }
     
       // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the
-      // new task is a top-level-task). Make task the parenttask, if existing.
+      // new task is a top-level-task). Make task the tqparenttask, if existing.
       DesktopList dl;
       if (level++>0) 
       {
-        parentTask=task;
-        task = new Task(taskName, 0, 0, dl, parentTask);
-        task->setUid(_taskView->storage()->addTask(task, parentTask));
+        tqparentTask=task;
+        task = new Task(taskName, 0, 0, dl, tqparentTask);
+        task->setUid(_taskView->storage()->addTask(task, tqparentTask));
       }
       else
       {
@@ -92,7 +92,7 @@ test cases:
     // only <task>s within <tasks> increased level, so only decrease for <task>s within <tasks>
     if (withInTasks)
     {
-      if (qName=="task")  if (level-->=0) task=task->parent();
+      if (qName=="task")  if (level-->=0) task=task->tqparent();
       if (qName=="tasks") withInTasks=false;
     }
     return true;
diff --git a/karm/plannerparser.h b/karm/plannerparser.h
index 6a7ff028..9334b8a5 100644
--- a/karm/plannerparser.h
+++ b/karm/plannerparser.h
@@ -34,7 +34,7 @@ test cases:
 #include "karmstorage.h"
 #include "kapplication.h"
 
-class PlannerParser : public QXmlDefaultHandler
+class PlannerParser : public TQXmlDefaultHandler
 {
 public:
 
@@ -54,7 +54,7 @@ private:
   bool withInTasks;     // within <tasks> ?
   TaskView *_taskView;
   Task *task;
-  Task *parentTask;
+  Task *tqparentTask;
   int level;            // level=1: task is top-level-task
 };
 
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index b270a2b2..24a5e8c4 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -54,12 +54,12 @@ void Preferences::makeBehaviorPage()
   TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 );
   tqlayout->setColStretch( 1, 1 );
 
-  _doIdleDetectionW = new QCheckBox
+  _doIdleDetectionW = new TQCheckBox
     ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW");
-  _idleDetectValueW = new QSpinBox
+  _idleDetectValueW = new TQSpinBox
     (1,60*24, 1, behaviorPage, "_idleDetectValueW");
   _idleDetectValueW->setSuffix(i18n(" min"));
-  _promptDeleteW = new QCheckBox
+  _promptDeleteW = new TQCheckBox
     ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" );
 
   tqlayout->addWidget(_doIdleDetectionW, 0, 0 );
@@ -113,7 +113,7 @@ void Preferences::makeStoragePage()
   tqlayout->setColStretch( 1, 1 );
 
   // autosave
-  _doAutoSaveW = new QCheckBox
+  _doAutoSaveW = new TQCheckBox
     ( i18n("Save tasks every"), storagePage, "_doAutoSaveW" );
   _autoSaveValueW = new TQSpinBox(1, 60*24, 1, storagePage, "_autoSaveValueW");
   _autoSaveValueW->setSuffix(i18n(" min"));
diff --git a/karm/preferences.h b/karm/preferences.h
index 33d51dd0..0cd11638 100644
--- a/karm/preferences.h
+++ b/karm/preferences.h
@@ -16,6 +16,7 @@ class KURLRequester;
 class Preferences :public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static Preferences *instance( const TQString& icsfile = "" );
diff --git a/karm/print.cpp b/karm/print.cpp
index a7ddd4ba..891c06fe 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -25,10 +25,10 @@ void MyPrinter::print()
   if (setup(0L, i18n("Print Times"))) {
     // setup
     TQPainter painter(this);
-    TQPaintDeviceMetrics deviceMetrics(this);
+    TQPaintDeviceMetrics tqdeviceMetrics(this);
     TQFontMetrics metrics = painter.fontMetrics();
-    pageHeight = deviceMetrics.height();
-    int pageWidth = deviceMetrics.width();
+    pageHeight = tqdeviceMetrics.height();
+    int pageWidth = tqdeviceMetrics.width();
     xMargin = margins().width();
     yMargin = margins().height();
     yoff = yMargin;
@@ -36,7 +36,7 @@ void MyPrinter::print()
     
     // Calculate the totals
     // Note the totals are only calculated at the top most levels, as the
-    // totals are increased together with its children.
+    // totals are increased together with its tqchildren.
     int totalTotal = 0;
     int sessionTotal = 0;
     for (Task* task = _taskView->first_child();
@@ -47,9 +47,9 @@ void MyPrinter::print()
     }
 
     // Calculate the needed width for each of the fields
-    timeWidth = QMAX(metrics.width(i18n("Total")),
+    timeWidth = TQMAX(metrics.width(i18n("Total")),
                      metrics.width(formatTime(totalTotal)));
-    sessionTimeWidth = QMAX(metrics.width(i18n("Session")),
+    sessionTimeWidth = TQMAX(metrics.width(i18n("Session")),
                             metrics.width(formatTime(sessionTotal)));
 
     nameFieldWidth = pageWidth - xMargin - timeWidth - sessionTimeWidth - 2*5;
@@ -61,9 +61,9 @@ void MyPrinter::print()
           task = static_cast<Task *>(task->nextSibling()))
     {
       int width = calculateReqNameWidth(task, metrics, 0);
-      maxReqNameFieldWidth = QMAX(maxReqNameFieldWidth, width);
+      maxReqNameFieldWidth = TQMAX(maxReqNameFieldWidth, width);
     }
-    nameFieldWidth = QMIN(nameFieldWidth, maxReqNameFieldWidth);
+    nameFieldWidth = TQMIN(nameFieldWidth, maxReqNameFieldWidth);
 
     int realPageWidth = nameFieldWidth + timeWidth + sessionTimeWidth + 2*5;
 
@@ -120,7 +120,7 @@ int MyPrinter::calculateReqNameWidth( Task* task,
               subTask;
               subTask = subTask->nextSibling() ) {
     int subTaskWidth = calculateReqNameWidth(subTask, metrics, level+1);
-    width = QMAX(width, subTaskWidth);
+    width = TQMAX(width, subTaskWidth);
   }
   return width;
 }
diff --git a/karm/printdialog.h b/karm/printdialog.h
index 1bd1604e..8ed2394f 100644
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@@ -31,6 +31,7 @@ class KDateEdit;
 class PrintDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PrintDialog();
diff --git a/karm/reportcriteria.h b/karm/reportcriteria.h
index dae6a48e..c6c1106e 100644
--- a/karm/reportcriteria.h
+++ b/karm/reportcriteria.h
@@ -29,7 +29,7 @@ class TQString;
  Stores entries from export dialog.
 
  Keeps details (like CSV export dialog control names) out of the TaskView
- class, which tqcontains the slot triggered by the export action.  
+ class, which contains the slot triggered by the export action.  
  
  The dialog and the report logic can change all they want and the TaskView
  logic can stay the same.
diff --git a/karm/task.cpp b/karm/task.cpp
index b150a94d..cf37ee43 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -22,21 +22,21 @@ const int gSecondsPerMinute = 60;
 TQPtrVector<TQPixmap> *Task::icons = 0;
 
 Task::Task( const TQString& taskName, long minutes, long sessionTime,
-            DesktopList desktops, TaskView *parent)
-  : TQObject(), TQListViewItem(parent)
+            DesktopList desktops, TaskView *tqparent)
+  : TQObject(), TQListViewItem(tqparent)
 { 
   init(taskName, minutes, sessionTime, desktops, 0);
 }
 
 Task::Task( const TQString& taskName, long minutes, long sessionTime,
-            DesktopList desktops, Task *parent)
-  : TQObject(), TQListViewItem(parent)
+            DesktopList desktops, Task *tqparent)
+  : TQObject(), TQListViewItem(tqparent)
 {
   init(taskName, minutes, sessionTime, desktops, 0);
 }
 
-Task::Task( KCal::Todo* todo, TaskView* parent )
-  : TQObject(), TQListViewItem( parent )
+Task::Task( KCal::Todo* todo, TaskView* tqparent )
+  : TQObject(), TQListViewItem( tqparent )
 {
   long minutes = 0;
   TQString name;
@@ -51,9 +51,9 @@ Task::Task( KCal::Todo* todo, TaskView* parent )
 void Task::init( const TQString& taskName, long minutes, long sessionTime,
                  DesktopList desktops, int percent_complete)
 {
-  // If our parent is the taskview then connect our totalTimesChanged
+  // If our tqparent is the taskview then connect our totalTimesChanged
   // signal to its receiver
-  if ( ! parent() )
+  if ( ! tqparent() )
     connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
              listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
 
@@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage)
 
   setPixmapProgress();
 
-  // When parent marked as complete, mark all children as complete as well.
-  // Complete tasks are not displayed in the task view, so if a parent is
-  // marked as complete and some of the children are not, then we get an error
+  // When tqparent marked as complete, mark all tqchildren as complete as well.
+  // Complete tasks are not displayed in the task view, so if a tqparent is
+  // marked as complete and some of the tqchildren are not, then we get an error
   // message.  KArm actually keep chugging along in this case and displays the
   // child tasks just fine, so an alternative solution is to remove that error
   // message (from KarmStorage::load).  But I think it makes more sense that
-  // if you mark a parent task as complete, then all children should be
+  // if you mark a tqparent task as complete, then all tqchildren should be
   // complete as well.
   //
   // This behavior is consistent with KOrganizer (as of 2003-09-24).
@@ -252,7 +252,7 @@ void Task::changeParentTotalTimes( long minutesSession, long minutes )
   if ( isRoot() )
     emit totalTimesChanged( minutesSession, minutes );
   else
-    parent()->changeTotalTimes( minutesSession, minutes );
+    tqparent()->changeTotalTimes( minutesSession, minutes );
 }
 
 bool Task::remove( TQPtrList<Task>& activeTasks, KarmStorage* storage)
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
+    return tqparent()->fullName() + TQString::tqfromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -390,10 +390,10 @@ void Task::cut()
 {
   //kdDebug(5970) << "Task::cut - " << name() << endl;
   changeParentTotalTimes( -_totalSessionTime, -_totalTime);
-  if ( ! parent())
+  if ( ! tqparent())
     listView()->takeItem(this);
   else
-    parent()->takeItem(this);
+    tqparent()->takeItem(this);
 }
 
 void Task::move(Task* destination)
diff --git a/karm/task.h b/karm/task.h
index 200612ae..acf2cd99 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -13,7 +13,7 @@
 #include "desktoplist.h"
 
 // Required b/c of static cast below?  (How else can compiler know that a
-// TaskView is a subclass or QListView?)
+// TaskView is a subclass or TQListView?)
 #include "taskview.h"
 
 class TQFile;
@@ -38,27 +38,28 @@ class TQPixmap;
  * It can also contain subtasks - these are managed using the
  * TQListViewItem class.
  */
-class Task : public TQObject, public QListViewItem
+class Task : public TQObject, public TQListViewItem
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     //@{ constructors
     Task( const TQString& taskame, long minutes, long sessionTime,
-          DesktopList desktops, TaskView* parent = 0);
+          DesktopList desktops, TaskView* tqparent = 0);
     Task( const TQString& taskame, long minutes, long sessionTime,
-          DesktopList desktops, Task* parent = 0);
-    Task( KCal::Todo* incident, TaskView* parent );
+          DesktopList desktops, Task* tqparent = 0);
+    Task( KCal::Todo* incident, TaskView* tqparent );
     //@}
     /* destructor */
     ~Task();
 
-    /** return parent Task or null in case of TaskView.
-     *  same as TQListViewItem::parent()
+    /** return tqparent Task or null in case of TaskView.
+     *  same as TQListViewItem::tqparent()
      */
     Task* firstChild() const  { return (Task*)TQListViewItem::firstChild(); }
     Task* nextSibling() const { return (Task*)TQListViewItem::nextSibling(); }
-    Task* parent() const      { return (Task*)TQListViewItem::parent(); }
+    Task* tqparent() const      { return (Task*)TQListViewItem::tqparent(); }
 
     /** Return task view for this task */
     TaskView* taskView() const {
@@ -77,9 +78,9 @@ class Task : public TQObject, public QListViewItem
      */
     void setUid(const TQString uid);
 
-    /** cut Task out of parent Task or the TaskView */
+    /** cut Task out of tqparent Task or the TaskView */
     void cut();
-    /** cut Task out of parent Task or the TaskView and into the
+    /** cut Task out of tqparent Task or the TaskView and into the
      *  destination Task */
     void move(Task* destination);
     /** insert Task into the destination Task */
@@ -161,7 +162,7 @@ class Task : public TQObject, public QListViewItem
       TQString name() const  { return _name; };
 
       /**
-       * Returns that task name, prefixed by parent tree up to root.
+       * Returns that task name, prefixed by tqparent tree up to root.
        *
        * Task names are seperated by a forward slash:  /
        */
@@ -205,9 +206,9 @@ class Task : public TQObject, public QListViewItem
     TQString comment() const;
 
     /** tells you whether this task is the root of the task tree */
-    bool isRoot() const                 { return parent() == 0; }
+    bool isRoot() const                 { return tqparent() == 0; }
 
-    /** remove Task with all it's children
+    /** remove Task with all it's tqchildren
      * @param   activeTasks - list of aktive tasks
      * @param storage a pointer to a KarmStorage object.
      */
@@ -230,7 +231,7 @@ class Task : public TQObject, public QListViewItem
     /** Return true if task is complete (percent complete equals 100).  */
     bool isComplete();
 
-    /** Remove current task and all it's children from the view.  */
+    /** Remove current task and all it's tqchildren from the view.  */
     void removeFromView();
 
     /** delivers when the task was started last */
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index a410806a..1ac108e0 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -37,7 +37,7 @@
 
 class DesktopTracker;
 
-TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):KListView(parent,name)
+TaskView::TaskView(TQWidget *tqparent, const char *name, const TQString &icsfile ):KListView(tqparent,name)
 {
   _preferences = Preferences::instance( icsfile );
   _storage = KarmStorage::instance();
@@ -56,10 +56,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
   addColumn( i18n("Time") );
   addColumn( i18n("Total Session Time") );
   addColumn( i18n("Total Time") );
-  setColumnAlignment( 1, Qt::AlignRight );
-  setColumnAlignment( 2, Qt::AlignRight );
-  setColumnAlignment( 3, Qt::AlignRight );
-  setColumnAlignment( 4, Qt::AlignRight );
+  setColumnAlignment( 1, TQt::AlignRight );
+  setColumnAlignment( 2, TQt::AlignRight );
+  setColumnAlignment( 3, TQt::AlignRight );
+  setColumnAlignment( 4, TQt::AlignRight );
   adaptColumns();
   setAllColumnsShowFocus( true );
 
@@ -255,7 +255,7 @@ void TaskView::refresh()
     t->setPixmapProgress();
   }
   
-  // remove root decoration if there is no more children.
+  // remove root decoration if there is no more tqchildren.
   bool anyChilds = false;
   for(Task* child = first_child();
             child;
@@ -278,7 +278,7 @@ void TaskView::loadFromFlatFile()
 
   //KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this);
 
-  TQString fileName(KFileDialog::getOpenFileName(TQString::null, TQString::null,
+  TQString fileName(KFileDialog::getOpenFileName(TQString(), TQString(),
         0));
   if (!fileName.isEmpty()) {
     TQString err = _storage->loadFromFlatFile(this, fileName);
@@ -309,7 +309,7 @@ TQString TaskView::importPlanner(TQString fileName)
 {
   kdDebug(5970) << "entering importPlanner" << endl;
   PlannerParser* handler=new PlannerParser(this);
-  if (fileName.isEmpty()) fileName=KFileDialog::getOpenFileName(TQString::null, TQString::null, 0);
+  if (fileName.isEmpty()) fileName=KFileDialog::getOpenFileName(TQString(), TQString(), 0);
   TQFile xmlFile( fileName );
   TQXmlInputSource source( xmlFile );
   TQXmlSimpleReader reader;
@@ -495,7 +495,7 @@ void TaskView::newTask()
   newTask(i18n("New Task"), 0);
 }
 
-void TaskView::newTask(TQString caption, Task *parent)
+void TaskView::newTask(TQString caption, Task *tqparent)
 {
   EditTaskDialog *dialog = new EditTaskDialog(caption, false);
   long total, totalDiff, session, sessionDiff;
@@ -514,7 +514,7 @@ void TaskView::newTask(TQString caption, Task *parent)
     if ( desktopList.size() == ( unsigned int ) _desktopTracker->desktopCount() )
       desktopList.clear();
 
-    TQString uid = addTask( taskName, total, session, desktopList, parent );
+    TQString uid = addTask( taskName, total, session, desktopList, tqparent );
     if ( uid.isNull() )
     {
       KMessageBox::error( 0, i18n(
@@ -527,15 +527,15 @@ void TaskView::newTask(TQString caption, Task *parent)
 
 TQString TaskView::addTask
 ( const TQString& taskname, long total, long session, 
-  const DesktopList& desktops, Task* parent )
+  const DesktopList& desktops, Task* tqparent )
 {
   Task *task;
   kdDebug(5970) << "TaskView::addTask: taskname = " << taskname << endl;
 
-  if ( parent ) task = new Task( taskname, total, session, desktops, parent );
+  if ( tqparent ) task = new Task( taskname, total, session, desktops, tqparent );
   else          task = new Task( taskname, total, session, desktops, this );
 
-  task->setUid( _storage->addTask( task, parent ) );
+  task->setUid( _storage->addTask( task, tqparent ) );
   TQString taskuid=task->uid();
   if ( ! taskuid.isNull() )
   {
@@ -688,7 +688,7 @@ void TaskView::deleteTask(bool markingascomplete)
       save();
     }
 
-    // remove root decoration if there is no more children.
+    // remove root decoration if there is no more tqchildren.
     refresh();
 
     // Stop idle detection if no more counters are running
diff --git a/karm/taskview.h b/karm/taskview.h
index a3b88413..7b9bc441 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -42,9 +42,10 @@ using namespace KCal;
 class TaskView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" );
+    TaskView( TQWidget *tqparent = 0, const char *name = 0, const TQString &icsfile = "" );
     virtual ~TaskView();
 
     /**  Return the first item in the view, cast to a Task pointer.  */
@@ -82,7 +83,7 @@ class TaskView : public KListView
 
     /** Add a task to view and storage. */
     TQString addTask( const TQString& taskame, long total, long session, const DesktopList& desktops, 
-                     Task* parent = 0 );
+                     Task* tqparent = 0 );
 
   public slots:
     /** Save to persistent storage. */
@@ -104,7 +105,7 @@ class TaskView : public KListView
     void newTask();
 
     /** Display edit task dialog and create a new task with results.  */
-    void newTask( TQString caption, Task* parent );
+    void newTask( TQString caption, Task* tqparent );
 
      /** Used to refresh (e.g. after import) */
     void refresh();
@@ -136,16 +137,16 @@ class TaskView : public KListView
      * expose wrappers around the storage methods we want to access instead of
      * giving clients full access to objects that we own.
      *
-     * Hopefully, this will be redesigned as part of the Qt4 migration.
+     * Hopefully, this will be redesigned as part of the TQt4 migration.
      */
     KarmStorage* storage();
 
     /**
-     * Delete task (and children) from view.
+     * Delete task (and tqchildren) from view.
      *
      * @param markingascomplete  If false (the default), deletes history for
-     * current task and all children.  If markingascomplete is true, then sets
-     * percent complete to 100 and removes task and all it's children from the
+     * current task and all tqchildren.  If markingascomplete is true, then sets
+     * percent complete to 100 and removes task and all it's tqchildren from the
      * list view.
      */
     void deleteTask(bool markingascomplete=false);
diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp
index 72d640e9..164023f2 100644
--- a/karm/taskviewwhatsthis.cpp
+++ b/karm/taskviewwhatsthis.cpp
@@ -26,7 +26,7 @@ TaskViewWhatsThis::~TaskViewWhatsThis()
 
 TQString TaskViewWhatsThis::text ( const TQPoint & pos )
 {
-  TQString desc = TQString::null;
+  TQString desc = TQString();
   kdDebug(5970) << "entering TaskViewWhatsThis::text" << endl;
   kdDebug(5970) << "x-pos:" << pos.x() << endl;
   if ( pos.x() < _listView->columnWidth( 0 ) ) 
diff --git a/karm/taskviewwhatsthis.h b/karm/taskviewwhatsthis.h
index 65f40f9f..1742c58d 100644
--- a/karm/taskviewwhatsthis.h
+++ b/karm/taskviewwhatsthis.h
@@ -18,7 +18,7 @@ this is the karm-taskview-specific implementation of qwhatsthis
 
 @author Thorsten Staerk
 */
-class TaskViewWhatsThis : public QWhatsThis
+class TaskViewWhatsThis : public TQWhatsThis
 {
 public:
     TaskViewWhatsThis( TQWidget* );
diff --git a/karm/test/README b/karm/test/README
index 31dbc8d2..c245b182 100644
--- a/karm/test/README
+++ b/karm/test/README
@@ -1,6 +1,6 @@
 This directory holds automated tests for karm.
 
-It's in very rough shape.
+It's in very rough tqshape.
 
 
 How you start:
diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php
index 7a24bd3d..afd423cc 100644
--- a/karm/test/lifetest.php
+++ b/karm/test/lifetest.php
@@ -96,7 +96,7 @@ if ($argv[1]!="--batch")
   echo "(b) make sure the code still builds (make)\n";
   echo "(c) run automated test routines like this (make check)\n\n";
   
-  echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardlayout (setxkbmap us). This must be run in X environment.\n
+  echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardtqlayout (setxkbmap us). This must be run in X environment.\n
   You must have XAutomation installed to run this.";
   system("xte -h 2&>/dev/null",$rc);
   if ($rc==0) echo " You have.\n";
@@ -132,7 +132,7 @@ else
     // the mouse can be in the way, so, move it out. This here even works with "focus strictly under mouse".
     system("xte 'mousemove 1 1'");
     echo "\nStarting karm";
-    $process=popen("karm --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); 
+    $process=popen("karm --tqgeometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); 
     $rc=1;
     while ($rc==1) system("dcop `dcop 2>/dev/null | grep karm` KarmDCOPIface version",$rc);
     echo "mainwindow is ready";
diff --git a/karm/test/lockerthread.h b/karm/test/lockerthread.h
index 3aee4a6a..38b5b1f0 100644
--- a/karm/test/lockerthread.h
+++ b/karm/test/lockerthread.h
@@ -7,7 +7,7 @@ class TQString;
  *
  * Result of attempt returned by gotlock().
  */
-class LockerThread : public QThread
+class LockerThread : public TQThread
 {
   public:
     LockerThread( const TQString &filename );
diff --git a/karm/test/runscripts.cpp b/karm/test/runscripts.cpp
index 1b44f482..e3a25a15 100644
--- a/karm/test/runscripts.cpp
+++ b/karm/test/runscripts.cpp
@@ -73,8 +73,8 @@ int runscripts
   dir.setNameFilter( extension );
   dir.setFilter( TQDir::Files );
   dir.setSorting( TQDir::Name | TQDir::IgnoreCase );
-  const QFileInfoList *list = dir.entryInfoList();
-  QFileInfoListIterator it( *list );
+  const TQFileInfoList *list = dir.entryInfoList();
+  TQFileInfoListIterator it( *list );
   TQFileInfo *fi;
   while ( !rval && ( fi = it.current() ) != 0 ) 
   {
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index 81631436..58e5af3b 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -94,7 +94,7 @@ void Script::terminate()
 
 void Script::exit()
 {
-  m_status = m_proc->exiStatus();
+  m_status = m_proc->exitqStatus();
   delete m_proc;
   m_proc = 0;
 }
diff --git a/karm/test/script.h b/karm/test/script.h
index 207d64b5..2f564750 100644
--- a/karm/test/script.h
+++ b/karm/test/script.h
@@ -28,9 +28,10 @@ class TQProcess;
 class TQString;
 class TQStringList;
 
-class Script : public QObject
+class Script : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   Script( const TQDir& workingDirectory );
   virtual ~Script();
diff --git a/karm/tray.cpp b/karm/tray.cpp
index ac820abb..3758dd7f 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -30,8 +30,8 @@
 
 TQPtrVector<TQPixmap> *KarmTray::icons = 0;
 
-KarmTray::KarmTray(MainWindow* parent)
-  : KSystemTray(parent, "Karm Tray")
+KarmTray::KarmTray(MainWindow* tqparent)
+  : KSystemTray(tqparent, "Karm Tray")
 {
   // the timer that updates the "running" icon in the tray
   _taskActiveTimer = new TQTimer(this);
@@ -49,8 +49,8 @@ KarmTray::KarmTray(MainWindow* parent)
     }
   }
 
-  parent->actionPreferences->plug( contextMenu() ); 
-  parent->actionStopAll->plug( contextMenu() );
+  tqparent->actionPreferences->plug( contextMenu() ); 
+  tqparent->actionStopAll->plug( contextMenu() );
 
   resetClock();
   initToolTip();
@@ -71,7 +71,7 @@ KarmTray::KarmTray(MainWindow* parent)
   */
 }
 
-KarmTray::KarmTray(karmPart * parent)
+KarmTray::KarmTray(karmPart * tqparent)
   : KSystemTray( 0 , "Karm Tray")
 {
 // it is not convenient if every kpart gets an icon in the systray.
diff --git a/karm/tray.h b/karm/tray.h
index 255e2d96..b299a6ed 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -24,10 +24,11 @@ class MainWindow;
 class KarmTray : public KSystemTray
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KarmTray(MainWindow * parent);
-    KarmTray(karmPart * parent);
+    KarmTray(MainWindow * tqparent);
+    KarmTray(karmPart * tqparent);
     ~KarmTray();
 
   private:
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 7f2df6e8..da6744c8 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -26,26 +26,19 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
 #include "KDGanttMinimizeSplitter.h"
-#ifndef QT_NO_SPLITTER
+#ifndef TQT_NO_SPLITTER
 
 #include "tqpainter.h"
 #include "tqdrawutil.h"
 #include "tqbitmap.h"
-#if QT_VERSION >= 300
 #include "tqptrlist.h"
 #include "tqmemarray.h"
-#else
-#include <tqlist.h>
-#include <tqarray.h>
-#define TQPtrList QList
-#define TQMemArray QArray
-#endif
 #include "tqlayout.h"
 #include "tqlayoutengine_p.h"
 #include "tqobjectlist.h"
@@ -53,23 +46,20 @@
 #include "tqapplication.h" //sendPostedEvents
 #include <tqvaluelist.h>
 #include <tqcursor.h>
-#ifndef KDGANTT_MASTER_CVS
-#include "KDGanttMinimizeSplitter.moc"
-#endif
 
+#include "KDGanttMinimizeSplitter.moc"
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 
-#if QT_VERSION >= 300
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
-				  KDGanttMinimizeSplitter *parent, const char * name )
-    : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
+				  KDGanttMinimizeSplitter *tqparent, const char * name )
+    : TQWidget( tqparent, name ), _activeButton( 0 ), _collapsed( false )
 {
-    s = parent;
+    s = tqparent;
     setOrientation(o);
     setMouseTracking( true );
 }
@@ -82,7 +72,7 @@ TQSize KDGanttSplitterHandle::tqsizeHint() const
 void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 {
     orient = o;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( o == KDGanttMinimizeSplitter::Horizontal )
 	setCursor( splitHCursor );
     else
@@ -100,14 +90,14 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
     if ( _activeButton != 0)
         return;
 
-    QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+    TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
 		 - mouseOffset;
     if ( opaque() ) {
 	s->moveSplitter( pos, id() );
     } else {
 	int min = pos; int max = pos;
 	s->getRange( id(), &min, &max );
-	s->setRubberband( QMAX( min, QMIN(max, pos )));
+	s->setRubberband( TQMAX( min, TQMIN(max, pos )));
     }
     _collapsed = false;
 }
@@ -169,7 +159,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
     }
     else {
         if ( !opaque() && e->button() == LeftButton ) {
-            QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+            TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
@@ -292,23 +282,22 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     }
     bitBlt( this, 0, 0, &buffer );
 }
-#endif
 
-class QSplitterLayoutStruct
+class TQSplitterLayoutStruct
 {
 public:
     KDGanttMinimizeSplitter::ResizeMode mode;
-    QCOORD sizer;
+    TQCOORD sizer;
     bool isSplitter;
     TQWidget *wid;
 };
 
-class QSplitterData
+class TQSplitterData
 {
 public:
-    QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
+    TQSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
 
-    TQPtrList<QSplitterLayoutStruct> list;
+    TQPtrList<TQSplitterLayoutStruct> list;
     bool opaque;
     bool firstShow;
 };
@@ -323,34 +312,34 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
   \brief The KDGanttMinimizeSplitter class implements a splitter
   widget with minimize buttons.
 
-  This class (and its documentation) is largely a copy of Qt's
+  This class (and its documentation) is largely a copy of TQt's
   TQSplitter; the copying was necessary because TQSplitter is not
   extensible at all. TQSplitter and its documentation are licensed
-  according to the GPL and the Qt Professional License (if you hold
+  according to the GPL and the TQt Professional License (if you hold
   such a license) and are (C) Trolltech AS.
 
   A splitter lets the user control the size of child widgets by
-  dragging the boundary between the children. Any number of widgets
+  dragging the boundary between the tqchildren. Any number of widgets
   may be controlled.
 
   To show a TQListBox, a TQListView and a TQTextEdit side by side:
 
   \code
-    KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent );
+    KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( tqparent );
     TQListBox *lb = new TQListBox( split );
     TQListView *lv = new TQListView( split );
     TQTextEdit *ed = new TQTextEdit( split );
   \endcode
 
   In KDGanttMinimizeSplitter, the boundary can be either horizontal or
-  vertical.  The default is horizontal (the children are side by side)
+  vertical.  The default is horizontal (the tqchildren are side by side)
   but you can use setOrientation( TQSplitter::Vertical ) to set it to
   vertical.
 
   Use setResizeMode() to specify
   that a widget should keep its size when the splitter is resized.
 
-  Although KDGanttMinimizeSplitter normally resizes the children only
+  Although KDGanttMinimizeSplitter normally resizes the tqchildren only
   at the end of a resize operation, if you call setOpaqueResize( TRUE
   ) the widgets are resized as often as possible.
 
@@ -360,7 +349,7 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
   sizes set by the user.
 
   If you hide() a child, its space will be distributed among the other
-  children. It will be reinstated when you show() it again. It is also
+  tqchildren. It will be reinstated when you show() it again. It is also
   possible to reorder the widgets within the splitter using
   moveToFirst() and moveToLast().
 */
@@ -389,53 +378,45 @@ static TQSize minSizeHint( const TQWidget* w )
 
 
 /*!
-  Constructs a horizontal splitter with the \a parent and \a
+  Constructs a horizontal splitter with the \a tqparent and \a
   name arguments being passed on to the TQFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name )
-    :TQFrame(parent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *tqparent, const char *name )
+    :TQFrame(tqparent,name,WPaintUnclipped)
 {
-#if QT_VERSION >= 300
      orient = Horizontal;
      init();
-#endif
 }
 
 /*!
-  Constructs a splitter with orientation \a o with the \a parent
+  Constructs a splitter with orientation \a o with the \a tqparent
   and \a name arguments being passed on to the TQFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, TQWidget *parent, const char *name )
-    :TQFrame(parent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *tqparent, const char *name )
+    :TQFrame(tqparent,name,WPaintUnclipped)
 {
-#if QT_VERSION >= 300
      orient = o;
      init();
-#endif
 }
 
 /*!
-  Destroys the splitter and any children.
+  Destroys the splitter and any tqchildren.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
-#if QT_VERSION >= 300
     data->list.setAutoDelete( TRUE );
     delete data;
-#endif
 }
 
 
-#if QT_VERSION >= 300
 void KDGanttMinimizeSplitter::init()
 {
-    data = new QSplitterData;
+    data = new TQSplitterData;
     if ( orient == Horizontal )
 	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
     else
 	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
 }
-#endif
 
 
 
@@ -443,11 +424,10 @@ void KDGanttMinimizeSplitter::init()
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
-  The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
+  The possible orientations are TQt:Vertical and TQt::Horizontal (the default).
 */
-void KDGanttMinimizeSplitter::setOrientation( Orientation o )
+void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
 {
-#if QT_VERSION >= 300
     if ( orient == o )
 	return;
     orient = o;
@@ -457,18 +437,16 @@ void KDGanttMinimizeSplitter::setOrientation( Orientation o )
     else
 	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
 	    ((KDGanttSplitterHandle*)s->wid)->setOrientation( o );
 	s = data->list.next();  // ### next at end of loop, no iterator
     }
     recalc( isVisible() );
-#endif
 }
 
 
-#if QT_VERSION >= 300
 /*!
   Reimplemented from superclass.
 */
@@ -487,12 +465,12 @@ void KDGanttMinimizeSplitter::resizeEvent( TQResizeEvent * )
   needed.  (If \a first is TRUE, then recalcId is very probably
   needed.)
 */
-QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool first )
+TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool first )
 {
-    QSplitterLayoutStruct *s;
+    TQSplitterLayoutStruct *s;
     KDGanttSplitterHandle *newHandle = 0;
     if ( data->list.count() > 0 ) {
-	s = new QSplitterLayoutStruct;
+	s = new TQSplitterLayoutStruct;
 	s->mode = KeepSize;
 	TQString tmp = "qt_splithandle_";
 	tmp += w->name();
@@ -506,7 +484,7 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fir
 	else
 	    data->list.append( s );
     }
-    s = new QSplitterLayoutStruct;
+    s = new TQSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
     if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() )
@@ -537,7 +515,7 @@ void KDGanttMinimizeSplitter::childEvent( TQChildEvent *c )
 	if ( ((TQWidget*)c->child())->testWFlags( WType_TopLevel ) )
 	    return;
 
-	QSplitterLayoutStruct *s = data->list.first();
+	TQSplitterLayoutStruct *s = data->list.first();
 	while ( s ) {
 	    if ( s->wid == c->child() )
 		return;
@@ -547,10 +525,10 @@ void KDGanttMinimizeSplitter::childEvent( TQChildEvent *c )
 	recalc( isVisible() );
 
     } else if ( c->type() == TQEvent::ChildRemoved ) {
-	QSplitterLayoutStruct *p = 0;
+	TQSplitterLayoutStruct *p = 0;
 	if ( data->list.count() > 1 )
 	    p = data->list.at(1); //remove handle _after_ first widget.
-	QSplitterLayoutStruct *s = data->list.first();
+	TQSplitterLayoutStruct *s = data->list.first();
 	while ( s ) {
 	    if ( s->wid == c->child() ) {
 		data->list.removeRef( s );
@@ -621,10 +599,10 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
   \sa TQStyle::drawPrimitive()
 */
 void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
-			      QCOORD x, QCOORD y, QCOORD w, QCOORD h )
+			      TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
 {
     style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
-			  (orientation() == Qt::Horizontal ?
+			  (orientation() == TQt::Horizontal ?
 			   TQStyle::Style_Horizontal : 0));
 }
 
@@ -636,7 +614,7 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
 */
 int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
 {
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     bool seen_w = FALSE;
     while ( s ) {
 	if ( s->isSplitter && seen_w )
@@ -661,11 +639,11 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
 
   \sa idAfter()
 */
-void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
+void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id )
 {
     p = adjustPos( p, id );
 
-    QSplitterLayoutStruct *s = data->list.at(id);
+    TQSplitterLayoutStruct *s = data->list.at(id);
     int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
     bool upLeft;
     if ( TQApplication::reverseLayout() && orient == Horizontal ) {
@@ -701,7 +679,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
 {
     if( id < 0 )
 	return;
-    QSplitterLayoutStruct *s = data->list.at(id);
+    TQSplitterLayoutStruct *s = data->list.at(id);
     if ( !s )
 	return;
     TQWidget *w = s->wid;
@@ -728,12 +706,12 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient == Horizontal ) {
 	    dd = w->tqgeometry().right() - pos;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
 	} else {
 	    dd = pos - pick( w->pos() ) + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	}
@@ -750,7 +728,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
 */
 void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 {
-    QSplitterLayoutStruct *s = id < int(data->list.count()) ?
+    TQSplitterLayoutStruct *s = id < int(data->list.count()) ?
 			       data->list.at(id) : 0;
     if ( !s )
 	return;
@@ -782,13 +760,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	int right, dd,/* newRight,*/ newLeft, nextPos;
 	if ( TQApplication::reverseLayout() && orient == Horizontal ) {
 	    dd = pos - left + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
 	    right = pick( w->tqgeometry().bottomRight() );
 	    dd = right - pos + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    /*newRight = pos+dd-1;*/
 	    newLeft = pos;
 	    nextPos = newLeft + dd;
@@ -802,7 +780,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 
 void KDGanttMinimizeSplitter::expandPos( int id, int*  min, int* max )
 {
-    QSplitterLayoutStruct *s = data->list.at(id-1);
+    TQSplitterLayoutStruct *s = data->list.at(id-1);
     TQWidget* w = s->wid;
     *min = pick( w->mapToParent( TQPoint(0,0) ) );
 
@@ -810,7 +788,7 @@ void KDGanttMinimizeSplitter::expandPos( int id, int*  min, int* max )
         pick( size() );
     }
     else {
-        QSplitterLayoutStruct *s = data->list.at(id+1);
+        TQSplitterLayoutStruct *s = data->list.at(id+1);
         TQWidget* w = s->wid;
         *max = pick( w->mapToParent( TQPoint( w->width(), w->height() ) ) ) -8;
     }
@@ -834,7 +812,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	return;
     int i;
     for ( i = 0; i < id; i++ ) {
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    //ignore
 	} else if ( s->isSplitter ) {
@@ -846,7 +824,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	}
     }
     for ( i = id; i < n; i++ ) {
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    //ignore
 	} else if ( s->isSplitter ) {
@@ -861,14 +839,14 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
     if ( orient == Horizontal && TQApplication::reverseLayout() ) {
 	int splitterWidth = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
 	if ( min )
-	    *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
+	    *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
-	    *max = pick(r.topRight()) - QMAX( minB, pick(r.size())-maxA ) - splitterWidth;
+	    *max = pick(r.topRight()) - TQMAX( minB, pick(r.size())-maxA ) - splitterWidth;
     } else {
 	if ( min )
-	    *min = pick(r.topLeft()) + QMAX( minB, pick(r.size())-maxA );
+	    *min = pick(r.topLeft()) + TQMAX( minB, pick(r.size())-maxA );
 	if ( max )
-	    *max = pick(r.topLeft()) + QMIN( maxB, pick(r.size())-minA );
+	    *max = pick(r.topLeft()) + TQMIN( maxB, pick(r.size())-minA );
     }
 }
 
@@ -884,7 +862,7 @@ int KDGanttMinimizeSplitter::adjustPos( int p, int id )
     int min = 0;
     int max = 0;
     getRange( id, &min, &max );
-    p = QMAX( min, QMIN( p, max ) );
+    p = TQMAX( min, TQMIN( p, max ) );
 
     return p;
 }
@@ -898,7 +876,7 @@ void KDGanttMinimizeSplitter::doResize()
     TQMemArray<QLayoutStruct> a( n );
     for ( i = 0; i< n; i++ ) {
 	a[i].init();
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    a[i].stretch = 0;
 	    a[i].tqsizeHint = a[i].tqminimumSize = 0;
@@ -929,7 +907,7 @@ void KDGanttMinimizeSplitter::doResize()
     kdganttGeomCalc( a, 0, n, pick( r.topLeft() ), pick( r.size() ), 0 );
 
     for ( i = 0; i< n; i++ ) {
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	setG( s->wid, a[i].pos, a[i].size );
     }
 
@@ -941,7 +919,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
     int fi = 2*frameWidth();
     int maxl = fi;
     int minl = fi;
-    int maxt = QWIDGETSIZE_MAX;
+    int maxt = TQWIDGETSIZE_MAX;
     int mint = fi;
     int n = data->list.count();
     bool first = TRUE;
@@ -951,9 +929,9 @@ void KDGanttMinimizeSplitter::recalc( bool update )
       The splitter before any other visible widget is visible.
     */
     for ( int i = 0; i< n; i++ ) {
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	if ( !s->isSplitter ) {
-	    QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0;
+	    TQSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0;
 	    if ( p && p->isSplitter )
 		if ( first || s->wid->isHidden() )
 		    p->wid->hide(); //may trigger new recalc
@@ -966,7 +944,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 
     bool empty=TRUE;
     for ( int j = 0; j< n; j++ ) {
-	QSplitterLayoutStruct *s = data->list.at(j);
+	TQSplitterLayoutStruct *s = data->list.at(j);
 	if ( !s->wid->isHidden() ) {
 	    empty = FALSE;
 	    if ( s->isSplitter ) {
@@ -976,10 +954,10 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 		TQSize minS = minSize(s->wid);
 		minl += pick( minS );
 		maxl += pick( s->wid->tqmaximumSize() );
-		mint = QMAX( mint, trans( minS ));
+		mint = TQMAX( mint, trans( minS ));
 		int tm = trans( s->wid->tqmaximumSize() );
 		if ( tm > 0 )
-		    maxt = QMIN( maxt, tm );
+		    maxt = TQMIN( maxt, tm );
 	    }
 	}
     }
@@ -988,11 +966,11 @@ void KDGanttMinimizeSplitter::recalc( bool update )
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
-            // KDGanttMinimizeSplitter with no children yet
-            maxl = QWIDGETSIZE_MAX;
+            // KDGanttMinimizeSplitter with no tqchildren yet
+            maxl = TQWIDGETSIZE_MAX;
         }
     } else {
-        maxl = QMIN( maxl, QWIDGETSIZE_MAX );
+        maxl = TQMIN( maxl, TQWIDGETSIZE_MAX );
     }
     if ( maxt < mint )
 	maxt = mint;
@@ -1017,7 +995,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 void KDGanttMinimizeSplitter::setResizeMode( TQWidget *w, ResizeMode mode )
 {
     processChildEvents();
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->wid == w  ) {
 	    s->mode = mode;
@@ -1064,11 +1042,11 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w )
 {
     processChildEvents();
     bool found = FALSE;
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->wid == w  ) {
 	    found = TRUE;
-	    QSplitterLayoutStruct *p = data->list.prev();
+	    TQSplitterLayoutStruct *p = data->list.prev();
 	    if ( p ) { // not already at first place
 		data->list.take(); //take p
 		data->list.take(); // take s
@@ -1093,12 +1071,12 @@ void KDGanttMinimizeSplitter::moveToLast( TQWidget *w )
 {
     processChildEvents();
     bool found = FALSE;
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->wid == w  ) {
 	    found = TRUE;
 	    data->list.take(); // take s
-	    QSplitterLayoutStruct *p = data->list.current();
+	    TQSplitterLayoutStruct *p = data->list.current();
 	    if ( p ) { // the splitter handle after s
 		data->list.take(); //take p
 		data->list.append( p );
@@ -1118,7 +1096,7 @@ void KDGanttMinimizeSplitter::recalcId()
 {
     int n = data->list.count();
     for ( int i = 0; i < n; i++ ) {
-	QSplitterLayoutStruct *s = data->list.at(i);
+	TQSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->isSplitter )
 	    ((KDGanttSplitterHandle*)s->wid)->setId(i);
     }
@@ -1132,8 +1110,8 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-	const TQObjectList * c = children();
+    if ( tqchildren() ) {
+	const TQObjectList * c = tqchildren();
 	TQObjectListIt it( *c );
 	TQObject * o;
 
@@ -1144,7 +1122,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const
 		TQSize s = ((TQWidget*)o)->tqsizeHint();
 		if ( s.isValid() ) {
 		    l += pick( s );
-		    t = QMAX( t, trans( s ) );
+		    t = TQMAX( t, trans( s ) );
 		}
 	    }
 	}
@@ -1162,8 +1140,8 @@ TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-	const TQObjectList * c = children();
+    if ( tqchildren() ) {
+	const TQObjectList * c = tqchildren();
 	TQObjectListIt it( *c );
 	TQObject * o;
 
@@ -1174,7 +1152,7 @@ TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
 		TQSize s = minSizeHint((TQWidget*)o);
 		if ( s.isValid() ) {
 		    l += pick( s );
-		    t = QMAX( t, trans( s ) );
+		    t = TQMAX( t, trans( s ) );
 		}
 	    }
 	}
@@ -1189,7 +1167,7 @@ TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
 
 void KDGanttMinimizeSplitter::storeSizes()
 {
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( !s->isSplitter )
 	    s->sizer = pick( s->wid->size() );
@@ -1214,7 +1192,7 @@ void KDGanttMinimizeSplitter::setHidden( TQWidget *w, bool hide )
     } else if ( w == w2 ) {
 	w2show = !hide;
     } else {
-#ifdef QT_CHECK_RANGE
+#ifdef TQT_CHECK_RANGE
 	qWarning( "KDGanttMinimizeSplitter::setHidden(), unknown widget" );
 #endif
 	return;
@@ -1237,7 +1215,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const
 	return !w1show;
      else if ( w == w2 )
 	return !w2show;
-#ifdef QT_CHECK_RANGE
+#ifdef TQT_CHECK_RANGE
     else
 	qWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" );
 #endif
@@ -1274,7 +1252,7 @@ TQValueList<int> KDGanttMinimizeSplitter::sizes() const
 	that->polish();
     }
     TQValueList<int> list;
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( !s->isSplitter )
 	    list.append( s->sizer );
@@ -1292,7 +1270,7 @@ TQValueList<int> KDGanttMinimizeSplitter::sizes() const
   top to bottom.
   Extra values in \a list are ignored.
 
-  If \a list tqcontains too few values, the result is undefined
+  If \a list contains too few values, the result is undefined
   but the program will still be well-behaved.
 
   \sa sizes()
@@ -1302,7 +1280,7 @@ void KDGanttMinimizeSplitter::setSizes( TQValueList<int> list )
 {
     processChildEvents();
     TQValueList<int>::Iterator it = list.begin();
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s && it != list.end() ) {
 	if ( !s->isSplitter ) {
 	    s->sizer = *it;
@@ -1332,7 +1310,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
 void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
 {
     int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
-    QSplitterLayoutStruct *s = data->list.first();
+    TQSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
 	    s->sizer = sw;
@@ -1342,8 +1320,6 @@ void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
     TQFrame::styleChange( old );
 }
 
-#endif
-
 /*!
   Specifies the direction of the minimize buttons.
   If the orientation of the splitter is horizontal then with
@@ -1408,7 +1384,7 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 	}
     } else if ( space < cHint + spacerCount*spacer ) {
 	// Less space than tqsizeHint, but more than minimum.
-	// Currently take space equally from each, like in Qt 2.x.
+	// Currently take space equally from each, like in TQt 2.x.
 	// Commented-out lines will give more space to stretchier items.
 	int n = count;
 	int space_left = space - spacerCount*spacer;
@@ -1555,7 +1531,7 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 */
 
 /*!
-  \fn Orientation KDGanttMinimizeSplitter::orientation() const
+  \fn Qt::Orientation KDGanttMinimizeSplitter::orientation() const
 
   Returns the orientation of the splitter.
 */
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 15429e5a..86b5340d 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -26,46 +26,42 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
 #ifndef KDGANTTMINIMIZESPLITTER_H
 #define KDGANTTMINIMIZESPLITTER_H
 
-#ifndef QT_H
 #include "tqframe.h"
 #include "tqvaluelist.h"
-#endif // QT_H
 
-#ifndef QT_NO_SPLITTER
+class TQSplitterData;
+class TQSplitterLayoutStruct;
 
-class QSplitterData;
-class QSplitterLayoutStruct;
-
-class KDGanttMinimizeSplitter : public QFrame
+class KDGanttMinimizeSplitter : public TQFrame
 {
     Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Direction )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
 
 public:
     enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
     enum Direction { Left, Right, Up, Down };
 
-    KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 );
-    KDGanttMinimizeSplitter( Orientation, TQWidget* parent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( TQWidget* tqparent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* tqparent=0, const char* name=0 );
     ~KDGanttMinimizeSplitter();
 
-    virtual void setOrientation( Orientation );
-    Orientation orientation() const { return orient; }
+    virtual void setOrientation( Qt::Orientation );
+    Qt::Orientation orientation() const { return orient; }
 
     void setMinimizeDirection( Direction );
     Direction minimizeDirection() const;
 
-#if QT_VERSION >= 300
     virtual void setResizeMode( TQWidget *w, ResizeMode );
     virtual void setOpaqueResize( bool = TRUE );
     bool opaqueResize() const;
@@ -89,9 +85,9 @@ protected:
 
     int idAfter( TQWidget* ) const;
 
-    void moveSplitter( QCOORD pos, int id );
-    virtual void drawSplitter( TQPainter*, QCOORD x, QCOORD y,
-			       QCOORD w, QCOORD h );
+    void moveSplitter( TQCOORD pos, int id );
+    virtual void drawSplitter( TQPainter*, TQCOORD x, TQCOORD y,
+			       TQCOORD w, TQCOORD h );
     void styleChange( TQStyle& );
     int adjustPos( int , int );
     virtual void setRubberband( int );
@@ -103,33 +99,32 @@ private:
     void doResize();
     void storeSizes();
     void processChildEvents();
-    QSplitterLayoutStruct *addWidget( TQWidget*, bool first = FALSE );
+    TQSplitterLayoutStruct *addWidget( TQWidget*, bool first = FALSE );
     void recalcId();
     void moveBefore( int pos, int id, bool upLeft );
     void moveAfter( int pos, int id, bool upLeft );
     void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE );
 
-    QCOORD pick( const TQPoint &p ) const
+    TQCOORD pick( const TQPoint &p ) const
     { return orient == Horizontal ? p.x() : p.y(); }
-    QCOORD pick( const TQSize &s ) const
+    TQCOORD pick( const TQSize &s ) const
     { return orient == Horizontal ? s.width() : s.height(); }
 
-    QCOORD trans( const TQPoint &p ) const
+    TQCOORD trans( const TQPoint &p ) const
     { return orient == Vertical ? p.x() : p.y(); }
-    QCOORD trans( const TQSize &s ) const
+    TQCOORD trans( const TQSize &s ) const
     { return orient == Vertical ? s.width() : s.height(); }
 
-    QSplitterData *data;
-#endif
+    TQSplitterData *data;
 
 private:
-    Orientation orient;
+    Qt::Orientation orient;
     Direction _direction;
 #ifndef DOXYGEN_SKIP_INTERNAL
     friend class KDGanttSplitterHandle;
 #endif
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     KDGanttMinimizeSplitter( const KDGanttMinimizeSplitter & );
     KDGanttMinimizeSplitter& operator=( const KDGanttMinimizeSplitter & );
 #endif
@@ -137,16 +132,16 @@ private:	// Disabled copy constructor and operator=
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 // This class was continued from a verbatim copy of the
-// QSplitterHandle pertaining to the Qt Enterprise License and the
+// TQSplitterHandle pertaining to the TQt Enterprise License and the
 // GPL. It has only been renamed to KDGanttSplitterHandler in order to
 // avoid a symbol clash on some platforms.
-class KDGanttSplitterHandle : public QWidget
+class KDGanttSplitterHandle : public TQWidget
 {
     Q_OBJECT
-#if QT_VERSION >= 300
+    TQ_OBJECT
 public:
     KDGanttSplitterHandle( Qt::Orientation o,
-		       KDGanttMinimizeSplitter *parent, const char* name=0 );
+		       KDGanttMinimizeSplitter *tqparent, const char* name=0 );
     void setOrientation( Qt::Orientation o );
     Qt::Orientation orientation() const { return orient; }
 
@@ -175,10 +170,7 @@ private:
     int _activeButton;
     bool _collapsed;
     int _origPos;
-#endif
 };
 #endif
 
-#endif // QT_NO_SPLITTER
-
 #endif // KDGANTTMINIMIZESPLITTER_H
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index 47d08950..e6258e90 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -57,15 +57,15 @@
   orientation and the control arrow button on top of the controlled
   widget.
 
-  \param parent the parent widget. This parameter is passed to the
+  \param tqparent the tqparent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
 */
 
-KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
+KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
                                           const char* name ) :
-    KDGanttSizingControl( parent, name ), _orient( Horizontal ), 
+    KDGanttSizingControl( tqparent, name ), _orient( Horizontal ), 
     _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -78,16 +78,16 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
   the controlled widget (depending on the orientation).
 
   \param orientation the orientation of the splitter
-  \param parent the parent widget. This parameter is passed to the
+  \param tqparent the tqparent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
 */
 
-KDGanttSemiSizingControl::KDGanttSemiSizingControl( Orientation orientation,
-                                          TQWidget* parent,
+KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
+                                          TQWidget* tqparent,
                                           const char* name ) :
-    KDGanttSizingControl( parent, name ), _orient( orientation ), 
+    KDGanttSizingControl( tqparent, name ), _orient( orientation ), 
     _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -101,17 +101,17 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Orientation orientation,
   \param arrowPosition specifies whether the control arrow button
   should appear before or after the controlled widget
   \param orientation the orientation of the splitter
-  \param parent the parent widget. This parameter is passed to the
+  \param tqparent the tqparent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
 */
 
 KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition,
-                                          Orientation orientation,
-                                          TQWidget* parent,
+                                          Qt::Orientation orientation,
+                                          TQWidget* tqparent,
                                           const char* name ) :
-    KDGanttSizingControl( parent, name ), _orient( orientation ), 
+    KDGanttSizingControl( tqparent, name ), _orient( orientation ), 
     _arrowPos( arrowPosition ), _minimizedWidget(0), _maximizedWidget(0)
 {
     init();
@@ -290,10 +290,10 @@ void KDGanttSemiSizingControl::setup()
     //------------------------------ Setup the button at the correct possition
     if ( _arrowPos == After && _orient == Vertical && !isMinimized() ) {
         butLayout->addStretch( 1 );
-        butLayout->addWidget( _but, 0, Qt::AlignLeft );
+        butLayout->addWidget( _but, 0, TQt::AlignLeft );
     }
     else {
-        butLayout->addWidget( _but, 0, Qt::AlignRight  );
+        butLayout->addWidget( _but, 0, TQt::AlignRight  );
         butLayout->addStretch( 1 );
     }
 
@@ -313,7 +313,7 @@ void KDGanttSemiSizingControl::setup()
      ************************************************** */
     // hack for the usage in KDGantt as pop-up legend widget
     // for this purpose,
-    // the _maximizedWidget must be a child of the parent of this widget
+    // the _maximizedWidget must be a child of the tqparent of this widget
 
     if ( isMinimized() ) {
        widget = _minimizedWidget;
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 6b43f7c2..5857786e 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -42,18 +42,19 @@ class TQBoxLayout;
 
 class KDGanttSemiSizingControl : public KDGanttSizingControl
 {
-    Q_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
+    TQ_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
     Q_ENUMS( ArrowPosition )
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ArrowPosition { Before, After };
 
-    KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 );
-    KDGanttSemiSizingControl( Orientation orientation, TQWidget* parent = 0,
+    KDGanttSemiSizingControl( TQWidget* tqparent = 0, const char* name = 0 );
+    KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* tqparent = 0,
                            const char* name = 0 );
     KDGanttSemiSizingControl( ArrowPosition arrowPosition,
-                         Orientation orientation, TQWidget* parent = 0,
+                         Qt::Orientation orientation, TQWidget* tqparent = 0,
                          const char* name = 0 );
 
     void setMinimizedWidget( TQWidget* widget );
@@ -78,7 +79,7 @@ protected:
     TQPixmap pixmap( Direction );
 
 private:
-    Orientation _orient;
+    Qt::Orientation _orient;
     ArrowPosition _arrowPos;
     TQWidget* _minimizedWidget;
     TQWidget* _maximizedWidget;
diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp
index a650a6e4..a51f9f4f 100644
--- a/kdgantt/KDGanttSizingControl.cpp
+++ b/kdgantt/KDGanttSizingControl.cpp
@@ -25,8 +25,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -48,7 +48,7 @@
 /*!
   Constructs an empty KDGanttSizing Control.
 
-  \param parent the parent widget. This parameter is passed to the
+  \param tqparent the tqparent widget. This parameter is passed to the
   base class.
   \param name the internal widget name. This parameter is passed to
   the base class.
@@ -56,8 +56,8 @@
 
 */
 
-KDGanttSizingControl::KDGanttSizingControl( TQWidget* parent, const char* name, WFlags f )
-    :TQWidget( parent, name, f ), _isMinimized( false )
+KDGanttSizingControl::KDGanttSizingControl( TQWidget* tqparent, const char* name, WFlags f )
+    :TQWidget( tqparent, name, f ), _isMinimized( false )
 {
 }
 
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index de700399..cbea0c58 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -25,8 +25,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -35,15 +35,16 @@
 
 #include <tqwidget.h>
 
-class KDGanttSizingControl : public QWidget
+class KDGanttSizingControl : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     bool isMinimized() const;
     
 protected:
-    KDGanttSizingControl( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    KDGanttSizingControl( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
 
 public slots:
     virtual void minimize( bool minimize );
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 6e2e4b4b..f7eeeacd 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -76,12 +76,12 @@
 /*!
   Constructs an empty KDGanttView.
 
-  \param parent the widget parent
+  \param tqparent the widget tqparent
   \param name the internal debugging name
 */
 
-KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
-    : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ),
+KDGanttView::KDGanttView( TQWidget* tqparent, const char* name  )
+    : KDGanttMinimizeSplitter( TQt::Vertical, tqparent, name ),
       myCanvasView(0),
       myTimeHeaderScroll(0),
       mFixedHorizon( false )
@@ -156,7 +156,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
     initDefaults();
     _showHeader = false;
 
-    myTextColor = Qt::black;
+    myTextColor = TQt::black;
     myLegendItems = new TQPtrList<legendItem>;
     //TQObject::connect( this, TQT_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQT_SLOT( editItem( KDGanttViewItem*  ))) ;
     myItemAttributeDialog = new itemAttributeDialog();
@@ -766,25 +766,25 @@ bool KDGanttView::editable() const
 
 
 /*!
-  Saves the state of the Gantt view in an IO device in XML format. The saved
+  Saves the state of the Gantt view in an IO tqdevice in XML format. The saved
   data can be reloaded with \a loadProject().
 
-  \param device a pointer to the IO device in which to store the Gantt
+  \param tqdevice a pointer to the IO tqdevice in which to store the Gantt
   view state.
   \return true if the data could be written, false if an error
   occurred
   \sa loadProject()
 */
 
-bool KDGanttView::saveProject( TQIODevice* device )
+bool KDGanttView::saveProject( TQIODevice* tqdevice )
 {
-    Q_ASSERT( device );
+    Q_ASSERT( tqdevice );
 
     TQDomDocument doc = saveXML();
-    if( device->isOpen() )
-        device->close();
-    if( device->open( IO_WriteOnly ) ) {
-        TQTextStream ts( device );
+    if( tqdevice->isOpen() )
+        tqdevice->close();
+    if( tqdevice->open( IO_WriteOnly ) ) {
+        TQTextStream ts( tqdevice );
         ts << doc.toString();
         return true;
     } else
@@ -796,30 +796,30 @@ bool KDGanttView::saveProject( TQIODevice* device )
   Loads a previously saved state of the Gantt view. All current
   settings and items are discarded before loading the data.
 
-  \param device a pointer to the IO device from which to load the
+  \param tqdevice a pointer to the IO tqdevice from which to load the
   Gantt view state.
   \return true if the file could be read, false if an error
   occurred
   \sa saveProject()
 */
 
-bool KDGanttView::loadProject( TQIODevice* device )
+bool KDGanttView::loadProject( TQIODevice* tqdevice )
 {
-    Q_ASSERT( device );
+    Q_ASSERT( tqdevice );
 
-    if( device->isOpen() )
-        device->close();
-    if( device->open( IO_ReadOnly ) ) {
+    if( tqdevice->isOpen() )
+        tqdevice->close();
+    if( tqdevice->open( IO_ReadOnly ) ) {
         TQDomDocument doc( "GanttView" );
         TQString err;
         int errline, errcol;
-        if ( !doc.setContent( device, &err, &errline, &errcol ) ) {
+        if ( !doc.setContent( tqdevice, &err, &errline, &errcol ) ) {
           qDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline );
           qDebug("%s ", err.latin1());
-          device->close();
+          tqdevice->close();
           return false;
         }
-        device->close();
+        tqdevice->close();
         return loadXML( doc );
     } else
         return false;
@@ -869,7 +869,7 @@ void KDGanttView::print( TQPrinter* printer ,
 
   // at the top, we want to print current time/date
   TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString();
-  int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
+  int hei = p.boundingRect(0,0, 5, 5, TQt::AlignLeft, date ).height();
   p.drawText( 0, 0, date );
 
   // compute the scale
@@ -2341,12 +2341,12 @@ KDGanttViewItem* KDGanttView::firstChild() const
 /*!
   This method turns calendar mode on and off.  In calendar mode, only
   those items can be opened which have subitems which have
-  subitems. I.e., if an item tqcontains multiple calendars, it can be
+  subitems. I.e., if an item contains multiple calendars, it can be
   opened, but not a calendar item itself.  If you want to use this
   GanttView as a calendar view, you have to call
   setDisplaySubitemsAsGroup( true ); to use the root items as calendar
   items.  To create new calendar entries for these root items, create
-  a new KDGanttViewTaskItem with this root item as a parent.  If you
+  a new KDGanttViewTaskItem with this root item as a tqparent.  If you
   want an item with subitems to behave like a calendar (which is
   possibly empty at startup), please call setIsCalendar( true ); for
   this item.
@@ -3727,7 +3727,7 @@ void KDGanttView::addTaskLinkGroup(KDGanttViewTaskLinkGroup* group)
     myTaskLinkGroupList.append(group);
     return;
   }
-    if (myTaskLinkGroupList.find(group) == -1)
+    if (myTaskLinkGroupList.tqfind(group) == -1)
         myTaskLinkGroupList.append(group);
 }
 
@@ -3776,10 +3776,10 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
   TQPixmap p = TQPixmap( size+4, size+4 );
   p.fill( backgroundColor );
   TQPainter paint (&p);
-  TQBrush b = TQBrush ( Qt::SolidPattern );
+  TQBrush b = TQBrush ( TQt::SolidPattern );
   b.setColor( tqshapeColor );
   paint.setBrush( b );
-  TQPen pen( Qt::black, 1 ) ;
+  TQPen pen( TQt::black, 1 ) ;
   paint.setPen( pen );
   switch (tqshape) {
   case KDGanttViewItem::TriangleDown:{
@@ -3857,12 +3857,12 @@ void KDGanttView::initDefaults()
         undefinedColorHL[i] = true;
     }
     // setting the default colors
-    myDefaultColor [ getIndex( KDGanttViewItem::Event ) ] =  Qt::blue; //event
-    myDefaultColorHL [ getIndex( KDGanttViewItem::Event ) ] =  Qt::red;
-    myDefaultColor [ getIndex( KDGanttViewItem::Task ) ] =  Qt::green;//task
-    myDefaultColorHL [ getIndex( KDGanttViewItem::Task ) ] =  Qt::red;
-    myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::cyan;//summary
-    myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::red;
+    myDefaultColor [ getIndex( KDGanttViewItem::Event ) ] =  TQt::blue; //event
+    myDefaultColorHL [ getIndex( KDGanttViewItem::Event ) ] =  TQt::red;
+    myDefaultColor [ getIndex( KDGanttViewItem::Task ) ] =  TQt::green;//task
+    myDefaultColorHL [ getIndex( KDGanttViewItem::Task ) ] =  TQt::red;
+    myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::cyan;//summary
+    myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::red;
 
     // setting the default tqshape types
     // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
@@ -4357,7 +4357,7 @@ bool KDGanttView::dropEnabled() const
   order to specify user-defined drop handling, subclass
   KDGanttView and reimplement this method.
 
-  \param e The QDropEvent
+  \param e The TQDropEvent
   Note: e->source() is a pointer to the KDGanttView from which the drag started.
   I.e., if e->source() == this, this drag is an internal drag.
   \param droppedItem 0, if this is a drag operation from another
@@ -4433,7 +4433,7 @@ bool  KDGanttView::lvDropEvent ( TQDropEvent* e,
   In order to define accepting drops for particular items yourself,
   subclass KDGanttView and reimplement this method.
 
-  \param e           The QDragMoveEvent
+  \param e           The TQDragMoveEvent
                      Note: e->source() is a pointer to the KDGanttView, the drag started from.
                      I.e., if e->source() == this, this drag is an internal drag.
 
@@ -4475,7 +4475,7 @@ void  KDGanttView::lvDragEnterEvent ( TQDragEnterEvent * e)
   In order to specify user-defined drop acceptance for particular
   items, subclass KDGanttView and reimplement this method.
 
-  \param e           The QDragMoveEvent
+  \param e           The TQDragMoveEvent
                      Note: e->source() is a pointer to the KDGanttView, the drag started from.
                      I.e. if e->source() == this, this drag is an internal drag.
          draggedItem 0, if this is a drag operation from another KDGanttView instance.
@@ -4542,7 +4542,7 @@ void  KDGanttView::lvStartDrag (KDGanttViewItem* item)
   // In order to avoid starting drags for particular items, subclass KDGanttView
   // an reimplement this method.
   // insert here some code like
-  // if ( item->parent() )
+  // if ( item->tqparent() )
   // return;
   // This particular code will make it impossible to drag other items but root items.
   if ( d->drag()  ) {
@@ -4800,7 +4800,7 @@ bool KDGanttView::isLinkItemsEnabled() const
   const TQString& text )
 
   This signal is emitted whenever the user changes the name of an item
-  in the list view using in-place editing. \a text tqcontains the new
+  in the list view using in-place editing. \a text contains the new
   text in the list view.
 */
 
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 0f135e5a..781cc758 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -70,43 +70,44 @@ class KDGanttMinimizeSplitter;
 class KDGanttView : public KDGanttMinimizeSplitter
 {
     Q_OBJECT
-
-    Q_PROPERTY( bool showLegend READ showLegend WRITE setShowLegend )
-    Q_PROPERTY( bool showListView READ showListView WRITE setShowListView )
-    Q_PROPERTY( bool showTaskLinks READ showTaskLinks WRITE setShowTaskLinks )
-    Q_PROPERTY( bool editorEnabled READ editorEnabled WRITE setEditorEnabled )
-    Q_PROPERTY( TQDateTime horizonStart READ horizonStart WRITE setHorizonStart )
-    Q_PROPERTY( TQDateTime horizonEnd READ horizonEnd WRITE setHorizonEnd )
-    Q_PROPERTY( Scale scale READ scale WRITE setScale )
-    Q_PROPERTY( YearFormat yearFormat READ yearFormat WRITE setYearFormat )
-    Q_PROPERTY( HourFormat hourFormat READ hourFormat WRITE setHourFormat )
-    Q_PROPERTY( bool showMinorTicks READ showMinorTicks WRITE setShowMinorTicks )
-    Q_PROPERTY( bool showMajorTicks READ showMajorTicks WRITE setShowMajorTicks )
-    Q_PROPERTY( bool editable READ editable WRITE setEditable )
-    Q_PROPERTY( TQColor textColor READ textColor WRITE setTextColor )
-    Q_PROPERTY( int majorScaleCount READ majorScaleCount WRITE setMajorScaleCount )
-    Q_PROPERTY( int minorScaleCount READ minorScaleCount WRITE setMinorScaleCount )
-    Q_PROPERTY( int autoScaleMinorTickCount READ autoScaleMinorTickCount WRITE setAutoScaleMinorTickCount )
-    Q_PROPERTY( Scale maximumScale READ maximumScale WRITE setMaximumScale )
-    Q_PROPERTY( Scale minimumScale READ minimumScale WRITE setMinimumScale )
-    Q_PROPERTY( int minimumColumnWidth READ minimumColumnWidth WRITE setMinimumColumnWidth )
-    Q_PROPERTY( int ganttMaximumWidth READ ganttMaximumWidth WRITE setGanttMaximumWidth )
-    Q_PROPERTY( TQColor weekendBackgroundColor READ weekendBackgroundColor WRITE setWeekendBackgroundColor )
-    Q_PROPERTY( TQColor ganttViewBackgroundColor READ gvBackgroundColor WRITE setGvBackgroundColor )
-    Q_PROPERTY( TQColor listViewBackgroundColor READ lvBackgroundColor WRITE setLvBackgroundColor )
-    Q_PROPERTY( TQColor timeHeaderBackgroundColor READ timeHeaderBackgroundColor WRITE setTimeHeaderBackgroundColor )
-    Q_PROPERTY( TQColor legendHeaderBackgroundColor READ legendHeaderBackgroundColor WRITE setLegendHeaderBackgroundColor )
-    Q_PROPERTY( double zoomFactor READ zoomFactor )
-    Q_PROPERTY( bool showHeaderPopupMenu READ showHeaderPopupMenu WRITE setShowHeaderPopupMenu )
-    Q_PROPERTY( bool showTimeTablePopupMenu READ showTimeTablePopupMenu WRITE setShowTimeTablePopupMenu )
-    Q_PROPERTY( bool headerVisible READ headerVisible WRITE setHeaderVisible )
-    Q_PROPERTY( bool showLegendButton READ showLegendButton	WRITE setShowLegendButton )
-    Q_PROPERTY( bool legendIsDockwindow READ legendIsDockwindow WRITE setLegendIsDockwindow )
-    Q_PROPERTY( bool displayEmptyTasksAsLine READ displayEmptyTasksAsLine WRITE setDisplayEmptyTasksAsLine )
-    Q_PROPERTY( TQBrush noInformationBrush READ noInformationBrush WRITE setNoInformationBrush )
-    Q_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
-    Q_PROPERTY( bool dropEnabled READ dropEnabled WRITE setDropEnabled )
-    Q_PROPERTY( bool calendarMode READ calendarMode WRITE setCalendarMode )
+    TQ_OBJECT
+
+    TQ_PROPERTY( bool showLegend READ showLegend WRITE setShowLegend )
+    TQ_PROPERTY( bool showListView READ showListView WRITE setShowListView )
+    TQ_PROPERTY( bool showTaskLinks READ showTaskLinks WRITE setShowTaskLinks )
+    TQ_PROPERTY( bool editorEnabled READ editorEnabled WRITE setEditorEnabled )
+    TQ_PROPERTY( TQDateTime horizonStart READ horizonStart WRITE setHorizonStart )
+    TQ_PROPERTY( TQDateTime horizonEnd READ horizonEnd WRITE setHorizonEnd )
+    TQ_PROPERTY( Scale scale READ scale WRITE setScale )
+    TQ_PROPERTY( YearFormat yearFormat READ yearFormat WRITE setYearFormat )
+    TQ_PROPERTY( HourFormat hourFormat READ hourFormat WRITE setHourFormat )
+    TQ_PROPERTY( bool showMinorTicks READ showMinorTicks WRITE setShowMinorTicks )
+    TQ_PROPERTY( bool showMajorTicks READ showMajorTicks WRITE setShowMajorTicks )
+    TQ_PROPERTY( bool editable READ editable WRITE setEditable )
+    TQ_PROPERTY( TQColor textColor READ textColor WRITE setTextColor )
+    TQ_PROPERTY( int majorScaleCount READ majorScaleCount WRITE setMajorScaleCount )
+    TQ_PROPERTY( int minorScaleCount READ minorScaleCount WRITE setMinorScaleCount )
+    TQ_PROPERTY( int autoScaleMinorTickCount READ autoScaleMinorTickCount WRITE setAutoScaleMinorTickCount )
+    TQ_PROPERTY( Scale maximumScale READ maximumScale WRITE setMaximumScale )
+    TQ_PROPERTY( Scale minimumScale READ minimumScale WRITE setMinimumScale )
+    TQ_PROPERTY( int minimumColumnWidth READ minimumColumnWidth WRITE setMinimumColumnWidth )
+    TQ_PROPERTY( int ganttMaximumWidth READ ganttMaximumWidth WRITE setGanttMaximumWidth )
+    TQ_PROPERTY( TQColor weekendBackgroundColor READ weekendBackgroundColor WRITE setWeekendBackgroundColor )
+    TQ_PROPERTY( TQColor ganttViewBackgroundColor READ gvBackgroundColor WRITE setGvBackgroundColor )
+    TQ_PROPERTY( TQColor listViewBackgroundColor READ lvBackgroundColor WRITE setLvBackgroundColor )
+    TQ_PROPERTY( TQColor timeHeaderBackgroundColor READ timeHeaderBackgroundColor WRITE setTimeHeaderBackgroundColor )
+    TQ_PROPERTY( TQColor legendHeaderBackgroundColor READ legendHeaderBackgroundColor WRITE setLegendHeaderBackgroundColor )
+    TQ_PROPERTY( double zoomFactor READ zoomFactor )
+    TQ_PROPERTY( bool showHeaderPopupMenu READ showHeaderPopupMenu WRITE setShowHeaderPopupMenu )
+    TQ_PROPERTY( bool showTimeTablePopupMenu READ showTimeTablePopupMenu WRITE setShowTimeTablePopupMenu )
+    TQ_PROPERTY( bool headerVisible READ headerVisible WRITE setHeaderVisible )
+    TQ_PROPERTY( bool showLegendButton READ showLegendButton	WRITE setShowLegendButton )
+    TQ_PROPERTY( bool legendIsDockwindow READ legendIsDockwindow WRITE setLegendIsDockwindow )
+    TQ_PROPERTY( bool displayEmptyTasksAsLine READ displayEmptyTasksAsLine WRITE setDisplayEmptyTasksAsLine )
+    TQ_PROPERTY( TQBrush noInformationBrush READ noInformationBrush WRITE setNoInformationBrush )
+    TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
+    TQ_PROPERTY( bool dropEnabled READ dropEnabled WRITE setDropEnabled )
+    TQ_PROPERTY( bool calendarMode READ calendarMode WRITE setCalendarMode )
 
     Q_ENUMS( Scale )
     Q_ENUMS( YearFormat )
@@ -118,7 +119,7 @@ public:
     enum HourFormat { Hour_24, Hour_12, Hour_24_FourDigit };
     enum RepaintMode { No, Medium, Always };
 
-    KDGanttView( TQWidget* parent = 0, const char* name = 0 );
+    KDGanttView( TQWidget* tqparent = 0, const char* name = 0 );
     ~KDGanttView();
 
     virtual void show();
@@ -152,7 +153,7 @@ public:
     void setHorBackgroundLines( int count = 2,
 				TQBrush brush =
 				TQBrush( TQColor ( 200,200,200 ),
-					Qt::Dense6Pattern ));
+					TQt::Dense6Pattern ));
     int horBackgroundLines( TQBrush& brush );
     bool saveProject( TQIODevice* );
     bool loadProject( TQIODevice* );
@@ -261,7 +262,7 @@ public:
 				   Scale mini =  KDGanttView::Minute ,
 				   Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
     void setIntervalBackgroundColor( const TQDateTime& start,
 				     const TQDateTime& end,
 				     const TQColor& color,
@@ -305,7 +306,7 @@ public:
     void setShowLegendButton( bool show );
     bool showLegendButton() const;
 
-    // Pass-through methods from QListView
+    // Pass-through methods from TQListView
     virtual int addColumn( const TQString& label, int width = -1 );
     virtual int addColumn( const TQIconSet& iconset, const TQString& label,
                            int width = -1 );
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index eadef6a1..9c385d46 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -64,15 +64,15 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
                                             const TQString& lvtext,
                                             const TQString& name ) :
-    KDGanttViewItem( Event, parent, lvtext, name )
+    KDGanttViewItem( Event, tqparent, lvtext, name )
 {
  initItem();
 
@@ -102,17 +102,17 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
                                             KDGanttViewItem* after,
                                             const TQString& lvtext,
                                             const TQString& name ) :
-    KDGanttViewItem( Event, parent, after, lvtext, name )
+    KDGanttViewItem( Event, tqparent, after, lvtext, name )
 {
 
   initItem();
diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h
index 6697e60c..033a248d 100644
--- a/kdgantt/KDGanttViewEventItem.h
+++ b/kdgantt/KDGanttViewEventItem.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -41,17 +41,17 @@ class KDGanttViewEventItem : public KDGanttViewItem
 {
 public:
     KDGanttViewEventItem( KDGanttView* view,
-                          const TQString& lvtext = TQString::null,
-                         const TQString& name = TQString::null );
-    KDGanttViewEventItem( KDGanttViewItem* parent,
-                          const TQString& lvtext = TQString::null,
-                         const TQString& name = TQString::null );
+                          const TQString& lvtext = TQString(),
+                         const TQString& name = TQString() );
+    KDGanttViewEventItem( KDGanttViewItem* tqparent,
+                          const TQString& lvtext = TQString(),
+                         const TQString& name = TQString() );
     KDGanttViewEventItem( KDGanttView* view, KDGanttViewItem* after,
-                          const TQString& lvtext = TQString::null,
-                         const TQString& name = TQString::null );
-    KDGanttViewEventItem( KDGanttViewItem* parent, KDGanttViewItem* after,
-                          const TQString& lvtext = TQString::null,
-                         const TQString& name = TQString::null );
+                          const TQString& lvtext = TQString(),
+                         const TQString& name = TQString() );
+    KDGanttViewEventItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+                          const TQString& lvtext = TQString(),
+                         const TQString& name = TQString() );
     virtual ~KDGanttViewEventItem();
 
     void setLeadTime( const TQDateTime& leadTimeStart );
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index c250d22f..eff5c26e 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -122,18 +122,18 @@
   shown or not.
   In the other mode (set with setDisplaySubitemsAsGroup( true ); ),
   called "calendar mode", the item is displayed as follows:
-  If the item has no children, it is displayed as usual.
-  If the item is opened (i.e., its children are displayed), the
+  If the item has no tqchildren, it is displayed as usual.
+  If the item is opened (i.e., its tqchildren are displayed), the
   start/end time of this item is computed automatically according to
-  the earliest start time/latest end time of its children. The item
-  and its children are displayed as usual.
-  If the item is closed (i.e., its children are hidden in the left
-  list view), the item itself is hidden, and its children are displayed
+  the earliest start time/latest end time of its tqchildren. The item
+  and its tqchildren are displayed as usual.
+  If the item is closed (i.e., its tqchildren are hidden in the left
+  list view), the item itself is hidden, and its tqchildren are displayed
   on the timeline of this item instead. To control the painting of
-  overlapping children, call \a setPriority() for the childs.
+  overlapping tqchildren, call \a setPriority() for the childs.
 
   Blocking of user interaction to open item:
-  If you want to block users to open items used as parents of calendar items,
+  If you want to block users to open items used as tqparents of calendar items,
   call \a KDGanttView::setCalendarMode( true );
 
   Example 1, Color:
@@ -147,12 +147,12 @@
   \a KDGanttView::setCalendarMode( true );
   \a KDGanttView::setDisplaySubitemsAsGroup( true );
   Insert root items in the Gantt view.
-  Insert items as children of these root item in the Gantt view.
-  You may use any item type as parent and child; there are no limitations.
+  Insert items as tqchildren of these root item in the Gantt view.
+  You may use any item type as tqparent and child; there are no limitations.
   It is, however, recommended to use KDGanttViewTaskItems
-  Actually, you may add child items to the children themselves.
-  Such a child behaves then like a parent.
-  Now set the start/end time of the children to specify a time
+  Actually, you may add child items to the tqchildren themselves.
+  Such a child behaves then like a tqparent.
+  Now set the start/end time of the tqchildren to specify a time
   interval for these items.
 */
 
@@ -182,16 +182,16 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param parentItem a parent item under which this one goes
+  \param tqparentItem a tqparent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem(parentItem,lvtext)
+    TQListViewItem(tqparentItem,lvtext)
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -224,18 +224,18 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param parentItem a parent item under which this one goes
+  \param tqparentItem a tqparent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
                                   KDGanttViewItem* after,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem( parentItem, after, lvtext )
+    TQListViewItem( tqparentItem, after, lvtext )
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -268,8 +268,8 @@ KDGanttViewItem::~KDGanttViewItem()
   if ( listView() ) {
       if ( isOpen() )
           setOpen( false );
-      if ( parent() )
-          parent()->takeItem( this );
+      if ( tqparent() )
+          tqparent()->takeItem( this );
       else
           myGanttView->myListView->takeItem( this );
       myGanttView->myTimeTable->updateMyContent();
@@ -292,10 +292,10 @@ void KDGanttViewItem::generateAndInsertName( const TQString& name )
         sItemDict.remove( _name );
 
     TQString newName;
-    if ( name.isEmpty() || sItemDict.find( name ) ) {
+    if ( name.isEmpty() || sItemDict.tqfind( name ) ) {
         // create unique name
         newName.sprintf( "%p", (void* )this );
-        while( sItemDict.find( newName ) ) {
+        while( sItemDict.tqfind( newName ) ) {
             newName += "_0";
         }
     } else {
@@ -325,11 +325,11 @@ TQString KDGanttViewItem::name() const
   with that name exists
 */
 
-KDGanttViewItem* KDGanttViewItem::find( const TQString& name )
+KDGanttViewItem* KDGanttViewItem::tqfind( const TQString& name )
 {
-    if (name.isEmpty()) // avoid error msg from QDict
+    if (name.isEmpty()) // avoid error msg from TQDict
         return 0;
-    return sItemDict.find( name );
+    return sItemDict.tqfind( name );
 }
 
 
@@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const
   Useful to get a so called "calendar view" with many items in one row.
   When \a displaySubitemsAsGroup() is set to true, this item has a normal view,
   when it is expanded. If it is not expanded (and has at least one child),
-  the item itself is hidden, and all children are displayed instead.
+  the item itself is hidden, and all tqchildren are displayed instead.
   To manage the painting priority of the childs (if overlapping),
   you may set \a priority() of these items.
 
@@ -463,9 +463,9 @@ void KDGanttViewItem::setDisplaySubitemsAsGroup( bool show )
   if ( !show && _displaySubitemsAsGroup)
     isVisibleInGanttView = true;
   _displaySubitemsAsGroup = show;
-  if ( parent() )
-    if ( parent()->isOpen() )
-	 parent()->setOpen( true );
+  if ( tqparent() )
+    if ( tqparent()->isOpen() )
+	 tqparent()->setOpen( true );
   if ( isOpen() )
     setOpen( true );
   updateCanvasItems();
@@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const
 /*!
   Specifies whether this item should be shown highlighted. The user
   can also highlight items with the mouse.
-  If the item displays its subitems (children) as a group
+  If the item displays its subitems (tqchildren) as a group
   (displaySubitemsAsGroup() == true),
   all changes apply to all subitems as well.
 
@@ -916,10 +916,10 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
         // items which don't have any tqshapes
         return;
     }
-    item->setBrush(Qt::SolidPattern);
+    item->setBrush(TQt::SolidPattern);
     item->setZ(5);
     itemShape = (KDCanvasPolygonItem*) item;
-    itemBack->setBrush(Qt::SolidPattern);
+    itemBack->setBrush(TQt::SolidPattern);
     itemBack->setZ(3);
     itemShapeBack = (KDCanvasPolygonItem*) itemBack;
 
@@ -999,7 +999,7 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
   KDGanttView::setHighlightColors() in order to get a uniform Gantt
   view.
 
-  If the item displays its subitems (children) as a group,
+  If the item displays its subitems (tqchildren) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor&
   It is advisable not to use this method, but rather set the text color
   for all items with KDGanttView::setTextColor() in order to get a
   uniform Gantt view.
-  If the item displays its subitems (children) as a group,
+  If the item displays its subitems (tqchildren) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
   \param color the text color
@@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const
   for all items of a type with KDGanttView::setDefaultColor() in order to
   get a uniform Gantt view.
 
-  If the item displays its subitems (children) as a group,
+  If the item displays its subitems (tqchildren) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const
   for all items of a type with KDGanttView::setDefaultHighlightColor()
   in order to get a uniform Gantt view.
 
-  If the item displays its subitems (children) as a group,
+  If the item displays its subitems (tqchildren) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const
 /*!
   Returns the first child of this item.
 
-  \return the first child of this item, 0 if this item has no children
+  \return the first child of this item, 0 if this item has no tqchildren
 */
 KDGanttViewItem* KDGanttViewItem::firstChild() const
 {
@@ -1248,14 +1248,14 @@ KDGanttViewItem* KDGanttViewItem::nextSibling() const
 
 
 /*!
-  Returns the parent item of this item
+  Returns the tqparent item of this item
 
-  \return the parent item of this item, 0 if this item is a top-level
+  \return the tqparent item of this item, 0 if this item is a top-level
   item
 */
-KDGanttViewItem* KDGanttViewItem::parent() const
+KDGanttViewItem* KDGanttViewItem::tqparent() const
 {
-    return (KDGanttViewItem*)TQListViewItem::parent();
+    return (KDGanttViewItem*)TQListViewItem::tqparent();
 }
 
 
@@ -1306,11 +1306,11 @@ void KDGanttViewItem::updateCanvasItems()
     if (blockUpdating) return;
     TQPen p,pBack;
     TQBrush b;
-    b.setStyle(Qt::SolidPattern);
+    b.setStyle(TQt::SolidPattern);
     if ( enabled() ) {
       textCanvas->setColor(myTextColor);
       if (isHighlighted) {
-        b.setStyle(Qt::SolidPattern);
+        b.setStyle(TQt::SolidPattern);
         b.setColor(myStartColorHL);
         startShape->setBrush(b);
         b.setColor(myMiddleColorHL);
@@ -1323,7 +1323,7 @@ void KDGanttViewItem::updateCanvasItems()
         p.setColor(myEndColorHL);
         endLine->setPen(p);
       } else {
-        b.setStyle(Qt::SolidPattern);
+        b.setStyle(TQt::SolidPattern);
         b.setColor(myStartColor);
 	//  qDebug("update color  %s %s", listViewText().latin1(),myStartColor.name().latin1() );
         startShape->setBrush(b);
@@ -1338,10 +1338,10 @@ void KDGanttViewItem::updateCanvasItems()
         endLine->setPen(p);
       }
     } else {
-      //TQColor discol = Qt::lightGray;
+      //TQColor discol = TQt::lightGray;
         TQColor discol = TQColor(232,232,232);
 	textCanvas->setColor( TQColor(150,150,150) );
-        b.setStyle(Qt::SolidPattern);
+        b.setStyle(TQt::SolidPattern);
         b.setColor(discol);
         startShape->setBrush(b);
         midShape->setBrush(b);
@@ -1458,7 +1458,7 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     startLineBack->setZ(1);endLineBack->setZ(1);
     actualEnd = new KDCanvasLine(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     actualEnd->setZ(5);
-    actualEnd->setPen( TQPen ( Qt::red, 3 ) );
+    actualEnd->setPen( TQPen ( TQt::red, 3 ) );
 
     textCanvas = new KDCanvasText(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     textCanvas->setText("");
@@ -1547,13 +1547,13 @@ KDGanttViewItem::Shape KDGanttViewItem::stringToShape( const TQString& string )
   Creates a DOM node that describes this item.
 
   \param doc the DOM document to which the node belongs
-  \param parentElement the element into which to insert this node
+  \param tqparentElement the element into which to insert this node
 */
 void KDGanttViewItem::createNode( TQDomDocument& doc,
-                                  TQDomElement& parentElement )
+                                  TQDomElement& tqparentElement )
 {
     TQDomElement itemElement = doc.createElement( "Item" );
-    parentElement.appendChild( itemElement );
+    tqparentElement.appendChild( itemElement );
     itemElement.setAttribute( "Type", typeToString( type() ) );
 
     KDGanttXML::createDateTimeNode( doc, itemElement, "StartTime", startTime() );
@@ -1674,22 +1674,22 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view,
   Creates a KDGanttViewItem according to the specification in a DOM
   element.
 
-  \param parent the parent item under which the item will be inserted
+  \param tqparent the tqparent item under which the item will be inserted
   \param element the DOM element from which to read the specification
   \return the newly created element
 */
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
                                                         TQDomElement& element )
 {
     TQString typeString = element.attribute( "Type" );
     Q_ASSERT( !typeString.isEmpty() );
     KDGanttViewItem* item;
     if( typeString == "Task" )
-        item = new KDGanttViewTaskItem( parent );
+        item = new KDGanttViewTaskItem( tqparent );
     else if( typeString == "Summary" )
-        item = new KDGanttViewSummaryItem( parent );
+        item = new KDGanttViewSummaryItem( tqparent );
     else if( typeString == "Event" )
-        item = new KDGanttViewEventItem( parent );
+        item = new KDGanttViewEventItem( tqparent );
     else {
         qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
         return 0;
@@ -1704,12 +1704,12 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
   Creates a KDGanttViewItem according to the specification in a DOM
   element.
 
-  \param parent the parent item under which the item will be inserted
+  \param tqparent the tqparent item under which the item will be inserted
   \param previous to item behind this one should appear
   \param element the DOM element from which to read the specification
   \return the newly created element
 */
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
                                                         KDGanttViewItem* previous,
                                                         TQDomElement& element )
 {
@@ -1717,11 +1717,11 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
     Q_ASSERT( !typeString.isEmpty() );
     KDGanttViewItem* item;
     if( typeString == "Task" )
-        item = new KDGanttViewTaskItem( parent, previous );
+        item = new KDGanttViewTaskItem( tqparent, previous );
     else if( typeString == "Summary" )
-        item = new KDGanttViewSummaryItem( parent, previous );
+        item = new KDGanttViewSummaryItem( tqparent, previous );
     else if( typeString == "Event" )
-        item = new KDGanttViewEventItem( parent, previous );
+        item = new KDGanttViewEventItem( tqparent, previous );
     else {
         qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
         return 0;
@@ -1944,9 +1944,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY )
 
 
 /*!
-  Returns the start time of the children of this item.
+  Returns the start time of the tqchildren of this item.
 
-  \return the start time of the children of this item
+  \return the start time of the tqchildren of this item
 */
 TQDateTime KDGanttViewItem::myChildStartTime()
 {
@@ -1978,9 +1978,9 @@ TQDateTime KDGanttViewItem::myChildStartTime()
 
 
 /*!
-  Returns the end time of the children of this item.
+  Returns the end time of the tqchildren of this item.
 
-  \return the end time of the children of this item
+  \return the end time of the tqchildren of this item
 */
 TQDateTime KDGanttViewItem::myChildEndTime()
 {
@@ -2030,7 +2030,7 @@ bool KDGanttViewItem::showNoInformation()
   The height of the line is the height of the item.
   The brush of the line is specified by KDGanttView::setNoInformationBrush().
   (i.e. the same brush for all items of the Gantt view).
-  The default brush is TQBrush(  TQColor ( 100,100,100 ), Qt::FDiagPattern );
+  The default brush is TQBrush(  TQColor ( 100,100,100 ), TQt::FDiagPattern );
   \param show if true, the 'showNoInformation' line  is shown for this item
   \sa  showNoInformation(), KDGanttView::setNoInformationBrush(), KDGanttView::noInformationBrush()
 */
@@ -2044,7 +2044,7 @@ void KDGanttViewItem::setShowNoInformation( bool show )
 /*!
   If the name of this item is \a name (i.e., listViewText() == name),
   the pointer to this item is returned.  Otherwise, it looks for an
-  item with name \a name in the set of children and subchildren of
+  item with name \a name in the set of tqchildren and subtqchildren of
   this item.
   \param  name the name of the item
   \return the pointer to the item with name \a name
@@ -2228,7 +2228,7 @@ void  KDGanttViewItem::paintBranches ( TQPainter* p, const TQColorGroup& cg,
 	int x_c = w/2;
 	int y_c = y+y_coord+ temp->height ()/2;
 	int y_ce ;
-	if ( temp->itemBelow() && temp->itemBelow()->parent() == this )
+	if ( temp->itemBelow() && temp->itemBelow()->tqparent() == this )
 	  y_ce =y+y_coord+ temp->height ();
 	else
 	  y_ce = y_c;
@@ -2255,11 +2255,11 @@ void  KDGanttViewItem::resetSubitemVisibility()
   if ( myGanttView->calendarMode() ) {
     // in calendarmode only items can be opened which have subitems which have subitems
     if ( ! temp ) {
-      if ( !parent() )
-	// has no parent, has no child : show!
+      if ( !tqparent() )
+	// has no tqparent, has no child : show!
 	setVisible( true );
       else
-	// has parent, has no child : hide!
+	// has tqparent, has no child : hide!
 	setVisible( false );
       return;
     }
@@ -2524,8 +2524,8 @@ bool KDGanttViewItem::isMyTextCanvas(TQCanvasItem *tc)
 
 void KDGanttViewItem::setProgress(int percent)
 {
-    myProgress = QMAX(0, percent);
-    myProgress = QMIN(100, myProgress);
+    myProgress = TQMAX(0, percent);
+    myProgress = TQMIN(100, myProgress);
 }
 
 /*!
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 80cc258d..8c29760a 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -55,7 +55,7 @@ class KDCanvasText;
 class KDCanvasPolygonItem;
 class KDGanttViewTaskLinkGroup;
 
-class KDGanttViewItem : public QListViewItem
+class KDGanttViewItem : public TQListViewItem
 {
 public:
     enum Type { Event, Task, Summary };
@@ -63,18 +63,18 @@ public:
 
 protected:
     KDGanttViewItem( Type type, KDGanttView* view,
-                     const TQString& lvtext = TQString::null,
-                     const TQString& name = TQString::null );
-    KDGanttViewItem( Type type, KDGanttViewItem* parent,
-                     const TQString& lvtext = TQString::null,
-                     const TQString& name = TQString::null );
+                     const TQString& lvtext = TQString(),
+                     const TQString& name = TQString() );
+    KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
+                     const TQString& lvtext = TQString(),
+                     const TQString& name = TQString() );
     KDGanttViewItem( Type type, KDGanttView* view, KDGanttViewItem* after,
-                     const TQString& lvtext = TQString::null,
-                     const TQString& name = TQString::null );
-    KDGanttViewItem( Type type, KDGanttViewItem* parent,
+                     const TQString& lvtext = TQString(),
+                     const TQString& name = TQString() );
+    KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
                      KDGanttViewItem* after,
-                     const TQString& lvtext = TQString::null,
-                     const TQString& name = TQString::null );
+                     const TQString& lvtext = TQString(),
+                     const TQString& name = TQString() );
 
   //bool _isCalendar;
     bool isVisibleInGanttView;
@@ -166,23 +166,23 @@ public:
 
     KDGanttViewItem* firstChild() const;
     KDGanttViewItem* nextSibling() const;
-    KDGanttViewItem* parent() const;
+    KDGanttViewItem* tqparent() const;
     KDGanttViewItem* itemAbove();
     KDGanttViewItem* itemBelow( bool includeDisabled = true );
     KDGanttViewItem* getChildByName( const TQString& name );
     TQString name() const;
-    static KDGanttViewItem* find( const TQString& name );
+    static KDGanttViewItem* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& parentElement );
+                     TQDomElement& tqparentElement );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
                                                   TQDomElement& element );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
                                                   KDGanttViewItem* previous,
                                                   TQDomElement& element );
-    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
+    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
                                                   TQDomElement& element );
-    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
+    static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
                                                   KDGanttViewItem* previous,
                                                   TQDomElement& element );
 
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 5ced61b3..c73eff67 100644
--- a/kdgantt/KDGanttViewItemDrag.cpp
+++ b/kdgantt/KDGanttViewItemDrag.cpp
@@ -24,8 +24,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h
index d29ec214..a4d6cb6f 100644
--- a/kdgantt/KDGanttViewItemDrag.h
+++ b/kdgantt/KDGanttViewItemDrag.h
@@ -23,8 +23,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -39,7 +39,7 @@
 
 class KDGanttViewItem;
 
-class KDGanttViewItemDrag :public QStoredDrag
+class KDGanttViewItemDrag :public TQStoredDrag
 {
 public:
   KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source,  const char * name  ) ;
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index b6dabe2b..197ba18b 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -58,19 +58,19 @@
 #include <kcalendarsystem.h>
 #include <kdebug.h>
 
-KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt)
-    : TQCanvas (parent)
+KDTimeTableWidget:: KDTimeTableWidget( TQWidget* tqparent,KDGanttView* myGantt)
+    : TQCanvas (tqparent)
 {
     myGanttView = myGantt;
     taskLinksVisible = true;
     flag_blockUpdating = false;
     int_blockUpdating = 0;
-    gridPen.setStyle(Qt::DotLine);
+    gridPen.setStyle(TQt::DotLine);
     gridPen.setColor(TQColor(100,100,100));
     maximumComputedGridHeight = 0;
     denseLineCount = 0;
     denseLineBrush = TQBrush( TQColor ( 240,240,240 ));
-    noInfoLineBrush = TQBrush(  TQColor ( 100,100,100 ), Qt::FDiagPattern );
+    noInfoLineBrush = TQBrush(  TQColor ( 100,100,100 ), TQt::FDiagPattern );
     pendingHeight = 0;
     pendingWidth = 0;
     retune(256);
@@ -514,7 +514,7 @@ void KDTimeTableWidget::computeDenseLines()
                     denseLine->setSize( wid, temp->height());
                 }
                 if (denseLine->brush() != denseLineBrush ) {
-                    denseLine->setPen( TQPen(  Qt::NoPen ) );
+                    denseLine->setPen( TQPen(  TQt::NoPen ) );
                     denseLine->setBrush( denseLineBrush);
                 }
                 if (!denseLine->isVisible() )
@@ -555,7 +555,7 @@ void KDTimeTableWidget::computeShowNoInformation()
             }
             noInfoLine->move( 0, temp->itemPos() );
             noInfoLine->setSize( wid, temp->height());
-            noInfoLine->setPen( TQPen(  Qt::NoPen ) );
+            noInfoLine->setPen( TQPen(  TQt::NoPen ) );
             noInfoLine->setBrush( noInfoLineBrush);
             noInfoLine->show();
         }
@@ -695,8 +695,8 @@ int KDTimeTableWidget::getCoordX( TQDateTime dt ) {
 /* ***************************************************************
    KDTimeHeaderWidget:: KDTimeHeaderWidget
    ***************************************************************** */
-KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
-    : TQWidget (parent)
+KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* tqparent,KDGanttView* gant )
+    : TQWidget (tqparent)
 {
     myToolTip = new KDTimeHeaderToolTip(this,this);
     mySizeHint = 0;
@@ -770,7 +770,7 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
     flagDoNotRepaintAfterChange = false;
     setShowPopupMenu(false,false,false,false,false,false,false);
     for (int j =1;j<8;++j)
-        weekdayColor[j] = Qt::white;
+        weekdayColor[j] = TQt::white;
     myMinimumWidth = 0;
     mouseDown = false;
     beginMouseDown = 0;
@@ -1636,7 +1636,7 @@ bool KDTimeHeaderWidget::getColumnColor(TQColor& col,int coordLow, int coordHigh
     start = getDateTimeForIndex((coordLow+coordHigh)/2);
     int day = start.date().dayOfWeek ();
     //checkweekdaycolor
-    if (weekdayColor[day] != Qt::white) {
+    if (weekdayColor[day] != TQt::white) {
         col = weekdayColor[day];
         return true;
     }
@@ -1915,7 +1915,7 @@ void KDTimeHeaderWidget::tqrepaintMe(int left,int paintwid, TQPainter* painter)
     for ( it =  minorText.begin(); it !=  minorText.end(); ++it ) {
         if (i*wid1 >= left-wid1 && i*wid1 <= left+paintwid) {
             qDrawShadeLine ( p,i*wid1-offsetLeft ,hei1-1, i*wid1-offsetLeft, hei2, qcg, true, lwid, 1 );
-            p->drawText(i*wid1+1-offsetLeft,hei1+1,wid1-1,hei2-hei1,Qt::AlignCenter,(*it));
+            p->drawText(i*wid1+1-offsetLeft,hei1+1,wid1-1,hei2-hei1,TQt::AlignCenter,(*it));
         }
         ++i;
     }
@@ -2135,8 +2135,8 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             qDebug("             RealScale == Auto : This may not be! ");
             break;
         }
-    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMinor);
-    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMajor);
+    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor);
+    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor);
     p.end();
     //qDebug("     tempMinorScaleCount %d ", tempMinorScaleCount);
     Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11;
@@ -2537,10 +2537,10 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
 /* ***************************************************************
    KDLegendWidget:: KDLegendWidget
    ***************************************************************** */
-KDLegendWidget:: KDLegendWidget( TQWidget* parent,
+KDLegendWidget:: KDLegendWidget( TQWidget* tqparent,
                                  KDGanttMinimizeSplitter* legendParent ) :
     KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Vertical,
-                               parent)
+                               tqparent)
 {
     myLegendParent = legendParent;
     dock = 0;
@@ -2645,10 +2645,10 @@ void KDLegendWidget::clearLegend ( )
 {
     if ( myLegend ) delete myLegend;
     if ( dock )
-        myLegend = new TQGroupBox( 1, Qt::Horizontal, scroll->viewport() );
+        myLegend = new TQGroupBox( 1, TQt::Horizontal, scroll->viewport() );
     else
-        myLegend = new TQGroupBox( 1, Qt::Horizontal, i18n( "Legend" ), scroll->viewport() );
-    myLegend->setBackgroundColor( Qt::white );
+        myLegend = new TQGroupBox( 1, TQt::Horizontal, i18n( "Legend" ), scroll->viewport() );
+    myLegend->setBackgroundColor( TQt::white );
     myLegend->setFont( font() );
     scroll->addChild(  myLegend );
     scroll->setResizePolicy( TQScrollView::AutoOneFit );
@@ -2664,16 +2664,16 @@ void KDLegendWidget::clearLegend ( )
 void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, Qt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, TQt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
-    w->setBackgroundColor( Qt::white );
+    w->setBackgroundColor( TQt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
     temp = new TQLabel ( w );
-    lay->addWidget( temp, 0, Qt:: AlignRight);
+    lay->addWidget( temp, 0, TQt:: AlignRight);
     temp->setPixmap(p);
     temp = new TQLabel ( text, w );
-    temp->setBackgroundColor( Qt::white );
-    lay->addWidget( temp, 0, Qt:: AlignLeft);
+    temp->setBackgroundColor( TQt::white );
+    lay->addWidget( temp, 0, TQt:: AlignLeft);
     lay->addStretch();
     if ( dock )
         scroll->setMaximumHeight( 32000 );
@@ -2688,7 +2688,7 @@ bool KDLegendWidget::isShown ( )
 }
 
 
-KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (parent)
+KDListView::KDListView(TQWidget* tqparent, KDGanttView* gantView):TQListView (tqparent)
 {
     myGanttView = gantView;
     setAcceptDrops(true);
@@ -2781,7 +2781,7 @@ void  KDListView::drawToPainter ( TQPainter * p, bool drawHeader )
         return;
     }
     // Draw headers
-    TQPen pen = TQPen(Qt::lightGray, 1);
+    TQPen pen = TQPen(TQt::lightGray, 1);
     p->save();
     TQHeader *h = header();
     for (int s = 0; s < h->count(); ++s) {
@@ -2790,7 +2790,7 @@ void  KDListView::drawToPainter ( TQPainter * p, bool drawHeader )
             p->translate(0, -r.height());
         }
         //kdDebug()<<s<<": "<<h->label(s)<<" "<<r<<endl;
-        p->drawText(r.x()+2, r.y(), r.width()-2, r.height(), columnAlignment(s)|Qt::AlignVCenter, h->label(s), -1);
+        p->drawText(r.x()+2, r.y(), r.width()-2, r.height(), columnAlignment(s)|TQt::AlignVCenter, h->label(s), -1);
         p->save();
         p->setPen(pen);
         p->drawRect(r.x(), r.y()+1, r.width(), r.height()-2);
@@ -2921,7 +2921,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
         if ( tx < 0 )
             tx = header()->cellPos( cell );
 
-        // do any children of current need to be painted?
+        // do any tqchildren of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
         if ( ih != ith &&
             rootIsDecorated() &&
@@ -2936,10 +2936,10 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
             int rleft = tx + current->l*treeStepSize();
             int rright = rleft + treeStepSize();
 
-            int crtop = QMAX( rtop, cy );
-            int crbottom = QMIN( rbottom, cy+ch );
-            int crleft = QMAX( rleft, cx );
-            int crright = QMIN( rright, cx+cw );
+            int crtop = TQMAX( rtop, cy );
+            int crbottom = TQMIN( rbottom, cy+ch );
+            int crleft = TQMAX( rleft, cx );
+            int crright = TQMIN( rright, cx+cw );
 
             r.setRect( crleft, crtop,
                     crright-crleft, crbottom-crtop );
@@ -2991,13 +2991,13 @@ void KDListView::dragMoveEvent ( TQDragMoveEvent * e)
     }
     if ( e->source() == myGanttView && gItem ){
         // internal drag - do not allow to drag the item to a subitem of itself
-        KDGanttViewItem* pItem = gItem->parent();
+        KDGanttViewItem* pItem = gItem->tqparent();
         while ( pItem ) {
             if ( pItem == myGanttView->myCanvasView->lastClickedItem ) {
                 e->accept( false );
                 return;
             }
-            pItem = pItem->parent();
+            pItem = pItem->tqparent();
         }
         if ( gItem == myGanttView->myCanvasView->lastClickedItem ) {
             e->accept( false );
@@ -3091,69 +3091,69 @@ void KDListView::startDrag ()
 }
 
 KDCanvasText::KDCanvasText( KDTimeTableWidget* canvas,
-                            void* parentItem,
+                            void* tqparentItem,
                             int type ) :
     TQCanvasText(canvas)
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 KDCanvasLine::KDCanvasLine( KDTimeTableWidget* canvas,
-                            void* parentItem,
+                            void* tqparentItem,
                             int type ) :
     TQCanvasLine(canvas)
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 KDCanvasPolygonItem::KDCanvasPolygonItem( KDTimeTableWidget* canvas,
-                                          void* parentItem,
+                                          void* tqparentItem,
                                           int type ) :
     TQCanvasPolygonalItem( canvas )
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 KDCanvasPolygon::KDCanvasPolygon( KDTimeTableWidget* canvas,
-                                  void* parentItem,
+                                  void* tqparentItem,
                                   int type ) :
     TQCanvasPolygon( canvas )
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 KDCanvasEllipse::KDCanvasEllipse( KDTimeTableWidget* canvas,
-                                  void* parentItem,
+                                  void* tqparentItem,
                                   int type ) :
     TQCanvasEllipse( canvas )
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
-                                      void* parentItem,
+                                      void* tqparentItem,
                                       int type ) :
     TQCanvasRectangle( canvas )
 {
     myParentType = type;
-    myParentItem = parentItem;
+    myParentItem = tqparentItem;
 }
 
 
 
 
-KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* parent,  const
-    char* name ) : TQCanvasView ( canvas, parent, name ),
+KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* tqparent,  const
+    char* name ) : TQCanvasView ( canvas, tqparent, name ),
     movingGVItem( 0 ),
     scrollBarTimer( 0, "scrollBarTimer" )
 {
@@ -3311,20 +3311,20 @@ void  KDGanttCanvasView::insertItemAsRoot( KDGanttViewItem* item )
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
-void  KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* parent, KDGanttViewItem* item )
+void  KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* tqparent, KDGanttViewItem* item )
 {
-    parent->insertItem( cuttedItem );
+    tqparent->insertItem( cuttedItem );
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
-void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewItem* item )
+void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttViewItem* item )
 {
-    if ( parent->parent() ) {
-        parent->parent()->insertItem( item );
+    if ( tqparent->tqparent() ) {
+        tqparent->tqparent()->insertItem( item );
     }
     else
         mySignalSender->myListView->insertItem( item );
-    item->moveItem( parent );
+    item->moveItem( tqparent );
     if ( item == cuttedItem )
         cuttedItem = 0;
 }
@@ -3332,9 +3332,9 @@ void  KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewI
 void  KDGanttCanvasView::cutItem()
 {
     lastClickedItem->hideSubtree();
-    //qDebug("last clicked %d parent %d ", lastClickedItem  , lastClickedItem->parent());
-    if ( lastClickedItem->parent() )
-        lastClickedItem->parent()->takeItem(lastClickedItem);
+    //qDebug("last clicked %d tqparent %d ", lastClickedItem  , lastClickedItem->tqparent());
+    if ( lastClickedItem->tqparent() )
+        lastClickedItem->tqparent()->takeItem(lastClickedItem);
     else
         mySignalSender->myListView->takeItem( lastClickedItem );
     mySignalSender->myTimeTable->updateMyContent();
@@ -3370,8 +3370,8 @@ void  KDGanttCanvasView::pasteItem( int type )
         lastClickedItem->insertItem( cuttedItem );
         break;
     case 2://after
-        if ( lastClickedItem->parent() ) {
-            lastClickedItem->parent()->insertItem( cuttedItem );
+        if ( lastClickedItem->tqparent() ) {
+            lastClickedItem->tqparent()->insertItem( cuttedItem );
         }
         else
             mySignalSender->myListView->insertItem( cuttedItem );
@@ -3418,20 +3418,20 @@ void  KDGanttCanvasView::newChildItem( int type )
         temp = new KDGanttViewTaskItem( lastClickedItem, i18n( "New Task" ) );
         break;
     case 5:
-        if ( lastClickedItem->parent() )
-            temp = new KDGanttViewEventItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Event" ) );
+        if ( lastClickedItem->tqparent() )
+            temp = new KDGanttViewEventItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Event" ) );
         else
             temp = new KDGanttViewEventItem( mySignalSender, lastClickedItem, i18n( "New Event" ) );
         break;
     case 4:
-        if ( lastClickedItem->parent() )
-            temp = new KDGanttViewSummaryItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Summary" ) );
+        if ( lastClickedItem->tqparent() )
+            temp = new KDGanttViewSummaryItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Summary" ) );
         else
             temp = new KDGanttViewSummaryItem( mySignalSender, lastClickedItem, i18n( "New Summary" ) );
         break;
     case 6:
-        if ( lastClickedItem->parent() )
-            temp = new KDGanttViewTaskItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Task" ) );
+        if ( lastClickedItem->tqparent() )
+            temp = new KDGanttViewTaskItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Task" ) );
         else
             temp = new KDGanttViewTaskItem( mySignalSender, lastClickedItem, i18n( "New Task" ) );
         break;
@@ -3935,7 +3935,7 @@ void KDGanttCanvasView::slotScrollTimer() {
     if (my < 0)
         dy = -5;
     else if (my > visibleHeight())
-        dy = QMIN(5, verticalScrollBar()->maxValue()-verticalScrollBar()->value());
+        dy = TQMIN(5, verticalScrollBar()->maxValue()-verticalScrollBar()->value());
 
     if (dx != 0 || dy != 0)
         scrollBy(dx, dy);
@@ -3984,7 +3984,7 @@ int KDGanttCanvasView::getLinkType(int from, int to) {
 /*!
   Represents the background color for a given interval of time (across all tasks).
   \sa KDGanttView::addIntervalBackgroundColor
-  \param view parent view
+  \param view tqparent view
  */
 KDIntervalColorRectangle::KDIntervalColorRectangle( KDGanttView* view )
   : KDCanvasRectangle( view->timeTableWidget(), 0, Type_is_KDGanttGridItem ),
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index de771800..af893c86 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -73,9 +73,10 @@ class KDToolTip;
 class KDCanvasRectangle;
 class KDTimeHeaderToolTip;
 
-class KDTimeHeaderWidget : public QWidget
+class KDTimeHeaderWidget : public TQWidget
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
    typedef KDGanttView::Scale Scale;
@@ -98,7 +99,7 @@ public:
      enum HourFormat { Hour_24, Hour_12 };
    */
 
-   KDTimeHeaderWidget (TQWidget* parent,KDGanttView* gant);
+   KDTimeHeaderWidget (TQWidget* tqparent,KDGanttView* gant);
   ~KDTimeHeaderWidget();
 
    TQString getToolTipText(TQPoint p);
@@ -138,7 +139,7 @@ public:
 				  Scale mini =  KDGanttView::Minute ,
 				  Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
    void setIntervalBackgroundColor( const TQDateTime& start,
 				    const TQDateTime& end,
 				  const TQColor& color,
@@ -250,12 +251,13 @@ private:
 /* KDTimeTableWidget */
 class KDListView ;
 
-class KDTimeTableWidget : public QCanvas
+class KDTimeTableWidget : public TQCanvas
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-   KDTimeTableWidget (TQWidget* parent,KDGanttView* my);
+   KDTimeTableWidget (TQWidget* tqparent,KDGanttView* my);
 
     void setBlockUpdating( bool block = true );
     bool blockUpdating();
@@ -329,9 +331,10 @@ private:
 class KDLegendWidget : public KDGanttSemiSizingControl
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
+  KDLegendWidget ( TQWidget* tqparent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
   void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
@@ -352,12 +355,13 @@ public:
 };
 
 class KDGanttView;
-class KDListView : public QListView
+class KDListView : public TQListView
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-   KDListView (TQWidget* parent,KDGanttView* gv );
+   KDListView (TQWidget* tqparent,KDGanttView* gv );
    KDGanttView* myGanttView;
    void drawToPainter( TQPainter *p, bool drawHeader=false );
    void setCalendarMode( bool mode );
@@ -396,56 +400,56 @@ private slots:
 };
 
 
-class KDCanvasText : public QCanvasText
+class KDCanvasText : public TQCanvasText
 {
 public:
-    KDCanvasText( KDTimeTableWidget* canvas, void* parentItem, int type );
+    KDCanvasText( KDTimeTableWidget* canvas, void* tqparentItem, int type );
     int myParentType;
     void* myParentItem;
 };
 
 
-class KDCanvasLine : public QCanvasLine
+class KDCanvasLine : public TQCanvasLine
 {
 public:
-    KDCanvasLine( KDTimeTableWidget* canvas, void* parentItem, int type );
+    KDCanvasLine( KDTimeTableWidget* canvas, void* tqparentItem, int type );
     int myParentType;
     void* myParentItem;
 };
 
 
-class KDCanvasPolygonItem: public QCanvasPolygonalItem
+class KDCanvasPolygonItem: public TQCanvasPolygonalItem
 {
 public:
-    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* parentItem,
+    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* tqparentItem,
                          int type );
     int myParentType;
     void* myParentItem;
 };
 
 
-class KDCanvasPolygon: public QCanvasPolygon
+class KDCanvasPolygon: public TQCanvasPolygon
 {
 public:
-    KDCanvasPolygon( KDTimeTableWidget* canvas, void* parentItem, int type );
+    KDCanvasPolygon( KDTimeTableWidget* canvas, void* tqparentItem, int type );
     int myParentType;
     void* myParentItem;
 };
 
 
-class KDCanvasEllipse: public QCanvasEllipse
+class KDCanvasEllipse: public TQCanvasEllipse
 {
 public:
-    KDCanvasEllipse( KDTimeTableWidget* canvas, void* parentItem, int type );
+    KDCanvasEllipse( KDTimeTableWidget* canvas, void* tqparentItem, int type );
     int myParentType;
     void* myParentItem;
 };
 
 
-class KDCanvasRectangle: public QCanvasRectangle
+class KDCanvasRectangle: public TQCanvasRectangle
 {
 public:
-    KDCanvasRectangle( KDTimeTableWidget* canvas, void* parentItem, int type );
+    KDCanvasRectangle( KDTimeTableWidget* canvas, void* tqparentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -480,12 +484,13 @@ private:
 
 class KDCanvasToolTip;
 
-class KDGanttCanvasView : public QCanvasView
+class KDGanttCanvasView : public TQCanvasView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 );
+    KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* tqparent = 0, const char* name = 0 );
     ~KDGanttCanvasView();
     TQString getToolTipText(TQPoint p);
     TQString getWhatsThisText(TQPoint p);
@@ -559,7 +564,7 @@ private:
   TQTimer scrollBarTimer;
 };
 
-class KDTimeHeaderToolTip :public QToolTip
+class KDTimeHeaderToolTip :public TQToolTip
 {
 
 public:
@@ -585,7 +590,7 @@ private:
   KDTimeHeaderWidget * _header;
 };
 
-class KDCanvasToolTip :public QToolTip
+class KDCanvasToolTip :public TQToolTip
 {
 
 public:
@@ -611,7 +616,7 @@ private:
   KDGanttCanvasView * _canview;
 };
 
-class KDCanvasWhatsThis :public QWhatsThis
+class KDCanvasWhatsThis :public TQWhatsThis
 {
 public:
   KDCanvasWhatsThis( TQWidget *wid, KDGanttCanvasView* canview ) : TQWhatsThis( wid ), _wid(wid),_canview (canview) { };
@@ -626,7 +631,7 @@ private:
   KDGanttCanvasView * _canview;
 };
 
-class KDListViewWhatsThis :public QWhatsThis
+class KDListViewWhatsThis :public TQWhatsThis
 {
 public:
   KDListViewWhatsThis( TQWidget *wid, KDListView* view ) : TQWhatsThis( wid ), _wid(wid),_view (view) { };
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index 95ca682d..7237cf31 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -65,15 +65,15 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
                                                 const TQString& lvtext,
                                                 const TQString& name ) :
-    KDGanttViewItem( Summary, parent, lvtext, name )
+    KDGanttViewItem( Summary, tqparent, lvtext, name )
 {
   initItem();
 }
@@ -101,17 +101,17 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
                                                 KDGanttViewItem* after,
                                                 const TQString& lvtext,
                                                 const TQString& name ) :
-    KDGanttViewItem( Summary, parent, after, lvtext, name )
+    KDGanttViewItem( Summary, tqparent, after, lvtext, name )
 {
 
   initItem();
@@ -272,7 +272,7 @@ void KDGanttViewSummaryItem::showItem( bool show, int coordY )
     hideMe();
     return;
   }
- if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
+ if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
     hideMe();
     return;
   }
diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h
index 6102dbff..3b2bb9c8 100644
--- a/kdgantt/KDGanttViewSummaryItem.h
+++ b/kdgantt/KDGanttViewSummaryItem.h
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -41,17 +41,17 @@ class KDGanttViewSummaryItem : public KDGanttViewItem
 {
 public:
     KDGanttViewSummaryItem( KDGanttView* view,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
-    KDGanttViewSummaryItem( KDGanttViewItem* parent,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
+    KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
     KDGanttViewSummaryItem( KDGanttView* view, KDGanttViewItem* after,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
-    KDGanttViewSummaryItem( KDGanttViewItem* parent, KDGanttViewItem* after,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
+    KDGanttViewSummaryItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
     virtual ~KDGanttViewSummaryItem();
 
     void setMiddleTime( const TQDateTime& );
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index f2ba122c..b7cc8a9d 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -79,15 +79,15 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
                                           const TQString& lvtext,
                                           const TQString& name ) :
-    KDGanttViewItem( Task, parent, lvtext, name )
+    KDGanttViewItem( Task, tqparent, lvtext, name )
 {
   initItem();
 }
@@ -115,17 +115,17 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
 /*!
   Constructs an empty Gantt item of type event.
 
-  \param parent a parent item under which this one goes
+  \param tqparent a tqparent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the listview
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
                                           KDGanttViewItem* after,
                                           const TQString& lvtext,
                                           const TQString& name ) :
-    KDGanttViewItem( Task, parent, after, lvtext, name )
+    KDGanttViewItem( Task, tqparent, after, lvtext, name )
 {
   initItem();
 }
@@ -216,7 +216,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
   floatEndShape->setZ(startShape->z()+0.003); // less than textCanvas
   floatEndShape->hide();
   textCanvas->setZ( prio + 0.005 );
-  if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
+  if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
     hideMe();
     return;
   }
@@ -242,9 +242,9 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
   }
   int hei = height();
   if ( ! isVisible() ) {
-    KDGanttViewItem * par = parent();
+    KDGanttViewItem * par = tqparent();
     while ( par != 0 && !par->isVisible() )
-      par = par->parent();
+      par = par->tqparent();
     if ( par )
       hei = par->height();
   }
@@ -356,9 +356,9 @@ void KDGanttViewTaskItem::initItem()
 {
   isVisibleInGanttView = false;
 
-  if ( myGanttView->calendarMode() && parent() ) {
+  if ( myGanttView->calendarMode() && tqparent() ) {
     setVisible( false );
-    parent()->setVisible( true );
+    tqparent()->setVisible( true );
   } else
     showItem(true);
   //qDebug("initItem  %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() );
diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h
index 6cdb92da..cd77240e 100644
--- a/kdgantt/KDGanttViewTaskItem.h
+++ b/kdgantt/KDGanttViewTaskItem.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -44,17 +44,17 @@ class KDGanttViewTaskItem : public KDGanttViewItem
 {
 public:
     KDGanttViewTaskItem( KDGanttView* view,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
-    KDGanttViewTaskItem( KDGanttViewItem* parent,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
+    KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
     KDGanttViewTaskItem( KDGanttView* view, KDGanttViewItem* after,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
-    KDGanttViewTaskItem( KDGanttViewItem* parent, KDGanttViewItem* after,
-                            const TQString& lvtext = TQString::null,
-                            const TQString& name = TQString::null );
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
+    KDGanttViewTaskItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+                            const TQString& lvtext = TQString(),
+                            const TQString& name = TQString() );
     virtual ~KDGanttViewTaskItem();
 
     void setStartTime( const TQDateTime& start );
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index 2f5ca479..4d21073e 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -236,8 +236,8 @@ void KDGanttViewTaskLink::initTaskLink()
   setWhatsThisText( "Tasklink" );
   myTimeTable->myTaskLinkList.append(this);
   setHighlight( false);
-  setHighlightColor(Qt::red );
-  setColor(Qt::black);
+  setHighlightColor(TQt::red );
+  setColor(TQt::black);
   setVisible(true);
 }
 
@@ -268,7 +268,7 @@ void KDGanttViewTaskLink::showMe( bool visible )
     TQPen p;
     TQBrush b;
     p.setWidth(wid);
-    b.setStyle(Qt::SolidPattern);
+    b.setStyle(TQt::SolidPattern);
     if (ishighlighted) {
         b.setColor(myColorHL);
         p.setColor(myColorHL);
@@ -333,7 +333,7 @@ void KDGanttViewTaskLink::showMeType( bool visible )
     TQPen p;
     TQBrush b;
     p.setWidth(wid);
-    b.setStyle(Qt::SolidPattern);
+    b.setStyle(TQt::SolidPattern);
     if (ishighlighted) {
         b.setColor(myColorHL);
         p.setColor(myColorHL);
@@ -732,13 +732,13 @@ TQPtrList<KDGanttViewItem> KDGanttViewTaskLink::to() const
   Creates a DOM node that describes this task link.
 
   \param doc the DOM document to which the node belongs
-  \param parentElement the element into which to insert this node
+  \param tqparentElement the element into which to insert this node
 */
 void KDGanttViewTaskLink::createNode( TQDomDocument& doc,
-                                      TQDomElement& parentElement )
+                                      TQDomElement& tqparentElement )
 {
     TQDomElement taskLinkElement = doc.createElement( "TaskLink" );
-    parentElement.appendChild( taskLinkElement );
+    tqparentElement.appendChild( taskLinkElement );
 
     TQDomElement fromItemsElement = doc.createElement( "FromItems" );
     taskLinkElement.appendChild( fromItemsElement );
@@ -870,13 +870,13 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el
     TQPtrList<KDGanttViewItem> toItemList;
     for( TQStringList::const_iterator fromIt = fromList.begin();
          fromIt != fromList.end(); ++fromIt ) {
-        KDGanttViewItem* item = KDGanttViewItem::find( *fromIt );
+        KDGanttViewItem* item = KDGanttViewItem::tqfind( *fromIt );
         if( item )
             fromItemList.append( item );
     }
     for( TQStringList::const_iterator toIt = toList.begin();
          toIt != toList.end(); ++toIt ) {
-        KDGanttViewItem* item = KDGanttViewItem::find( *toIt );
+        KDGanttViewItem* item = KDGanttViewItem::tqfind( *toIt );
         if( item )
             toItemList.append( item );
     }
@@ -898,7 +898,7 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el
     tl->setHighlightColor( highlightColor );
     tl->setTooltipText( tooltipText );
     tl->setWhatsThisText( whatsThisText );
-    KDGanttViewTaskLinkGroup* gr = KDGanttViewTaskLinkGroup::find( group );
+    KDGanttViewTaskLinkGroup* gr = KDGanttViewTaskLinkGroup::tqfind( group );
     if( gr )
         tl->setGroup( gr );
 
diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h
index 40f6660f..f09e2370 100644
--- a/kdgantt/KDGanttViewTaskLink.h
+++ b/kdgantt/KDGanttViewTaskLink.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -89,7 +89,7 @@ public:
     TQString whatsThisText() const;
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& parentElement );
+                     TQDomElement& tqparentElement );
     static KDGanttViewTaskLink* createFromDomElement( TQDomElement& );
 
     int linkType();
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp
index 5109168d..5b39f4b4 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.cpp
+++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp
@@ -26,8 +26,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -70,7 +70,7 @@ KDGanttViewTaskLinkGroup::~KDGanttViewTaskLinkGroup()
 /*!
   Constructs an empty task link group and records it under the name \a
   name so that it can later be found again with
-  KDGanttViewTaskLinkGroup::find().
+  KDGanttViewTaskLinkGroup::tqfind().
 
   \param name the search name of this task link group
 */
@@ -268,11 +268,11 @@ void KDGanttViewTaskLinkGroup::removeItem (KDGanttViewTaskLink* link)
   \return the task link group with the specified name; 0 if no group
   with that name exists
 */
-KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::find( const TQString& name )
+KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::tqfind( const TQString& name )
 {
-    if (name.isEmpty()) // avoid error msg from QDict
+    if (name.isEmpty()) // avoid error msg from TQDict
         return 0;
-    return sGroupDict.find( name );
+    return sGroupDict.tqfind( name );
 }
 
 
@@ -280,13 +280,13 @@ KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::find( const TQString& name )
   Creates a DOM node that describes this task link group.
 
   \param doc the DOM document to which the node belongs
-  \param parentElement the element into which to insert this node
+  \param tqparentElement the element into which to insert this node
 */
 void KDGanttViewTaskLinkGroup::createNode( TQDomDocument& doc,
-                                           TQDomElement& parentElement )
+                                           TQDomElement& tqparentElement )
 {
     TQDomElement taskLinkGroupElement = doc.createElement( "TaskLink" );
-    parentElement.appendChild( taskLinkGroupElement );
+    tqparentElement.appendChild( taskLinkGroupElement );
 
     KDGanttXML::createBoolNode( doc, taskLinkGroupElement, "Highlight",
                            highlight() );
@@ -371,10 +371,10 @@ void KDGanttViewTaskLinkGroup::generateAndInsertName( const TQString& name )
         sGroupDict.remove( _name );
     
     TQString newName;
-    if ( name.isEmpty() || sGroupDict.find( name ) ) {
+    if ( name.isEmpty() || sGroupDict.tqfind( name ) ) {
         // create unique name
         newName.sprintf( "%p", (void* )this );
-        while( sGroupDict.find( newName ) ) {
+        while( sGroupDict.tqfind( newName ) ) {
             newName += "_0";
         }
     } else {
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h
index b401c590..56f5d2b9 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.h
+++ b/kdgantt/KDGanttViewTaskLinkGroup.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -42,7 +42,7 @@
 class KDTimeTableWidget;
 class KDGanttView;
 
-class KDGanttViewTaskLinkGroup : public QObject
+class KDGanttViewTaskLinkGroup : public TQObject
 {
 public:
     KDGanttViewTaskLinkGroup( const TQString& name );
@@ -62,10 +62,10 @@ public:
     void setHighlightColor( const TQColor& color );
     TQColor highlightColor() const;
 
-    static KDGanttViewTaskLinkGroup* find( const TQString& name );
+    static KDGanttViewTaskLinkGroup* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& parentElement );
+                     TQDomElement& tqparentElement );
     static KDGanttViewTaskLinkGroup* createFromDomElement( TQDomElement& );
 
     void generateAndInsertName( const TQString& name );
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index f5f97a36..248829d3 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -40,12 +40,12 @@
 
 namespace KDGanttXML {
 
-void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
+void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
                      const TQString& elementName, bool value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    parent.appendChild( newElement );
+    tqparent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( value ? "true" : "false" );
     newElement.appendChild( elementContent );
@@ -53,59 +53,59 @@ void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
 
 
 
-void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
+void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
                      const TQString& elementName, const TQSize& value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    parent.appendChild( newElement );
+    tqparent.appendChild( newElement );
     newElement.setAttribute( "Width", value.width() );
     newElement.setAttribute( "Height", value.height() );
 }
 
 
-void createIntNode( TQDomDocument& doc, TQDomNode& parent,
+void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
                     const TQString& elementName, int value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    parent.appendChild( newElement );
+    tqparent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( TQString::number( value ) );
     newElement.appendChild( elementContent );
 }
 
 
-void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
+void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
                        const TQString& elementName, double value )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    parent.appendChild( newElement );
+    tqparent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( TQString::number( value ) );
     newElement.appendChild( elementContent );
 }
 
 
-void createStringNode( TQDomDocument& doc, TQDomNode& parent,
+void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
                        const TQString& elementName,
                        const TQString& text )
 {
     TQDomElement newElement =
         doc.createElement( elementName );
-    parent.appendChild( newElement );
+    tqparent.appendChild( newElement );
     TQDomText elementContent =
         doc.createTextNode( text );
     newElement.appendChild( elementContent );
 }
 
 
-void createColorNode( TQDomDocument& doc, TQDomNode& parent,
+void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
                       const TQString& elementName, const TQColor& color )
 {
     TQDomElement colorElement = doc.createElement( elementName );
-    parent.appendChild( colorElement );
+    tqparent.appendChild( colorElement );
     colorElement.setAttribute( "Red",
                                TQString::number( color.red() ) );
     colorElement.setAttribute( "Green",
@@ -115,29 +115,29 @@ void createColorNode( TQDomDocument& doc, TQDomNode& parent,
 }
 
 
-void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
+void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
                       const TQString& elementName, const TQBrush& brush )
 
 {
     TQDomElement brushElement = doc.createElement( elementName );
-    parent.appendChild( brushElement );
+    tqparent.appendChild( brushElement );
     createColorNode( doc, brushElement, "Color", brush.color() );
     createStringNode( doc, brushElement, "Style",
                       KDGanttXML::brushStyleToString( brush.style() ) );
-    if( brush.style() == Qt::CustomPattern && brush.pixmap() )
+    if( brush.style() == TQt::CustomPattern && brush.pixmap() )
         createPixmapNode( doc, brushElement, "Pixmap", *brush.pixmap() );
 }
 
 
-void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
+void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
                        const TQString& elementName, const TQPixmap& pixmap )
 {
     TQDomElement pixmapElement = doc.createElement( elementName );
-    parent.appendChild( pixmapElement );
+    tqparent.appendChild( pixmapElement );
 
     // Convert the pixmap to an image, save that image to an in-memory
     // XPM representation and compress this representation. This
-    // conforms to the file format Qt Designer uses.
+    // conforms to the file format TQt Designer uses.
     TQByteArray ba;
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
@@ -163,11 +163,11 @@ void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
 }
 
 
-void createRectNode( TQDomDocument& doc, TQDomNode& parent,
+void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
                      const TQString& elementName, const TQRect& rect )
 {
     TQDomElement rectElement = doc.createElement( elementName );
-    parent.appendChild( rectElement );
+    tqparent.appendChild( rectElement );
     TQDomElement xElement = doc.createElement( "X" );
     rectElement.appendChild( xElement );
     TQDomText xContent = doc.createTextNode( TQString::number( rect.x() ) );
@@ -187,7 +187,7 @@ void createRectNode( TQDomDocument& doc, TQDomNode& parent,
 }
 
 
-void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
+void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
                             const TQString& elementName,
                             const TQStringList* list )
 {
@@ -197,68 +197,64 @@ void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
     for( TQStringList::ConstIterator it = list->begin();
          it != list->end(); ++it ) {
         TQDomElement element = doc.createElement( elementName );
-        parent.appendChild( element );
+        tqparent.appendChild( element );
         TQDomText elementContent = doc.createTextNode( *it );
         element.appendChild( elementContent );
     }
 }
 
 
-void createFontNode( TQDomDocument& doc, TQDomNode& parent,
+void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
                      const TQString& elementName, const TQFont& font )
 {
     TQDomElement fontElement = doc.createElement( elementName );
-    parent.appendChild( fontElement );
+    tqparent.appendChild( fontElement );
     createStringNode( doc, fontElement, "Family", font.family() );
     createIntNode( doc, fontElement, "PointSize", font.pointSize() );
     createIntNode( doc, fontElement, "PixelSize", font.pixelSize() );
     createIntNode( doc, fontElement, "Weight", font.weight() );
     createBoolNode( doc, fontElement, "Italic", font.italic() );
-#if QT_VERSION < 300
-    // Qt 3 handles the charset internally.
-    createIntNode( doc, fontElement, "CharSet", font.charSet() );
-#endif
 }
 
 
-void createPenNode( TQDomDocument& doc, TQDomNode& parent,
+void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
                     const TQString& elementName, const TQPen& pen )
 {
     TQDomElement penElement = doc.createElement( elementName );
-    parent.appendChild( penElement );
+    tqparent.appendChild( penElement );
     createIntNode( doc, penElement, "Width", pen.width() );
     createColorNode( doc, penElement, "Color", pen.color() );
     createStringNode( doc, penElement, "Style", penStyleToString( pen.style() ) );
 }
 
 
-void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
+void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName,
                          const TQDateTime& datetime )
 {
     TQDomElement dateTimeElement = doc.createElement( elementName );
-    parent.appendChild( dateTimeElement );
+    tqparent.appendChild( dateTimeElement );
     createDateNode( doc, dateTimeElement, "Date", datetime.date() );
     createTimeNode( doc, dateTimeElement, "Time", datetime.time() );
 }
 
 
-void createDateNode( TQDomDocument& doc, TQDomNode& parent,
+void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
                      const TQString& elementName, const TQDate& date )
 {
     TQDomElement dateElement = doc.createElement( elementName );
-    parent.appendChild( dateElement );
+    tqparent.appendChild( dateElement );
     dateElement.setAttribute( "Year", TQString::number( date.year() ) );
     dateElement.setAttribute( "Month", TQString::number( date.month() ) );
     dateElement.setAttribute( "Day", TQString::number( date.day() ) );
 }
 
 
-void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
+void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
                       const TQString& elementName, const TQTime& time )
 {
     TQDomElement timeElement = doc.createElement( elementName );
-    parent.appendChild( timeElement );
+    tqparent.appendChild( timeElement );
     timeElement.setAttribute( "Hour",
                                TQString::number( time.hour() ) );
     timeElement.setAttribute( "Minute",
@@ -270,20 +266,20 @@ void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
 }
 
 
-TQString penStyleToString( Qt::PenStyle style )
+TQString penStyleToString( TQt::PenStyle style )
 {
     switch( style ) {
-    case Qt::NoPen:
+    case TQt::NoPen:
         return "NoPen";
-    case Qt::SolidLine:
+    case TQt::SolidLine:
         return "SolidLine";
-    case Qt::DashLine:
+    case TQt::DashLine:
         return "DashLine";
-    case Qt::DotLine:
+    case TQt::DotLine:
         return "DotLine";
-    case Qt::DashDotLine:
+    case TQt::DashDotLine:
         return "DashDotLine";
-    case Qt::DashDotDotLine:
+    case TQt::DashDotDotLine:
         return "DashDotDotLine";
     default: // should not happen
         return "SolidLine";
@@ -292,39 +288,39 @@ TQString penStyleToString( Qt::PenStyle style )
 
 
 
-TQString brushStyleToString( Qt::BrushStyle style )
+TQString brushStyleToString( TQt::BrushStyle style )
 {
     // PENDING(kalle) Support custom patterns
     switch( style ) {
-    case Qt::NoBrush:
+    case TQt::NoBrush:
         return "NoBrush";
-    case Qt::SolidPattern:
+    case TQt::SolidPattern:
         return "SolidPattern";
-    case Qt::Dense1Pattern:
+    case TQt::Dense1Pattern:
         return "Dense1Pattern";
-    case Qt::Dense2Pattern:
+    case TQt::Dense2Pattern:
         return "Dense2Pattern";
-    case Qt::Dense3Pattern:
+    case TQt::Dense3Pattern:
         return "Dense3Pattern";
-    case Qt::Dense4Pattern:
+    case TQt::Dense4Pattern:
         return "Dense4Pattern";
-    case Qt::Dense5Pattern:
+    case TQt::Dense5Pattern:
         return "Dense5Pattern";
-    case Qt::Dense6Pattern:
+    case TQt::Dense6Pattern:
         return "Dense6Pattern";
-    case Qt::Dense7Pattern:
+    case TQt::Dense7Pattern:
         return "Dense7Pattern";
-    case Qt::HorPattern:
+    case TQt::HorPattern:
         return "HorPattern";
-    case Qt::VerPattern:
+    case TQt::VerPattern:
         return "VerPattern";
-    case Qt::CrossPattern:
+    case TQt::CrossPattern:
         return "CrossPattern";
-    case Qt::BDiagPattern:
+    case TQt::BDiagPattern:
         return "BDiagPattern";
-    case Qt::FDiagPattern:
+    case TQt::FDiagPattern:
         return "FDiagPattern";
-    case Qt::DiagCrossPattern:
+    case TQt::DiagCrossPattern:
         return "DiagCrossPattern";
     default: // should not happen (but can for a custom pattern)
         return "SolidPattern";
@@ -403,7 +399,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush )
 {
     bool ok = true;
     TQColor tempColor;
-    Qt::BrushStyle tempStyle;
+    TQt::BrushStyle tempStyle;
     TQPixmap tempPixmap;
     TQDomNode node = element.firstChild();
     while( !node.isNull() ) {
@@ -466,7 +462,7 @@ bool readPixmapNode( const TQDomElement& element, TQPixmap& pixmap )
 
     if( ok ) {
 	if( 0 < tempLengthi ) {
-            // Decode the image file format in the same way Qt Designer does.
+            // Decode the image file format in the same way TQt Designer does.
             char *ba = new char[ tempData.length() / 2 ];
             for ( int i = 0; i < (int)tempData.length() / 2; ++i ) {
                 char h = tempData[ 2 * i ].latin1();
@@ -510,7 +506,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen )
     bool ok = true;
     int tempWidth;
     TQColor tempColor;
-    Qt::PenStyle tempStyle;
+    TQt::PenStyle tempStyle;
     TQDomNode node = element.firstChild();
     while( !node.isNull() ) {
         TQDomElement element = node.toElement();
@@ -577,10 +573,6 @@ bool readFontNode( const TQDomElement& element, TQFont& font )
 	if ( pixelSize > 0 ) font.setPixelSize( pixelSize );
         font.setWeight( weight );
         font.setItalic( italic );
-#if QT_VERSION < 300
-        // Qt 3 handles charsets internally.
-        font.setCharSet( (TQFont::CharSet)charSet );
-#endif
     }
 
     return ok;
@@ -713,60 +705,60 @@ bool readTimeNode( const TQDomElement& element, TQTime& value )
 
 
 
-Qt::PenStyle stringToPenStyle( const TQString& style )
+TQt::PenStyle stringToPenStyle( const TQString& style )
 {
     if( style == "NoPen" )
-        return Qt::NoPen;
+        return TQt::NoPen;
     else if( style == "SolidLine" )
-        return Qt::SolidLine;
+        return TQt::SolidLine;
     else if( style == "DashLine" )
-        return Qt::DashLine;
+        return TQt::DashLine;
     else if( style == "DotLine" )
-        return Qt::DotLine;
+        return TQt::DotLine;
     else if( style == "DashDotLine" )
-        return Qt::DashDotLine;
+        return TQt::DashDotLine;
     else if( style == "DashDotDotLine" )
-        return Qt::DashDotDotLine;
+        return TQt::DashDotDotLine;
     else // should not happen
-        return Qt::SolidLine;
+        return TQt::SolidLine;
 }
 
 
-Qt::BrushStyle stringToBrushStyle( const TQString& style )
+TQt::BrushStyle stringToBrushStyle( const TQString& style )
 {
     // PENDING(kalle) Support custom patterns
     if( style == "NoBrush" )
-        return Qt::NoBrush;
+        return TQt::NoBrush;
     else if( style == "SolidPattern" )
-        return Qt::SolidPattern;
+        return TQt::SolidPattern;
     else if( style == "Dense1Pattern" )
-        return Qt::Dense1Pattern;
+        return TQt::Dense1Pattern;
     else if( style == "Dense2Pattern" )
-        return Qt::Dense2Pattern;
+        return TQt::Dense2Pattern;
     else if( style == "Dense3Pattern" )
-        return Qt::Dense3Pattern;
+        return TQt::Dense3Pattern;
     else if( style == "Dense4Pattern" )
-        return Qt::Dense4Pattern;
+        return TQt::Dense4Pattern;
     else if( style == "Dense5Pattern" )
-        return Qt::Dense5Pattern;
+        return TQt::Dense5Pattern;
     else if( style == "Dense6Pattern" )
-        return Qt::Dense6Pattern;
+        return TQt::Dense6Pattern;
     else if( style == "Dense7Pattern" )
-        return Qt::Dense7Pattern;
+        return TQt::Dense7Pattern;
     else if( style == "HorPattern" )
-        return Qt::HorPattern;
+        return TQt::HorPattern;
     else if( style == "VerPattern" )
-        return Qt::VerPattern;
+        return TQt::VerPattern;
     else if( style == "CrossPattern" )
-        return Qt::CrossPattern;
+        return TQt::CrossPattern;
     else if( style == "BDiagPattern" )
-        return Qt::BDiagPattern;
+        return TQt::BDiagPattern;
     else if( style == "FDiagPattern" )
-        return Qt::FDiagPattern;
+        return TQt::FDiagPattern;
     else if( style == "DiagCrossPattern" )
-        return Qt::DiagCrossPattern;
+        return TQt::DiagCrossPattern;
     else // should not happen (but can with custom patterns)
-        return Qt::SolidPattern;
+        return TQt::SolidPattern;
 }
 
 }
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index 784bc2e1..4d316f8b 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -27,8 +27,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -45,44 +45,44 @@
 #include <tqdatetime.h>
 
 namespace KDGanttXML {
-    TQString penStyleToString( Qt::PenStyle style );
-    Qt::PenStyle stringToPenStyle( const TQString& style );
-    TQString brushStyleToString( Qt::BrushStyle style );
-    Qt::BrushStyle stringToBrushStyle( const TQString& style );
+    TQString penStyleToString( TQt::PenStyle style );
+    TQt::PenStyle stringToPenStyle( const TQString& style );
+    TQString brushStyleToString( TQt::BrushStyle style );
+    TQt::BrushStyle stringToBrushStyle( const TQString& style );
 
-    void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
+    void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, bool value );
-    void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
+    void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, const TQSize& value );
-    void createIntNode( TQDomDocument& doc, TQDomNode& parent,
+    void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
                         const TQString& elementName, int value );
-    void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
+    void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
                            const TQString& elementName, double value );
-    void createStringNode( TQDomDocument& doc, TQDomNode& parent,
+    void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
                            const TQString& elementName,
                            const TQString& text );
-    void createColorNode( TQDomDocument& doc, TQDomNode& parent,
+    void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
                           const TQString& elementName, const TQColor& color );
-    void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
+    void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
                           const TQString& elementName, const TQBrush& brush );
-    void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
+    void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
                            const TQString& elementName, const TQPixmap& pixmap );
-    void createRectNode( TQDomDocument& doc, TQDomNode& parent,
+    void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, const TQRect& rect );
-    void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
+    void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
                                 const TQString& elementName,
                                 const TQStringList* list );
-    void createFontNode( TQDomDocument& doc, TQDomNode& parent,
+    void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, const TQFont& font );
 
-    void createPenNode( TQDomDocument& doc, TQDomNode& parent,
+    void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
                         const TQString& elementName, const TQPen& pen );
-    void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
+    void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
                              const TQString& elementName,
                              const TQDateTime& datetime );
-    void createDateNode( TQDomDocument& doc, TQDomNode& parent,
+    void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, const TQDate& date );
-    void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
+    void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
                          const TQString& elementName, const TQTime& time );
     bool readIntNode( const TQDomElement& element, int& value );
     bool readStringNode( const TQDomElement& element, TQString& value );
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 10fac5d6..c214971a 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>itemAttributeDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>itemAttributeDialog</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -47,7 +47,7 @@
                         <string>Item name:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>itemName</cstring>
                     </property>
@@ -71,7 +71,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <string>ShapeType:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>TextLabel8</cstring>
                     </property>
@@ -101,12 +101,12 @@
                         <string>Highlight color:</string>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="4" column="5">
+                <widget class="TQTimeEdit" row="4" column="5">
                     <property name="name">
                         <cstring>TimeEdit5</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <string>Lead</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -122,7 +122,7 @@
                         <string>ShapeColor:</string>
                     </property>
                 </widget>
-                <widget class="QDateEdit" row="3" column="2">
+                <widget class="TQDateEdit" row="3" column="2">
                     <property name="name">
                         <cstring>DateEdit1</cstring>
                     </property>
@@ -130,7 +130,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="3">
+                <widget class="TQComboBox" row="1" column="3">
                     <item>
                         <property name="text">
                             <string>TriangleDown</string>
@@ -160,7 +160,7 @@
                         <cstring>MiddleBox</cstring>
                     </property>
                 </widget>
-                <widget class="QDateEdit" row="3" column="3">
+                <widget class="TQDateEdit" row="3" column="3">
                     <property name="name">
                         <cstring>DateEdit2</cstring>
                     </property>
@@ -168,7 +168,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>StartShape</cstring>
                     </property>
@@ -176,7 +176,7 @@
                         <string>Start</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>ChangeStart</cstring>
                     </property>
@@ -184,7 +184,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="3">
+                <widget class="TQLabel" row="0" column="3">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -192,7 +192,7 @@
                         <string>Middle</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="2">
+                <widget class="TQComboBox" row="1" column="2">
                     <item>
                         <property name="text">
                             <string>TriangleDown</string>
@@ -222,7 +222,7 @@
                         <cstring>StartBox</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="4">
+                <widget class="TQLabel" row="0" column="4">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -230,12 +230,12 @@
                         <string>End</string>
                     </property>
                 </widget>
-                <widget class="QDateEdit" row="3" column="1">
+                <widget class="TQDateEdit" row="3" column="1">
                     <property name="name">
                         <cstring>DateEdit4</cstring>
                     </property>
                 </widget>
-                <widget class="QDateEdit" row="3" column="4">
+                <widget class="TQDateEdit" row="3" column="4">
                     <property name="name">
                         <cstring>DateEdit3</cstring>
                     </property>
@@ -243,7 +243,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="5">
+                <widget class="TQLabel" row="0" column="5">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <string>Actual End</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="5" column="3">
+                <widget class="TQPushButton" row="5" column="3">
                     <property name="name">
                         <cstring>HighMiddle</cstring>
                     </property>
@@ -259,7 +259,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="5" column="2">
+                <widget class="TQPushButton" row="5" column="2">
                     <property name="name">
                         <cstring>HighStart</cstring>
                     </property>
@@ -267,7 +267,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="3">
+                <widget class="TQPushButton" row="2" column="3">
                     <property name="name">
                         <cstring>ChangeMiddle</cstring>
                     </property>
@@ -275,7 +275,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="4" column="4">
+                <widget class="TQTimeEdit" row="4" column="4">
                     <property name="name">
                         <cstring>TimeEdit3</cstring>
                     </property>
@@ -283,7 +283,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="4">
+                <widget class="TQPushButton" row="2" column="4">
                     <property name="name">
                         <cstring>ChangeEnd</cstring>
                     </property>
@@ -291,7 +291,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel6</cstring>
                     </property>
@@ -299,7 +299,7 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="5" column="4">
+                <widget class="TQPushButton" row="5" column="4">
                     <property name="name">
                         <cstring>HighEnd</cstring>
                     </property>
@@ -307,7 +307,7 @@
                         <string>Change</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="4">
+                <widget class="TQComboBox" row="1" column="4">
                     <item>
                         <property name="text">
                             <string>TriangleDown</string>
@@ -337,17 +337,17 @@
                         <cstring>EndBox</cstring>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="4" column="1">
+                <widget class="TQTimeEdit" row="4" column="1">
                     <property name="name">
                         <cstring>TimeEdit4</cstring>
                     </property>
                 </widget>
-                <widget class="QDateEdit" row="3" column="5">
+                <widget class="TQDateEdit" row="3" column="5">
                     <property name="name">
                         <cstring>DateEdit5</cstring>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="4" column="2">
+                <widget class="TQTimeEdit" row="4" column="2">
                     <property name="name">
                         <cstring>TimeEdit1</cstring>
                     </property>
@@ -355,7 +355,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="4" column="3">
+                <widget class="TQTimeEdit" row="4" column="3">
                     <property name="name">
                         <cstring>TimeEdit2</cstring>
                     </property>
@@ -363,7 +363,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>TextLabel10</cstring>
                     </property>
@@ -390,7 +390,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -404,7 +404,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -418,7 +418,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel7</cstring>
                             </property>
@@ -426,7 +426,7 @@
                                 <string>Displayed text:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>LineEdit1</cstring>
                             </property>
@@ -441,7 +441,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -455,7 +455,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel9</cstring>
                             </property>
@@ -466,7 +466,7 @@
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>ChangeText</cstring>
                             </property>
@@ -478,7 +478,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout8</cstring>
             </property>
@@ -492,7 +492,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>PrioLabel</cstring>
                     </property>
@@ -500,7 +500,7 @@
                         <string>Priority:</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>PrioSpinBox</cstring>
                     </property>
@@ -511,7 +511,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QSlider">
+                <widget class="TQSlider">
                     <property name="name">
                         <cstring>PrioSlider</cstring>
                     </property>
@@ -525,7 +525,7 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>CalBox</cstring>
                     </property>
@@ -702,7 +702,7 @@
 <variables>
     <variable>KDGanttViewItem * myItem</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>ChangeText_clicked()</slot>
     <slot>ChangeStart_clicked()</slot>
@@ -732,6 +732,6 @@
     <slot>CalBox_toggled( bool mode )</slot>
     <slot>PrioSlider_valueChanged( int val )</slot>
     <slot returnType="KDGanttViewItem *">getItem()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 348b3e97..3ab24af8 100644
--- a/kdgantt/itemAttributeDialog.ui.h
+++ b/kdgantt/itemAttributeDialog.ui.h
@@ -22,8 +22,8 @@
  ** licensing are not clear to you.
  **
  ** As a special exception, permission is given to link this program
- ** with any edition of Qt, and distribute the resulting executable,
- ** without including the source code for Qt in the source distribution.
+ ** with any edition of TQt, and distribute the resulting executable,
+ ** without including the source code for TQt in the source distribution.
  **
  **********************************************************************/
 
@@ -31,7 +31,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -49,7 +49,7 @@ void itemAttributeDialog::init( )
 void itemAttributeDialog::ChangeText_clicked()
 {
     if ( !myItem) return;
-    TQColor c = QColorDialog::getColor( myItem->textColor(), this );
+    TQColor c = TQColorDialog::getColor( myItem->textColor(), this );
     if ( c.isValid() )
       myItem->setTextColor( c );
     TQPixmap *  pix  = (TQPixmap *)ChangeText->pixmap();
@@ -65,7 +65,7 @@ void itemAttributeDialog::ChangeStart_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
-    TQColor c = QColorDialog::getColor( st, this );
+    TQColor c = TQColorDialog::getColor( st, this );
     if ( c.isValid() ) {
 	st = c;
 	ChangeStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -82,7 +82,7 @@ void itemAttributeDialog::ChangeMiddle_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
-    TQColor c = QColorDialog::getColor( mi, this );
+    TQColor c = TQColorDialog::getColor( mi, this );
     if ( c.isValid() ) {
 	mi = c;
 	ChangeMiddle->setPixmap(  KDGanttView::getPixmap( middle, mi, backgroundColor(), 10 )  );
@@ -98,7 +98,7 @@ void itemAttributeDialog::ChangeEnd_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
-     TQColor c = QColorDialog::getColor( en, this );
+     TQColor c = TQColorDialog::getColor( en, this );
     if ( c.isValid() ) {
 	en = c;
 	ChangeEnd->setPixmap(  KDGanttView::getPixmap( end, en, backgroundColor(), 10 )  );
@@ -275,7 +275,7 @@ void itemAttributeDialog::HighStart_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
-    TQColor c = QColorDialog::getColor( st, this );
+    TQColor c = TQColorDialog::getColor( st, this );
     if ( c.isValid() ) {
 	st = c;
 	HighStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -292,7 +292,7 @@ void itemAttributeDialog::HighMiddle_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
-    TQColor c = QColorDialog::getColor( mi, this );
+    TQColor c = TQColorDialog::getColor( mi, this );
     if ( c.isValid() ) {
 	mi = c;
 	HighMiddle->setPixmap(  KDGanttView::getPixmap( middle, mi, backgroundColor(), 10 )  );
@@ -309,7 +309,7 @@ void itemAttributeDialog::HighEnd_clicked()
     myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
-    TQColor c = QColorDialog::getColor( en, this );
+    TQColor c = TQColorDialog::getColor( en, this );
     if ( c.isValid() ) {
 	en = c;
 	HighEnd->setPixmap(  KDGanttView::getPixmap( end, en, backgroundColor(), 10 )  );
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index 2681ff73..a071dae3 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -1,4 +1,4 @@
-// THIS IS A COPY OF THE FILE FOUND IN $QTDIR/src/kernel. Needed to modify qsplitter
+// THIS IS A COPY OF THE FILE FOUND IN $TQTDIR/src/kernel. Needed to modify qsplitter
 
 /****************************************************************************
 ** $Id$
@@ -9,27 +9,27 @@
 **
 ** Copyright (C) 1998-99 by Trolltech AS.  All rights reserved.
 **
-** This file is part of the kernel module of the Qt GUI Toolkit.
+** This file is part of the kernel module of the TQt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+**   information about TQt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -37,15 +37,15 @@
 **
 **********************************************************************/
 
-#ifndef QLAYOUTENGINE_P_H
-#define QLAYOUTENGINE_P_H
+#ifndef TQLAYOUTENGINE_P_H
+#define TQLAYOUTENGINE_P_H
 
 
 //
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists for the convenience
+// This file is not part of the TQt API.  It exists for the convenience
 // of qtqlayout.cpp, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
@@ -55,22 +55,22 @@
 //
 
 
-#ifndef QT_H
+#ifndef TQT_H
 #include "tqabstractqlayout.h"
-#endif // QT_H
+#endif // TQT_H
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 struct QLayoutStruct
 {
     void initParameters() { tqminimumSize = tqsizeHint = 0;
-    tqmaximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
+    tqmaximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
     //permanent storage:
     int stretch;
     //parameters:
-    QCOORD tqsizeHint;
-    QCOORD tqmaximumSize;
-    QCOORD tqminimumSize;
+    TQCOORD tqsizeHint;
+    TQCOORD tqmaximumSize;
+    TQCOORD tqminimumSize;
     bool expansive;
     bool empty;
     //temporary storage:
@@ -92,20 +92,20 @@ void qGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, int pos,
 
   Expansive boxes win over non-expansive boxes.
 */
-static inline void qMaxExpCalc( QCOORD & max, bool &exp,
-			       QCOORD boxmax, bool boxexp )
+static inline void qMaxExpCalc( TQCOORD & max, bool &exp,
+			       TQCOORD boxmax, bool boxexp )
 {
     if ( exp ) {
 	if ( boxexp )
-	    max = QMAX( max, boxmax );
+	    max = TQMAX( max, boxmax );
     } else {
 	if ( boxexp )
 	    max = boxmax;
 	else
-	    max = QMIN( max, boxmax );
+	    max = TQMIN( max, boxmax );
     }
     exp = exp || boxexp;
 }
 
-#endif //QT_NO_LAYOUT
+#endif //TQT_NO_LAYOUT
 #endif
diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp
index b8346f4f..aa4ece8c 100644
--- a/kfile-plugins/ics/kfile_ics.cpp
+++ b/kfile-plugins/ics/kfile_ics.cpp
@@ -33,8 +33,8 @@ using namespace KCal;
 typedef KGenericFactory<ICSPlugin> ICSFactory;
 K_EXPORT_COMPONENT_FACTORY(kfile_ics, ICSFactory( "kfile_ics" ))
 
-ICSPlugin::ICSPlugin( TQObject *parent, const char *name, const TQStringList& args )
-  : KFilePlugin( parent, name, args )
+ICSPlugin::ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args )
+  : KFilePlugin( tqparent, name, args )
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "text/calendar" ); //TODO: vcs !!
 
diff --git a/kfile-plugins/ics/kfile_ics.h b/kfile-plugins/ics/kfile_ics.h
index f8f29e9c..342c0d45 100644
--- a/kfile-plugins/ics/kfile_ics.h
+++ b/kfile-plugins/ics/kfile_ics.h
@@ -27,8 +27,9 @@ class TQStringList;
 class ICSPlugin : public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
+  ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
   virtual bool readInfo( KFileMetaInfo& info, uint what );
 };
diff --git a/kfile-plugins/palm-databases/kfile_palm.cpp b/kfile-plugins/palm-databases/kfile_palm.cpp
index c3865076..0e4db00c 100644
--- a/kfile-plugins/palm-databases/kfile_palm.cpp
+++ b/kfile-plugins/palm-databases/kfile_palm.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory<KPalmPlugin> PalmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_palm, PalmFactory( "kfile_palm" ))
 
-KPalmPlugin::KPalmPlugin(TQObject *parent, const char *name,
+KPalmPlugin::KPalmPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "application/vnd.palm" );
 
diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/kfile-plugins/palm-databases/kfile_palm.h
index 1797ee9a..d42225ee 100644
--- a/kfile-plugins/palm-databases/kfile_palm.h
+++ b/kfile-plugins/palm-databases/kfile_palm.h
@@ -29,9 +29,10 @@ class TQStringList;
 class KPalmPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KPalmPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KPalmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 //    virtual bool writeInfo( const KFileMetaInfo& info ) const;
diff --git a/kfile-plugins/rfc822/kfile_rfc822.cpp b/kfile-plugins/rfc822/kfile_rfc822.cpp
index 6d248884..f5ee73c6 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.cpp
+++ b/kfile-plugins/rfc822/kfile_rfc822.cpp
@@ -42,10 +42,10 @@ typedef KGenericFactory<KRfc822Plugin> Rfc822Factory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_rfc822, Rfc822Factory( "kfile_rfc822" ))
 
-KRfc822Plugin::KRfc822Plugin(TQObject *parent, const char *name,
+KRfc822Plugin::KRfc822Plugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "message/rfc822" );
 
diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/kfile-plugins/rfc822/kfile_rfc822.h
index 85f026e1..9a232506 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.h
+++ b/kfile-plugins/rfc822/kfile_rfc822.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KRfc822Plugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KRfc822Plugin( TQObject *parent, const char *name, const TQStringList& args );
+    KRfc822Plugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 6c083895..84b29696 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory<KVcfPlugin> VcfFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_vcf, VcfFactory( "kfile_vcf" ))
 
-KVcfPlugin::KVcfPlugin(TQObject *parent, const char *name,
+KVcfPlugin::KVcfPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "text/x-vcard" );
 
diff --git a/kfile-plugins/vcf/kfile_vcf.h b/kfile-plugins/vcf/kfile_vcf.h
index 705a9bd7..e617d4db 100644
--- a/kfile-plugins/vcf/kfile_vcf.h
+++ b/kfile-plugins/vcf/kfile_vcf.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KVcfPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KVcfPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KVcfPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kgantt/COPYING b/kgantt/COPYING
index 54754ab4..b55fa146 100644
--- a/kgantt/COPYING
+++ b/kgantt/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp
index 249f11ad..a3360c7a 100644
--- a/kgantt/kgantt/KGantt.cpp
+++ b/kgantt/kgantt/KGantt.cpp
@@ -15,8 +15,8 @@
 
 
 KGantt::KGantt(KGanttItem* toplevelitem,
-	       TQWidget* parent, const char * name, WFlags f)
-  : TQWidget(parent,name,f)
+	       TQWidget* tqparent, const char * name, WFlags f)
+  : TQWidget(tqparent,name,f)
 { 
 #ifdef _DEBUG_
   printf("KGantt::KGantt()\n");
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index 5cfe559c..7448e01a 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -49,7 +49,7 @@
 /**
  *  \mainpage KGantt Module <br> <IMG SRC="gantt.png">
  *
- *  The kgantt module tqcontains several classes (KGanttItem, KGantt)
+ *  The kgantt module contains several classes (KGanttItem, KGantt)
  *  for drawing and editing gantt-diagramms.
  *
  *  This example shows how to use the gantt module:
@@ -83,15 +83,16 @@
 
 ///  Gantt Widget.
 /*!
- *   A gantt widget tqcontains two parts, a list view and a
+ *   A gantt widget contains two parts, a list view and a
  *   bar view.
  */
 ////////////////////////////////
-class KDE_EXPORT KGantt : public QWidget
+class KDE_EXPORT KGantt : public TQWidget
 ////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 
 public:  
@@ -102,7 +103,7 @@ public:
    *
    */
   KGantt(KGanttItem* toplevelitem = 0,
-	 TQWidget* parent = 0, const char * name=0, WFlags f=0 );
+	 TQWidget* tqparent = 0, const char * name=0, WFlags f=0 );
 
 
   ///  Destructor.
diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp
index ff5f4ee8..e41dc7c6 100644
--- a/kgantt/kgantt/KGanttBarConfig.cpp
+++ b/kgantt/kgantt/KGanttBarConfig.cpp
@@ -13,9 +13,9 @@
 
 
 KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview,
-				 TQWidget* parent,  
+				 TQWidget* tqparent,  
 				 const char * name, WFlags f)
-  : TQWidget(parent,name,f) 
+  : TQWidget(tqparent,name,f) 
 {
   _barview = barview;
   KColorButton* b = new KColorButton(this);
diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h
index 88049fea..e12475b1 100644
--- a/kgantt/kgantt/KGanttBarConfig.h
+++ b/kgantt/kgantt/KGanttBarConfig.h
@@ -34,15 +34,16 @@
 class xQGanttBarView;
 
 
-class KGanttBarConfig : public QWidget
+class KGanttBarConfig : public TQWidget
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
   KGanttBarConfig(xQGanttBarView* barview,
-		  TQWidget* parent = 0, const char* name=0, WFlags f=0);
+		  TQWidget* tqparent = 0, const char* name=0, WFlags f=0);
    
 
 protected slots:
diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp
index 3632e170..7939d49c 100644
--- a/kgantt/kgantt/KGanttItem.cpp
+++ b/kgantt/kgantt/KGanttItem.cpp
@@ -12,28 +12,28 @@
 TQBrush KGanttItem::_selectBrush(TQColor(255,0,0));
 
 
-KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, 
+KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, 
 	 const TQDateTime& start, const TQDateTime& end)
   : TQObject()
 ////////////////////////////////////////////////////////
 {
-  init(parentItem,text, start,end);
+  init(tqparentItem,text, start,end);
 }
 
 
 
-KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, 
+KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, 
 	 const TQDateTime& start, long durationMin)
   : TQObject()
 ////////////////////////////////////////////////////////
 {  
-  init(parentItem, text, start, start.addSecs( durationMin * 60));
+  init(tqparentItem, text, start, start.addSecs( durationMin * 60));
 }
 
 
 
 void 
-KGanttItem::init(KGanttItem* parentItem, const TQString& text,
+KGanttItem::init(KGanttItem* tqparentItem, const TQString& text,
 	     const TQDateTime& start, const TQDateTime& end) 
 ///////////////////////////////////////////////////////////////
 {
@@ -55,10 +55,10 @@ KGanttItem::init(KGanttItem* parentItem, const TQString& text,
   _start = start; _minDateTime = start;
   _end = end; _maxDateTime = end;
 
-  _parentItem = parentItem;
+  _tqparentItem = tqparentItem;
 
-  if(_parentItem)
-    _parentItem->registerItem(this);
+  if(_tqparentItem)
+    _tqparentItem->registerItem(this);
   
 }
 
@@ -71,8 +71,8 @@ KGanttItem::~KGanttItem()
   printf("-> delete %s \n", getText().latin1() );
 #endif
 
-  if(_parentItem)
-    _parentItem->unregisterItem(this);
+  if(_tqparentItem)
+    _tqparentItem->unregisterItem(this);
 
   _subitems.setAutoDelete(true);
   _subitems.clear();
@@ -90,7 +90,7 @@ KGanttRelation*
 KGanttItem::addRelation(KGanttItem* from, KGanttItem* to,
 			const TQString& text)
 {
-  if(_subitems.tqcontainsRef(from) > 0 && _subitems.tqcontainsRef(to) >0) {
+  if(_subitems.containsRef(from) > 0 && _subitems.containsRef(to) >0) {
     KGanttRelation* rel = new KGanttRelation(from,to,text);
     _relations.append(rel);
 
@@ -595,7 +595,7 @@ KGanttItem::dump(TQTextOStream& cout, const TQString& pre)
 }
 
 
-QString
+TQString
 KGanttItem::ChangeAsString(Change c)
 //////////////////////////////////
 {
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index fb7feb04..a49c825b 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -25,9 +25,9 @@
 
 
     changelog : 26 dec 2000, jh
-                09 jan 2001, jh - added signal destroyed(xQTask*)
+                09 jan 2001, jh - added signal destroyed(xTQTask*)
 
-		11 jan 2001, jh changed to kde : xQTask -> KGanttItem
+		11 jan 2001, jh changed to kde : xTQTask -> KGanttItem
 
 */
 
@@ -46,16 +46,17 @@
 
 ///  KGanttItem.
 /*!
- *   This class describes a item. It tqcontains dates on which the item starts and
- *   ends. It also tqcontains attributes that gouverns the graphical representation
+ *   This class describes a item. It contains dates on which the item starts and
+ *   ends. It also contains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
-class KDE_EXPORT KGanttItem : public QObject
+class KDE_EXPORT KGanttItem : public TQObject
 //////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 
 public:
@@ -121,7 +122,7 @@ public:
     //  Draw handlke for opening/closing item.
     DrawHandle      = 16,
     
-    /// Draw handle only if item tqcontains subitems
+    /// Draw handle only if item contains subitems
     DrawHandleWSubitems = 32,
     
     DrawAll         = 255 
@@ -138,7 +139,7 @@ public:
   /*!
    * 
    */
-  KGanttItem(KGanttItem* parentItem, const TQString& text, 
+  KGanttItem(KGanttItem* tqparentItem, const TQString& text, 
 	 const TQDateTime& start, const TQDateTime& end);
 
 
@@ -147,7 +148,7 @@ public:
   /*!
    * 
    */
-  KGanttItem(KGanttItem* parentItem, const TQString& text, 
+  KGanttItem(KGanttItem* tqparentItem, const TQString& text, 
 	 const TQDateTime& start, long durationMin);
 
 
@@ -501,7 +502,7 @@ private:
   void registerItem(KGanttItem* item);
   void unregisterItem(KGanttItem* item);
 
-  void init(KGanttItem* parentItem, const TQString& text,
+  void init(KGanttItem* tqparentItem, const TQString& text,
 	    const TQDateTime& start, const TQDateTime& end);
 
 
@@ -525,7 +526,7 @@ private:
   int _height, _style, _mode;
 
 
-  KGanttItem*            _parentItem;
+  KGanttItem*            _tqparentItem;
   TQPtrList<KGanttItem>      _subitems;  
   TQPtrList<KGanttRelation>  _relations;
 
diff --git a/kgantt/kgantt/KGanttRelation.cpp b/kgantt/kgantt/KGanttRelation.cpp
index f95deea1..e5eab3b4 100644
--- a/kgantt/kgantt/KGanttRelation.cpp
+++ b/kgantt/kgantt/KGanttRelation.cpp
@@ -138,7 +138,7 @@ KGanttRelation::dump(TQTextOStream& cout, const TQString& pre)
 }
 
 
-QString
+TQString
 KGanttRelation::ChangeAsString(Change c)
 //////////////////////////////////
 {
diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h
index 8ab96c5d..a75cec9b 100644
--- a/kgantt/kgantt/KGanttRelation.h
+++ b/kgantt/kgantt/KGanttRelation.h
@@ -40,16 +40,17 @@ class KGanttItem;
 
 ///  KGanttRelation.
 /*!
- *   This class describes a item. It tqcontains dates on which the item starts and
- *   ends. It also tqcontains attributes that gouverns the graphical representation
+ *   This class describes a item. It contains dates on which the item starts and
+ *   ends. It also contains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
-class KGanttRelation : public QObject
+class KGanttRelation : public TQObject
 //////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
   friend class KGanttItem;
 
diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui
index 3be22f9e..2b2e2a67 100644
--- a/kgantt/kgantt/itemedit.ui
+++ b/kgantt/kgantt/itemedit.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>_itemTextLabel</cstring>
             </property>
@@ -53,7 +53,7 @@
             <property name="vAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>groupBox10</cstring>
             </property>
@@ -81,7 +81,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLineEdit" row="1" column="3">
+                <widget class="TQLineEdit" row="1" column="3">
                     <property name="name">
                         <cstring>_minStartMinuetEdit</cstring>
                     </property>
@@ -95,7 +95,7 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>_minStartHourEdit</cstring>
                     </property>
@@ -109,12 +109,12 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>_minStartDateEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_minStartDateLabel</cstring>
                     </property>
@@ -130,7 +130,7 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>_minStartTimeSepatatorLabel</cstring>
                     </property>
@@ -144,7 +144,7 @@
                         <string>:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_minStartTimeLabel</cstring>
                     </property>
@@ -162,7 +162,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="3" column="2">
+        <widget class="TQGroupBox" row="3" column="2">
             <property name="name">
                 <cstring>groupBox11</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>_maxStartHourEdit</cstring>
                     </property>
@@ -187,12 +187,12 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>_maxStartDateEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>_maxStartTimeSepatatorLabel</cstring>
                     </property>
@@ -206,7 +206,7 @@
                         <string>:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="3">
+                <widget class="TQLineEdit" row="1" column="3">
                     <property name="name">
                         <cstring>_maxStartMinuetEdit</cstring>
                     </property>
@@ -237,7 +237,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_maxStartTimeLabel</cstring>
                     </property>
@@ -253,7 +253,7 @@
                         <string>Time:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_maxStartDateLabel</cstring>
                     </property>
@@ -271,7 +271,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>groupBox8</cstring>
             </property>
@@ -282,7 +282,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_startTimeLabel</cstring>
                     </property>
@@ -315,7 +315,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>_startTimeSepatatorLabel</cstring>
                     </property>
@@ -329,7 +329,7 @@
                         <string>:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_startDateLabel</cstring>
                     </property>
@@ -345,12 +345,12 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>_startDateEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>_startHourEdit</cstring>
                     </property>
@@ -364,7 +364,7 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="3">
+                <widget class="TQLineEdit" row="1" column="3">
                     <property name="name">
                         <cstring>_startMinuetEdit</cstring>
                     </property>
@@ -380,7 +380,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="2">
+        <widget class="TQGroupBox" row="2" column="2">
             <property name="name">
                 <cstring>groupBox9</cstring>
             </property>
@@ -391,7 +391,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLineEdit" row="1" column="3">
+                <widget class="TQLineEdit" row="1" column="3">
                     <property name="name">
                         <cstring>_endMinuetEdit</cstring>
                     </property>
@@ -422,12 +422,12 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>_endDateEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_endTimeLabel</cstring>
                     </property>
@@ -443,7 +443,7 @@
                         <string>Time:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_endDateLabel</cstring>
                     </property>
@@ -459,7 +459,7 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>_endTimeSeparator</cstring>
                     </property>
@@ -473,7 +473,7 @@
                         <string>:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>_endHourEdit</cstring>
                     </property>
@@ -489,7 +489,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox7</cstring>
             </property>
@@ -500,7 +500,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>mode1</string>
@@ -528,7 +528,7 @@
                         <number>20</number>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>style1</string>
@@ -548,7 +548,7 @@
                         <cstring>_styleStyleCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_styleStyleLabel</cstring>
                     </property>
@@ -564,7 +564,7 @@
                         <string>Style:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>_styleModeLabel</cstring>
                     </property>
@@ -580,7 +580,7 @@
                         <string>Mode:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_styleHeightLabel</cstring>
                     </property>
@@ -598,7 +598,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>_itemTextEdit</cstring>
             </property>
diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui
index bdcc0eb7..d77d2f5f 100644
--- a/kgantt/kgantt/itemedit2.ui
+++ b/kgantt/kgantt/itemedit2.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -26,12 +26,12 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>_itemTextEdit</cstring>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>groupBox5</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>style1</string>
@@ -70,7 +70,7 @@
                         <number>20</number>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>mode1</string>
@@ -90,7 +90,7 @@
                         <cstring>_styleModeCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_styleHeightLabel</cstring>
                     </property>
@@ -106,7 +106,7 @@
                         <string>Height:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>_styleModeLabel</cstring>
                     </property>
@@ -122,7 +122,7 @@
                         <string>Mode:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_styleStyleLabel</cstring>
                     </property>
@@ -140,7 +140,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>groupBox6</cstring>
             </property>
@@ -151,7 +151,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="4">
                     <item>
                         <property name="text">
                             <string>Start</string>
@@ -176,7 +176,7 @@
                         <cstring>_dateTimeEditCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>_dateTimeTimeLabel</cstring>
                     </property>
@@ -192,7 +192,7 @@
                         <string>Time:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>_dateTimeDateLabel</cstring>
                     </property>
@@ -208,12 +208,12 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>_startDateEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>_dateTimeHourEdit</cstring>
                     </property>
@@ -227,7 +227,7 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="2">
+                <widget class="TQLabel" row="2" column="2">
                     <property name="name">
                         <cstring>_startTimeSepatatorLabel</cstring>
                     </property>
@@ -241,7 +241,7 @@
                         <string>:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="3">
+                <widget class="TQLineEdit" row="2" column="3">
                     <property name="name">
                         <cstring>_dateTimeMinuetEdit</cstring>
                     </property>
@@ -272,7 +272,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>_dateTimeEditLabel</cstring>
                     </property>
@@ -290,7 +290,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>_itemTextLabel</cstring>
             </property>
diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp
index 7cc410d1..dc931499 100644
--- a/kgantt/kgantt/xQGanttBarView.cpp
+++ b/kgantt/kgantt/xQGanttBarView.cpp
@@ -12,9 +12,9 @@
 
 
 xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem,
-			       TQWidget* parent, 
+			       TQWidget* tqparent, 
 			       const char * name, WFlags f)
-  : TQScrollView(parent,name,f)
+  : TQScrollView(tqparent,name,f)
 {     
   _config = NULL;
 
diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h
index 08105727..d9037b40 100644
--- a/kgantt/kgantt/xQGanttBarView.h
+++ b/kgantt/kgantt/xQGanttBarView.h
@@ -1,5 +1,5 @@
-#ifndef _XQGANTTBARVIEW_H_
-#define _XQGANTTBARVIEW_H_
+#ifndef _XTQGANTTBARVIEW_H_
+#define _XTQGANTTBARVIEW_H_
   
 /*
 
@@ -47,11 +47,12 @@ class KGanttBarConfig;
  */
 
 //////////////////////////////////////////
-class xQGanttBarView : public QScrollView
+class xQGanttBarView : public TQScrollView
 //////////////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 
 public:
@@ -61,7 +62,7 @@ public:
   /*!
    *
    */
-  xQGanttBarView(KGanttItem* toplevelitem, TQWidget* parent = 0,  
+  xQGanttBarView(KGanttItem* toplevelitem, TQWidget* tqparent = 0,  
 		 const char * name=0, WFlags f=0 );
 
 
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 2ee7ad02..c1dc60d6 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -22,12 +22,12 @@
 
 
 xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, 
-				       xQGanttBarView* parent,
+				       xQGanttBarView* tqparent,
 				       const char * name, WFlags f)
-  : TQFrame(parent,name,f)
+  : TQFrame(tqparent,name,f)
 /////////////////////////////////////////////////////////////////////////////
 {
-  _parent = parent;
+  _tqparent = tqparent;
 
   closedIcon =  TQPixmap(open_xpm);
   openedIcon =  TQPixmap(close_xpm);
@@ -35,7 +35,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
   _observedList = NULL;
   _toolbar = NULL;
 
-  _gItemList = TQPtrDict<xQTaskPosition>(449);
+  _gItemList = TQPtrDict<xTQTaskPosition>(449);
   _gItemList.setAutoDelete(true);
 
   _toplevelitem = toplevelitem;
@@ -107,7 +107,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
 {
   if(_toolbar || mw == 0) return _toolbar;
 
-  _toolbar = new KToolBar(mw,TQMainWindow::DockTop);
+  _toolbar = new KToolBar(mw,TQMainWindow::TQt::DockTop);
 
   mw->addToolBar(_toolbar);
 
@@ -239,7 +239,7 @@ xQGanttBarViewPort::initMenu()
 
   pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 );
   if(pix.isNull()) printf("configure.png not found !\n");
-  _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig()));
+  _menu->insertItem(pix, i18n("Configure Gantt..."), _tqparent, TQT_SLOT(showConfig()));
 
 }
 
@@ -420,8 +420,8 @@ xQGanttBarViewPort::recalc(KGanttItem* item, int xPos, int yPos,
   int _textPosY = yPos + (int) (0.7 * (double) tmpHeight * _scaleY);
   int _textPosX = xPos + dd + 18;
 
-  xQTaskPosition* tpos =  
-    new xQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
+  xTQTaskPosition* tpos =  
+    new xTQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
 		       _textPosX, _textPosY, depth);
   
   _gItemList.tqreplace(item, tpos );
@@ -459,7 +459,7 @@ void
 xQGanttBarViewPort::drawItem(KGanttItem* item, TQPainter* p, 
 			     const TQRect& rect )
 {
-  xQTaskPosition* tpos = _gItemList[item];
+  xTQTaskPosition* tpos = _gItemList[item];
 
   if(!tpos) return;
 
@@ -589,8 +589,8 @@ xQGanttBarViewPort::drawRelation(TQPainter* p,
   KGanttItem* from = rel->getFrom();
   KGanttItem* to = rel->getTo();
 
-  xQTaskPosition* tpos_from = _gItemList[from];
-  xQTaskPosition* tpos_to = _gItemList[to];
+  xTQTaskPosition* tpos_from = _gItemList[from];
+  xTQTaskPosition* tpos_to = _gItemList[to];
 
   p->setPen(rel->getPen());
 
@@ -839,7 +839,7 @@ xQGanttBarViewPort::zoom(double sfactor, int sx, int sy)
   recalc();
   adjustSize();
 
-  _parent->center(screenX(wx), screenY(wy) );
+  _tqparent->center(screenX(wx), screenY(wy) );
 
   TQWidget::update();
 
@@ -854,12 +854,12 @@ xQGanttBarViewPort::zoom(double sfactor)
 {
   printf("zoom %f \n", sfactor );
 
-  int x = (int) (_parent->visibleWidth()/2 + 0.5);
-  int y = (int) (_parent->visibleHeight()/2 + 0.5);
+  int x = (int) (_tqparent->visibleWidth()/2 + 0.5);
+  int y = (int) (_tqparent->visibleHeight()/2 + 0.5);
 
   printf("dx/2 = %d, dy/2 = %d \n", x,y);
 
-  zoom(sfactor, x + _parent->contentsX(), y + _parent->contentsY() );
+  zoom(sfactor, x + _tqparent->contentsX(), y + _tqparent->contentsY() );
 
 }
 
@@ -872,7 +872,7 @@ xQGanttBarViewPort::zoomAll()
   printf("zoom all. scaleX = %f\n", _scaleX );
 #endif
 
-  _scaleX = ((double) _parent->visibleWidth()*60)/
+  _scaleX = ((double) _tqparent->visibleWidth()*60)/
     ((double) (_toplevelitem->getStart().secsTo(_toplevelitem->getEnd()) + _marginX*120));
 
   recalc();
@@ -910,7 +910,7 @@ xQGanttBarViewPort::addHoliday(int y, int m, int d)
 xQGanttBarViewPort::Position 
 xQGanttBarViewPort::check(KGanttItem** founditem, int x, int y)
 {
-  TQPtrDictIterator<xQTaskPosition> it(_gItemList); 
+  TQPtrDictIterator<xTQTaskPosition> it(_gItemList); 
 
   static int ty, ty2, tx, tx2, hx, hx2, hy, hy2;
   bool increased;
diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h
index 1b3de985..e84761e1 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.h
+++ b/kgantt/kgantt/xQGanttBarViewPort.h
@@ -1,5 +1,5 @@
-#ifndef _XQGANTTBARVIEWPORT_H_
-#define _XQGANTTBARVIEWPORT_H_
+#ifndef _XTQGANTTBARVIEWPORT_H_
+#define _XTQGANTTBARVIEWPORT_H_
 
 /*
 
@@ -51,13 +51,13 @@ class xQGanttBarView;
 // This is an internal class.
 // helper for drawing items
 
-class xQTaskPosition 
+class xTQTaskPosition 
 ////////////////////
 {
 
 public :
 
-  xQTaskPosition(int nr, int x, int y, int w, int h, int hiSub, 
+  xTQTaskPosition(int nr, int x, int y, int w, int h, int hiSub, 
 		 int tPx, int tPy, int d) 
     :  _nr(nr), _screenX(x), _screenY(y), _screenW(w), _screenH(h), 
        _screenHS(hiSub), _textPosX(tPx), _textPosY(tPy), _depth(d)
@@ -85,11 +85,12 @@ public :
  */
 
 /////////////////////////////////////////
-class KDE_EXPORT xQGanttBarViewPort : public QFrame
+class KDE_EXPORT xQGanttBarViewPort : public TQFrame
 ////////////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
   friend class xQGanttBarView;
   friend class KGantt;
@@ -103,7 +104,7 @@ public:
   /*!
    *
    */
-  xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* parent = 0,
+  xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* tqparent = 0,
 		     const char * name=0, WFlags f=0 );
 
 
@@ -123,7 +124,7 @@ public:
   
 
  
-  TQPtrDict<xQTaskPosition> _gItemList;
+  TQPtrDict<xTQTaskPosition> _gItemList;
 
 
   ///  Add holiday.
@@ -244,7 +245,7 @@ private:
 
 
   //  this will be set by setParentScrollView()
-  xQGanttBarView* _parent;
+  xQGanttBarView* _tqparent;
 
   int _grid, _snapgrid;
   bool _drawGrid, _drawHeader;
diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
index 1791689e..be6d38b5 100644
--- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
@@ -66,7 +66,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
    */
   if(e->button() == MidButton && _mode == Select) {
 
-    xQTaskPosition* tp = _gItemList.find(_currentItem);
+    xTQTaskPosition* tp = _gItemList.tqfind(_currentItem);
     TQPainter p(this);
 
     TQRect rect = p.boundingRect(tp->_textPosX, 
@@ -118,7 +118,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
 	_itemInfo->setText( tmp );
 	_itemInfo->adjustSize();
 	
-	_itemInfo->move(e->x() + 25, _gItemList.find(_currentItem)->_screenY - 50 );
+	_itemInfo->move(e->x() + 25, _gItemList.tqfind(_currentItem)->_screenY - 50 );
 	_itemInfo->show();
       }
       else
@@ -245,7 +245,7 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e)
 
 	double sys_width  = fabs(x2 - x1);
 
-	double mass = (_parent->visibleWidth()/ sys_width);
+	double mass = (_tqparent->visibleWidth()/ sys_width);
 
 	zoom(mass, (int) (x1+(x2-x1)/2), (int) (y1+(y2-y1)/2) );
 
@@ -298,7 +298,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
       int pixeldiff = e->x() - _startPoint->x();
       _timediff = (int) ((double) pixeldiff / _scaleX + 0.5 );
       
-      xQTaskPosition* tpos = _gItemList[_currentItem];
+      xTQTaskPosition* tpos = _gItemList[_currentItem];
 
       int x = tpos->_screenX; int w = tpos->_screenW;
       
@@ -366,15 +366,15 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
 
       _itemInfo->setText( stmp );
       _itemInfo->adjustSize();
-      _itemInfo->move(e->x() + 25, _gItemList.find(_currentItem)->_screenY - 50);
+      _itemInfo->move(e->x() + 25, _gItemList.tqfind(_currentItem)->_screenY - 50);
       _itemInfo->show();
 
       if(oldx > 0) {
-	p.fillRect(oldx, _gItemList.find(_currentItem)->_screenY, 
-		   oldw, _gItemList.find(_currentItem)->_screenH,
+	p.fillRect(oldx, _gItemList.tqfind(_currentItem)->_screenY, 
+		   oldw, _gItemList.tqfind(_currentItem)->_screenH,
 		   TQBrush(TQColor(50,50,50), Dense4Pattern));
-	p.drawRect(oldx, _gItemList.find(_currentItem)->_screenY, 
-		   oldw, _gItemList.find(_currentItem)->_screenH);
+	p.drawRect(oldx, _gItemList.tqfind(_currentItem)->_screenY, 
+		   oldw, _gItemList.tqfind(_currentItem)->_screenH);
 
 	p.setPen(_solidPen);
 	if(_changeStart)
@@ -386,11 +386,11 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
       }
 
       p.setPen(_dashPen);
-      p.fillRect(x, _gItemList.find(_currentItem)->_screenY, 
-		 w, _gItemList.find(_currentItem)->_screenH,
+      p.fillRect(x, _gItemList.tqfind(_currentItem)->_screenY, 
+		 w, _gItemList.tqfind(_currentItem)->_screenH,
 		 TQBrush(TQColor(50,50,50), Dense4Pattern) );
-      p.drawRect(x, _gItemList.find(_currentItem)->_screenY, 
-		 w, _gItemList.find(_currentItem)->_screenH);
+      p.drawRect(x, _gItemList.tqfind(_currentItem)->_screenY, 
+		 w, _gItemList.tqfind(_currentItem)->_screenH);
 
       p.setPen(_solidPen);
       if(_changeStart)
diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp
index 3f5f44c2..f5a587da 100644
--- a/kgantt/kgantt/xQGanttListView.cpp
+++ b/kgantt/kgantt/xQGanttListView.cpp
@@ -10,9 +10,9 @@
 #include <tqcolor.h>
 #include <klocale.h>
 
-xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent, 
+xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent, 
 				 const char * name, WFlags f)
-  : TQScrollView(parent,name,f)
+  : TQScrollView(tqparent,name,f)
 /////////////////////////////////////////////////////////
 { 
   _toplevelitem = toplevelitem;
diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h
index ff002a7b..fa0f973d 100644
--- a/kgantt/kgantt/xQGanttListView.h
+++ b/kgantt/kgantt/xQGanttListView.h
@@ -1,5 +1,5 @@
-#ifndef _XQGANTTLISTVIEW_H_
-#define _XQGANTTLISTVIEW_H_
+#ifndef _XTQGANTTLISTVIEW_H_
+#define _XTQGANTTLISTVIEW_H_
  
 /*
 
@@ -44,11 +44,12 @@
  */
 
 //////////////////////////////////////////////
-class xQGanttListView : public QScrollView
+class xQGanttListView : public TQScrollView
 //////////////////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 
 public:
@@ -58,7 +59,7 @@ public:
   /*!
    *
    */
-  xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent = 0,  
+  xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent = 0,  
 		  const char * name=0, WFlags f=0 );
 
 
diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp
index a792ad99..2549c880 100644
--- a/kgantt/kgantt/xQGanttListViewPort.cpp
+++ b/kgantt/kgantt/xQGanttListViewPort.cpp
@@ -13,9 +13,9 @@
 int xQGanttListViewPort::_ListViewCounter = 0;
 
 
-xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent,
+xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent,
 					 const char * name, WFlags f )
-  : TQFrame(parent,name,f)
+  : TQFrame(tqparent,name,f)
 {
   _toplevelitem = toplevelitem;
 
@@ -109,7 +109,7 @@ xQGanttListViewPort::drawItem(KGanttItem* item, TQPainter* p, const TQRect& rect
 {
   static int margin = 2;
 
-  xQTaskPosition* tpos = _barviewport->_gItemList[item];
+  xTQTaskPosition* tpos = _barviewport->_gItemList[item];
 
   if(!tpos) return;
   
diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h
index cc16ca8c..bb0d1b15 100644
--- a/kgantt/kgantt/xQGanttListViewPort.h
+++ b/kgantt/kgantt/xQGanttListViewPort.h
@@ -1,5 +1,5 @@
-#ifndef _XQGANTTLISTVIEWPORT_H_
-#define _XQGANTTLISTVIEWPORT_H_
+#ifndef _XTQGANTTLISTVIEWPORT_H_
+#define _XTQGANTTLISTVIEWPORT_H_
 
 /*
 
@@ -44,11 +44,12 @@
  */
 
 ////////////////////////////////////////////
-class xQGanttListViewPort : public QFrame
+class xQGanttListViewPort : public TQFrame
 ////////////////////////////////////////////
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
   friend class xQGanttListView;
  
@@ -60,7 +61,7 @@ public:
   /*!
    *
    */
-  xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent = 0,
+  xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent = 0,
 		     const char * name=0, WFlags f=0 );
 
 
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index b5d1071f..29ab5980 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -228,11 +228,11 @@ IMAP4Protocol::get (const KURL & _url)
     //        the logic is in the app.
 
     TQString aUpper = aSection.upper();
-    if (aUpper.find ("STRUCTURE") != -1)
+    if (aUpper.tqfind ("STRUCTURE") != -1)
     {
       aSection = "BODYSTRUCTURE";
     }
-    else if (aUpper.find ("ENVELOPE") != -1)
+    else if (aUpper.tqfind ("ENVELOPE") != -1)
     {
       aSection = "UID RFC822.SIZE FLAGS ENVELOPE";
       if (hasCapability("IMAP4rev1")) {
@@ -246,9 +246,9 @@ IMAP4Protocol::get (const KURL & _url)
     {
       aSection = "UID RFC822.HEADER RFC822.SIZE FLAGS";
     }
-    else if (aUpper.find ("BODY.PEEK[") != -1)
+    else if (aUpper.tqfind ("BODY.PEEK[") != -1)
     {
-      if (aUpper.find ("BODY.PEEK[]") != -1)
+      if (aUpper.tqfind ("BODY.PEEK[]") != -1)
       {
         if (!hasCapability("IMAP4rev1")) // imap4 does not know BODY.PEEK[]
           aSection.tqreplace("BODY.PEEK[]", "RFC822.PEEK");
@@ -295,7 +295,7 @@ IMAP4Protocol::get (const KURL & _url)
         }
       }
       outputLine ("\r\n", 2);
-      flushOutput(TQString::null);
+      flushOutput(TQString());
       cacheOutput = false;
     }
 
@@ -342,11 +342,11 @@ IMAP4Protocol::get (const KURL & _url)
 
         if (cmd && !cmd->isComplete ())
         {
-          if ((aUpper.find ("BODYSTRUCTURE") != -1)
-                    || (aUpper.find ("FLAGS") != -1)
-                    || (aUpper.find ("UID") != -1)
-                    || (aUpper.find ("ENVELOPE") != -1)
-                    || (aUpper.find ("BODY.PEEK[0]") != -1
+          if ((aUpper.tqfind ("BODYSTRUCTURE") != -1)
+                    || (aUpper.tqfind ("FLAGS") != -1)
+                    || (aUpper.tqfind ("UID") != -1)
+                    || (aUpper.tqfind ("ENVELOPE") != -1)
+                    || (aUpper.tqfind ("BODY.PEEK[0]") != -1
                         && (aEnum == ITYPE_BOX || aEnum == ITYPE_DIR_AND_BOX)))
           {
             if (aEnum == ITYPE_BOX || aEnum == ITYPE_DIR_AND_BOX)
@@ -440,8 +440,8 @@ IMAP4Protocol::listDir (const KURL & _url)
       UDSEntry entry;
       UDSAtom atom;
       KURL aURL = _url;
-      if (aURL.path().find(';') != -1)
-        aURL.setPath(aURL.path().left(aURL.path().find(';')));
+      if (aURL.path().tqfind(';') != -1)
+        aURL.setPath(aURL.path().left(aURL.path().tqfind(';')));
 
       kdDebug(7116) << "IMAP4Protocol::listDir - got " << listResponses.count () << endl;
 
@@ -495,7 +495,7 @@ IMAP4Protocol::listDir (const KURL & _url)
       && myLType != "LIST" && myLType != "LSUB" && myLType != "LSUBNOCHECK")
   {
     KURL aURL = _url;
-    aURL.setQuery (TQString::null);
+    aURL.setQuery (TQString());
     const TQString encodedUrl = aURL.url(0, 106); // utf-8
 
     if (!_url.query ().isEmpty ())
@@ -588,7 +588,7 @@ IMAP4Protocol::listDir (const KURL & _url)
         bool withSubject = mySection.isEmpty();
         if (mySection.isEmpty()) mySection = "UID RFC822.SIZE ENVELOPE";
 
-        bool withFlags = mySection.upper().find("FLAGS") != -1;
+        bool withFlags = mySection.upper().tqfind("FLAGS") != -1;
         imapCommand *fetch =
           sendCommand (imapCommand::
                        clientFetch (mySequence, mySection));
@@ -670,7 +670,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay)
   char buf[8192];
   while (buffer.size() < len)
   {
-    ssize_t readLen = myRead(buf, QMIN(len - buffer.size(), sizeof(buf) - 1));
+    ssize_t readLen = myRead(buf, TQMIN(len - buffer.size(), sizeof(buf) - 1));
     if (readLen == 0)
     {
       kdDebug(7116) << "parseRead: readLen == 0 - connection broken" << endl;
@@ -683,7 +683,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay)
     {
       TQByteArray relayData;
       ssize_t relbuf = relay - buffer.size();
-      int currentRelay = QMIN(relbuf, readLen);
+      int currentRelay = TQMIN(relbuf, readLen);
       relayData.setRawData(buf, currentRelay);
       parseRelay(relayData);
       relayData.resetRawData(buf, currentRelay);
@@ -875,7 +875,7 @@ IMAP4Protocol::put (const KURL & _url, int, bool, bool)
         if (hasCapability("UIDPLUS"))
         {
           TQString uid = cmd->resultInfo();
-          if (uid.find("APPENDUID") != -1)
+          if (uid.tqfind("APPENDUID") != -1)
           {
             uid = uid.section(" ", 2, 2);
             uid.truncate(uid.length()-1);
@@ -930,7 +930,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int)
     parseURL(_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
   if (type == ITYPE_BOX)
   {
-    bool ask = ( aInfo.find( "ASKUSER" ) != -1 );
+    bool ask = ( aInfo.tqfind( "ASKUSER" ) != -1 );
     if ( ask &&
         messageBox(QuestionYesNo,
           i18n("The following folder will be created on the server: %1 "
@@ -972,7 +972,7 @@ IMAP4Protocol::copy (const KURL & src, const KURL & dest, int, bool overwrite)
   if (dType != ITYPE_BOX && dType != ITYPE_DIR_AND_BOX)
   {
     // this might be konqueror
-    int sub = dBox.find (sBox);
+    int sub = dBox.tqfind (sBox);
 
     // might be moving to upper folder
     if (sub > 0)
@@ -1049,7 +1049,7 @@ IMAP4Protocol::copy (const KURL & src, const KURL & dest, int, bool overwrite)
       if (hasCapability("UIDPLUS"))
       {
         TQString uid = cmd->resultInfo();
-        if (uid.find("COPYUID") != -1)
+        if (uid.tqfind("COPYUID") != -1)
         {
           uid = uid.section(" ", 2, 3);
           uid.truncate(uid.length()-1);
@@ -1330,10 +1330,10 @@ IMAP4Protocol::special (const TQByteArray & aData)
     // quota
     int cmd;
     stream >> cmd;
-    if ( hasCapability( "QUOTA" ) ) {
+    if ( hasCapability( "TQUOTA" ) ) {
       specialQuotaCommand( cmd, stream );
     } else {
-      error( ERR_UNSUPPORTED_ACTION, "QUOTA" );
+      error( ERR_UNSUPPORTED_ACTION, "TQUOTA" );
     }
     break;
   }
@@ -1493,7 +1493,7 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
     }
     // Returning information to the application from a special() command isn't easy.
     // I'm reusing the infoMessage trick seen above (for capabilities), but this
-    // limits me to a string instead of a stringlist. Using DQUOTE as separator,
+    // limits me to a string instead of a stringlist. Using DTQUOTE as separator,
     // because it's forbidden in userids by rfc3501
     kdDebug(7116) << getResults() << endl;
     infoMessage(getResults().join( "\"" ));
@@ -1718,9 +1718,9 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
   parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
 
   switch( command ) {
-    case 'R': // GEQUOTAROOT
+    case 'R': // GETQUOTAROOT
       {
-        kdDebug(7116) << "QUOTAROOT " << aBox << endl;
+        kdDebug(7116) << "TQUOTAROOT " << aBox << endl;
         imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) );
         if (cmd->result () != "OK")
         {
@@ -1734,15 +1734,15 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
         finished();
         break;
       }
-    case 'G': // GEQUOTA
+    case 'G': // GETQUOTA
       {
-        kdDebug(7116) << "GEQUOTA command" << endl;
+        kdDebug(7116) << "GETQUOTA command" << endl;
         kdWarning(7116) << "UNIMPLEMENTED" << endl;
         break;
       }
-    case 'S': // SEQUOTA
+    case 'S': // SETQUOTA
       {
-        kdDebug(7116) << "SEQUOTA command" << endl;
+        kdDebug(7116) << "SETQUOTA command" << endl;
         kdWarning(7116) << "UNIMPLEMENTED" << endl;
         break;
       }
@@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status ()
 {
   bool connected = (getState() != ISTATE_NO) && isConnectionValid();
   kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-  slavetqStatus ( connected ? myHost : TQString::null, connected );
+  slavetqStatus ( connected ? myHost : TQString(), connected );
 }
 
 void
@@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url)
       ok = true;
     else
     {
-      imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection));
+      imapCommand *cmd = doCommand(imapCommand::clientqStatus(aBox, aSection));
       ok = cmd->result() == "OK";
       cmdInfo = cmd->resultInfo();
       completeQueue.removeRef(cmd);
@@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url)
         error(KIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
-    if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
-      || (aSection == "UNSEEN" && geStatus().unseenAvailable()))
+    if ((aSection == "UIDNEXT" && getqStatus().uidNextAvailable())
+      || (aSection == "UNSEEN" && getqStatus().unseenAvailable()))
     {
       atom.m_uds = UDS_SIZE;
-      atom.m_str = TQString::null;
-      atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext()
-        : geStatus().unseen();
+      atom.m_str = TQString();
+      atom.m_long = (aSection == "UIDNEXT") ? getqStatus().uidNext()
+        : getqStatus().unseen();
       entry.append(atom);
     }
   } else
@@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url)
       // only do this if the box is not selected
       // the server might change the validity for new select/examine
       imapCommand *cmd =
-        doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY"));
+        doCommand (imapCommand::clientqStatus (aBox, "UIDVALIDITY"));
       completeQueue.removeRef (cmd);
-      validity = geStatus ().uidValidity ();
+      validity = getqStatus ().uidValidity ();
     }
     validity = 0;               // temporary
 
@@ -1954,7 +1954,7 @@ IMAP4Protocol::stat (const KURL & _url)
   {
   case ITYPE_DIR:
     atom.m_uds = UDS_FILE_TYPE;
-    atom.m_str = TQString::null;
+    atom.m_str = TQString();
     atom.m_long = S_IFDIR;
     entry.append (atom);
     break;
@@ -1962,7 +1962,7 @@ IMAP4Protocol::stat (const KURL & _url)
   case ITYPE_BOX:
   case ITYPE_DIR_AND_BOX:
     atom.m_uds = UDS_FILE_TYPE;
-    atom.m_str = TQString::null;
+    atom.m_str = TQString();
     atom.m_long = S_IFDIR;
     entry.append (atom);
     break;
@@ -1970,7 +1970,7 @@ IMAP4Protocol::stat (const KURL & _url)
   case ITYPE_MSG:
   case ITYPE_ATTACH:
     atom.m_uds = UDS_FILE_TYPE;
-    atom.m_str = TQString::null;
+    atom.m_str = TQString();
     atom.m_long = S_IFREG;
     entry.append (atom);
     break;
@@ -2008,7 +2008,7 @@ void IMAP4Protocol::closeConnection()
   completeQueue.clear();
   sentQueue.clear();
   lastHandled = 0;
-  currentBox = TQString::null;
+  currentBox = TQString();
   readBufferLen = 0;
 }
 
@@ -2188,7 +2188,7 @@ bool IMAP4Protocol::makeLogin ()
       }
       if ( it != listResponses.end() )
       {
-        namespaceToDelimiter[TQString::null] = (*it).hierarchyDelimiter();
+        namespaceToDelimiter[TQString()] = (*it).hierarchyDelimiter();
         kdDebug(7116) << "makeLogin - delimiter for empty ns='" <<
           (*it).hierarchyDelimiter() << "'" << endl;
         if ( !hasCapability("NAMESPACE") )
@@ -2225,7 +2225,7 @@ IMAP4Protocol::parseWriteLine (const TQString & aStr)
   write(writer.data(), len);
 }
 
-QString
+TQString
 IMAP4Protocol::getMimeType (enum IMAP_TYPE aType)
 {
   switch (aType)
@@ -2264,7 +2264,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, int stretch, imapCache * cache,
   bool withFlags, bool withSubject)
 {
   KURL aURL = _url;
-  aURL.setQuery (TQString::null);
+  aURL.setQuery (TQString());
   const TQString encodedUrl = aURL.url(0, 106); // utf-8
   doListEntry(encodedUrl, stretch, cache, withFlags, withSubject);
 }
@@ -2309,7 +2309,7 @@ IMAP4Protocol::doListEntry (const TQString & encodedUrl, int stretch, imapCache
     entry.append (atom);
 
     atom.m_uds = UDS_FILE_TYPE;
-    atom.m_str = TQString::null;
+    atom.m_str = TQString();
     atom.m_long = S_IFREG;
     entry.append (atom);
 
@@ -2339,7 +2339,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, const TQString & myBox,
                             const imapList & item, bool appendPath)
 {
   KURL aURL = _url;
-  aURL.setQuery (TQString::null);
+  aURL.setQuery (TQString());
   UDSEntry entry;
   UDSAtom atom;
   int hdLen = item.hierarchyDelimiter().length();
@@ -2349,7 +2349,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, const TQString & myBox,
     TQString mailboxName = item.name ();
 
     // some beautification
-    if (mailboxName.find (myBox) == 0 && mailboxName.length() > myBox.length())
+    if (mailboxName.tqfind (myBox) == 0 && mailboxName.length() > myBox.length())
     {
       mailboxName =
         mailboxName.right (mailboxName.length () - myBox.length ());
@@ -2363,7 +2363,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, const TQString & myBox,
 
     atom.m_uds = UDS_NAME;
     if (!item.hierarchyDelimiter().isEmpty() &&
-        mailboxName.find(item.hierarchyDelimiter()) != -1)
+        mailboxName.tqfind(item.hierarchyDelimiter()) != -1)
       atom.m_str = mailboxName.section(item.hierarchyDelimiter(), -1);
     else
       atom.m_str = mailboxName;
@@ -2392,7 +2392,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, const TQString & myBox,
 
         // explicitly set this as a directory for KFileDialog
         atom.m_uds = UDS_FILE_TYPE;
-        atom.m_str = TQString::null;
+        atom.m_str = TQString();
         atom.m_long = S_IFDIR;
         entry.append (atom);
       }
@@ -2406,7 +2406,7 @@ IMAP4Protocol::doListEntry (const KURL & _url, const TQString & myBox,
 
         // explicitly set this as a directory for KFileDialog
         atom.m_uds = UDS_FILE_TYPE;
-        atom.m_str = TQString::null;
+        atom.m_str = TQString();
         atom.m_long = S_IFDIR;
         entry.append (atom);
       }
@@ -2554,17 +2554,17 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
   {
     if (!_uid.isEmpty ())
     {
-      if (_uid.find (':') == -1 && _uid.find (',') == -1
-          && _uid.find ('*') == -1)
+      if (_uid.tqfind (':') == -1 && _uid.tqfind (',') == -1
+          && _uid.tqfind ('*') == -1)
         retVal = ITYPE_MSG;
     }
   }
   if (retVal == ITYPE_MSG)
   {
-    if ( (_section.find ("BODY.PEEK[", 0, false) != -1 ||
-          _section.find ("BODY[", 0, false) != -1) &&
-         _section.find(".MIME") == -1 &&
-         _section.find(".HEADER") == -1 )
+    if ( (_section.tqfind ("BODY.PEEK[", 0, false) != -1 ||
+          _section.tqfind ("BODY[", 0, false) != -1) &&
+         _section.tqfind(".MIME") == -1 &&
+         _section.tqfind(".HEADER") == -1 )
       retVal = ITYPE_ATTACH;
   }
   if ( _hierarchyDelimiter.isEmpty() &&
@@ -2629,14 +2629,14 @@ void IMAP4Protocol::flushOutput(TQString contentEncoding)
   {
     // get the coding from the MIME header
     TQByteArray decoded;
-    if (contentEncoding.find("quoted-printable", 0, false) == 0)
+    if (contentEncoding.tqfind("quoted-printable", 0, false) == 0)
       decoded = KCodecs::quotedPrintableDecode(outputCache);
-    else if (contentEncoding.find("base64", 0, false) == 0)
+    else if (contentEncoding.tqfind("base64", 0, false) == 0)
       KCodecs::base64Decode(outputCache, decoded);
     else
       decoded = outputCache;
 
-    TQString mimetype = KMimeType::tqfindByContent( decoded )->name();
+    TQString mimetype = KMimeType::findByContent( decoded )->name();
     kdDebug(7116) << "IMAP4::flushOutput - mimeType " << mimetype << endl;
     mimeType(mimetype);
     decodeContent = false;
@@ -2697,7 +2697,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
       }
       completeQueue.removeRef (cmd);
       if (found) {
-        if (cmdInfo.find("permission", 0, false) != -1) {
+        if (cmdInfo.tqfind("permission", 0, false) != -1) {
           // not allowed to enter this folder
           error(ERR_ACCESS_DENIED, cmdInfo);
         } else {
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index a44b4eb7..d03f8c0c 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -37,8 +37,8 @@ enum IMAP_TYPE
 {
   ITYPE_UNKNOWN, /*< unknown type */
   ITYPE_DIR,     /*< Object is a directory. i.e. does not contain message, just mailboxes */
-  ITYPE_BOX,     /*< Object is a mailbox. i.e. tqcontains mails */
-  ITYPE_DIR_AND_BOX, /*< Object tqcontains both mails and mailboxes */
+  ITYPE_BOX,     /*< Object is a mailbox. i.e. contains mails */
+  ITYPE_DIR_AND_BOX, /*< Object contains both mails and mailboxes */
   ITYPE_MSG,   /*< Object is a mail */
   ITYPE_ATTACH   /*< Object is an attachment */
 };
@@ -126,7 +126,7 @@ public:
   virtual int outputLine (const TQCString & _str, int len = -1);
 
   /** @brief send out cached data to the application */
-  virtual void flushOutput(TQString contentEncoding = TQString::null);
+  virtual void flushOutput(TQString contentEncoding = TQString());
 
 protected:
 
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index 97956200..65a9227d 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -58,7 +58,7 @@
 imapCommand::imapCommand ()
 {
   mComplete = false;
-  mId = TQString::null;
+  mId = TQString();
 }
 
 imapCommand::imapCommand (const TQString & command, const TQString & parameter)
@@ -69,7 +69,7 @@ imapCommand::imapCommand (const TQString & command, const TQString & parameter)
   mComplete = false;
   aCommand = command;
   aParameter = parameter;
-  mId = TQString::null;
+  mId = TQString();
 }
 
 bool
@@ -145,7 +145,7 @@ imapCommand::setParameter (const TQString & parameter)
   aParameter = parameter;
 }
 
-const QString
+const TQString
 imapCommand::getStr ()
 {
   if (parameter().isEmpty())
@@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags,
 }
 
 imapCommand *
-imapCommand::clienStatus (const TQString & path, const TQString & parameters)
+imapCommand::clientqStatus (const TQString & path, const TQString & parameters)
 {
   return new imapCommand ("STATUS",
                           TQString ("\"") + rfcDecoder::toIMAP (path) +
@@ -397,7 +397,7 @@ imapCommand *
 imapCommand::clientGetQuotaroot( const TQString& box )
 {
   TQString parameter = TQString("\"") + rfcDecoder::toIMAP (box) + '"';
-  return new imapCommand ("GEQUOTAROOT", parameter);
+  return new imapCommand ("GETQUOTAROOT", parameter);
 }
 
 imapCommand *
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index 4c955202..9ddb3f25 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -212,7 +212,7 @@ public:
    * @param parameters
    * @return a STATUS imapCommand
    */
-  static imapCommand *clienStatus (const TQString & path,
+  static imapCommand *clientqStatus (const TQString & path,
                                     const TQString & parameters);
   /**
    * @brief Create a COPY command
@@ -365,9 +365,9 @@ public:
   static imapCommand *clientNamespace ();
 
   /**
-   * @brief Create a GEQUOTAROOT command
+   * @brief Create a GETQUOTAROOT command
    * @param box mailbox name
-   * @return a GEQUOTAROOT imapCommand
+   * @return a GETQUOTAROOT imapCommand
    */
   static imapCommand *clientGetQuotaroot ( const TQString& box );
 
diff --git a/kioslaves/imap4/imapinfo.cc b/kioslaves/imap4/imapinfo.cc
index c65eca0c..be955c23 100644
--- a/kioslaves/imap4/imapinfo.cc
+++ b/kioslaves/imap4/imapinfo.cc
@@ -147,8 +147,8 @@ permanentFlagsAvailable_ (false), readWriteAvailable_ (false)
 
       else if (tokens[2] == "[PERMANENTFLAGS")
       {
-        int flagsStart = line.find('(');
-        int flagsEnd = line.find(')');
+        int flagsStart = line.tqfind('(');
+        int flagsEnd = line.tqfind(')');
 
         kdDebug(7116) << "Checking permFlags from " << flagsStart << " to " << flagsEnd << endl;
         if ((-1 != flagsStart) && (-1 != flagsEnd) && flagsStart < flagsEnd)
@@ -170,8 +170,8 @@ permanentFlagsAvailable_ (false), readWriteAvailable_ (false)
     }
     else if (tokens[1] == "FLAGS")
     {
-      int flagsStart = line.find ('(');
-      int flagsEnd = line.find (')');
+      int flagsStart = line.tqfind ('(');
+      int flagsEnd = line.tqfind (')');
 
       if ((-1 != flagsStart) && (-1 != flagsEnd) && flagsStart < flagsEnd)
         setFlags (_flags (line.mid (flagsStart, flagsEnd).latin1() ));
diff --git a/kioslaves/imap4/imaplist.cc b/kioslaves/imap4/imaplist.cc
index b15c821d..6c9dad64 100644
--- a/kioslaves/imap4/imaplist.cc
+++ b/kioslaves/imap4/imaplist.cc
@@ -103,7 +103,7 @@ hasNoChildren_ (false)
 
   hierarchyDelimiter_ = parser_->parseOneWordC(s);
   if (hierarchyDelimiter_ == "NIL")
-    hierarchyDelimiter_ = TQString::null;
+    hierarchyDelimiter_ = TQString();
   name_ = rfcDecoder::fromIMAP (parser_->parseLiteral (s));  // decode modified UTF7
 }
 
@@ -116,17 +116,17 @@ void imapList::parseAttributes( parseString & str )
     orig = parser_->parseOneWordC(str);
     attributes_ << orig;
     attribute = orig.lower();
-    if (-1 != attribute.find ("\\noinferiors"))
+    if (-1 != attribute.tqfind ("\\noinferiors"))
       noInferiors_ = true;
-    else if (-1 != attribute.find ("\\noselect"))
+    else if (-1 != attribute.tqfind ("\\noselect"))
       noSelect_ = true;
-    else if (-1 != attribute.find ("\\marked"))
+    else if (-1 != attribute.tqfind ("\\marked"))
       marked_ = true;
-    else if (-1 != attribute.find ("\\unmarked"))
+    else if (-1 != attribute.tqfind ("\\unmarked"))
       unmarked_ = true;
-    else if (-1 != attribute.find ("\\haschildren"))
+    else if (-1 != attribute.tqfind ("\\hastqchildren"))
       hasChildren_ = true;
-    else if (-1 != attribute.find ("\\hasnochildren"))
+    else if (-1 != attribute.tqfind ("\\hasnotqchildren"))
       hasNoChildren_ = true;
     else
       kdDebug(7116) << "imapList::imapList: bogus attribute " << attribute << endl;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index 0cd8938e..57366526 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -120,16 +120,16 @@ imapParser::sendCommand (imapCommand * aCmd)
   else if (command == "CLOSE")
   {
      // we no longer have a box open
-    currentBox = TQString::null;
+    currentBox = TQString();
   }
-  else if (command.find ("SEARCH") != -1
+  else if (command.tqfind ("SEARCH") != -1
            || command == "GETACL"
            || command == "LISTRIGHTS"
            || command == "MYRIGHTS"
            || command == "GETANNOTATION"
            || command == "NAMESPACE"
-           || command == "GEQUOTAROOT"
-           || command == "GEQUOTA"
+           || command == "GETQUOTAROOT"
+           || command == "GETQUOTA"
            || command == "X-GET-OTHER-USERS"
            || command == "X-GET-DELEGATES"
            || command == "X-GET-OUT-OF-OFFICE")
@@ -216,7 +216,7 @@ static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
 
 bool
 imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
-  const TQString & aFQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
+  const TQString & aFTQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
 {
   bool retVal = false;
 #ifdef HAVE_LIBSASL2
@@ -228,7 +228,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
   const char *mechusing = 0;
   TQByteArray tmp, challenge;
 
-  kdDebug(7116) << "aAuth: " << aAuth << " FQDN: " << aFQDN << " isSSL: " << isSSL << endl;
+  kdDebug(7116) << "aAuth: " << aAuth << " FTQDN: " << aFTQDN << " isSSL: " << isSSL << endl;
 
   // see if server supports this authenticator
   if (!hasCapability ("AUTH=" + aAuth))
@@ -237,7 +237,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
 //  result = sasl_client_new( isSSL ? "imaps" : "imap",
   result = sasl_client_new( "imap", /* FIXME: with cyrus-imapd, even imaps' digest-uri
                                        must be 'imap'. I don't know if it's good or bad. */
-                       aFQDN.latin1(),
+                       aFTQDN.latin1(),
                        0, 0, callbacks, 0, &conn );
 
   if ( result != SASL_OK ) {
@@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result)
     }
     else if (tqstrncmp(what, "STATUS", what.size()) == 0)
     {
-      parseStatus (result);
+      parsetqStatus (result);
     }
     break;
 
@@ -457,12 +457,12 @@ imapParser::parseUntagged (parseString & result)
       parseAnnotation (result);
     }
     break;
-  case 'Q': // QUOTA or QUOTAROOT
-    if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
+  case 'Q': // TQUOTA or TQUOTAROOT
+    if ( what.size() > 5 && tqstrncmp(what, "TQUOTAROOT", what.size()) == 0)
     {
       parseQuotaRoot( result );
     }
-    else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
+    else if (tqstrncmp(what, "TQUOTA", what.size()) == 0)
     {
       parseQuota( result );
     }
@@ -498,7 +498,7 @@ imapParser::parseUntagged (parseString & result)
         case 'F':
           if (tqstrncmp(what, "FETCH", what.size()) == 0)
           {
-            seenUid = TQString::null;
+            seenUid = TQString();
             parseFetch (number, result);
           }
           break;
@@ -506,7 +506,7 @@ imapParser::parseUntagged (parseString & result)
         case 'S':
           if (tqstrncmp(what, "STORE", what.size()) == 0)  // deprecated store
           {
-            seenUid = TQString::null;
+            seenUid = TQString();
             parseFetch (number, result);
           }
           break;
@@ -544,7 +544,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
     case 'A':                  // ALERT
       if (option == "ALERT")
       {
-        rest.pos = rest.data.find(']', rest.pos) + 1;
+        rest.pos = rest.data.tqfind(']', rest.pos) + 1;
         // The alert text is after [ALERT].
         // Is this correct or do we need to care about litterals?
         selectInfo.setAlert( rest.cstr() );
@@ -563,7 +563,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
       }
       else if (option == "PERMANENTFLAGS")
       {
-        uint end = rest.data.find(']', rest.pos);
+        uint end = rest.data.tqfind(']', rest.pos);
         TQCString flags(rest.data.data() + rest.pos, end - rest.pos);
         selectInfo.setPermanentFlags (flags);
         rest.pos = end;
@@ -645,7 +645,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
       {
         if (currentState == ISTATE_SELECT)
           currentState = ISTATE_LOGIN;
-        currentBox = TQString::null;
+        currentBox = TQString();
       }
       kdDebug(7116) << "imapParser::parseResult - current box is now " << currentBox << endl;
     }
@@ -660,7 +660,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
       {
         if (currentState == ISTATE_SELECT)
           currentState = ISTATE_LOGIN;
-        currentBox = TQString::null;
+        currentBox = TQString();
       }
       kdDebug(7116) << "imapParser::parseResult - current box is now " << currentBox << endl;
     }
@@ -752,7 +752,7 @@ void imapParser::parseAnnotation (parseString & result)
 
 void imapParser::parseQuota (parseString & result)
 {
-  // quota_response  ::= "QUOTA" SP astring SP quota_list
+  // quota_response  ::= "TQUOTA" SP astring SP quota_list
   // quota_list      ::= "(" #quota_resource ")"
   // quota_resource  ::= atom SP number SP number
   TQCString root = parseOneWordC( result );
@@ -777,7 +777,7 @@ void imapParser::parseQuota (parseString & result)
 void imapParser::parseQuotaRoot (parseString & result)
 {
   //    quotaroot_response
-  //         ::= "QUOTAROOT" SP astring *(SP astring)
+  //         ::= "TQUOTAROOT" SP astring *(SP astring)
   parseOneWordC (result); // skip mailbox name
   skipWS (result);
   if ( result.isEmpty() )
@@ -845,9 +845,9 @@ void imapParser::parseSearch (parseString & result)
   }
 }
 
-void imapParser::parseStatus (parseString & inWords)
+void imapParser::parsetqStatus (parseString & inWords)
 {
-  lasStatus = imapInfo ();
+  lastqStatus = imapInfo ();
 
   parseLiteralC(inWords);       // swallow the box
   if (inWords.isEmpty() || inWords[0] != '(')
@@ -864,15 +864,15 @@ void imapParser::parseStatus (parseString & inWords)
     if (parseOneNumber (inWords, value))
     {
       if (label == "MESSAGES")
-        lasStatus.setCount (value);
+        lastqStatus.setCount (value);
       else if (label == "RECENT")
-        lasStatus.setRecent (value);
+        lastqStatus.setRecent (value);
       else if (label == "UIDVALIDITY")
-        lasStatus.setUidValidity (value);
+        lastqStatus.setUidValidity (value);
       else if (label == "UNSEEN")
-        lasStatus.setUnseen (value);
+        lastqStatus.setUnseen (value);
       else if (label == "UIDNEXT")
-        lasStatus.setUidNext (value);
+        lastqStatus.setUidNext (value);
     }
   }
 
@@ -1114,7 +1114,7 @@ mimeHeader * imapParser::parseSimplePart (parseString & inWords,
 
   localPart->setType (typeStr + "/" + subtype);
 
-  //body parameter parenthesized list
+  //body parameter tqparenthesized list
   parameters = parseParameters (inWords);
   {
     TQAsciiDictIterator < TQString > it (parameters);
@@ -1379,7 +1379,7 @@ void imapParser::parseBody (parseString & inWords)
         kdDebug(7116) << "imapParser::parseBody - reading " << envelope << " " << seenUid.ascii () << endl;
         // fill it up with data
         TQString theHeader = parseLiteralC(inWords, true);
-        mimeIOQString myIO;
+        mimeIOTQString myIO;
 
         myIO.setString (theHeader);
         envelope->parseHeader (myIO);
@@ -1406,7 +1406,7 @@ void imapParser::parseBody (parseString & inWords)
        else
        {
          TQCString references = parseLiteralC(inWords, true);
-         int start = references.find ('<');
+         int start = references.tqfind ('<');
          int end = references.findRev ('>');
          if (start < end)
                  references = references.mid (start, end - start + 1);
@@ -1420,11 +1420,11 @@ void imapParser::parseBody (parseString & inWords)
     }
     else
     {
-      if (specifier.find(".MIME") != -1)
+      if (specifier.tqfind(".MIME") != -1)
       {
         mailHeader *envelope = new mailHeader;
         TQString theHeader = parseLiteralC(inWords, false);
-        mimeIOQString myIO;
+        mimeIOTQString myIO;
         myIO.setString (theHeader);
         envelope->parseHeader (myIO);
         if (lastHandled)
@@ -1573,7 +1573,7 @@ void imapParser::parseFetch (ulong /* value */, parseString & inWords)
           if (!lastHandled) lastHandled = new imapCache();
           lastHandled->setSize (size);
         }
-        else if (word.find ("RFC822") == 0)
+        else if (word.tqfind ("RFC822") == 0)
         {
           // might be RFC822 RFC822.TEXT RFC822.HEADER
           parseLiteralC(inWords, true);
@@ -1628,7 +1628,7 @@ void imapParser::parseSentence (parseString & inWords)
   bool first = true;
   int stack = 0;
 
-  //find the first nesting parentheses
+  //find the first nesting tqparentheses
 
   while (!inWords.isEmpty () && (stack != 0 || first))
   {
@@ -1675,8 +1675,8 @@ void imapParser::parseNamespace (parseString & result)
     return;
 
   TQString delimEmpty;
-  if ( namespaceToDelimiter.tqcontains( TQString::null ) )
-    delimEmpty = namespaceToDelimiter[TQString::null];
+  if ( namespaceToDelimiter.tqcontains( TQString() ) )
+    delimEmpty = namespaceToDelimiter[TQString()];
 
   namespaceToDelimiter.clear();
   imapNamespaces.clear();
@@ -1733,7 +1733,7 @@ void imapParser::parseNamespace (parseString & result)
   }
   if ( !delimEmpty.isEmpty() ) {
     // remember default delimiter
-    namespaceToDelimiter[TQString::null] = delimEmpty;
+    namespaceToDelimiter[TQString()] = delimEmpty;
     if ( !personalAvailable )
     {
       // at least one personal ns would be nice
@@ -1855,7 +1855,7 @@ imapParser::parseURL (const KURL & _url, TQString & _box, TQString & _section,
 
   _box = _url.path ();
   kdDebug(7116) << "imapParser::parseURL " << _box << endl;
-  int paramStart = _box.find("/;");
+  int paramStart = _box.tqfind("/;");
   if ( paramStart > -1 )
   {
     TQString paramString = _box.right( _box.length() - paramStart-2 );
@@ -1868,24 +1868,24 @@ imapParser::parseURL (const KURL & _url, TQString & _box, TQString & _section,
   {
     TQString temp = (*it);
 
-    int pt = temp.find ('/');
+    int pt = temp.tqfind ('/');
     if (pt > 0)
     {
-      if (temp.findRev ('"', pt) == -1 || temp.find('"', pt) == -1)
+      if (temp.findRev ('"', pt) == -1 || temp.tqfind('"', pt) == -1)
       {
         // if we have non-quoted '/' separator we'll just nuke it
         temp.truncate(pt);
       }
     }
-    if (temp.find ("section=", 0, false) == 0)
+    if (temp.tqfind ("section=", 0, false) == 0)
       _section = temp.right (temp.length () - 8);
-    else if (temp.find ("type=", 0, false) == 0)
+    else if (temp.tqfind ("type=", 0, false) == 0)
       _type = temp.right (temp.length () - 5);
-    else if (temp.find ("uid=", 0, false) == 0)
+    else if (temp.tqfind ("uid=", 0, false) == 0)
       _uid = temp.right (temp.length () - 4);
-    else if (temp.find ("uidvalidity=", 0, false) == 0)
+    else if (temp.tqfind ("uidvalidity=", 0, false) == 0)
       _validity = temp.right (temp.length () - 12);
-    else if (temp.find ("info=", 0, false) == 0)
+    else if (temp.tqfind ("info=", 0, false) == 0)
       _info = temp.right (temp.length () - 5);
   }
 //  kdDebug(7116) << "URL: section= " << _section << ", type= " << _type << ", uid= " << _uid << endl;
@@ -1911,7 +1911,7 @@ TQCString imapParser::parseLiteralC(parseString & inWords, bool relay, bool stop
   if (!inWords.isEmpty() && inWords[0] == '{')
   {
     TQCString retVal;
-    ulong runLen = inWords.find ('}', 1);
+    ulong runLen = inWords.tqfind ('}', 1);
     if (runLen > 0)
     {
       bool proper;
@@ -1927,7 +1927,7 @@ TQCString imapParser::parseLiteralC(parseString & inWords, bool relay, bool stop
           parseRelay (runLen);
         TQByteArray rv;
         parseRead (rv, runLen, relay ? runLen : 0);
-        rv.resize(QMAX(runLen, rv.size())); // what's the point?
+        rv.resize(TQMAX(runLen, rv.size())); // what's the point?
         retVal = b2c(rv);
         inWords.clear();
         parseReadLine (inWords.data); // must get more
@@ -2076,7 +2076,7 @@ TQString imapParser::namespaceForBox( const TQString & box )
     TQString cleanPrefix;
     for ( TQValueList<TQString>::Iterator it = list.begin(); it != list.end(); ++it )
     {
-      if ( !(*it).isEmpty() && box.find( *it ) != -1 )
+      if ( !(*it).isEmpty() && box.tqfind( *it ) != -1 )
         return (*it);
     }
   }
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index d40524d1..0552baf8 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -60,9 +60,9 @@ public:
     if (pos >= data.size()) return TQCString();
     return TQCString(data.data() + pos, data.size() - pos + 1);
   }
-  int find(char c, int index = 0)
+  int tqfind(char c, int index = 0)
   {
-    int res = data.find(c, index + pos);
+    int res = data.tqfind(c, index + pos);
     return (res == -1) ? res : (res - pos);
   }
   // Warning: does not check for going past end of "data"
@@ -244,7 +244,7 @@ public:
    * @param resultInfo The resultinfo from the command
    * @return success or failure
    */
-  bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFQDN,
+  bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFTQDN,
     const TQString & aAuth, bool isSSL, TQString & resultInfo);
 
   /**
@@ -263,7 +263,7 @@ public:
   void parseRecent (ulong value, parseString & result);
   /** @brief parse a RESULT line */
   void parseResult (TQByteArray & result, parseString & rest,
-                    const TQString & command = TQString::null);
+                    const TQString & command = TQString());
   /** @brief parse a CAPABILITY line */
   void parseCapability (parseString & result);
   /** @brief parse a FLAGS line */
@@ -279,7 +279,7 @@ public:
   /** @brief parse a SEARCH line */
   void parseSearch (parseString & result);
   /** @brief parse a STATUS line */
-  void parseStatus (parseString & result);
+  void parsetqStatus (parseString & result);
   /** @brief parse a EXISTS line */
   void parseExists (ulong value, parseString & result);
   /** @brief parse a EXPUNGE line */
@@ -290,9 +290,9 @@ public:
   void parseAnnotation (parseString & result);
   /** @brief parse a NAMESPACE line */
   void parseNamespace (parseString & result);
-  /** @brief parse a QUOTAROOT line */
+  /** @brief parse a TQUOTAROOT line */
   void parseQuotaRoot (parseString & result);
-  /** @brief parse a QUOTA line */
+  /** @brief parse a TQUOTA line */
   void parseQuota (parseString & result);
   /** @brief parse a custom command line */
   void parseCustom (parseString & result);
@@ -356,7 +356,7 @@ public:
 
   // generic parser routines
 
-  /** parse a parenthesized list */
+  /** parse a tqparenthesized list */
   void parseSentence (parseString & inWords);
 
   /** parse a literal or word, may require more data */
@@ -404,9 +404,9 @@ public:
   };
 
   /** @brief return the last status code */
-  const imapInfo & geStatus ()
+  const imapInfo & getqStatus ()
   {
-    return lasStatus;
+    return lastqStatus;
   };
   /** return the select info */
   const imapInfo & getSelected ()
@@ -450,7 +450,7 @@ protected:
   imapInfo selectInfo;
 
   /** @brief the results from the last status command */
-  imapInfo lasStatus;
+  imapInfo lastqStatus;
 
   /** @brief the results from the capabilities, split at ' ' */
   TQStringList imapCapabilities;
diff --git a/kioslaves/imap4/mailaddress.cc b/kioslaves/imap4/mailaddress.cc
index 227defa9..0775d0f3 100644
--- a/kioslaves/imap4/mailaddress.cc
+++ b/kioslaves/imap4/mailaddress.cc
@@ -105,7 +105,7 @@ mailAddress::parseAddress (char *aCStr)
         len = advance;
         user = user.mid (1, len - 2);  // strip <>
         len -= 2;
-        pt = user.find('@');
+        pt = user.tqfind('@');
         host = user.right (len - pt - 1); // split it into host
         user.truncate(pt); // and user
         break;
@@ -161,7 +161,7 @@ mailAddress::parseAddress (char *aCStr)
     }
     else if (user.isEmpty ())
     {
-      pt = rawFullName.find ('@');
+      pt = rawFullName.tqfind ('@');
       if (pt >= 0)
       {
         user = rawFullName;
@@ -196,7 +196,7 @@ mailAddress::parseAddress (char *aCStr)
   return retVal;
 }
 
-const QCString
+const TQCString
 mailAddress::getStr ()
 {
   TQCString retVal(128); // Should be generally big enough
@@ -235,7 +235,7 @@ mailAddress::setFullName (const TQString & _str)
 {
   rawFullName = rfcDecoder::encodeRFC2047String (_str).latin1 ();
 }
-const QString
+const TQString
 mailAddress::getFullName () const
 {
   return rfcDecoder::decodeRFC2047String (rawFullName);
@@ -252,7 +252,7 @@ mailAddress::setComment (const TQString & _str)
 {
   rawComment = rfcDecoder::encodeRFC2047String (_str).latin1 ();
 }
-const QString
+const TQString
 mailAddress::getComment () const
 {
   return rfcDecoder::decodeRFC2047String (rawComment);
@@ -264,7 +264,7 @@ mailAddress::getCommentRaw () const
   return rawComment;
 }
 
-QString
+TQString
 mailAddress::emailAddrAsAnchor (const mailAddress & adr, bool shortAdr)
 {
   TQString retVal;
@@ -298,7 +298,7 @@ mailAddress::emailAddrAsAnchor (const mailAddress & adr, bool shortAdr)
   return retVal;
 }
 
-QString
+TQString
 mailAddress::emailAddrAsAnchor (const TQPtrList < mailAddress > &list, bool value)
 {
   TQString retVal;
diff --git a/kioslaves/imap4/mailheader.cc b/kioslaves/imap4/mailheader.cc
index dea9ce5f..285bd325 100644
--- a/kioslaves/imap4/mailheader.cc
+++ b/kioslaves/imap4/mailheader.cc
@@ -186,7 +186,7 @@ mailHeader::parseAddressList (const char *inCStr,
   return advance;
 }
 
-QCString
+TQCString
 mailHeader::getAddressStr (TQPtrList < mailAddress > *aList)
 {
   TQCString retVal;
diff --git a/kioslaves/imap4/mimehdrline.cc b/kioslaves/imap4/mimehdrline.cc
index 0706d04c..56c9b2d7 100644
--- a/kioslaves/imap4/mimehdrline.cc
+++ b/kioslaves/imap4/mimehdrline.cc
@@ -480,7 +480,7 @@ mimeHdrLine::getValue ()
 
 
 // FIXME: very inefficient still
-QCString
+TQCString
 mimeHdrLine::truncateLine(TQCString aLine, unsigned int truncate)
 {
   int cutHere;
@@ -489,7 +489,7 @@ mimeHdrLine::truncateLine(TQCString aLine, unsigned int truncate)
 
   // see if we have a line of the form "key: value" (like "Subject: bla")
   // then we do not want to truncate between key and value
-  int validStart = aLine.find(": ");
+  int validStart = aLine.tqfind(": ");
   if (validStart > -1) {
     validStart += 2;
   }
@@ -498,9 +498,9 @@ mimeHdrLine::truncateLine(TQCString aLine, unsigned int truncate)
     if (cutHere < 1 || cutHere < validStart) {
       cutHere = aLine.findRev('\t', truncate);
       if (cutHere < 1) {
-        cutHere = aLine.find(' ', 1);
+        cutHere = aLine.tqfind(' ', 1);
         if (cutHere < 1) {
-          cutHere = aLine.find('\t', 1);
+          cutHere = aLine.tqfind('\t', 1);
           if (cutHere < 1) {
             // simply truncate
             return aLine.left(truncate);
diff --git a/kioslaves/imap4/mimehdrline.h b/kioslaves/imap4/mimehdrline.h
index 210f5a7c..e31c1864 100644
--- a/kioslaves/imap4/mimehdrline.h
+++ b/kioslaves/imap4/mimehdrline.h
@@ -52,10 +52,10 @@ and report characters slurped */
   static int parseAlphaNum (const char *);
 
 protected:                     // Protected attributes
-  /** tqcontains the Value 
+  /** contains the Value 
  */
     TQCString mimeValue;
-  /** tqcontains the Label of the line
+  /** contains the Label of the line
  */
   TQCString mimeLabel;
 protected:                     // Protected methods
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 1d0b7ab9..c14fbb70 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -168,7 +168,7 @@ mimeHeader::addParameter (const TQCString& aParameter, TQDict < TQString > *aLis
 
   TQString *aValue;
   TQCString aLabel;
-  int pos = aParameter.find ('=');
+  int pos = aParameter.tqfind ('=');
 //  cout << aParameter.left(pos).data();
   aValue = new TQString ();
   aValue->setLatin1 (aParameter.right (aParameter.length () - pos - 1));
@@ -180,13 +180,13 @@ mimeHeader::addParameter (const TQCString& aParameter, TQDict < TQString > *aLis
 //  cout << "=" << aValue->data() << endl;
 }
 
-QString
+TQString
 mimeHeader::getDispositionParm (const TQCString& aStr)
 {
   return getParameter (aStr, &dispositionList);
 }
 
-QString
+TQString
 mimeHeader::getTypeParm (const TQCString& aStr)
 {
   return getParameter (aStr, &typeList);
@@ -261,18 +261,18 @@ mimeHeader::outputHeader (mimeIO & useIO)
   useIO.outputMimeLine (TQCString (""));
 }
 
-QString
+TQString
 mimeHeader::getParameter (const TQCString& aStr, TQDict < TQString > *aDict)
 {
   TQString retVal, *found;
   if (aDict)
   {
     //see if it is a normal parameter
-    found = aDict->find (aStr);
+    found = aDict->tqfind (aStr);
     if (!found)
     {
       //might be a continuated or encoded parameter
-      found = aDict->find (aStr + "*");
+      found = aDict->tqfind (aStr + "*");
       if (!found)
       {
         //continuated parameter
@@ -284,10 +284,10 @@ mimeHeader::getParameter (const TQCString& aStr, TQDict < TQString > *aDict)
           TQCString search;
           search.setNum (part);
           search = aStr + "*" + search;
-          found = aDict->find (search);
+          found = aDict->tqfind (search);
           if (!found)
           {
-            found = aDict->find (search + "*");
+            found = aDict->tqfind (search + "*");
             if (found)
               encoded += rfcDecoder::encodeRFC2231String (*found);
           }
@@ -298,7 +298,7 @@ mimeHeader::getParameter (const TQCString& aStr, TQDict < TQString > *aDict)
           part++;
         }
         while (found);
-        if (encoded.find ('\'') >= 0)
+        if (encoded.tqfind ('\'') >= 0)
         {
           retVal = rfcDecoder::decodeRFC2231String (encoded.local8Bit ());
         }
@@ -335,7 +335,7 @@ mimeHeader::setParameter (const TQCString& aLabel, const TQString& aValue,
   {
 
     //see if it needs to get encoded
-    if (encoded && aLabel.find ('*') == -1)
+    if (encoded && aLabel.tqfind ('*') == -1)
     {
       val = rfcDecoder::encodeRFC2231String (aValue);
     }
@@ -402,7 +402,7 @@ mimeHeader::setParameter (const TQCString& aLabel, const TQString& aValue,
   }
 }
 
-QCString
+TQCString
 mimeHeader::outputParameter (TQDict < TQString > *aDict)
 {
   TQCString retVal;
@@ -412,7 +412,7 @@ mimeHeader::outputParameter (TQDict < TQString > *aDict)
     while (it.current ())
     {
       retVal += (";\n\t" + it.currentKey () + "=").latin1 ();
-      if (it.current ()->find (' ') > 0 || it.current ()->find (';') > 0)
+      if (it.current ()->tqfind (' ') > 0 || it.current ()->tqfind (';') > 0)
       {
         retVal += '"' + it.current ()->utf8 () + '"';
       }
@@ -527,7 +527,7 @@ mimeHeader::parseBody (mimeIO & useIO, TQCString & messageBody,
       retVal = 1;               //continue with next part
       break;
     }
-    else if (mbox && inputStr.find ("From ") == 0)
+    else if (mbox && inputStr.tqfind ("From ") == 0)
     {
       retVal = 0;               // end of mbox
       break;
@@ -556,7 +556,7 @@ mimeHeader::parseHeader (mimeIO & useIO)
   while (useIO.inputLine (inputStr))
   {
     int appended;
-    if (inputStr.find ("From ") != 0 || !first)
+    if (inputStr.tqfind ("From ") != 0 || !first)
     {
       first = false;
       appended = my_line.appendStr (inputStr);
@@ -584,7 +584,7 @@ mimeHeader *
 mimeHeader::bodyPart (const TQString & _str)
 {
   // see if it is nested a little deeper
-  int pt = _str.find('.');
+  int pt = _str.tqfind('.');
   if (pt != -1)
   {
     TQString tempStr = _str;
@@ -643,7 +643,7 @@ void mimeHeader::serialize(TQDataStream& stream)
 
 #ifdef KMAIL_COMPATIBLE
 // compatibility subroutines
-QString
+TQString
 mimeHeader::bodyDecoded ()
 {
   kdDebug(7116) << "mimeHeader::bodyDecoded" << endl;
@@ -653,14 +653,14 @@ mimeHeader::bodyDecoded ()
   return TQString::tqfromLatin1 (temp.data (), temp.count ());
 }
 
-QByteArray
+TQByteArray
 mimeHeader::bodyDecodedBinary ()
 {
   TQByteArray retVal;
 
-  if (contentEncoding.find ("quoted-printable", 0, false) == 0)
+  if (contentEncoding.tqfind ("quoted-printable", 0, false) == 0)
     retVal = KCodecs::quotedPrintableDecode(postMultipartBody);
-  else if (contentEncoding.find ("base64", 0, false) == 0)
+  else if (contentEncoding.tqfind ("base64", 0, false) == 0)
     KCodecs::base64Decode(postMultipartBody, retVal);
   else retVal = postMultipartBody;
 
@@ -680,9 +680,9 @@ mimeHeader::setBodyEncoded (const TQByteArray & _arr)
   TQByteArray setVal;
 
   kdDebug(7116) << "mimeHeader::setBodyEncoded - in size " << _arr.size () << endl;
-  if (contentEncoding.find ("quoted-printable", 0, false) == 0)
+  if (contentEncoding.tqfind ("quoted-printable", 0, false) == 0)
     setVal = KCodecs::quotedPrintableEncode(_arr);
-  else if (contentEncoding.find ("base64", 0, false) == 0)
+  else if (contentEncoding.tqfind ("base64", 0, false) == 0)
     KCodecs::base64Encode(_arr, setVal);
   else
     setVal.duplicate (_arr);
@@ -692,14 +692,14 @@ mimeHeader::setBodyEncoded (const TQByteArray & _arr)
   kdDebug(7116) << "mimeHeader::setBodyEncoded - out size " << postMultipartBody.size () << endl;
 }
 
-QString
+TQString
 mimeHeader::iconName ()
 {
   TQString fileName;
 
   // FIXME: bug?  Why throw away this data?
   fileName =
-    KMimeType::mimeType (contentType.lower ())->icon (TQString::null, false);
+    KMimeType::mimeType (contentType.lower ())->icon (TQString(), false);
   fileName =
     KGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop);
 //  if (fileName.isEmpty())
@@ -714,16 +714,16 @@ mimeHeader::setNestedMessage (mailHeader * inPart, bool destroy)
   nestedMessage = inPart;
 }
 
-QString
+TQString
 mimeHeader::headerAsString ()
 {
-  mimeIOQString myIO;
+  mimeIOTQString myIO;
 
   outputHeader (myIO);
   return myIO.getString ();
 }
 
-QString
+TQString
 mimeHeader::magicSetType (bool aAutoDecode)
 {
   TQString mimetype;
diff --git a/kioslaves/imap4/mimeheader.h b/kioslaves/imap4/mimeheader.h
index 0eb46630..14d86e9d 100644
--- a/kioslaves/imap4/mimeheader.h
+++ b/kioslaves/imap4/mimeheader.h
@@ -56,7 +56,7 @@ public:
   void setTypeParm (const TQCString&, const TQString&);
   TQDictIterator < TQString > getTypeIterator ();
 
-  // recursively serialize all important contents to the QDataStream
+  // recursively serialize all important contents to the TQDataStream
   void serialize(TQDataStream& stream);
 
   const TQCString& getType ()
@@ -227,7 +227,7 @@ public:
   }
   TQString typeStr ()
   {
-    return TQString (contentType.left (contentType.find ('/')));
+    return TQString (contentType.left (contentType.tqfind ('/')));
   }
   void setTypeStr (const TQString & _str)
   {
@@ -236,7 +236,7 @@ public:
   TQString subtypeStr ()
   {
     return TQString (contentType.
-                    right (contentType.length () - contentType.find ('/') -
+                    right (contentType.length () - contentType.tqfind ('/') -
                            1));
   }
   void setSubtypeStr (const TQString & _str)
diff --git a/kioslaves/imap4/mimeio.cc b/kioslaves/imap4/mimeio.cc
index 5adf28f9..971cd0a9 100644
--- a/kioslaves/imap4/mimeio.cc
+++ b/kioslaves/imap4/mimeio.cc
@@ -83,7 +83,7 @@ mimeIO::outputMimeLine (const TQCString & inLine)
   {
     int start, end, offset;
     start = 0;
-    end = aLine.find ('\n', start);
+    end = aLine.tqfind ('\n', start);
     while (end >= 0)
     {
       offset = 1;
@@ -94,7 +94,7 @@ mimeIO::outputMimeLine (const TQCString & inLine)
       }
       outputLine (aLine.mid (start, end - start) + theCRLF, end - start + crlfLen);
       start = end + offset;
-      end = aLine.find ('\n', start);
+      end = aLine.tqfind ('\n', start);
     }
     outputLine (aLine.mid (start, len - start) + theCRLF, len - start + crlfLen);
   }
@@ -127,26 +127,26 @@ mimeIO::setCRLF (const char *aCRLF)
   crlfLen = strlen(aCRLF);
 }
 
-mimeIOQFile::mimeIOQFile (const TQString & aName):
+mimeIOTQFile::mimeIOTQFile (const TQString & aName):
 mimeIO (),
 myFile (aName)
 {
   myFile.open (IO_ReadOnly);
 }
 
-mimeIOQFile::~mimeIOQFile ()
+mimeIOTQFile::~mimeIOTQFile ()
 {
   myFile.close ();
 }
 
 int
-mimeIOQFile::outputLine (const TQCString &, int)
+mimeIOTQFile::outputLine (const TQCString &, int)
 {
   return 0;
 }
 
 int
-mimeIOQFile::inputLine (TQCString & data)
+mimeIOTQFile::inputLine (TQCString & data)
 {
   data.resize( 1024 );
   myFile.readLine (data.data(), 1024);
@@ -154,16 +154,16 @@ mimeIOQFile::inputLine (TQCString & data)
   return data.length ();
 }
 
-mimeIOQString::mimeIOQString ()
+mimeIOTQString::mimeIOTQString ()
 {
 }
 
-mimeIOQString::~mimeIOQString ()
+mimeIOTQString::~mimeIOTQString ()
 {
 }
 
 int
-mimeIOQString::outputLine (const TQCString & _str, int len)
+mimeIOTQString::outputLine (const TQCString & _str, int len)
 {
   if (len == -1) {
     len = _str.length();
@@ -173,12 +173,12 @@ mimeIOQString::outputLine (const TQCString & _str, int len)
 }
 
 int
-mimeIOQString::inputLine (TQCString & _str)
+mimeIOTQString::inputLine (TQCString & _str)
 {
   if (theString.isEmpty ())
     return 0;
 
-  int i = theString.find ('\n');
+  int i = theString.tqfind ('\n');
 
   if (i == -1)
     return 0;
diff --git a/kioslaves/imap4/mimeio.h b/kioslaves/imap4/mimeio.h
index e14861a8..37a96998 100644
--- a/kioslaves/imap4/mimeio.h
+++ b/kioslaves/imap4/mimeio.h
@@ -44,11 +44,11 @@ protected:
     int crlfLen;
 };
 
-class mimeIOQFile:public mimeIO
+class mimeIOTQFile:public mimeIO
 {
 public:
-  mimeIOQFile (const TQString &);
-    virtual ~ mimeIOQFile ();
+  mimeIOTQFile (const TQString &);
+    virtual ~ mimeIOTQFile ();
   virtual int outputLine (const TQCString &, int len = -1);
   virtual int inputLine (TQCString &);
 
@@ -56,11 +56,11 @@ protected:
     TQFile myFile;
 };
 
-class mimeIOQString:public mimeIO
+class mimeIOTQString:public mimeIO
 {
 public:
-  mimeIOQString ();
-  virtual ~ mimeIOQString ();
+  mimeIOTQString ();
+  virtual ~ mimeIOTQString ();
   virtual int outputLine (const TQCString &, int len = -1);
   virtual int inputLine (TQCString &);
   const TQString& getString () const
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index 5470901e..46500fad 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -37,7 +37,7 @@
 // adapted to QT-Toolkit by Sven Carstens <s.carstens@gmx.de> 2000
 
 static unsigned char base64chars[] =
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
+  "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
 #define UNDEFINED 64
 #define MAXLINE  76
 
@@ -315,7 +315,7 @@ rfcDecoder::codecForName (const TQString & _str)
 }
 
 //-----------------------------------------------------------------------------
-const QString
+const TQString
 rfcDecoder::decodeRFC2047String (const TQString & _str)
 {
   TQString throw_away;
@@ -324,7 +324,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str)
 }
 
 //-----------------------------------------------------------------------------
-const QString
+const TQString
 rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset)
 {
   TQString throw_away;
@@ -333,12 +333,12 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset)
 }
 
 //-----------------------------------------------------------------------------
-const QString
+const TQString
 rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset,
                                  TQString & language)
 {
   //do we have a rfc string
-  if (_str.find("=?") < 0)
+  if (_str.tqfind("=?") < 0)
     return _str;
 
   TQCString aStr = _str.ascii ();  // TQString.length() means Unicode chars
@@ -457,7 +457,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset,
 //-----------------------------------------------------------------------------
 const char especials[17] = "()<>@,;:\"/[]?.= ";
 
-const QString
+const TQString
 rfcDecoder::encodeRFC2047String (const TQString & _str)
 {
   if (_str.isEmpty ())
@@ -571,7 +571,7 @@ rfcDecoder::encodeRFC2047String (const TQString & _str)
 
 
 //-----------------------------------------------------------------------------
-const QString
+const TQString
 rfcDecoder::encodeRFC2231String (const TQString & _str)
 {
   if (_str.isEmpty ())
@@ -625,10 +625,10 @@ rfcDecoder::encodeRFC2231String (const TQString & _str)
 
 
 //-----------------------------------------------------------------------------
-const QString
+const TQString
 rfcDecoder::decodeRFC2231String (const TQString & _str)
 {
-  int p = _str.find ('\'');
+  int p = _str.tqfind ('\'');
 
   //see if it is an rfc string
   if (p < 0)
diff --git a/kioslaves/mbox/mboxfile.cc b/kioslaves/mbox/mboxfile.cc
index 271b7101..3c6c6cc7 100644
--- a/kioslaves/mbox/mboxfile.cc
+++ b/kioslaves/mbox/mboxfile.cc
@@ -20,9 +20,9 @@
 
 #include <assert.h>
 
-MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* parent )
+MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent )
 	: m_info( info ),
-	m_mbox( parent )
+	m_mbox( tqparent )
 {
 	assert( m_info );
 }
diff --git a/kioslaves/mbox/mboxfile.h b/kioslaves/mbox/mboxfile.h
index b8a98973..a628e381 100644
--- a/kioslaves/mbox/mboxfile.h
+++ b/kioslaves/mbox/mboxfile.h
@@ -32,9 +32,9 @@ public:
 	/**
 	 * Constructor
 	 * @param info The urlinfo which must be used
-	 * @param parent The MBoxProtocol parent instance, used to throw errors.
+	 * @param tqparent The MBoxProtocol tqparent instance, used to throw errors.
 	 */
-	MBoxFile( const UrlInfo* info, MBoxProtocol* parent );
+	MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent );
 
 	/**
 	 * Empty destructor
@@ -61,7 +61,7 @@ protected:
 	const UrlInfo* const m_info;
 
 	/**
-	 * A instance of the parent protocol, meant to throw errors if neccesairy.
+	 * A instance of the tqparent protocol, meant to throw errors if neccesairy.
 	 */
 	MBoxProtocol* const m_mbox;
 };
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 7cf67e32..32f52d5b 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -37,12 +37,12 @@
 
 #include <utime.h>
 
-ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, bool savetime )
-	: MBoxFile( info, parent ),
+ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew, bool savetime )
+	: MBoxFile( info, tqparent ),
 	m_file( 0 ),
 	m_stream( 0 ),
-	m_current_line( new TQString( TQString::null ) ),
-	m_current_id( new TQString( TQString::null ) ),
+	m_current_line( new TQString( TQString() ) ),
+	m_current_id( new TQString( TQString() ) ),
 	m_atend( true ),
 	m_prev_time( 0 ),
 	m_only_new( onlynew ),
@@ -88,7 +88,7 @@ bool ReadMBox::nextLine()
 	m_atend = m_current_line->isNull();
 	if( m_atend ) // Cursor was at EOF
 	{
-		*m_current_id = TQString::null;
+		*m_current_id = TQString();
 		m_prev_status = m_status;
 		return true;
 	}
@@ -103,7 +103,7 @@ bool ReadMBox::nextLine()
 		return true;
 	} else if( m_only_new )
 	{
-		if( m_header && m_current_line->left( 7 ) == "Status:" &&
+		if( m_header && m_current_line->left( 7 ) == "tqStatus:" &&
 		    ! m_current_line->tqcontains( "U" ) && ! m_current_line->tqcontains( "N" ) )
 		{
 			m_status = false;
@@ -145,7 +145,7 @@ void ReadMBox::rewind()
 	if( !m_stream )
 		return; //Rewinding not possible
 	
-	m_stream->device()->reset();
+	m_stream->tqdevice()->reset();
 	m_atend = m_stream->atEnd();
 }
 
diff --git a/kioslaves/mbox/readmbox.h b/kioslaves/mbox/readmbox.h
index 0f7c4d83..ea63068c 100644
--- a/kioslaves/mbox/readmbox.h
+++ b/kioslaves/mbox/readmbox.h
@@ -40,11 +40,11 @@ public:
 	 * Constructor
 	 *
 	 * @param info The information of the file to read
-	 * @param parent The instance of the parent MBoxProtocol.
+	 * @param tqparent The instance of the tqparent MBoxProtocol.
 	 * @param onlynew Only read new messages from the MBox file.
 	 * @param savetime If true, the atime of the mbox-file is preserved (note that this touch the ctime).
 	 */
-	ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew = false, bool savetime = false );
+	ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew = false, bool savetime = false );
 
 	/**
 	 * Destructor
@@ -53,14 +53,14 @@ public:
 
 	/**
 	 * This functions return the current line
-	 * @return The line last read, or TQString::null if there wasn't such last line
+	 * @return The line last read, or TQString() if there wasn't such last line
 	 */
 	TQString currentLine() const;
 
 	/**
 	 * This function returns the current id. The id is the first line of an email,
 	 * and is used in filenaming. The id normally starts with "From ".
-	 * @return The current ID, or TQString::null if no id was found yet.
+	 * @return The current ID, or TQString() if no id was found yet.
 	 */
 	TQString currentID() const;
 
diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc
index c34f0bce..00285b14 100644
--- a/kioslaves/mbox/stat.cc
+++ b/kioslaves/mbox/stat.cc
@@ -107,7 +107,7 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng )
 {
 	KIO::UDSAtom atom;
 	atom.m_uds = uds;
-	atom.m_str = TQString::null;
+	atom.m_str = TQString();
 	atom.m_long = lng;
 
 	entry.append( atom );
diff --git a/kioslaves/mbox/urlinfo.cc b/kioslaves/mbox/urlinfo.cc
index 2153afb1..d59c77ac 100644
--- a/kioslaves/mbox/urlinfo.cc
+++ b/kioslaves/mbox/urlinfo.cc
@@ -101,7 +101,7 @@ bool UrlInfo::isDirectory( const KURL& url )
 
 	//Setting paramaters
 	*m_filename = filename;
-	*m_id = TQString::null;
+	*m_id = TQString();
 	m_type = directory;
 	kdDebug() << "urlInfo::isDirectory( " << url << " )" << endl;
 	return true;
diff --git a/kioslaves/mbox/urlinfo.h b/kioslaves/mbox/urlinfo.h
index b15f64fb..96882d1d 100644
--- a/kioslaves/mbox/urlinfo.h
+++ b/kioslaves/mbox/urlinfo.h
@@ -64,7 +64,7 @@ public:
 	TQString id() const;
 
 	/**
-	 * @return the while url as QString
+	 * @return the while url as TQString
 	 */
 	TQString url() const;
 private:
diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h
index 1a7b143e..3f48ff88 100644
--- a/kioslaves/opengroupware/opengroupware.h
+++ b/kioslaves/opengroupware/opengroupware.h
@@ -33,6 +33,7 @@ namespace KIO {
 class OpenGroupware : public TQObject, public KIO::SlaveBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     OpenGroupware( const TQCString &protocol, const TQCString &pool,
                    const TQCString &app );
diff --git a/kioslaves/opengroupware/webdavhandler.cpp b/kioslaves/opengroupware/webdavhandler.cpp
index 1177624c..61f2d6b5 100644
--- a/kioslaves/opengroupware/webdavhandler.cpp
+++ b/kioslaves/opengroupware/webdavhandler.cpp
@@ -70,7 +70,7 @@ TQDomDocument WebdavHandler::createAllPropsRequest()
 {
   TQDomDocument doc;
 
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement(  doc, root, "prop" );
   WebdavHandler::addDavElement(  doc, prop, "getcontentlength");
   WebdavHandler::addDavElement(  doc, prop, "getlastmodified" );
diff --git a/kioslaves/opengroupware/webdavhandler.h b/kioslaves/opengroupware/webdavhandler.h
index 367ff3aa..eebb7b03 100644
--- a/kioslaves/opengroupware/webdavhandler.h
+++ b/kioslaves/opengroupware/webdavhandler.h
@@ -37,7 +37,7 @@ class WebdavHandler
                                       const TQString &tag );
     static TQDomElement addSloxElement( TQDomDocument &, TQDomNode &,
                                        const TQString &tag,
-                                       const TQString &text = TQString::null );
+                                       const TQString &text = TQString() );
     static TQDomDocument createAllPropsRequest();
 };
 
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 6d2f90b8..802b3cdc 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -149,10 +149,10 @@ const TQCString& kio_sieveResponse::getExtra() const
 }
 
 /* ---------------------------------------------------------------------------------- */
-void kio_sieveResponse::setQuantity(const uint& newQty)
+void kio_sieveResponse::setQuantity(const uint& newTQty)
 {
-	rType = QUANTITY;
-	quantity = newQty;
+	rType = TQUANTITY;
+	quantity = newTQty;
 }
 
 /* ---------------------------------------------------------------------------------- */
@@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
 /* ---------------------------------------------------------------------------------- */
 /*void kio_sieveProtocol::slave_status()
 {
-	slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid());
+	slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid());
 
 	finished();
 }*/
@@ -661,7 +661,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
 			// send the extra message off for re-processing
 			receiveData(false, &extra);
 
-			if (r.getType() == kio_sieveResponse::QUANTITY) {
+			if (r.getType() == kio_sieveResponse::TQUANTITY) {
 				// length of the error message
 				uint len = r.getQuantity();
 
@@ -736,7 +736,7 @@ void kio_sieveProtocol::get(const KURL& url)
 	if (!sendData("GETSCRIPT \"" + filename.utf8() + "\""))
 		return;
 
-	if (receiveData() && r.getType() == kio_sieveResponse::QUANTITY) {
+	if (receiveData() && r.getType() == kio_sieveResponse::TQUANTITY) {
 		// determine script size
 		ssize_t total_len = r.getQuantity();
 		totalSize( total_len );
@@ -1105,7 +1105,7 @@ bool kio_sieveProtocol::authenticate()
 
 		ksDebug() << "Challenge len  " << r.getQuantity() << endl;
 
-		if (r.getType() != kio_sieveResponse::QUANTITY) {
+		if (r.getType() != kio_sieveResponse::TQUANTITY) {
       sasl_dispose( &conn );
 			error(ERR_SLAVE_DEFINED,
 					i18n("A protocol error occurred during authentication.\n"
@@ -1237,10 +1237,10 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 		  {
 			// expecting {quantity}
 			start = 0;
-			end = interpret.find("+}", start + 1);
+			end = interpret.tqfind("+}", start + 1);
 			// some older versions of Cyrus enclose the literal size just in { } instead of { +}
 			if ( end == -1 )
-				end = interpret.find('}', start + 1);
+				end = interpret.tqfind('}', start + 1);
 
 			bool ok = false;
 			r.setQuantity(interpret.mid(start + 1, end - start - 1).toUInt( &ok ));
@@ -1263,7 +1263,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 
 	start = 0;
 
-	end = interpret.find(34, start + 1);
+	end = interpret.tqfind(34, start + 1);
 	if (end == -1) {
 		ksDebug() << "Possible insufficient buffer size." << endl;
 		r.setKey(interpret.right(interpret.length() - start));
@@ -1272,7 +1272,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 
 	r.setKey(interpret.mid(start + 1, end - start - 1));
 
-	start = interpret.find(34, end + 1);
+	start = interpret.tqfind(34, end + 1);
 	if (start == -1) {
 		if ((int)interpret.length() > end)
 			// skip " and space
@@ -1281,7 +1281,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 		return true;
 	}
 
-	end = interpret.find(34, start + 1);
+	end = interpret.tqfind(34, start + 1);
 	if (end == -1) {
 		ksDebug() << "Possible insufficient buffer size." << endl;
 		r.setVal(interpret.right(interpret.length() - start));
diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h
index 0fc3bbd6..4a22cbe1 100644
--- a/kioslaves/sieve/sieve.h
+++ b/kioslaves/sieve/sieve.h
@@ -30,7 +30,7 @@ class KURL;
 class kio_sieveResponse
 {
 public:
-	enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY };
+	enum responses { NONE, KEY_VAL_PAIR, ACTION, TQUANTITY };
 
 	kio_sieveResponse();
 
@@ -53,9 +53,9 @@ public:
 protected:
 	uint		rType;
 	uint		quantity;
-	QCString	key;
-	QCString	val;
-	QCString	extra;
+	TQCString	key;
+	TQCString	val;
+	TQCString	extra;
 };
 
 class kio_sieveProtocol : public KIO::TCPSlaveBase
@@ -110,17 +110,17 @@ protected:
 	uint				m_connMode;
 
 	// Host-specific data
-	QStringList			m_sasl_caps;
+	TQStringList			m_sasl_caps;
 	bool				m_supportsTLS;
 
 	// Global server respose class
 	kio_sieveResponse	r;
 
 	// connection details
-	QString				m_sServer;
-	QString				m_sUser;
-	QString				m_sPass;
-	QString				m_sAuth;
+	TQString				m_sServer;
+	TQString				m_sUser;
+	TQString				m_sPass;
+	TQString				m_sAuth;
 	bool				m_shouldBeConnected;
         bool m_allowUnencrypted;
 
diff --git a/kitchensync/libqopensync/callbackhandler.cpp b/kitchensync/libqopensync/callbackhandler.cpp
index 504afea9..f3ae4c68 100644
--- a/kitchensync/libqopensync/callbackhandler.cpp
+++ b/kitchensync/libqopensync/callbackhandler.cpp
@@ -29,7 +29,7 @@
 
 using namespace QSync;
 
-class CallbackHandler::ConflictEvent : public QCustomEvent
+class CallbackHandler::ConflictEvent : public TQCustomEvent
 {
   public:
     ConflictEvent( const SyncMapping& mapping )
@@ -43,7 +43,7 @@ class CallbackHandler::ConflictEvent : public QCustomEvent
     SyncMapping mMapping;
 };
 
-class CallbackHandler::ChangeEvent : public QCustomEvent
+class CallbackHandler::ChangeEvent : public TQCustomEvent
 {
   public:
     ChangeEvent( const SyncChangeUpdate& change )
@@ -57,7 +57,7 @@ class CallbackHandler::ChangeEvent : public QCustomEvent
     SyncChangeUpdate mChange;
 };
 
-class CallbackHandler::MappingEvent : public QCustomEvent
+class CallbackHandler::MappingEvent : public TQCustomEvent
 {
   public:
     MappingEvent( const SyncMappingUpdate& mapping )
@@ -71,7 +71,7 @@ class CallbackHandler::MappingEvent : public QCustomEvent
     SyncMappingUpdate mMapping;
 };
 
-class CallbackHandler::EngineEvent : public QCustomEvent
+class CallbackHandler::EngineEvent : public TQCustomEvent
 {
   public:
     EngineEvent( const SyncEngineUpdate& engine )
@@ -85,7 +85,7 @@ class CallbackHandler::EngineEvent : public QCustomEvent
     SyncEngineUpdate mEngine;
 };
 
-class CallbackHandler::MemberEvent : public QCustomEvent
+class CallbackHandler::MemberEvent : public TQCustomEvent
 {
   public:
     MemberEvent( const SyncMemberUpdate& member )
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h
index fa6b97c6..f0971fd6 100644
--- a/kitchensync/libqopensync/callbackhandler.h
+++ b/kitchensync/libqopensync/callbackhandler.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_CALLBACKHANDLER_H
-#define QSYNC_CALLBACKHANDLER_H
+#ifndef TQSYNC_CALLBACKHANDLER_H
+#define TQSYNC_CALLBACKHANDLER_H
 
 #include <libqopensync/syncmapping.h>
 #include <libqopensync/syncupdates.h>
@@ -40,9 +40,10 @@ namespace QSync {
 
 class Engine;
 
-class CallbackHandler : public QObject
+class CallbackHandler : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     CallbackHandler();
diff --git a/kitchensync/libqopensync/conversion.h b/kitchensync/libqopensync/conversion.h
index e4b32c58..3e5204c9 100644
--- a/kitchensync/libqopensync/conversion.h
+++ b/kitchensync/libqopensync/conversion.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_CONVERSION_H
-#define QSYNC_CONVERSION_H
+#ifndef TQSYNC_CONVERSION_H
+#define TQSYNC_CONVERSION_H
 
 #include <tqstringlist.h>
 
diff --git a/kitchensync/libqopensync/engine.h b/kitchensync/libqopensync/engine.h
index e62a5f68..e014d3f4 100644
--- a/kitchensync/libqopensync/engine.h
+++ b/kitchensync/libqopensync/engine.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_ENGINE_H
-#define QSYNC_ENGINE_H
+#ifndef TQSYNC_ENGINE_H
+#define TQSYNC_ENGINE_H
 
 #include <libqopensync/group.h>
 
diff --git a/kitchensync/libqopensync/filter.h b/kitchensync/libqopensync/filter.h
index f10ac18f..94d419a9 100644
--- a/kitchensync/libqopensync/filter.h
+++ b/kitchensync/libqopensync/filter.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_FILTER_H
-#define QSYNC_FILTER_H
+#ifndef TQSYNC_FILTER_H
+#define TQSYNC_FILTER_H
 
 #include <tqstring.h>
 
diff --git a/kitchensync/libqopensync/group.h b/kitchensync/libqopensync/group.h
index 750e7c41..fe9ceaeb 100644
--- a/kitchensync/libqopensync/group.h
+++ b/kitchensync/libqopensync/group.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_GROUP_H
-#define QSYNC_GROUP_H
+#ifndef TQSYNC_GROUP_H
+#define TQSYNC_GROUP_H
 
 #include <tqdatetime.h>
 #include <tqstringlist.h>
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 5ed40986..fc7dfe31 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -160,7 +160,7 @@ TQString Member::scanDevices( const TQString &query )
   Q_ASSERT( mMember );
 
   OSyncError *error = 0;
-  char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error );
+  char *data = (char*)osync_member_call_plugin( mMember, "scan_tqdevices", const_cast<char*>( query.utf8().data() ), &error );
   if ( error != 0 ) {
     osync_error_free( &error );
     return TQString();
diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h
index 294c19f1..48a1164b 100644
--- a/kitchensync/libqopensync/member.h
+++ b/kitchensync/libqopensync/member.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_MEMBER_H
-#define QSYNC_MEMBER_H
+#ifndef TQSYNC_MEMBER_H
+#define TQSYNC_MEMBER_H
 
 #include <libqopensync/plugin.h>
 #include <libqopensync/result.h>
@@ -107,7 +107,7 @@ class Member
     bool operator==( const Member& ) const;
 
     /**
-      This method can be used to query the plugin for scanning devices.
+      This method can be used to query the plugin for scanning tqdevices.
       The @param query is a plugin specific xml document as well as
       the return value.
      */
@@ -115,7 +115,7 @@ class Member
 
     /**
       This method can be used to test whether the plugin can connect
-      to the device with the given configuration.
+      to the tqdevice with the given configuration.
      */
     bool testConnection( const TQString &configuration );
 
diff --git a/kitchensync/libqopensync/plugin.h b/kitchensync/libqopensync/plugin.h
index d26c2826..1c6c219e 100644
--- a/kitchensync/libqopensync/plugin.h
+++ b/kitchensync/libqopensync/plugin.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_PLUGIN_H
-#define QSYNC_PLUGIN_H
+#ifndef TQSYNC_PLUGIN_H
+#define TQSYNC_PLUGIN_H
 
 #include <tqstring.h>
 
diff --git a/kitchensync/libqopensync/result.h b/kitchensync/libqopensync/result.h
index f35ed347..29d3dad8 100644
--- a/kitchensync/libqopensync/result.h
+++ b/kitchensync/libqopensync/result.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_RESULT_H
-#define QSYNC_RESULT_H
+#ifndef TQSYNC_RESULT_H
+#define TQSYNC_RESULT_H
 
 #include <tqstring.h>
 
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 27ff6b22..1ab3fb72 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_SYNCCHANGE_H
-#define QSYNC_SYNCCHANGE_H
+#ifndef TQSYNC_SYNCCHANGE_H
+#define TQSYNC_SYNCCHANGE_H
 
 #include <libqopensync/member.h>
 
@@ -82,7 +82,7 @@ class SyncChange
     TQString data() const;
 
     /**
-      Returns whether the change tqcontains data.
+      Returns whether the change contains data.
      */
     bool hasData() const;
 
@@ -92,7 +92,7 @@ class SyncChange
     TQString objectFormatName() const;
 
     /**
-      Returns the parent member of this change.
+      Returns the tqparent member of this change.
      */
     Member member() const;
 
diff --git a/kitchensync/libqopensync/syncmapping.h b/kitchensync/libqopensync/syncmapping.h
index 6de67330..a9eee670 100644
--- a/kitchensync/libqopensync/syncmapping.h
+++ b/kitchensync/libqopensync/syncmapping.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_SYNCMAPPING_H
-#define QSYNC_SYNCMAPPING_H
+#ifndef TQSYNC_SYNCMAPPING_H
+#define TQSYNC_SYNCMAPPING_H
 
 #include <libqopensync/syncchange.h>
 
diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h
index 14a2d919..29f2ce78 100644
--- a/kitchensync/libqopensync/syncupdates.h
+++ b/kitchensync/libqopensync/syncupdates.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QSYNC_SYNCUPDATES_H
-#define QSYNC_SYNCUPDATES_H
+#ifndef TQSYNC_SYNCUPDATES_H
+#define TQSYNC_SYNCUPDATES_H
 
 #include <libqopensync/member.h>
 #include <libqopensync/result.h>
diff --git a/kitchensync/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp
index f992350c..f53ee74e 100644
--- a/kitchensync/opensyncdbus/dbusclient.cpp
+++ b/kitchensync/opensyncdbus/dbusclient.cpp
@@ -39,13 +39,13 @@ OpenSyncService::OpenSyncService()
 {
 }
 
-void OpenSyncService::setConnection( QDBusConnection *connection )
+void OpenSyncService::setConnection( TQDBusConnection *connection )
 {
   mConnection = connection;
   mConnection->registerObject( "/ABC", this );
 }
 
-bool OpenSyncService::handleMethodCall( const QDBusMessage &message )
+bool OpenSyncService::handleMethodCall( const TQDBusMessage &message )
 {
   qDebug( "OpenSyncService::handleMethodCall()" );
 
@@ -56,7 +56,7 @@ bool OpenSyncService::handleMethodCall( const QDBusMessage &message )
 
   if ( message.interface() != "org.opensync.SyncEngine" ) return false;
 
-  QDBusMessage reply;
+  TQDBusMessage reply;
 
   TQString function = message.member();
   if ( function == "hello" ) {
@@ -80,7 +80,7 @@ bool OpenSyncService::handleMethodCall( const QDBusMessage &message )
   return true;
 }
 
-QDBusMessage OpenSyncService::showMember( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message )
 {
   if ( message.count() != 2 ) {
     return error( message, "arg_count",
@@ -99,14 +99,14 @@ QDBusMessage OpenSyncService::showMember( const QDBusMessage &message )
     return error( message, "missing_arg", "Missing argument: member id." );
   }
 
-  QDBusMessage reply;
+  TQDBusMessage reply;
 
   QSync::Environment env;
   QSync::Result result = env.initialize();
   if ( result.isError() ) {
     return error( message, result.name(), result.message() ); 
   } else {
-    reply = QDBusMessage::methodReply( message );
+    reply = TQDBusMessage::methodReply( message );
 
     QSync::Group group = env.groupByName( groupName );
     if ( !group.isValid() ) {
@@ -131,7 +131,7 @@ QDBusMessage OpenSyncService::showMember( const QDBusMessage &message )
 }
 
 
-QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message )
 {
   if ( message.count() != 1 ) {
     return error( message, "arg_count",
@@ -144,14 +144,14 @@ QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message )
     return error( message, "missing_arg", "Missing argument group name." );
   }
 
-  QDBusMessage reply;
+  TQDBusMessage reply;
 
   QSync::Environment env;
   QSync::Result result = env.initialize();
   if ( result.isError() ) {
     return error( message, result.name(), result.message() ); 
   } else {
-    reply = QDBusMessage::methodReply( message );
+    reply = TQDBusMessage::methodReply( message );
 
     QSync::Group group = env.groupByName( groupName );
     if ( !group.isValid() ) {
@@ -171,25 +171,25 @@ QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message )
   return reply;
 }
 
-QDBusMessage OpenSyncService::error( const QDBusMessage &message,
+TQDBusMessage OpenSyncService::error( const TQDBusMessage &message,
   const TQString &errorCode,
   const TQString &errorMessage )
 {
-  QDBusError error( "org.opensync." + errorCode, errorMessage );
-  return QDBusMessage::methodError( message, error );
+  TQDBusError error( "org.opensync." + errorCode, errorMessage );
+  return TQDBusMessage::methodError( message, error );
 }
 
-QDBusMessage OpenSyncService::listPlugins( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::listPlugins( const TQDBusMessage &message )
 {
-  QDBusMessage reply;
+  TQDBusMessage reply;
 
   QSync::Environment env;
   QSync::Result result = env.initialize();
   if ( result.isError() ) {
-    QDBusError error( result.name(), result.message() ); 
-    reply = QDBusMessage::methodError( message, error );
+    TQDBusError error( result.name(), result.message() ); 
+    reply = TQDBusMessage::methodError( message, error );
   } else {
-    reply = QDBusMessage::methodReply( message );
+    reply = TQDBusMessage::methodReply( message );
 
     QSync::Environment::PluginIterator it( env.pluginBegin() );
     for ( ; it != env.pluginEnd(); ++it ) {
@@ -202,17 +202,17 @@ QDBusMessage OpenSyncService::listPlugins( const QDBusMessage &message )
   return reply;
 }
 
-QDBusMessage OpenSyncService::listGroups( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::listGroups( const TQDBusMessage &message )
 {
-  QDBusMessage reply;
+  TQDBusMessage reply;
 
   QSync::Environment env;
   QSync::Result result = env.initialize();
   if ( result.isError() ) {
-    QDBusError error( result.name(), result.message() ); 
-    reply = QDBusMessage::methodError( message, error );
+    TQDBusError error( result.name(), result.message() ); 
+    reply = TQDBusMessage::methodError( message, error );
   } else {
-    reply = QDBusMessage::methodReply( message );
+    reply = TQDBusMessage::methodReply( message );
 
     QSync::Environment::GroupIterator it( env.groupBegin() );
     for ( ; it != env.groupEnd(); ++it ) {
@@ -225,21 +225,21 @@ QDBusMessage OpenSyncService::listGroups( const QDBusMessage &message )
   return reply;
 }
 
-QDBusMessage OpenSyncService::hello( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::hello( const TQDBusMessage &message )
 {
-  QDBusMessage reply = QDBusMessage::methodReply( message );
+  TQDBusMessage reply = TQDBusMessage::methodReply( message );
 
-// QDBusError error;
-// reply = QDBusMessage::methodError( message, error );
+// TQDBusError error;
+// reply = TQDBusMessage::methodError( message, error );
 
   reply.append( TQVariant( TQString( "Hello!" ) ) );
   
   return reply;
 }
 
-QDBusMessage OpenSyncService::randomNumber( const QDBusMessage &message )
+TQDBusMessage OpenSyncService::randomNumber( const TQDBusMessage &message )
 {
-  QDBusMessage reply = QDBusMessage::methodReply( message );
+  TQDBusMessage reply = TQDBusMessage::methodReply( message );
 
   int number = rand();
 
@@ -254,15 +254,15 @@ int main( int argc, char *argv[] )
 
   std::cout << "Hello" << std::endl;
 
-  QDBusConnection connection = QDBusConnection::addConnection(
-    QDBusConnection::SessionBus );
+  TQDBusConnection connection = TQDBusConnection::addConnection(
+    TQDBusConnection::SessionBus );
 
   if ( !connection.isConnected() ) {
     qFatal("Cannot connect to session bus");
   }
 
   connection.requestName( "org.opensync.SyncEngine",
-    QDBusConnection::NoReplace );
+    TQDBusConnection::NoReplace );
 
   OpenSyncService service;
   service.setConnection( &connection );
diff --git a/kitchensync/opensyncdbus/dbusclient.h b/kitchensync/opensyncdbus/dbusclient.h
index bffcd4cc..b0493c85 100644
--- a/kitchensync/opensyncdbus/dbusclient.h
+++ b/kitchensync/opensyncdbus/dbusclient.h
@@ -25,32 +25,32 @@
 
 #include <dbus/qdbusobject.h>
 
-class QDBusMessage;
-class QDBusConnection;
+class TQDBusMessage;
+class TQDBusConnection;
 
-class OpenSyncService : public QDBusObjectBase
+class OpenSyncService : public TQDBusObjectBase
 {
   public:
     OpenSyncService();
 
-    void setConnection( QDBusConnection *connection );
+    void setConnection( TQDBusConnection *connection );
 
   protected:
-    virtual bool handleMethodCall( const QDBusMessage &message );
+    virtual bool handleMethodCall( const TQDBusMessage &message );
 
-    QDBusMessage hello( const QDBusMessage & );
-    QDBusMessage randomNumber( const QDBusMessage & );
+    TQDBusMessage hello( const TQDBusMessage & );
+    TQDBusMessage randomNumber( const TQDBusMessage & );
 
-    QDBusMessage listGroups( const QDBusMessage &message );
-    QDBusMessage listPlugins( const QDBusMessage &message );
-    QDBusMessage showGroup( const QDBusMessage &message );
-    QDBusMessage showMember( const QDBusMessage &message );
+    TQDBusMessage listGroups( const TQDBusMessage &message );
+    TQDBusMessage listPlugins( const TQDBusMessage &message );
+    TQDBusMessage showGroup( const TQDBusMessage &message );
+    TQDBusMessage showMember( const TQDBusMessage &message );
 
-    QDBusMessage error( const QDBusMessage &, const TQString &errorCode,
+    TQDBusMessage error( const TQDBusMessage &, const TQString &errorCode,
       const TQString &errorMessage );
 
   private:
-    QDBusConnection *mConnection;
+    TQDBusConnection *mConnection;
 };
 
 #endif
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 3d5b1f04..9d0503ed 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -48,8 +48,8 @@ static TQString readFile( const TQString &fileName )
   return content;
 }
 
-AboutPage::AboutPage( TQWidget *parent )
-  : TQWidget( parent, "AboutPage" )
+AboutPage::AboutPage( TQWidget *tqparent )
+  : TQWidget( tqparent, "AboutPage" )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
@@ -133,7 +133,7 @@ TQString AboutPage::htmlText() const
       .arg( wizard_icon_path )
       .arg( "exec:/addGroup" )
       .arg( i18n( "Add Synchronization Group" ) )
-      .arg( i18n( "Create group of devices for synchronization" ) );
+      .arg( i18n( "Create group of tqdevices for synchronization" ) );
 
   return info;
 }
diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h
index 75f9d489..9da3a72b 100644
--- a/kitchensync/src/aboutpage.h
+++ b/kitchensync/src/aboutpage.h
@@ -25,12 +25,13 @@
 
 #include <tqwidget.h>
 
-class AboutPage : public QWidget
+class AboutPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AboutPage( TQWidget *parent );
+    AboutPage( TQWidget *tqparent );
 
   signals:
     void addGroup();
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
index fc73c367..cba16ec8 100644
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@@ -146,12 +146,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id,
                                   const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.find( left[ i ] ) == right.end() )
+    if ( right.tqfind( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.find( right[ i ] ) == left.end() )
+    if ( left.tqfind( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index 9d18649a..fe376428 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -44,17 +44,17 @@ static TQString toString( KCal::Attendee *attendee )
 
 static TQString toString( KCal::Alarm * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Incidence * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Attachment * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( const TQDate &date )
@@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
     conflictField( i18n( "Summary" ), left->summary(), right->summary() );
 
   if ( left->status() != right->status() )
-    conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
+    conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
 
   if ( left->secrecy() != right->secrecy() )
     conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );
@@ -206,12 +206,12 @@ void CalendarDiffAlgo::diffList( const TQString &id,
                                  const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.find( left[ i ] ) == right.end() )
+    if ( right.tqfind( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.find( right[ i ] ) == left.end() )
+    if ( left.tqfind( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
index 6e2aa5d7..2fb7ef18 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -49,8 +49,8 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent )
-  : TQWidget( parent ), mMember( member )
+ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *tqparent )
+  : TQWidget( tqparent ), mMember( member )
 {
   mTopLayout = new TQVBoxLayout( this );
   mTopLayout->setSpacing( KDialog::spacingHint() );
@@ -76,49 +76,49 @@ TQString ConfigGui::instanceName() const
 }
 
 ConfigGui *ConfigGui::Factory::create( const QSync::Member &member,
-  TQWidget *parent )
+  TQWidget *tqparent )
 {
   TQString name = member.pluginName();
   if ( name == "file-sync" ) {
-    return new ConfigGuiFile( member, parent );
+    return new ConfigGuiFile( member, tqparent );
   } else if ( name == "palm-sync" ) {
-    return new ConfigGuiPalm( member, parent );
+    return new ConfigGuiPalm( member, tqparent );
   } else if ( name == "irmc-sync" ) {
-    return new ConfigGuiIRMC( member, parent );
+    return new ConfigGuiIRMC( member, tqparent );
   } else if ( name == "syncml-obex-client" ) {
-    return new ConfigGuiSyncmlObex( member, parent );
+    return new ConfigGuiSyncmlObex( member, tqparent );
   } else if ( name == "syncml-http-server" ) {
-    return new ConfigGuiSyncmlHttp( member, parent );
+    return new ConfigGuiSyncmlHttp( member, tqparent );
   } else if ( name == "opie-sync" ) {
-    return new ConfigGuiOpie( member, parent );
+    return new ConfigGuiOpie( member, tqparent );
   } else if ( name == "gnokii-sync" ) {
-    return new ConfigGuiGnokii( member, parent );
+    return new ConfigGuiGnokii( member, tqparent );
   } else if ( name == "gpe-sync" ) {
-    return new ConfigGuiGpe( member, parent );
+    return new ConfigGuiGpe( member, tqparent );
   } else if ( name == "google-calendar" ) {
-    return new ConfigGuiGoogleCalendar( member, parent );
+    return new ConfigGuiGoogleCalendar( member, tqparent );
   } else if ( name == "ldap-sync" ) {
-    return new ConfigGuiLdap( member, parent );
+    return new ConfigGuiLdap( member, tqparent );
   } else if ( name == "kdepim-sync" ) {
-    return new ConfigGuiBlank( member, parent ); 
+    return new ConfigGuiBlank( member, tqparent ); 
   } else if ( name == "jescs-sync" ) {
-    return new ConfigGuiJescs( member, parent );
+    return new ConfigGuiJescs( member, tqparent );
   } else if ( name == "evo2-sync" ) {
-    return new ConfigGuiEvo2( member, parent );
+    return new ConfigGuiEvo2( member, tqparent );
   } else if ( name == "moto-sync" ) {
-    return new ConfigGuiMoto( member, parent );
+    return new ConfigGuiMoto( member, tqparent );
   } else if ( name == "synce-plugin" ) {
-    return new ConfigGuiSynce( member, parent );
+    return new ConfigGuiSynce( member, tqparent );
   } else if ( name == "sunbird-sync" ) {
-    return new ConfigGuiSunbird( member, parent );
+    return new ConfigGuiSunbird( member, tqparent );
   } else {
-    return new ConfigGuiXml( member, parent );
+    return new ConfigGuiXml( member, tqparent );
   }
 }
 
 
-ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   mTextEdit = new TQTextEdit( this );
   topLayout()->addWidget( mTextEdit );  
diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h
index 4309db1b..9f784dc2 100644
--- a/kitchensync/src/configgui.h
+++ b/kitchensync/src/configgui.h
@@ -29,15 +29,15 @@ class TQBoxLayout;
 class KLineEdit;
 class TQTextEdit;
 
-class ConfigGui : public QWidget
+class ConfigGui : public TQWidget
 {
   public:
-    ConfigGui( const QSync::Member &, TQWidget *parent );
+    ConfigGui( const QSync::Member &, TQWidget *tqparent );
 
     class Factory
     {
       public:
-        static ConfigGui *create( const QSync::Member &, TQWidget *parent );
+        static ConfigGui *create( const QSync::Member &, TQWidget *tqparent );
     };
 
     void setInstanceName( const TQString & );
@@ -60,7 +60,7 @@ class ConfigGui : public QWidget
 class ConfigGuiXml : public ConfigGui
 {
   public:
-    ConfigGuiXml( const QSync::Member &, TQWidget *parent );
+    ConfigGuiXml( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString & );
     TQString save() const;
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index 3e9d47b6..e5e60f20 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this );
   topLayout()->addWidget( label );
diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h
index e2048ac7..738c5adb 100644
--- a/kitchensync/src/configguiblank.h
+++ b/kitchensync/src/configguiblank.h
@@ -26,7 +26,7 @@
 class ConfigGuiBlank : public ConfigGui
 {
   public:
-    ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 );
+    ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent = 0 );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 716bce78..872e673f 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -32,8 +32,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h
index 7e3a1767..5e030aa9 100644
--- a/kitchensync/src/configguievo2.h
+++ b/kitchensync/src/configguievo2.h
@@ -29,7 +29,7 @@ class KURLRequester;
 class ConfigGuiEvo2 : public ConfigGui
 {
   public:
-    ConfigGuiEvo2( const QSync::Member &, TQWidget *parent );
+    ConfigGuiEvo2( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index 6a8b0402..fdf4c8ce 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -30,8 +30,8 @@
 #include <tqlabel.h>
 #include <tqdom.h>
 
-ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() );
 
diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h
index db938522..7859fbee 100644
--- a/kitchensync/src/configguifile.h
+++ b/kitchensync/src/configguifile.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 class ConfigGuiFile : public ConfigGui
 {
   public:
-    ConfigGuiFile( const QSync::Member &, TQWidget *parent );
+    ConfigGuiFile( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index 8e800676..d832157e 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -29,8 +29,8 @@
 #include <tqdom.h>
 #include <tqlineedit.h>
 
-ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() );
 
diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h
index 198cf77c..458e948d 100644
--- a/kitchensync/src/configguigcalendar.h
+++ b/kitchensync/src/configguigcalendar.h
@@ -29,7 +29,7 @@ class TQLineEdit;
 class ConfigGuiGoogleCalendar : public ConfigGui
 {
   public:
-    ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent );
+    ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 84db0275..dfc7413e 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -34,8 +34,8 @@
 #include <tqdom.h>
 #include <tqvbox.h>
 
-ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
index fcb5eaad..673dce0a 100644
--- a/kitchensync/src/configguignokii.h
+++ b/kitchensync/src/configguignokii.h
@@ -34,9 +34,10 @@ class TQComboBox;
 class ConfigGuiGnokii : public ConfigGui
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );
+    ConfigGuiGnokii( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
@@ -49,7 +50,7 @@ class ConfigGuiGnokii : public ConfigGui
 
     BluetoothWidget *mBluetooth;
 
-    typedef QPair<TQString, TQString> ConnectionType;
+    typedef TQPair<TQString, TQString> ConnectionType;
     typedef TQValueList<ConnectionType> ConnectionTypeList;
     ConnectionTypeList mConnectionTypes;
 
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 94108d30..34502d4d 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -32,8 +32,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 
@@ -93,7 +93,7 @@ void ConfigGuiGpe::initGUI()
   mIP->setInputMask( "000.000.000.000" );
   tqlayout->addWidget( mIP, 1, 1 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
   tqlayout->addWidget( mPort, 1, 3 );
 
diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h
index e1fc10c6..0d4888f6 100644
--- a/kitchensync/src/configguigpe.h
+++ b/kitchensync/src/configguigpe.h
@@ -32,7 +32,7 @@ class KLineEdit;
 class ConfigGuiGpe : public ConfigGui
 {
   public:
-    ConfigGuiGpe( const QSync::Member &, TQWidget *parent );
+    ConfigGuiGpe( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index 721c82d7..8bff86fe 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -42,8 +42,8 @@
 
 #include "configguiirmc.h"
 
-ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
index 5e8250d1..5fe5b454 100644
--- a/kitchensync/src/configguiirmc.h
+++ b/kitchensync/src/configguiirmc.h
@@ -37,9 +37,10 @@ class TQSpinBox;
 class ConfigGuiIRMC : public ConfigGui
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );
+    ConfigGuiIRMC( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 158eb225..552b49a3 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -30,8 +30,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h
index 1667900c..6884bbbd 100644
--- a/kitchensync/src/configguijescs.h
+++ b/kitchensync/src/configguijescs.h
@@ -30,7 +30,7 @@ class TQCheckBox;
 class ConfigGuiJescs : public ConfigGui
 {
   public:
-    ConfigGuiJescs( const QSync::Member &, TQWidget *parent );
+    ConfigGuiJescs( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 417e58d0..485b6599 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -32,8 +32,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index a73eae5b..1db94357 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -36,9 +36,10 @@ class KLineEdit;
 class ConfigGuiLdap : public ConfigGui
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiLdap( const QSync::Member &, TQWidget *parent );
+    ConfigGuiLdap( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index c44a2b40..3314dbef 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -29,8 +29,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 }
@@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml )
   TQDomNode node;
   for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
-    if ( element.tagName() == "device" ) {
+    if ( element.tagName() == "tqdevice" ) {
       mDeviceString->setText( element.text() );
     }
   }
@@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() );
+  config += TQString( "<tqdevice>%1</tqdevice>\n" ).arg( mDeviceString->text() );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h
index cd588fac..1c5cd0f0 100644
--- a/kitchensync/src/configguimoto.h
+++ b/kitchensync/src/configguimoto.h
@@ -29,7 +29,7 @@ class KLineEdit;
 class ConfigGuiMoto : public ConfigGui
 {
   public:
-    ConfigGuiMoto( const QSync::Member &, TQWidget *parent );
+    ConfigGuiMoto( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index ed8aa15f..c2b3be2e 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -30,8 +30,8 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
-ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
@@ -81,7 +81,7 @@ ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
   tqlayout->addWidget( mPort, 5, 1 );
 
   mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
-  mDeviceType->insertItem( i18n("Qtopia2") );
+  mDeviceType->insertItem( i18n("TQtopia2") );
 
   mConnectionType->insertItem( i18n("SCP") );
   mConnectionType->insertItem( i18n("FTP") );
@@ -105,7 +105,7 @@ void ConfigGuiOpie::load( const TQString &xml )
       mDeviceIP->setText( e.text() );
     } else if ( e.tagName() == "port" ) {
       mPort->setValue( e.text().toInt() );
-    } else if ( e.tagName() == "device" ) {
+    } else if ( e.tagName() == "tqdevice" ) {
       if ( e.text() == "opie" )
         mDeviceType->setCurrentItem( 0 );
       else
@@ -126,7 +126,7 @@ TQString ConfigGuiOpie::save() const
   xml += "<username>" + mUserName->text() + "</username>";
   xml += "<password>" + mPassword->text() + "</password>";
   xml += "<url>" + mDeviceIP->text() + "</url>";
-  xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>";
+  xml += "<tqdevice>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</tqdevice>";
   xml += "<port>" + TQString::number( mPort->value() ) + "</port>";
   xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>";
   xml += "</config>";
diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h
index e90f4acf..b798de93 100644
--- a/kitchensync/src/configguiopie.h
+++ b/kitchensync/src/configguiopie.h
@@ -30,7 +30,7 @@ class TQSpinBox;
 class ConfigGuiOpie : public ConfigGui
 {
   public:
-    ConfigGuiOpie( const QSync::Member &, TQWidget *parent );
+    ConfigGuiOpie( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index 03d87cdb..b07223d5 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -35,8 +35,8 @@
 
 #include "configguipalm.h"
 
-ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 
@@ -167,7 +167,7 @@ void ConfigGuiPalm::initGUI()
   gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() );
   gridLayout->setMargin( KDialog::marginHint() );
 
-  TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget );
+  TQButtonGroup *buttonGroup = new TQButtonGroup( 1, TQt::Horizontal, connectionWidget );
   buttonGroup->setExclusive( true );
   buttonGroup->setFrameStyle( TQFrame::NoFrame );
   mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup );
diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h
index 354e5a29..86c797a0 100644
--- a/kitchensync/src/configguipalm.h
+++ b/kitchensync/src/configguipalm.h
@@ -33,7 +33,7 @@ class TQSpinBox;
 class ConfigGuiPalm : public ConfigGui
 {
   public:
-    ConfigGuiPalm( const QSync::Member &, TQWidget *parent );
+    ConfigGuiPalm( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index b0da28ca..daa251b1 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -40,8 +40,8 @@
 #include <klocale.h>
 #include <kfile.h>
 
-ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQTabWidget *tabWidget = new TQTabWidget( this );
   topLayout()->addWidget( tabWidget );
@@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar )
   calendar->deleteLater();
 }
 
-LocalCalendar::LocalCalendar( TQWidget *parent )
-  : TQWidget( parent )
+LocalCalendar::LocalCalendar( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   initGui();
 }
 
-LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent )
-  : TQWidget( parent )
+LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   initGui();
 
@@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget()
   emit deleteRequest( this );
 }
 
-WebdavCalendar::WebdavCalendar( TQWidget *parent )
-  : TQWidget( parent )
+WebdavCalendar::WebdavCalendar( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   initGui();
 };
 
 WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url,
-                                const TQString &defaultcal, const TQString &days, TQWidget *parent )
-  : TQWidget( parent )
+                                const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   initGui();
 
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
index d8401bd8..25ac78a9 100644
--- a/kitchensync/src/configguisunbird.h
+++ b/kitchensync/src/configguisunbird.h
@@ -36,15 +36,16 @@ class KURLRequester;
 class KPushButton;
 class KLineEdit;
 
-class LocalCalendar : public QWidget
+class LocalCalendar : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LocalCalendar( TQWidget *parent = 0 );
+    LocalCalendar( TQWidget *tqparent = 0 );
     LocalCalendar( const TQString &path,
                    const TQString &defaultcal,
-                   const TQString &days, TQWidget *parent = 0 );
+                   const TQString &days, TQWidget *tqparent = 0 );
 
     KURLRequester *mPathRequester;
     TQCheckBox *mDaysCheckBox;
@@ -62,17 +63,18 @@ class LocalCalendar : public QWidget
     void initGui();
 };
 
-class WebdavCalendar : public QWidget
+class WebdavCalendar : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    WebdavCalendar( TQWidget *parent = 0 );
+    WebdavCalendar( TQWidget *tqparent = 0 );
     WebdavCalendar( const TQString &username,
                     const TQString &password,
                     const TQString &url,
                     const TQString &defaultcal,
-                    const TQString &days, TQWidget *parent = 0 );
+                    const TQString &days, TQWidget *tqparent = 0 );
 
     KLineEdit *mUrl;
     TQCheckBox *mDaysCheckBox;
@@ -95,9 +97,10 @@ class WebdavCalendar : public QWidget
 class ConfigGuiSunbird : public ConfigGui
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );
+    ConfigGuiSunbird( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index b83e8568..64c171a8 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -30,8 +30,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h
index 680b1b12..fb318f9d 100644
--- a/kitchensync/src/configguisynce.h
+++ b/kitchensync/src/configguisynce.h
@@ -31,7 +31,7 @@ class KLineEdit;
 class ConfigGuiSynce : public ConfigGui
 {
   public:
-    ConfigGuiSynce( const QSync::Member &, TQWidget *parent );
+    ConfigGuiSynce( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 08c596bc..e81e92d4 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -35,8 +35,8 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 
-ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 )
+ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent ), mUrl( 0 ), mPort( 0 )
 {
 
   TQTabWidget *tabWidget = new TQTabWidget( this );
@@ -137,12 +137,12 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget
   topLayout()->addStretch( 1 );
 }
 
-void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
 {
-  TQLabel *label = new TQLabel( text, parent);
+  TQLabel *label = new TQLabel( text, tqparent);
   mGridLayout->addWidget( label, row, 0 );
 
-  *edit = new KComboBox( true, parent );
+  *edit = new KComboBox( true, tqparent );
   mGridLayout->addWidget( *edit, row, 1 );
 }
 
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
index 784a7fe0..de71586d 100644
--- a/kitchensync/src/configguisyncmlhttp.h
+++ b/kitchensync/src/configguisyncmlhttp.h
@@ -36,9 +36,10 @@ class ConfigGuiSyncmlHttp : public ConfigGui
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );
+    ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *tqparent );
 
     void load( const TQString &xml );
     TQString save() const;
@@ -61,7 +62,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
     KComboBox *mNoteDb;
 
   protected slots:
-    void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
+    void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
 };
 
 #endif
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index fe7354ed..1447f569 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -37,8 +37,8 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 
-ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent )
-  : ConfigGui( member, parent )
+ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *tqparent )
+  : ConfigGui( member, tqparent )
 {
   TQTabWidget *tabWidget = new TQTabWidget( this );
   topLayout()->addWidget( tabWidget );
@@ -308,12 +308,12 @@ TQString ConfigGuiSyncmlObex::save() const
   return xml;
 }
 
-void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlObex::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
 {
-  TQLabel *label = new TQLabel( text, parent );
+  TQLabel *label = new TQLabel( text, tqparent );
   mGridLayout->addWidget( label, row, 0 );
 
-  *edit = new KComboBox( true, parent );
+  *edit = new KComboBox( true, tqparent );
   mGridLayout->addWidget( *edit, row, 1 );
 }
 
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
index c45f842b..a4e42747 100644
--- a/kitchensync/src/configguisyncmlobex.h
+++ b/kitchensync/src/configguisyncmlobex.h
@@ -38,9 +38,10 @@ class KURLRequester;
 class ConfigGuiSyncmlObex : public ConfigGui
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );
+    ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *tqparent = 0 );
 
     void load( const TQString &xml );
     TQString save() const;
@@ -50,7 +51,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
 
   private:
     // Connection
-    typedef QPair<int, TQString> ConnectionType;
+    typedef TQPair<int, TQString> ConnectionType;
     typedef TQValueList<ConnectionType> ConnectionTypeList;
     ConnectionTypeList mConnectionTypes;
 
@@ -59,7 +60,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
     UsbWidget *mUsb;
 
     // Options
-    typedef QPair<int, TQString> SyncmlVersion;
+    typedef TQPair<int, TQString> SyncmlVersion;
     typedef TQValueList<SyncmlVersion> SyncmlVersionList;
     SyncmlVersionList mSyncmlVersions;
 
@@ -81,7 +82,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
     KComboBox *mNoteDb;
 
   protected slots:
-    void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
+    void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
 };
 
 #endif
diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp
index 39943ffe..c3e236cc 100644
--- a/kitchensync/src/conflictdialog.cpp
+++ b/kitchensync/src/conflictdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "conflictdialog.h"
 
-ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
-  : TQDialog( parent ), mMapping( mapping )
+ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
+  : TQDialog( tqparent ), mMapping( mapping )
 {
 }
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
index 1a17e06c..81c91138 100644
--- a/kitchensync/src/conflictdialog.h
+++ b/kitchensync/src/conflictdialog.h
@@ -28,10 +28,10 @@
 /**
   Base class for SingleConflictDialog and MultiConflictDialog.
  */
-class ConflictDialog : public QDialog
+class ConflictDialog : public TQDialog
 {
   public:
-    ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
+    ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
 
   protected:
     QSync::SyncMapping mMapping;
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index bb25c271..f6157b6f 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -40,8 +40,8 @@
 
 #include "connectionwidgets.h"
 
-BluetoothWidget::BluetoothWidget( TQWidget *parent )
-  : TQWidget( parent )
+BluetoothWidget::BluetoothWidget( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this );
 
@@ -100,8 +100,8 @@ TQString BluetoothWidget::channel() const
 }
 
 // FIXME - Only IrMC specific
-IRWidget::IRWidget( TQWidget *parent )
-  : TQWidget( parent )
+IRWidget::IRWidget( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
 
@@ -122,10 +122,10 @@ IRWidget::IRWidget( TQWidget *parent )
   tqlayout->setRowStretch( 2, 1 );
 }
 
-void IRWidget::load( const TQDomElement &parent )
+void IRWidget::load( const TQDomElement &tqparent )
 {
   TQDomNode node;
-  for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+  for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
     if ( element.tagName() == "irname" )
       mDevice->setText( element.text() );
@@ -134,20 +134,20 @@ void IRWidget::load( const TQDomElement &parent )
   }
 }
 
-void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
+void IRWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
 {
   TQDomElement element = doc.createElement( "irname" );
   element.appendChild( doc.createTextNode( mDevice->text() ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 
   element = doc.createElement( "irserial" );
   element.appendChild( doc.createTextNode( mSerialNumber->text() ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 // FIXME - Only IrMC specific
-CableWidget::CableWidget( TQWidget *parent )
-  : TQWidget( parent )
+CableWidget::CableWidget( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
 
@@ -176,10 +176,10 @@ CableWidget::CableWidget( TQWidget *parent )
   mDevice->insertItem( "/dev/ttyUSB1" );
 }
 
-void CableWidget::load( const TQDomElement &parent )
+void CableWidget::load( const TQDomElement &tqparent )
 {
   TQDomNode node;
-  for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+  for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
     if ( element.tagName() == "cabletype" )
       mManufacturer->setCurrentItem( element.text().toInt() );
@@ -188,19 +188,19 @@ void CableWidget::load( const TQDomElement &parent )
   }
 }
 
-void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
+void CableWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
 {
   TQDomElement element = doc.createElement( "cabletype" );
   element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 
   element = doc.createElement( "cabledev" );
   element.appendChild( doc.createTextNode( mDevice->currentText() ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
-UsbWidget::UsbWidget( TQWidget *parent )
-  : TQWidget( parent )
+UsbWidget::UsbWidget( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
 
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
index d3326acb..5ffc9bc5 100644
--- a/kitchensync/src/connectionwidgets.h
+++ b/kitchensync/src/connectionwidgets.h
@@ -35,12 +35,13 @@ class TQSpinBox;
 class KComboBox;
 class KLineEdit;
 
-class BluetoothWidget : public QWidget
+class BluetoothWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    BluetoothWidget( TQWidget *parent );
+    BluetoothWidget( TQWidget *tqparent );
 
     void hideChannel();
     void showChannel();
@@ -56,12 +57,13 @@ class BluetoothWidget : public QWidget
     TQLabel *mChannelLabel;
 };
 
-class IRWidget : public QWidget
+class IRWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    IRWidget( TQWidget *parent );
+    IRWidget( TQWidget *tqparent );
 
     void load( const TQDomElement& );
     void save( TQDomDocument&, TQDomElement& );
@@ -71,10 +73,10 @@ class IRWidget : public QWidget
     KLineEdit *mSerialNumber;
 };
 
-class CableWidget : public QWidget
+class CableWidget : public TQWidget
 {
   public:
-    CableWidget( TQWidget *parent );
+    CableWidget( TQWidget *tqparent );
 
     void load( const TQDomElement& );
     void save( TQDomDocument&, TQDomElement& );
@@ -84,10 +86,10 @@ class CableWidget : public QWidget
     KComboBox *mDevice;
 };
 
-class UsbWidget : public QWidget
+class UsbWidget : public TQWidget
 {
   public:
-    UsbWidget( TQWidget *parent );
+    UsbWidget( TQWidget *tqparent );
 
     int interface() const;
     void setInterface( int interface );
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 2d1ccbc5..eac5759c 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -41,8 +41,8 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-GroupConfig::GroupConfig( TQWidget *parent )
-  : TQWidget( parent )
+GroupConfig::GroupConfig( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
index 8dc300b6..be19641d 100644
--- a/kitchensync/src/groupconfig.h
+++ b/kitchensync/src/groupconfig.h
@@ -31,12 +31,13 @@ class GroupConfigCommon;
 class MemberConfig;
 class SyncProcess;
 
-class GroupConfig : public QWidget
+class GroupConfig : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupConfig( TQWidget *parent );
+    GroupConfig( TQWidget *tqparent );
 
     void setSyncProcess( SyncProcess *process );
 
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index d5c89bc8..f2afe3c4 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -38,8 +38,8 @@
 
 #include "groupconfigcommon.h"
 
-ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
-  : TQWidget( parent )
+ObjectTypeSelector::ObjectTypeSelector( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this );
   tqlayout->setMargin( 0 );
@@ -125,8 +125,8 @@ void ObjectTypeSelector::save( QSync::Group group )
   config.setActiveObjectTypes( objectTypes );
 }
 
-GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
-  : TQWidget( parent )
+GroupConfigCommon::GroupConfigCommon( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
@@ -135,7 +135,7 @@ GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   mGroupName = new KLineEdit( this );
   tqlayout->addWidget( mGroupName, 0, 1 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
   tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h
index 25a0ceb0..b406d451 100644
--- a/kitchensync/src/groupconfigcommon.h
+++ b/kitchensync/src/groupconfigcommon.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 class ObjectTypeSelector : public TQWidget
 {
   public:
-    ObjectTypeSelector( TQWidget *parent );
+    ObjectTypeSelector( TQWidget *tqparent );
 
     void load( const QSync::Group &group );
     void save( QSync::Group group );
@@ -42,10 +42,10 @@ class ObjectTypeSelector : public TQWidget
     TQMap<TQString,TQCheckBox *> mObjectTypeChecks;
 };
 
-class GroupConfigCommon : public QWidget
+class GroupConfigCommon : public TQWidget
 {
   public:
-    GroupConfigCommon( TQWidget *parent );
+    GroupConfigCommon( TQWidget *tqparent );
 
     void setSyncProcess( SyncProcess *syncProcess );
     void save();
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index 4d8be65d..bf48ce21 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -26,8 +26,8 @@
 
 #include <tqlayout.h>
 
-GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process )
-  : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"),
+GroupConfigDialog::GroupConfigDialog( TQWidget *tqparent, SyncProcess *process )
+  : KDialogBase( tqparent, 0, true, i18n("Configure Synchronization Group"),
      Ok )
 {
   TQFrame *topFrame = makeMainWidget();
diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h
index 5fd70884..712f627a 100644
--- a/kitchensync/src/groupconfigdialog.h
+++ b/kitchensync/src/groupconfigdialog.h
@@ -28,9 +28,10 @@ class SyncProcess;
 class GroupConfigDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupConfigDialog( TQWidget *parent, SyncProcess * );
+    GroupConfigDialog( TQWidget *tqparent, SyncProcess * );
     ~GroupConfigDialog();
 
   protected slots:
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 0a27fb9e..d708f681 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -40,8 +40,8 @@
 
 #include "groupitem.h"
 
-GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
-  : KWidgetListItem( parent ), mSyncProcess( process ),
+GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process )
+  : KWidgetListItem( tqparent ), mSyncProcess( process ),
     mCallbackHandler( new QSync::CallbackHandler ),
     mProcessedItems( 0 ), mMaxProcessedItems( 0 ),
     mSynchronizing( false )
@@ -81,14 +81,14 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
   mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  mStatus = new TQLabel( hbox );
-  mStatus->tqsetAlignment( Qt::AlignRight );
-  mStatus->tqsetAlignment( AlignRight | AlignVCenter );
-  mStatus->setIndent( KDialog::spacingHint() );
-  mStatus->setFont( boldFont );
-  mStatus->setPaletteForegroundColor( tqcolorGroup().light() );
-  mStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
-  mStatus->setText( i18n( "Ready" ) );
+  mtqStatus = new TQLabel( hbox );
+  mtqStatus->tqsetAlignment( TQt::AlignRight );
+  mtqStatus->tqsetAlignment( AlignRight | AlignVCenter );
+  mtqStatus->setIndent( KDialog::spacingHint() );
+  mtqStatus->setFont( boldFont );
+  mtqStatus->setPaletteForegroundColor( tqcolorGroup().light() );
+  mtqStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  mtqStatus->setText( i18n( "Ready" ) );
 
   hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
   hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
@@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update )
   switch ( update.type() ) {
     case QSync::SyncChangeUpdate::Received:
       mProcessedItems++;
-      mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) );
+      mtqStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) );
       break;
     case QSync::SyncChangeUpdate::ReceivedInfo:
-      mStatus->setText( i18n( "Receive information" ) );
+      mtqStatus->setText( i18n( "Receive information" ) );
       break;
     case QSync::SyncChangeUpdate::Sent:
       mProcessedItems--;
-      mStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) );
+      mtqStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) );
 
       mProgressBar->show();
 
@@ -212,15 +212,15 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update )
       }
       break;
     case QSync::SyncChangeUpdate::WriteError:
-      mStatus->setText( i18n( "Error" ) );
+      mtqStatus->setText( i18n( "Error" ) );
       KPassivePopup::message( update.result().message(), this );
       break;
     case QSync::SyncChangeUpdate::ReceiveError:
-      mStatus->setText( i18n( "Error" ) );
+      mtqStatus->setText( i18n( "Error" ) );
       KPassivePopup::message( update.result().message(), this );
       break;
     default:
-      mStatus->setText( TQString() );
+      mtqStatus->setText( TQString() );
       break;
   }
 }
@@ -233,24 +233,24 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
 {
   switch ( update.type() ) {
     case QSync::SyncEngineUpdate::EndPhaseConnected:
-      mStatus->setText( i18n( "Connected" ) );
+      mtqStatus->setText( i18n( "Connected" ) );
       mProgressBar->setProgress( 0 );
       mSynchronizing = true;
       mSyncAction->setText( "Abort Synchronization" );
       break;
     case QSync::SyncEngineUpdate::EndPhaseRead:
-      mStatus->setText( i18n( "Data read" ) );
+      mtqStatus->setText( i18n( "Data read" ) );
       break;
     case QSync::SyncEngineUpdate::EndPhaseWrite:
-      mStatus->setText( i18n( "Data written" ) );
+      mtqStatus->setText( i18n( "Data written" ) );
       mProgressBar->setProgress( 100 );
       mProcessedItems = mMaxProcessedItems = 0;
       break;
     case QSync::SyncEngineUpdate::EndPhaseDisconnected:
-      mStatus->setText( i18n( "Disconnected" ) );
+      mtqStatus->setText( i18n( "Disconnected" ) );
       break;
     case QSync::SyncEngineUpdate::Error:
-      mStatus->setText( i18n( "Synchronization failed" ) );
+      mtqStatus->setText( i18n( "Synchronization failed" ) );
       KPassivePopup::message( update.result().message(), this );
       this->update();
 
@@ -258,7 +258,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       mSyncAction->setText( i18n( "Synchronize Now" ) );
       break;
     case QSync::SyncEngineUpdate::SyncSuccessfull:
-      mStatus->setText( i18n( "Successfully synchronized" ) );
+      mtqStatus->setText( i18n( "Successfully synchronized" ) );
       mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() );
       mSyncProcess->group().save();
       this->update();
@@ -267,14 +267,14 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       mSyncAction->setText( i18n( "Synchronize Now" ) );
       break;
     case QSync::SyncEngineUpdate::PrevUnclean:
-      mStatus->setText( i18n( "Previous synchronization failed" ) );
+      mtqStatus->setText( i18n( "Previous synchronization failed" ) );
       break;
     case QSync::SyncEngineUpdate::EndConflicts:
-      mStatus->setText( i18n( "Conflicts solved" ) );
+      mtqStatus->setText( i18n( "Conflicts solved" ) );
       mMaxProcessedItems = mProcessedItems;
       break;
     default:
-      mStatus->setText( TQString() );
+      mtqStatus->setText( TQString() );
       break;
   }
 }
@@ -345,9 +345,9 @@ void GroupItem::engineChanged( QSync::Engine *engine )
   this->update();
 }
 
-MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
+MemberItem::MemberItem( TQWidget *tqparent, SyncProcess *process,
                         const QSync::Member &member )
-  : TQWidget( parent ), mSyncProcess( process ), mMember( member )
+  : TQWidget( tqparent ), mSyncProcess( process ), mMember( member )
 {
   TQFont boldFont;
   boldFont.setBold( true );
@@ -367,7 +367,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
-  mIcon->tqsetAlignment( Qt::AlignTop );
+  mIcon->tqsetAlignment( TQt::AlignTop );
   mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
 
   TQVBox *nameBox = new TQVBox( box );
@@ -375,7 +375,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
   mMemberName->setFont( boldFont );
   mDescription = new TQLabel( nameBox );
 
-  mStatus = new TQLabel( box );
+  mtqStatus = new TQLabel( box );
 
   mMemberName->setText( member.name() );
   mDescription->setText( plugin.longName() );
@@ -383,7 +383,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
 void MemberItem::seStatusMessage( const TQString &msg )
 {
-  mStatus->setText( msg );
+  mtqStatus->setText( msg );
 }
 
 #include "groupitem.moc"
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index dc724890..0202f13d 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -40,6 +40,7 @@ class TQVBox;
 class GroupItem : public KWidgetListItem
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     GroupItem( KWidgetList*, SyncProcess *syncProcess );
@@ -75,7 +76,7 @@ class GroupItem : public KWidgetListItem
 
     TQLabel *mIcon;
     TQLabel *mGroupName;
-    TQLabel *mStatus;
+    TQLabel *mtqStatus;
     TQLabel *mTime;
     KURLLabel *mSyncAction;
     KURLLabel *mConfigureAction;
@@ -87,10 +88,10 @@ class GroupItem : public KWidgetListItem
     bool mSynchronizing;
 };
 
-class MemberItem : public QWidget
+class MemberItem : public TQWidget
 {
   public:
-    MemberItem( TQWidget *parent, SyncProcess *syncProcess,
+    MemberItem( TQWidget *tqparent, SyncProcess *syncProcess,
                 const QSync::Member &member );
 
     SyncProcess* syncProcess() const { return mSyncProcess; }
@@ -105,7 +106,7 @@ class MemberItem : public QWidget
     TQLabel *mIcon;
     TQLabel *mMemberName;
     TQLabel *mDescription;
-    TQLabel *mStatus;
+    TQLabel *mtqStatus;
 };
 
 #endif
diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp
index 8e1adf87..d7afdf10 100644
--- a/kitchensync/src/groupview.cpp
+++ b/kitchensync/src/groupview.cpp
@@ -26,8 +26,8 @@
 
 #include "groupview.h"
 
-GroupView::GroupView( TQWidget *parent )
-  : TQWidget( parent ), mAboutPage( 0 )
+GroupView::GroupView( TQWidget *tqparent )
+  : TQWidget( tqparent ), mAboutPage( 0 )
 {
   mLayout = new TQVBoxLayout( this );
 
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
index 5d1e4791..88f8da21 100644
--- a/kitchensync/src/groupview.h
+++ b/kitchensync/src/groupview.h
@@ -26,12 +26,13 @@ class AboutPage;
 class SyncProcess;
 class TQVBoxLayout;
 
-class GroupView : public QWidget
+class GroupView : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupView( TQWidget *parent );
+    GroupView( TQWidget *tqparent );
 
     SyncProcess* selectedSyncProcess() const;
 
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 610f05a5..06779c80 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
   return TQStyleSheet::convertFromPlainText( text );
 }
 
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
-  : KTextBrowser( parent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
+  : KTextBrowser( tqparent )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
   setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h
index b3d52259..f7964e18 100644
--- a/kitchensync/src/htmldiffalgodisplay.h
+++ b/kitchensync/src/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KSync {
 class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
 {
   public:
-    HTMLDiffAlgoDisplay( TQWidget *parent );
+    HTMLDiffAlgoDisplay( TQWidget *tqparent );
 
     void begin();
     void end();
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index e8c1b791..3869bc1d 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -38,8 +38,8 @@ class KWidgetList::Private
     TQVBox *mBox;
 };
 
-KWidgetList::KWidgetList( TQWidget *parent, const char *name )
-  : TQScrollView( parent, name ),
+KWidgetList::KWidgetList( TQWidget *tqparent, const char *name )
+  : TQScrollView( tqparent, name ),
     d( new Private )
 {
   d->mBox = new TQVBox( viewport() );
@@ -217,7 +217,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
     }
   } else if ( event->type() == TQEvent::KeyPress ) {
     TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>( event );
-    if ( keyEvent->key() == Qt::Key_Up ) {
+    if ( keyEvent->key() == TQt::Key_Up ) {
       if ( d->mSelectedItem == 0 ) {
         if ( !d->mItems.isEmpty() ) {
           setSelected( d->mItems.first() );
@@ -234,7 +234,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
         }
       }
       return true;
-    } else if ( keyEvent->key() == Qt::Key_Down ) {
+    } else if ( keyEvent->key() == TQt::Key_Down ) {
       if ( d->mSelectedItem == 0 ) {
         if ( !d->mItems.isEmpty() ) {
           setSelected( d->mItems.last() );
@@ -256,8 +256,8 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
   return TQScrollView::eventFilter( object, event );
 }
 
-KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name )
-  : TQWidget( parent, name )
+KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   mForegroundColor = KGlobalSettings::textColor();
   mBackgroundColor = KGlobalSettings::baseColor();
diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h
index 83c928f2..89586b89 100644
--- a/kitchensync/src/kwidgetlist.h
+++ b/kitchensync/src/kwidgetlist.h
@@ -26,12 +26,13 @@
 
 class KWidgetListItem;
 
-class KWidgetList : public QScrollView
+class KWidgetList : public TQScrollView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KWidgetList( TQWidget *parent = 0, const char *name = 0 );
+    KWidgetList( TQWidget *tqparent = 0, const char *name = 0 );
     ~KWidgetList();
 
     uint count() const;
@@ -66,10 +67,10 @@ class KWidgetList : public QScrollView
     Private *d;
 };
 
-class KWidgetListItem : public QWidget
+class KWidgetListItem : public TQWidget
 {
   public:
-    KWidgetListItem( KWidgetList *parent, const char *name = 0 );
+    KWidgetListItem( KWidgetList *tqparent, const char *name = 0 );
     ~KWidgetListItem();
 
     void setSelected( bool selected );
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index d04542f9..63c5c8f9 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -125,7 +125,7 @@ void MainWidget::addGroup()
 {
   bool ok;
   TQString name = KInputDialog::getText( i18n("Create Synchronization Group"),
-    i18n("Name for new synchronization group."), TQString::null, &ok, this );
+    i18n("Name for new synchronization group."), TQString(), &ok, this );
   if ( ok ) {
     SyncProcessManager::self()->addGroup( name );
     enableActions();
diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h
index acd35343..1378e1dc 100644
--- a/kitchensync/src/mainwidget.h
+++ b/kitchensync/src/mainwidget.h
@@ -36,9 +36,10 @@ namespace QSync {
 class Environment;
 }
 
-class KDE_EXPORT MainWidget : public QWidget
+class KDE_EXPORT MainWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 );
     ~MainWidget();
diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h
index 65322718..90cc1ff9 100644
--- a/kitchensync/src/mainwindow.h
+++ b/kitchensync/src/mainwindow.h
@@ -32,6 +32,7 @@ class MainWidget;
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     MainWindow();
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index 37755a50..7687e452 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member )
-  : TQWidget( parent ), mMember( member )
+MemberConfig::MemberConfig( TQWidget *tqparent, const QSync::Member &member )
+  : TQWidget( tqparent ), mMember( member )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
index c6457972..2e20e63e 100644
--- a/kitchensync/src/memberconfig.h
+++ b/kitchensync/src/memberconfig.h
@@ -27,12 +27,13 @@
 class TQTextEdit;
 class ConfigGui;
 
-class MemberConfig : public QWidget
+class MemberConfig : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    MemberConfig( TQWidget *parent, const QSync::Member & );
+    MemberConfig( TQWidget *tqparent, const QSync::Member & );
     ~MemberConfig();
 
     void loadData();
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
index 212e2e39..d8c672d6 100644
--- a/kitchensync/src/memberinfo.cpp
+++ b/kitchensync/src/memberinfo.cpp
@@ -95,5 +95,5 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName )
   if ( pluginName == "jescs-sync" ) return "www";
 
 
-  return TQString::null;
+  return TQString();
 }
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index e7c03761..35679392 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -33,8 +33,8 @@
 class ChangeItem : public KWidgetListItem
 {
   public:
-    ChangeItem( KWidgetList *parent, const QSync::SyncChange &change )
-      : KWidgetListItem( parent ),
+    ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change )
+      : KWidgetListItem( tqparent ),
         mChange( change )
     {
       TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
@@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem
     QSync::SyncChange mChange;
 };
 
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
-  : ConflictDialog( mapping, parent )
+MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
+  : ConflictDialog( mapping, tqparent )
 {
   initGUI();
 
diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
index a7dcfadd..fd0cdef5 100644
--- a/kitchensync/src/multiconflictdialog.h
+++ b/kitchensync/src/multiconflictdialog.h
@@ -28,9 +28,10 @@ class KWidgetList;
 class MultiConflictDialog : public ConflictDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
+    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
     ~MultiConflictDialog();
 
   private slots:
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 0e5c5c0c..217b32bc 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -37,9 +37,9 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
 K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
 
 KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
-                                  TQObject *parent, const char *name,
+                                  TQObject *tqparent, const char *name,
                                   const TQStringList& )
-  : KParts::ReadOnlyPart( parent, name )
+  : KParts::ReadOnlyPart( tqparent, name )
 {
   setInstance( KitchenSyncFactory::instance() );
 
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index d9e03a3f..82a64187 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -30,10 +30,11 @@ class KAboutData;
 class KitchenSyncPart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
-                     TQObject *parent, const char *name, const TQStringList& );
+                     TQObject *tqparent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
     static KAboutData *createAboutData();
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d8d6c46d..10f311f9 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -57,8 +57,8 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
 }
 
 
-PluginPicker::PluginPicker( TQWidget *parent )
-  : TQWidget( parent )
+PluginPicker::PluginPicker( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQBoxLayout *tqlayout = new TQVBoxLayout( this );
 
@@ -94,8 +94,8 @@ QSync::Plugin PluginPicker::selectedPlugin() const
 }
 
 
-PluginPickerDialog::PluginPickerDialog( TQWidget *parent )
-  : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel )
+PluginPickerDialog::PluginPickerDialog( TQWidget *tqparent )
+  : KDialogBase( tqparent, 0, true, i18n("Select Member Type"), Ok | Cancel )
 {
   TQFrame *topFrame = makeMainWidget();
 
@@ -114,9 +114,9 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const
   return mPicker->selectedPlugin();
 }
 
-QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent )
+QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *tqparent )
 {
-  PluginPickerDialog dlg( parent );
+  PluginPickerDialog dlg( tqparent );
   if ( dlg.exec() )
     return dlg.selectedPlugin();
   else
diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h
index 81b49161..fbaed3f2 100644
--- a/kitchensync/src/pluginpicker.h
+++ b/kitchensync/src/pluginpicker.h
@@ -39,12 +39,13 @@ class PluginItem : public KWidgetListItem
     QSync::Plugin mPlugin;
 };
 
-class PluginPicker : public QWidget
+class PluginPicker : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PluginPicker( TQWidget *parent );
+    PluginPicker( TQWidget *tqparent );
 
     QSync::Plugin selectedPlugin() const;
 
@@ -61,13 +62,14 @@ class PluginPicker : public QWidget
 class PluginPickerDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PluginPickerDialog( TQWidget *parent );
+    PluginPickerDialog( TQWidget *tqparent );
 
     QSync::Plugin selectedPlugin() const;
 
-    static QSync::Plugin getPlugin( TQWidget *parent );
+    static QSync::Plugin getPlugin( TQWidget *tqparent );
 
   protected slots:
     void slotOk();
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index f9228e17..c7040279 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -32,8 +32,8 @@
 
 #include "singleconflictdialog.h"
 
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
-  : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
+SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
+  : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 )
 {
   initGUI();
 
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
index 25ff4bd7..9c80f7fc 100644
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@@ -33,9 +33,10 @@ class HTMLDiffAlgoDisplay;
 class SingleConflictDialog : public ConflictDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
+    SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
     ~SingleConflictDialog();
 
   private slots:
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 924151bd..1a70f877 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -48,12 +48,12 @@ SyncProcess::~SyncProcess()
   mEngine = 0;
 }
 
-TQString SyncProcess::groupStatus() const
+TQString SyncProcess::grouptqStatus() const
 {
   return i18n( "Ready" );
 }
 
-TQString SyncProcess::memberStatus( const QSync::Member& ) const
+TQString SyncProcess::membertqStatus( const QSync::Member& ) const
 {
   return i18n( "Ready" );
 }
diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h
index ef23f7c5..31cbd50c 100644
--- a/kitchensync/src/syncprocess.h
+++ b/kitchensync/src/syncprocess.h
@@ -29,9 +29,10 @@ namespace QSync {
 class Engine;
 }
 
-class SyncProcess : public QObject
+class SyncProcess : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     SyncProcess( const QSync::Group &group );
@@ -40,8 +41,8 @@ class SyncProcess : public QObject
     QSync::Group group() const { return mGroup; }
     QSync::Engine* engine() const { return mEngine; }
 
-    TQString groupStatus() const;
-    TQString memberStatus( const QSync::Member &member ) const;
+    TQString grouptqStatus() const;
+    TQString membertqStatus( const QSync::Member &member ) const;
 
     QSync::Result addMember( const QSync::Plugin &plugin );
 
diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h
index b95018a8..f29d8a11 100644
--- a/kitchensync/src/syncprocessmanager.h
+++ b/kitchensync/src/syncprocessmanager.h
@@ -31,9 +31,10 @@ class Environment;
 
 class SyncProcess;
 
-class SyncProcessManager : public QObject
+class SyncProcessManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     static SyncProcessManager *self();
 
diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp
index b5f4890f..53f051f1 100644
--- a/kitchensync/src/xmldiffalgo.cpp
+++ b/kitchensync/src/xmldiffalgo.cpp
@@ -87,14 +87,14 @@ void XmlDiffAlgo::appendConflictNodes(TQDomElement &leftElement, TQDomElement &r
 
       TQString id = leftChild.tagName();
       if (id == "Content")
-        id = left.parentNode().nodeName();
+        id = left.tqparentNode().nodeName();
 
       conflictField( id, leftChild.text(), rightChild.text() );
 
-      left.parentNode().removeChild( left );
+      left.tqparentNode().removeChild( left );
       left = leftElement.firstChild();
 
-      right.parentNode().removeChild( right );
+      right.tqparentNode().removeChild( right );
       right = rightElement.firstChild();
 
     }
@@ -121,8 +121,8 @@ top:;
         compareNode( leftChild, rightChild );
 
         if ( !left.hasChildNodes() && !right.hasChildNodes() ) {
-          left.parentNode().removeChild( left );
-          right.parentNode().removeChild( right );
+          left.tqparentNode().removeChild( left );
+          right.tqparentNode().removeChild( right );
           goto top;
         }
 
@@ -133,13 +133,13 @@ top:;
         TQString id = leftChild.tagName();
 
         if ( id == "Content" )
-          id = left.parentNode().nodeName(); 
+          id = left.tqparentNode().nodeName(); 
  
 	if ( id != "Type" )
           //matchingField( id, leftChild.text(), rightChild.text() );
 
-        left.parentNode().removeChild( left );
-        right.parentNode().removeChild( right );
+        left.tqparentNode().removeChild( left );
+        right.tqparentNode().removeChild( right );
         goto top;
       }
     }
diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index e9c2eaa1..bd7c2908 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -184,7 +184,7 @@ please visit http://webcvs.kde.org
           Do the right thing when sending to "me@there (John Doe)"
           Waldo's folderless-acount-segv-fix
           More against destroyed last char in message
-          Better long/normal folder-list geometry bugfix
+          Better long/normal folder-list tqgeometry bugfix
           Don't quit while sending, and show a label while you send.
         
 1999-02-03  Sven Radej <radej@kde.org> (KMail-1.0.16)
@@ -245,7 +245,7 @@ please visit http://webcvs.kde.org
 
 1999-01-23  Stefan Taferner  <taferner@kde.org> (KMail-1.0.14)
 
-	* New feature: layout can now be switched between
+	* New feature: tqlayout can now be switched between
 	"long folder list" and "short folder list". Option
 	setable in settings->appearance.
 	
@@ -264,7 +264,7 @@ please visit http://webcvs.kde.org
 	Now it is possible to have more folders than the screen
 	is high and still select them in the filter dialog.
 	* Filter Dialog: changed folder combo box to (semi) auto
-	resize. Changed layout of dialog to better display all
+	resize. Changed tqlayout of dialog to better display all
 	elements. Also enabled vertical resizing of dialog.
 
 1999-01-17  Stefan Taferner  <taferner@kde.org> (KMail-1.0.12)
@@ -494,7 +494,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 	ignored.
 
 	* Finetuning: added missing pixmaps to makefile and
-	repainted pixmap for queued and sent messages.
+	tqrepainted pixmap for queued and sent messages.
 
 	* Composer: changed behaviour of email completion a bit.
 	Now it is possible to add multiple recipients with comma
@@ -553,7 +553,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 	quoted text to catch smileys at the beginning of the
 	line ;-)
 
-	* Main window configuration (geometry, etc.) is now
+	* Main window configuration (tqgeometry, etc.) is now
 	stored again.
 
 	* Composer: changed completion key from Ctrl-. to Ctrl-T
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 0b15ebfb..8f7a6503 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to
 function that want to use the identity reference. Store the UOID
 instead if you need to keep track of the identity. You may also want
 to connect to one of the KPIM::IdentityManager::changed() or ::deleted()
-signals, if you want to do special processing in case the identity
+Q_SIGNALS, if you want to do special processing in case the identity
 changes.
 
 Thus, in the ConfigureDialog, you will see non-const KPIM::Identity
@@ -271,13 +271,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are :
    folder manager. In dimap, both the headers and a copy of the full message
    are cached locally.
 4) KMFolderMgr *searchFolderMgr() - which returns the folder manager
-   for search folders (folders created by using the "find
+   for search folders (folders created by using the "tqfind
    messages" tool). Other email clients call this type of folder
    "virtual folders".
 
 FolderJob classes - These classes allow asynchronous operations on
 KMFolder's. You create a Job on the heap, connect to one of its 
-signals and wait for the job to finish. Folders serve as FolderJob
+Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob
 factories. For example, to retrieve the full message from a folder
 you do :
 
@@ -316,9 +316,9 @@ with questions...
 
    length := Q_UINT16 ; little endian (native?)
 
-   value := unicode-string-value / ulong-value
+   value := tqunicode-string-value / ulong-value
 
-   unicode-string-value := 0*256QChar ; network-byte-order
+   tqunicode-string-value := 0*256QChar ; network-byte-order
 
    ulong-value := unsigned_long ; little endian
 
@@ -334,7 +334,7 @@ Currently defined tag values are:
    IdMD5	 5	   u	msgIdMD5().stripWhiteSpace()
    XMark	 6	   u	xmark().stripWhiteSpace()
    Offset	 7	   l	folderOffset() (not only mbox!)
-   LegacyStatus	 8	   l	mLegacyStatus
+   LegacytqStatus	 8	   l	mLegacytqStatus
    Size		 9	   l	msgSize()
    Date		 10	   l	date()
    File		 11	   u	fileName() (not only maildir!)
@@ -342,9 +342,9 @@ Currently defined tag values are:
    MDNSent	 13	   l	mdnSentState()
    ReplyToAuxIdMD5 14	   u	replyToAuxIdMD5()
    StrippedSubject 15	   u	strippedSubjectMD5().stripWhiteSpace()
-   Status	   16	   l	status()
+   tqStatus	   16	   l	status()
 
-   u: unicode-string-value; l: ulong-value
+   u: tqunicode-string-value; l: ulong-value
 
 Proposed new (KDE 3.2 / KMail 1.6) entry format:
 
@@ -446,20 +446,20 @@ Currently defined tags are:
    MBoxOffset	     Offset(64) Offset in mbox file (pointing to From_)
    MBoxLength        Size(64)   Length of message in mbox file (incl. From_)
    Size		     Size(64)	rfc2822-size of message (in mbox: excl. From_)
-   Status	     BitField	(see below)
+   tqStatus	     BitField	(see below)
    MessageIdMD5	     MD5Hash	MD5Hash of _normalized_ Message-Id:
    MDNLink	     SerialNumber SerNum of MDN received for this message
    DNSLink	     SerialNumber SerNUm of DSN received for this message
    ThreadHeads	     SerialNumberList	MD5Hash's of all (so far discovered)
-					_top-level thread parents_
+					_top-level thread tqparents_
    ThreadParents     SerialNumberList	MD5Hash's of all (so far discovered)
-					thread parents
+					thread tqparents
 
 
    "String" is either Utf8String or (Utf16String or Latin1String),
 	    depending on content
 
-Currently allocated bits for the Status BitField are:
+Currently allocated bits for the tqStatus BitField are:
 
     Bit              Value: on(/off) (\\imapflag)
 
@@ -527,7 +527,7 @@ class SortCacheItem:
   folder) messages is cached on disk in a file named .$FOLDER.index.sorted 
   so if, for example the name of a folder is foo, the associated sorting 
   cache file would be called ".foo.index.sorted".
-  For each message, its serial number, that of its parent, the length of its
+  For each message, its serial number, that of its tqparent, the length of its
   sorting key, and the key itself are written to this file. At the start of
   the file several per folder counts and flags are cached additionally,
   immediately after a short file headers. The entries from the start of the
@@ -544,13 +544,13 @@ class SortCacheItem:
 
 What is used for figuring out threading?
   - messages can have an In-Reply-To header that contains the message id of
-    another message. This is called a perfect parent.
+    another message. This is called a perfect tqparent.
   - additionally there is the References header which, if present, holds a 
     list of message ids that the current message is a follow up to. We
     currently use the second to last entry in that list only. See further 
     down for the reasoning behind that.
   - If the above two fail and the message is prefixed (Re: foo, Fwd: foo etc.)
-    an attempt is made to find a parent by looking for messages with the same
+    an attempt is made to find a tqparent by looking for messages with the same
     subject. How that is done is explained below as well.
   
   For all these comparisons of header contents, the md5 hashes of the headers
@@ -578,27 +578,27 @@ Strategy:
   has been moved away in the meantime (possibly by outside forces such as
   other clients) and a deleted counter is incremented and all further
   processing stopped for this message.
-  The messages parent serial number, as read from the sorted file is then
-  used to look up the parent and reset it to -1 should it not be in the 
+  The messages tqparent serial number, as read from the sorted file is then
+  used to look up the tqparent and reset it to -1 should it not be in the 
   current folder anymore. -1 and -2 are special values that can show up
-  as parent serial numbers and are used to encode the following:
-  -1 means this message has no perfect parent, a parent for it needs to
+  as tqparent serial numbers and are used to encode the following:
+  -1 means this message has no perfect tqparent, a tqparent for it needs to
   be found from among the other messages, if there is a suitable one
   -2 means this message is top level and will forever stay so, no need
-  to even try to find a parent. This is also used for the non-threaded
+  to even try to find a tqparent. This is also used for the non-threaded
   case. These are messages that have neither an In-Reply-To header nor
   a References header and have a subject that is not prefixed.
-  In case there is a perfect parent, the current sort cache item is
-  appended to the parents list of unsorted children, or to that of
+  In case there is a perfect tqparent, the current sort cache item is
+  appended to the tqparents list of unsorted tqchildren, or to that of
   root, if there is not. A sort cache item is created in the mSortCache
-  for the parent, if it is not already there. Messages with a parent of
-  -1 are appended to the "unparented" list, which is later traversed and
-  its elements threaded. Messages with -2 as the parent are children of
+  for the tqparent, if it is not already there. Messages with a tqparent of
+  -1 are appended to the "untqparented" list, which is later traversed and
+  its elements threaded. Messages with -2 as the tqparent are tqchildren of
   root as well, as noted above, and will remain so. 
 
   Once the end of the file is reached, we should have a nicely filled 
   mSortCache, containing a sort cache item for each message that was in the 
-  sorted file. Messages with perfect parents know about them, top level 
+  sorted file. Messages with perfect tqparents know about them, top level 
   messages know about that as well, all others are on a list and will be
   threaded later.
 
@@ -608,16 +608,16 @@ Strategy:
   to mFolder->count() are looked at and a SortCacheItem is created for the
   ones that do not have one yet. This is where all sort cache items are created
   if there was no sorted file. The items created here are by definition un-
-  sorted as well as unparented. On creation their sort key is figured out as
+  sorted as well as untqparented. On creation their sort key is figured out as
   well.
 
-  The next step is finding parents for those messages that are either new, or
-  had a parent of -1 in the .sorted file. To that end, a dict of all sort
+  The next step is finding tqparents for those messages that are either new, or
+  had a tqparent of -1 in the .sorted file. To that end, a dict of all sort
   cache items indexed by the md5 hash of their messsage id headers is created,
   that will be used for looking up sort cache items by message id. The list of
-  yet unparented messages is then traversed and findParent() called for each 
+  yet untqparented messages is then traversed and findParent() called for each 
   element wihch checks In-Reply-To and References headers and looks up the 
-  sort cache item of those parents in the above mentioned dict. Should none be
+  sort cache item of those tqparents in the above mentioned dict. Should none be
   found, the item is added to a second list the items of which will be subject
   threaded. 
   
@@ -638,7 +638,7 @@ Strategy:
 
   - since the above is a common special case, it is worth trying. I think. ;)
 
-  If the parent found is perfect (In-Reply-To), the sort cache items is marked
+  If the tqparent found is perfect (In-Reply-To), the sort cache items is marked
   as such. mIsImperfectlyThreaded is used for that purposer, we will soon see
   why that flag is needed.
 
@@ -646,30 +646,30 @@ Strategy:
   the messages that are now top-level, the current thread heads, so to speak, 
   are collected into a second dict ( QDict< QPtrList< SortCacheItem > > )
   that contains for each different subject an entry holding a list of (so far
-  top level) messages with that subject, that are potential parents for 
-  threading by subjects. These lists are sorted by date, so the parent closest
+  top level) messages with that subject, that are potential tqparents for 
+  threading by subjects. These lists are sorted by date, so the tqparent closest
   by date can be chosen. Sorting of these lists happens via insertion sort 
   while they are built because not only are they expected to be short (apart
   from hard corner cases such as cvs commit lists, for which subject threading 
   makes little sense anyhow and where it should be turned off), but also since
   the messages should be roughly pre sorted by date in the store already. 
   Some cursory benchmarking supports that assumption. 
-  If now a parent is needed for a message with a certain subject, the list of
+  If now a tqparent is needed for a message with a certain subject, the list of
   top level messages with that subject is traversed and the first one that is
-  older than our message is chosen as it's parent. Parents more than six weeks
+  older than our message is chosen as it's tqparent. Parents more than six weeks
   older than the message are not accepted. The reasoning being that if a new
   message with the same subject turns up after such a long time, the chances
   that it is still part of the same thread are slim. The value of six weeks
   is chosen as a result of a poll conducted on #kde-devel, so it's probably
   bogus. :) All of this happens in the aptly named: findParentBySubject().
 
-  Everthing that still has no parent after this ends up at toplevel, no further
+  Everthing that still has no tqparent after this ends up at toplevel, no further
   attemp is made at finding one. If you are reading this because you want to
   implement threading by body search or somesuch, please go away, I don't like
   you. :)
 
   Ok, so far we have only operated on sort cache items, nothing ui wise has
-  happened yet. Now that we have established the parent/child relations of all
+  happened yet. Now that we have established the tqparent/child relations of all
   messages, it's time to create HeaderItems for them for use in the header
   list. But wait, you say, what about sorting? Wouldn't it make sense to do
   that first? Exactly, you're a clever bugger, ey? Here, have a cookie. ;)
@@ -677,13 +677,13 @@ Strategy:
   cache items happen at the same time. 
   
   As previously mentioned (or not) each sort cache item holds a list of its
-  sorted and one of its unsorted children. Starting with the root node the
+  sorted and one of its unsorted tqchildren. Starting with the root node the
   unsorted list is first qsorted, and then merged with the list of already
-  sorted children. To achieve that, the heads of both lists are compared and
+  sorted tqchildren. To achieve that, the heads of both lists are compared and
   the one with the "better" key is added to the list view next by creating a
   KMHeaderListItem for it. That header item receives both its sort key as well
   as its id from the sort cache item. Should the current sort cache item have
-  children, it is added to the end of a queue of nodes to repeat these steps
+  tqchildren, it is added to the end of a queue of nodes to repeat these steps
   on after the current level is sorted. This way, a breadth first merge sort
   is performed on the sort cache items and header items are created at each
   node.
@@ -706,16 +706,16 @@ What happens when a message arrives in the folder?
   structures described above are updated accordingly. If threading is enabled,
   the new message is threaded using the same findParent and findParentBySubject
   methods used on folder open. If the message ends up in a watched or ignored
-  thread, those status bits are inherited from the parent. The message is also
+  thread, those status bits are inherited from the tqparent. The message is also
   added to the dict of header items, the index of messages by message id and,
   if applicable and if the message is threaded at top level, to the list of
-  potential parents for subject threading. 
+  potential tqparents for subject threading. 
 
   After those house keeping tasks are performed, the list of as of yet imper-
   fectly threaded messages is traversed and our newly arrived message is 
-  considered as a new parent for each item on it. This is especially important
-  to ensure that parents arriving out of order after their children still end
-  up as parents. If necessary, the entries in the .sorted file of rethreaded
+  considered as a new tqparent for each item on it. This is especially important
+  to ensure that tqparents arriving out of order after their tqchildren still end
+  up as tqparents. If necessary, the entries in the .sorted file of rethreaded
   messages are updated. An entry for the new message itself is appended to the
   .sorted file as well.
 
@@ -732,10 +732,10 @@ What happens when a message is removed from the folder?
   In this case the msgRemoved slot kicks in and updates the headers list. First
   the sort cache item and header item representing our message are removed from
   the data structures and the ids of all items after it in the store decre-
-  mented. Then a list of children of the message is assembled containing those
-  children that have to be reparented now that our message has gone away. If 
-  one of those children has been marked as toBeDeleted, it is simply added to 
-  root at top level, because there is no need to find a parent for it if it is
+  mented. Then a list of tqchildren of the message is assembled containing those
+  tqchildren that have to be reparented now that our message has gone away. If 
+  one of those tqchildren has been marked as toBeDeleted, it is simply added to 
+  root at top level, because there is no need to find a tqparent for it if it is
   to go away as well. This is an optimization to avoid rethreading  all 
   messages in a thread when deleting several messages in a thread, or even the
   whole thread. The KMMoveCommand marks all messages that will be moved out of
@@ -743,7 +743,7 @@ What happens when a message is removed from the folder?
   can be avoided. Note that that does not work when moving messages via filter
   action. 
 
-  That list of children is then traversed and a new parent found for each one
+  That list of tqchildren is then traversed and a new tqparent found for each one
   using, again, findParent and findParentBySubject. When a message becomes
   imperfectly threaded in the process, it is added to the corresponding list.
 
@@ -859,7 +859,7 @@ public:
     QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) );
   }
 
-private slots:
+private Q_SLOTS:
   void slotTimeout() { notify(): }
 
 private:
diff --git a/kmail/TODO b/kmail/TODO
index cf5792a1..e16a9116 100644
--- a/kmail/TODO
+++ b/kmail/TODO
@@ -29,7 +29,7 @@ DS: Zero-copy downloading from pop server
 DS: Set color action
 DS: XML GUI context menus to support KMail plugins
 DS: IMAP body searching
-??: Dock Windows
+??: TQt::Dock Windows
 
 Groupware:
 KHZ: Make groupware use a real vCal parser
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 19d25574..0fa29906 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement
+    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
     { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
     { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
     { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
@@ -175,7 +175,7 @@ namespace KMail {
       "heiko@ist.eigentlich.net", 0 },
     { "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801)
     { "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages)
-    { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search
+    { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search
     { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
     { "Martin Koller", 0, 0, 0 }, // optional columns in the message list
     { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index b7c82f11..513f9483 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index c89ed360..252a49c8 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -34,8 +34,8 @@
 
 using namespace KMail;
 
-AccountComboBox::AccountComboBox( TQWidget* parent, const char* name )
-  : TQComboBox( parent, name )
+AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name )
+  : TQComboBox( tqparent, name )
 {
   connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
            this, TQT_SLOT( slotRefreshAccounts() ) );
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 9229cb33..04a8bc07 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -39,12 +39,13 @@ namespace KMail {
  * WARNING: this widget is hardcoded to only display disconnected imap
  * accounts, in this branch.
  */
-class AccountComboBox : public QComboBox
+class AccountComboBox : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  AccountComboBox( TQWidget* parent, const char* name = 0 );
+  AccountComboBox( TQWidget* tqparent, const char* name = 0 );
 
   void setCurrentAccount( KMAccount* account );
   KMAccount* currentAccount() const;
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 51c72977..4dab221b 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -85,7 +85,7 @@ namespace KMail {
 class ProcmailRCParser
 {
 public:
-  ProcmailRCParser(TQString fileName = TQString::null);
+  ProcmailRCParser(TQString fileName = TQString());
   ~ProcmailRCParser();
 
   TQStringList getLockFilesList() const { return mLockFiles; }
@@ -133,7 +133,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
 
       int commentPos = -1;
 
-      if( (commentPos = s.find('#')) > -1 ) {
+      if( (commentPos = s.tqfind('#')) > -1 ) {
         // get rid of trailing comment
         s.truncate(commentPos);
         s = s.stripWhiteSpace();
@@ -143,7 +143,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
         processGlobalLock(s);
       } else if( lockFileLocal.search(s) != -1 ) {
         processLocalLock(s);
-      } else if( int i = s.find('=') ) {
+      } else if( int i = s.tqfind('=') ) {
         processVariableSetting(s,i);
       }
     }
@@ -172,7 +172,7 @@ ProcmailRCParser::~ProcmailRCParser()
 void
 ProcmailRCParser::processGlobalLock(const TQString &s)
 {
-  TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
+  TQString val = expandVars(s.mid(s.tqfind('=') + 1).stripWhiteSpace());
   if ( !mLockFiles.tqcontains(val) )
     mLockFiles << val;
 }
@@ -190,7 +190,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       // user specified a lockfile, so process it
       //
       val = expandVars(val);
-      if( val[0] != '/' && mVars.find("MAILDIR") )
+      if( val[0] != '/' && mVars.tqfind("MAILDIR") )
         val.insert(0, *(mVars["MAILDIR"]) + '/');
     } // else we'll deduce the lockfile name one we
     // get the spoolfile name
@@ -211,7 +211,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
     line = expandVars(line);
 
     // prepend default MAILDIR if needed
-    if( line[0] != '/' && mVars.find("MAILDIR") )
+    if( line[0] != '/' && mVars.tqfind("MAILDIR") )
       line.insert(0, *(mVars["MAILDIR"]) + '/');
 
     // now we have the spoolfile name
@@ -224,7 +224,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       val = line;
 
       // append lock extension
-      if( mVars.find("LOCKEXT") )
+      if( mVars.tqfind("LOCKEXT") )
         val += *(mVars["LOCKEXT"]);
       else
         val += ".lock";
@@ -248,7 +248,7 @@ ProcmailRCParser::processVariableSetting(const TQString &s, int eqPos)
   mVars.insert(varName.latin1(), new TQString(varValue));
 }
 
-QString
+TQString
 ProcmailRCParser::expandVars(const TQString &s)
 {
   if( s.isEmpty()) return s;
@@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s)
 
 
 AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
-			      TQWidget *parent, const char *name, bool modal )
-  : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
+			      TQWidget *tqparent, const char *name, bool modal )
+  : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
     mAccount( account ),
     mServerTest( 0 ),
     mCurCapa( AllCapa ),
@@ -357,11 +357,11 @@ void AccountDialog::makeLocalAccountPage()
   topLayout->addWidget( choose, 3, 2 );
 
   TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
-  group->setColumnLayout(0, Qt::Horizontal);
+  group->setColumnLayout(0, TQt::Horizontal);
   group->tqlayout()->setSpacing( 0 );
   group->tqlayout()->setMargin( 0 );
   TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  groupLayout->tqsetAlignment( TQt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage()
 
   vlay->addSpacing( KDialog::spacingHint() );
 
-  mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Encryption"), page2 );
   mPop.encryptionNone =
     new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
@@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage()
     TQT_SLOT(slotPopEncryptionChanged(int)));
   vlay->addWidget( mPop.encryptionGroup );
 
-  mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Authentication Method"), page2 );
   mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup,
                                     "auth clear text" );
@@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
 
   vlay->addSpacing( KDialog::spacingHint() );
 
-  mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Encryption"), page2 );
   mImap.encryptionNone =
     new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
@@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
     TQT_SLOT(slotImapEncryptionChanged(int)));
   vlay->addWidget( mImap.encryptionGroup );
 
-  mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Authentication Method"), page2 );
   mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup );
   mImap.authLogin = new TQRadioButton( i18n("Please translate this "
@@ -1490,7 +1490,7 @@ void AccountDialog::slotPipeliningClicked()
       "Supports\" button at the bottom of the dialog;\n"
       "if your server does not announce it, but you want more speed, then "
       "you should do some testing first by sending yourself a batch "
-      "of mail and downloading it."), TQString::null,
+      "of mail and downloading it."), TQString(),
       "pipelining");
 }
 
@@ -1764,7 +1764,7 @@ void AccountDialog::checkHighest( TQButtonGroup *btnGroup )
 {
   kdDebug(5006) << "checkHighest( " << btnGroup << " )" << endl;
   for ( int i = btnGroup->count() - 1; i >= 0 ; --i ) {
-    TQButton * btn = btnGroup->find( i );
+    TQButton * btn = btnGroup->tqfind( i );
     if ( btn && btn->isEnabled() ) {
       btn->animateClick();
       return;
@@ -1972,7 +1972,7 @@ void AccountDialog::saveSettings()
   // get the new account and register the new destination folder
   // this is the target folder for local or pop accounts and the root folder
   // of the account for (d)imap
-  KMAccount* newAcct = kmkernel->acctMgr()->find(mAccount->id());
+  KMAccount* newAcct = kmkernel->acctMgr()->tqfind(mAccount->id());
   if (newAcct)
   {
     if( accountType == "local" ) {
@@ -1994,7 +1994,7 @@ void AccountDialog::slotLocationChooser()
 {
   static TQString directory( "/" );
 
-  KFileDialog dialog( directory, TQString::null, this, 0, true );
+  KFileDialog dialog( directory, TQString(), this, 0, true );
   dialog.setCaption( i18n("Choose Location") );
 
   bool result = dialog.exec();
@@ -2117,8 +2117,8 @@ void AccountDialog::slotReloadNamespaces()
   {
     initAccountForConnect();
     mImap.personalNS->setText( i18n("Fetching Namespaces...") );
-    mImap.otherUsersNS->setText( TQString::null );
-    mImap.sharedNS->setText( TQString::null );
+    mImap.otherUsersNS->setText( TQString() );
+    mImap.sharedNS->setText( TQString() );
     ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount );
     connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
         this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
@@ -2136,16 +2136,16 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& )
         this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
     disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ),
           this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
-    mImap.personalNS->setText( TQString::null );
+    mImap.personalNS->setText( TQString() );
   }
 }
 
 void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map )
 {
   disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
-  mImap.personalNS->setText( TQString::null );
-  mImap.otherUsersNS->setText( TQString::null );
-  mImap.sharedNS->setText( TQString::null );
+  mImap.personalNS->setText( TQString() );
+  mImap.otherUsersNS->setText( TQString() );
+  mImap.sharedNS->setText( TQString() );
   mImap.nsMap = map;
 
   ImapAccountBase::namespaceDelim ns = map[ImapAccountBase::PersonalNS];
@@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace()
   }
 }
 
-NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent )
-  : KLineEdit( parent )
+NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent )
+  : KLineEdit( tqparent )
 {
 }
 
@@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text )
   KLineEdit::setText( text );
 }
 
-NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
+NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
     ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map )
-  : KDialogBase( parent, "edit_namespace", false, TQString::null,
+  : KDialogBase( tqparent, "edit_namespace", false, TQString(),
       Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map )
 {
   TQVBox *page = makeVBoxMainWidget();
@@ -2298,7 +2298,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
 
   mBg = new TQButtonGroup( 0 );
   connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) );
-  mDelimMap = mNamespaceMap->find( mType ).data();
+  mDelimMap = mNamespaceMap->tqfind( mType ).data();
   ImapAccountBase::namespaceDelim::Iterator it;
   for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) {
     NamespaceLineEdit* edit = new NamespaceLineEdit( grid );
@@ -2325,9 +2325,9 @@ void NamespaceEditDialog::slotRemoveEntry( int id )
     mLineEditMap.remove( id );
     delete edit;
   }
-  if ( mBg->find( id ) ) {
+  if ( mBg->tqfind( id ) ) {
     // delete the button
-    delete mBg->find( id );
+    delete mBg->tqfind( id );
   }
   adjustSize();
 }
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 085e40d9..060b576a 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -55,10 +55,11 @@ class FolderRequester;
 class AccountDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AccountDialog( const TQString & caption, KMAccount *account,
-		   TQWidget *parent=0, const char *name=0, bool modal=true );
+		   TQWidget *tqparent=0, const char *name=0, bool modal=true );
     virtual ~AccountDialog();
   private:
     struct LocalWidgets
@@ -302,9 +303,10 @@ class AccountDialog : public KDialogBase
 class NamespaceLineEdit: public KLineEdit
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NamespaceLineEdit( TQWidget* parent );
+    NamespaceLineEdit( TQWidget* tqparent );
 
     const TQString& lastText() { return mLastText; }
 
@@ -318,9 +320,10 @@ class NamespaceLineEdit: public KLineEdit
 class NamespaceEditDialog: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,
+    NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type,
         ImapAccountBase::nsDelimMap* map );
 
   protected slots:
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 5484c66d..d62280fd 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -149,13 +149,13 @@ void AccountManager::processNextCheck( bool _newMail )
     kdDebug(5006) << "account " << acct->name() << " finished check" << endl;
     mAcctChecking.remove( acct );
     kmkernel->filterMgr()->deref();
-    disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+    disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                       this, TQT_SLOT( processNextCheck( bool ) ) );
   }
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+      KPIM::BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -219,10 +219,10 @@ void AccountManager::processNextCheck( bool _newMail )
     }
   }
 
-  connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+  connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcasStatus::instance()->seStatusMsg(
+  KPIM::BroadcastqStatus::instance()->seStatusMsg(
       i18n("Checking account %1 for new mail").arg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
@@ -293,7 +293,7 @@ KMAccount* AccountManager::findByName(const TQString &aName) const
 
 
 //-----------------------------------------------------------------------------
-KMAccount* AccountManager::find( const uint id ) const
+KMAccount* AccountManager::tqfind( const uint id ) const
 {
   if (id == 0) return 0;
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
@@ -397,7 +397,7 @@ void AccountManager::addToTotalNewMailCount( const TQMap<TQString, int> & newInF
   for ( TQMap<TQString, int>::const_iterator it = newInFolder.begin();
         it != newInFolder.end(); ++it ) {
     mTotalNewMailsArrived += it.data();
-    if ( mTotalNewInFolder.find( it.key() ) == mTotalNewInFolder.end() )
+    if ( mTotalNewInFolder.tqfind( it.key() ) == mTotalNewInFolder.end() )
       mTotalNewInFolder[it.key()] = it.data();
     else
       mTotalNewInFolder[it.key()] += it.data();
@@ -417,7 +417,7 @@ uint AccountManager::createId()
   do
   {
     newId = kapp->random();
-  } while ( usedIds.find(newId) != usedIds.end() );
+  } while ( usedIds.tqfind(newId) != usedIds.end() );
 
   return newId;
 }
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index f693180f..c88aab92 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -32,9 +32,10 @@ namespace KMail {
  * The account manager is responsible for creating accounts of various types
  * via the factory method create() and for keeping track of them.
  */
-class KDE_EXPORT AccountManager: public QObject
+class KDE_EXPORT AccountManager: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMAccount;
 
 public:
@@ -52,7 +53,7 @@ public:
   /** Create a new account of given type with given name. Currently
    the types "local" for local mail folders and "pop" are supported. */
   KMAccount* create( const TQString& type,
-                             const TQString& name = TQString::null,
+                             const TQString& name = TQString(),
                              uint id = 0);
 
   /** Adds an account to the list of accounts */
@@ -64,7 +65,7 @@ public:
 
   /** Find account by id. Returns 0 if account does not exist.
    */
-  KMAccount* find( const uint id ) const;
+  KMAccount* tqfind( const uint id ) const;
 
   /** Physically remove account. Also deletes the given account object !
       Returns FALSE and does nothing if the account cannot be removed. */
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 0dfb503d..e4e8b833 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox
   public:
     enum Type { Local, POP3, IMAP, dIMAP, Maildir };
 
-    AccountTypeBox( TQWidget *parent )
-      : KListBox( parent, "AccountTypeBox" )
+    AccountTypeBox( TQWidget *tqparent )
+      : KListBox( tqparent, "AccountTypeBox" )
     {
       mTypeList << i18n( "Local mailbox" );
       mTypeList << i18n( "POP3" );
@@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox
     TQStringList mTypeList;
 };
 
-AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
-  : KWizard( parent, "KWizard" ), mKernel( kernel ),
+AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
+  : KWizard( tqparent, "KWizard" ), mKernel( kernel ),
     mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 )
 {
   setupWelcomePage();
@@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
   setupServerInformationPage();
 }
 
-void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
+void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent )
 {
   KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
 
   if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
-    AccountWizard wizard( kernel, parent );
+    AccountWizard wizard( kernel, tqparent );
     int result = wizard.exec();
     if ( result == TQDialog::Accepted ) {
       wizardConfig.writeEntry( "ShowOnStartup", false );
@@ -153,7 +153,7 @@ void AccountWizard::showPage( TQWidget *page )
     if ( mLoginName->text().isEmpty() ) {
       // try to extract login from email address
       TQString email = mEMailAddress->text();
-      int pos = email.find( '@' );
+      int pos = email.tqfind( '@' );
       if ( pos != -1 )
         mLoginName->setText( email.left( pos ) );
 
@@ -329,7 +329,7 @@ TQString AccountWizard::accountName() const
   TQString name( i18n( "None" ) );
 
   TQString email = mEMailAddress->text();
-  int pos = email.find( '@' );
+  int pos = email.tqfind( '@' );
   if ( pos != -1 ) {
     name = email.mid( pos + 1 );
     name[ 0 ] = name[ 0 ].upper();
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 51e19b10..6a05fc65 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -45,6 +45,7 @@ class KMTransportInfo;
 class AccountWizard : public KWizard
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -52,9 +53,9 @@ class AccountWizard : public KWizard
       run successfully before.
 
       @param kernel The mail kernel the wizard should work on.
-      @param parent The parent widget of the dialog.
+      @param tqparent The tqparent widget of the dialog.
      */
-    static void start( KMKernel *kernel, TQWidget *parent = 0 );
+    static void start( KMKernel *kernel, TQWidget *tqparent = 0 );
 
     /**
       Reimplemented
@@ -62,7 +63,7 @@ class AccountWizard : public KWizard
     void showPage( TQWidget *page );
 
   protected:
-    AccountWizard( KMKernel *kernel, TQWidget *parent );
+    AccountWizard( KMKernel *kernel, TQWidget *tqparent );
     ~AccountWizard() {};
 
     void setupWelcomePage();
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 9926cc46..33a7e583 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -198,7 +198,7 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray
 void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str )
 {
   // Parse the result
-  m_permissions = IMAPRightsToPermission( str, url(), TQString::null );
+  m_permissions = IMAPRightsToPermission( str, url(), TQString() );
 }
 
 ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId,
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index d6a9b245..d548c621 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -39,7 +39,7 @@ namespace KMail {
 
   /// One entry in the ACL list: user and permissions
   struct ACLListEntry {
-    ACLListEntry() {} // for QValueVector
+    ACLListEntry() {} // for TQValueVector
     ACLListEntry( const TQString& u, const TQString& irl, int p )
       : userId( u ), internalRightsList( irl ), permissions( p ), changed( false ) {}
     TQString userId;
@@ -51,7 +51,7 @@ namespace KMail {
   typedef TQValueVector<ACLListEntry> ACLList;
 
 /**
- * This namespace tqcontains functions that return jobs for ACL operations.
+ * This namespace contains functions that return jobs for ACL operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the class into a namespace
@@ -108,6 +108,7 @@ namespace ACLJobs {
   class GetACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GetACLJob( const KURL& url, const TQByteArray &packedArgs,
                bool showProgressInfo );
@@ -124,6 +125,7 @@ namespace ACLJobs {
   class GetUserRightsJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
                       bool showProgressInfo );
@@ -140,6 +142,7 @@ namespace ACLJobs {
   class DeleteACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     DeleteACLJob( const KURL& url, const TQString& userId,
                   const TQByteArray &packedArgs,
@@ -154,6 +157,7 @@ namespace ACLJobs {
   /// Set and delete a list of permissions for different users on a given url
   class MultiSetACLJob : public KIO::Job {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 6975b3fc..77685ee4 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage()
   } else if (msg) {
     fetchTimeOutTime = TQTime::currentTime();
     fetchTimeOutTimer->start( 60 * 1000, true );
-    FolderJob *job = msg->parent()->createJob( msg );
+    FolderJob *job = msg->tqparent()->createJob( msg );
     connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
 	     TQT_SLOT(messageFetched( KMMessage* )) );
     lastJob = job;
@@ -454,15 +454,15 @@ void ActionScheduler::messageFetched( KMMessage *msg )
     serNumS.setNum( msg->getMsgSerNum() );
     KMMessage *newMsg = new KMMessage;
     newMsg->fromString(msg->asString());
-    newMsg->seStatus(msg->status());
+    newMsg->setqStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
   } else {
     fetchMessageTimer->start( 0, true );
   }
-  if (mFetchUnget && msg->parent())
-    msg->parent()->unGetMsg( msg->parent()->find( msg ));
+  if (mFetchUnget && msg->tqparent())
+    msg->tqparent()->unGetMsg( msg->tqparent()->tqfind( msg ));
   return;
 }
 
@@ -562,7 +562,7 @@ void ActionScheduler::processMessage()
     return;
   }
   if (msg) {
-    FolderJob *job = msg->parent()->createJob( msg );
+    FolderJob *job = msg->tqparent()->createJob( msg );
     connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
 	     TQT_SLOT(messageRetrieved( KMMessage* )) );
     job->start();
@@ -665,9 +665,9 @@ void ActionScheduler::moveMessage()
   if (mOriginalSerNum)
     orgMsg = message( mOriginalSerNum );
   mResult = mOldReturnCode; // ignore errors in deleting original message
-  if (!orgMsg || !orgMsg->parent()) {
+  if (!orgMsg || !orgMsg->tqparent()) {
     // Original message is gone, no point filtering it anymore
-    mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
+    mSrcFolder->removeMsg( mSrcFolder->tqfind( msg ) );
     kdDebug(5006) << "The original serial number is missing. "
                   << "Cannot complete the filtering." << endl;
     mExecutingLock = false;
@@ -675,12 +675,12 @@ void ActionScheduler::moveMessage()
     return;
   } else {
     if (!folder) // no filter folder specified leave in current place
-      folder = orgMsg->parent();
+      folder = orgMsg->tqparent();
   }
 
   mIgnore = true;
-  assert( msg->parent() == mSrcFolder.operator->() );
-  mSrcFolder->take( mSrcFolder->find( msg ) );
+  assert( msg->tqparent() == mSrcFolder.operator->() );
+  mSrcFolder->take( mSrcFolder->tqfind( msg ) );
   mSrcFolder->addMsg( msg );
   mIgnore = false;
 
@@ -719,7 +719,7 @@ void ActionScheduler::moveMessageFinished( KMCommand *command )
 
   mResult = mOldReturnCode; // ignore errors in deleting original message
   KMCommand *cmd = 0;
-  if (msg && msg->parent()) {
+  if (msg && msg->tqparent()) {
     cmd = new KMMoveCommand( 0, msg );
 //    cmd->start(); // Note: sensitive logic here.
   }
@@ -787,10 +787,10 @@ TQString ActionScheduler::debug()
     int i = 1;
     for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) {
 	res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) );
-	if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) {
+	if ((*it)->mAccount && kmkernel->tqfind( (*it)->mAccountId )) {
 	    res.append( TQString( "Account %1, Name %2.\n" )
 			.arg( (*it)->mAccountId )
-			.arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
+			.arg( kmkernel->acctMgr()->tqfind( (*it)->mAccountId )->name() ) );
 	}
 	res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) );
 	res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) );
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 3c989450..797b9963 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,9 +46,10 @@ class KMHeaders;
 namespace KMail {
 
 /* A class for asynchronous filtering of messages */
-class ActionScheduler : public QObject
+class ActionScheduler : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum ReturnCode { ResultOk, ResultError, ResultCriticalError };
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 4e5dc201..6fb6645e 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index df3da1ad..c700a4b4 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -39,7 +39,7 @@ namespace KMail {
 
 /// One entry in the annotation list: attribute name and attribute value
 struct AnnotationAttribute {
-  AnnotationAttribute() {} // for QValueVector
+  AnnotationAttribute() {} // for TQValueVector
   AnnotationAttribute( const TQString& e, const TQString& n, const TQString& v )
     : entry( e ), name( n ), value( v ) {}
   TQString entry; // e.g. /comment
@@ -50,7 +50,7 @@ struct AnnotationAttribute {
 typedef TQValueVector<AnnotationAttribute> AnnotationList;
 
 /**
- * This namespace tqcontains functions that return jobs for annotation operations.
+ * This namespace contains functions that return jobs for annotation operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
@@ -108,6 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
 class GetAnnotationJob : public KIO::SimpleJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
                     bool showProgressInfo );
@@ -125,6 +126,7 @@ private:
 class MultiGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
@@ -148,6 +150,7 @@ private:
 class MultiUrlGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
@@ -172,6 +175,7 @@ private:
 class MultiSetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 9a5b4a23..384752c2 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -89,7 +89,7 @@ const SpamAgents AntiSpamConfig::uniqueAgents() const
     SpamAgents::ConstIterator end( mAgents.end() );
     for ( ; it != end ; ++it ) {
         const TQString agent( ( *it ).name() );
-        if ( seenAgents.find( agent ) == seenAgents.end() ) {
+        if ( seenAgents.tqfind( agent ) == seenAgents.end() ) {
             agents.append( *it );
             seenAgents.append( agent );
         }
diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h
index e2aa2eca..9c344993 100644
--- a/kmail/antispamconfig.h
+++ b/kmail/antispamconfig.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 15b3e7f7..af32ec48 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -57,8 +57,8 @@
 using namespace KMail;
 
 AntiSpamWizard::AntiSpamWizard( WizardMode mode,
-                                TQWidget* parent, KMFolderTree * mainFolderTree )
-  : KWizard( parent ),
+                                TQWidget* tqparent, KMFolderTree * mainFolderTree )
+  : KWizard( tqparent ),
     mInfoPage( 0 ),
     mSpamRulesPage( 0 ),
     mVirusRulesPage( 0 ),
@@ -150,7 +150,7 @@ void AntiSpamWizard::accept()
 
   KMFilterActionDict dict;
   TQValueList<KMFilter*> filterList;
-  bool tqreplaceExistingFilters = false;
+  bool replaceExistingFilters = false;
 
   // Let's start with virus detection and handling,
   // so we can avoid spam checks for viral messages
@@ -227,10 +227,10 @@ void AntiSpamWizard::accept()
     }
   }
   else { // AntiSpam mode
-    // TODO Existing filters with same name are tqreplaced. This is hardcoded
-    // ATM and needs to be tqreplaced with a value from a (still missing)
-    // checkbox in the GUI. At least, the tqreplacement is announced in the GUI.
-    tqreplaceExistingFilters = true;
+    // TODO Existing filters with same name are replaced. This is hardcoded
+    // ATM and needs to be replaced with a value from a (still missing)
+    // checkbox in the GUI. At least, the replacement is announced in the GUI.
+    replaceExistingFilters = true;
     for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
@@ -245,7 +245,7 @@ void AntiSpamWizard::accept()
         pipeFilterAction->argsFromString( (*it).getDetectCmd() );
         pipeFilterActions->append( pipeFilterAction );
         KMSearchPattern* pipeFilterPattern = pipeFilter->pattern();
-        if ( tqreplaceExistingFilters )
+        if ( replaceExistingFilters )
           pipeFilterPattern->setName( (*it).getFilterName() );
         else
           pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) );
@@ -279,7 +279,7 @@ void AntiSpamWizard::accept()
       spamFilterActions->append( spamFilterAction3 );
     }
     KMSearchPattern* spamFilterPattern = spamFilter->pattern();
-    if ( tqreplaceExistingFilters )
+    if ( replaceExistingFilters )
       spamFilterPattern->setName( i18n( "Spam handling" ) );
     else
       spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) );
@@ -320,7 +320,7 @@ void AntiSpamWizard::accept()
       unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() );
       unsureFilterActions->append( unsureFilterAction1 );
       KMSearchPattern* unsureFilterPattern = unsureFilter->pattern();
-      if ( tqreplaceExistingFilters )
+      if ( replaceExistingFilters )
         unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) );
       else
         unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) );
@@ -382,7 +382,7 @@ void AntiSpamWizard::accept()
     }
 
     KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern();
-    if ( tqreplaceExistingFilters )
+    if ( replaceExistingFilters )
       classSpamFilterPattern->setName( i18n( "Classify as spam" ) );
     else
       classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) );
@@ -414,7 +414,7 @@ void AntiSpamWizard::accept()
       }
     }
     KMSearchPattern* classHamFilterPattern = classHamFilter->pattern();
-    if ( tqreplaceExistingFilters )
+    if ( replaceExistingFilters )
       classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) );
     else
       classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) );
@@ -441,7 +441,7 @@ void AntiSpamWizard::accept()
    * initialized. This should happend only once. */
   if ( !filterList.isEmpty() )
     KMKernel::self()->filterMgr()->appendFilters(
-          filterList, tqreplaceExistingFilters );
+          filterList, replaceExistingFilters );
 
   TQDialog::accept();
 }
@@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary()
 {
   TQString text;
   TQString newFilters;
-  TQString tqreplaceFilters;
+  TQString replaceFilters;
 
   if ( mMode == AntiVirus ) {
     text = ""; // TODO add summary for the virus part
@@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary()
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
          (*it).isSpamTool() && !(*it).isDetectionOnly() ) {
-        sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters );
+        sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters );
       }
     }
-    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters );
+    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters );
 
     // The need for a andling of status "probably spam" depends on the tools chosen
     if ( mSpamRulesPage->moveUnsureSelected() ) {
@@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary()
       }
       if ( atLeastOneUnsurePattern ) {
         sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ),
-                               newFilters, tqreplaceFilters );
+                               newFilters, replaceFilters );
         text += i18n( "<p>The folder for messages classified as unsure (probably spam) is <i>" )
               + mSpamRulesPage->selectedUnsureFolderName() + "</i>.</p>";
       }
@@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary()
 
     // Manual classification via toolbar icon / manually applied filter action
     sortFilterOnExistance( i18n( "Classify as spam" ),
-                            newFilters, tqreplaceFilters );
+                            newFilters, replaceFilters );
     sortFilterOnExistance( i18n( "Classify as NOT spam" ),
-                            newFilters, tqreplaceFilters );
+                            newFilters, replaceFilters );
 
     // Show the filters in the summary
     if ( !newFilters.isEmpty() )
       text += i18n( "<p>The wizard will create the following filters:<ul>" )
             + newFilters + "</ul></p>";
-    if ( !tqreplaceFilters.isEmpty() )
-      text += i18n( "<p>The wizard will tqreplace the following filters:<ul>" )
-            + tqreplaceFilters + "</ul></p>";
+    if ( !replaceFilters.isEmpty() )
+      text += i18n( "<p>The wizard will replace the following filters:<ul>" )
+            + replaceFilters + "</ul></p>";
   }
 
   mSummaryPage->setSummaryText( text );
@@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name )
 
 void AntiSpamWizard::sortFilterOnExistance(
         const TQString & intendedFilterName,
-        TQString & newFilters, TQString & tqreplaceFilters )
+        TQString & newFilters, TQString & replaceFilters )
 {
   if ( uniqueNameFor( intendedFilterName ) == intendedFilterName )
     newFilters += "<li>" + intendedFilterName + "</li>";
   else
-    tqreplaceFilters += "<li>" + intendedFilterName + "</li>";
+    replaceFilters += "<li>" + intendedFilterName + "</li>";
 }
 
 
@@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList()
 
 
 //---------------------------------------------------------------------------
-ASWizPage::ASWizPage( TQWidget * parent, const char * name,
+ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
                       const TQString *bannerName )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQString banner = "kmwizard.png";
   if ( bannerName && !bannerName->isEmpty() )
@@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * parent, const char * name,
 
 //---------------------------------------------------------------------------
 ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
-                              TQWidget * parent, const char * name )
-  : ASWizPage( parent, name )
+                              TQWidget * tqparent, const char * name )
+  : ASWizPage( tqparent, name )
 {
   TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
@@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange()
 
 
 //---------------------------------------------------------------------------
-ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
+ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name,
                                         KMFolderTree * mainFolderTree )
-  : ASWizPage( parent, name )
+  : ASWizPage( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
 
@@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled )
 
 
 //---------------------------------------------------------------------------
-ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name,
+ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name,
                                   KMFolderTree * mainFolderTree )
-  : ASWizPage( parent, name )
+  : ASWizPage( tqparent, name )
 {
   TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() );
 
@@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange()
 
 
 //---------------------------------------------------------------------------
-ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
-  : ASWizPage( parent, name )
+ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name )
+  : ASWizPage( tqparent, name )
 {
   TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e8023426..a17e341a 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -104,6 +104,7 @@ namespace KMail {
   class AntiSpamWizard : public KWizard
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /** The wizard can be used for setting up anti-spam tools and for
@@ -114,13 +115,13 @@ namespace KMail {
       /** Constructor that needs to initialize from the main folder tree
         of KMail.
         @param mode The mode the wizard should run in.
-        @param parent The parent widget for the wizard.
+        @param tqparent The tqparent widget for the wizard.
         @param mainFolderTree The main folder tree from which the folders
           are copied to allow the selection of a spam folder in a tree
           within one of the wizard pages.
       */
       AntiSpamWizard( WizardMode mode,
-                      TQWidget * parent, KMFolderTree * mainFolderTree );
+                      TQWidget * tqparent, KMFolderTree * mainFolderTree );
 
     protected:
       /**
@@ -259,7 +260,7 @@ namespace KMail {
       /* convenience method to sort out new and existing filters */
       void sortFilterOnExistance( const TQString & intendedFilterName,
                                   TQString & newFilters, 
-                                  TQString & tqreplaceFilters );
+                                  TQString & replaceFilters );
 
       /* The pages in the wizard */
       ASWizInfoPage * mInfoPage;
@@ -280,10 +281,10 @@ namespace KMail {
 
 
   //---------------------------------------------------------------------------
-  class ASWizPage : public QWidget
+  class ASWizPage : public TQWidget
   {
     public:
-      ASWizPage( TQWidget *parent, const char *name, 
+      ASWizPage( TQWidget *tqparent, const char *name, 
                  const TQString *bannerName = 0);
 
     protected:
@@ -298,10 +299,11 @@ namespace KMail {
   class ASWizInfoPage : public ASWizPage
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       ASWizInfoPage( AntiSpamWizard::WizardMode mode,
-                     TQWidget *parent, const char *name );
+                     TQWidget *tqparent, const char *name );
 
       void setScanProgressText( const TQString &toolName );
       void addAvailableTool( const TQString &visibleName );
@@ -324,9 +326,10 @@ namespace KMail {
   class ASWizSpamRulesPage : public ASWizPage
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-      ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
+      ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
 
       bool markAsReadSelected() const;
       bool moveSpamSelected() const;
@@ -356,9 +359,10 @@ namespace KMail {
   class ASWizVirusRulesPage : public ASWizPage
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-      ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
+      ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
 
       bool pipeRulesSelected() const;
       bool moveRulesSelected() const;
@@ -382,9 +386,10 @@ namespace KMail {
   class ASWizSummaryPage : public ASWizPage
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-      ASWizSummaryPage( TQWidget * parent, const char * name );
+      ASWizSummaryPage( TQWidget * tqparent, const char * name );
 
       void setSummaryText( const TQString & text );
 
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index c740f02d..9a5db05b 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 979065e4..ca10bd44 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName )
     "_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2";
 }
 
-ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
-  : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
+ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent )
+  : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, true ),
-    mParentWidget( parent )
+    mParentWidget( tqparent )
 {
   TQWidget *mainWidget = new TQWidget( this );
   TQGridLayout *mainLayout = new TQGridLayout( mainWidget );
@@ -65,7 +65,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
 
   // TODO: better label for "Ok" button
   // TODO: Explaination label
-  // TODO: Use QFormLayout in KDE4
+  // TODO: Use TQFormLayout in KDE4
 
   TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget );
   mainLayout->addWidget( folderLabel, row, 0 );
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index 806d5b12..cc469959 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -33,10 +33,11 @@ class FolderRequester;
 class ArchiveFolderDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    ArchiveFolderDialog( TQWidget *parent = 0 );
+    ArchiveFolderDialog( TQWidget *tqparent = 0 );
     void setFolder( KMFolder *defaultFolder );
 
   protected slots:
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index 7114242c..688af623 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) {
       continue;
     }
     if ( isInSkipList( node ) ) {
-      node = node->next( false ); // skip even the children
+      node = node->next( false ); // skip even the tqchildren
       continue;
     }
     if ( isInExclusionList( node ) ) {
diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h
index e7449607..6930e07e 100644
--- a/kmail/attachmentcollector.h
+++ b/kmail/attachmentcollector.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 49fc3935..7eebbbb2 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -33,7 +33,7 @@ using KPIM::MailListDrag;
 // other KDE headers
 #include <kurldrag.h>
 
-// other Qt headers
+// other TQt headers
 #include <tqevent.h>
 #include <tqcstring.h>
 #include <tqbuffer.h>
@@ -47,9 +47,9 @@ using KPIM::MailListDrag;
 namespace KMail {
 
 AttachmentListView::AttachmentListView( KMail::Composer * composer,
-                                        TQWidget* parent,
+                                        TQWidget* tqparent,
                                         const char* name )
-  : KListView( parent, name ),
+  : KListView( tqparent, name ),
     mComposer( composer )
 {
   setAcceptDrops( true );
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 2c8f2800..a25d792e 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -30,8 +30,9 @@ class Composer;
 class AttachmentListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
+  AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0,
                       const char* name = 0 );
   virtual ~AttachmentListView();
 
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 6e147b94..23bd0595 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h
index 83576894..268a4330 100644
--- a/kmail/attachmentstrategy.h
+++ b/kmail/attachmentstrategy.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index a20e4118..3953f3bc 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -36,12 +36,12 @@
 
 using namespace KMail;
 
-BackupJob::BackupJob( TQWidget *parent )
-  : TQObject( parent ),
+BackupJob::BackupJob( TQWidget *tqparent )
+  : TQObject( tqparent ),
     mArchiveType( Zip ),
     mRootFolder( 0 ),
     mArchive( 0 ),
-    mParentWidget( parent ),
+    mParentWidget( tqparent ),
     mCurrentFolderOpen( false ),
     mArchivedMessages( 0 ),
     mArchivedSize( 0 ),
@@ -165,7 +165,7 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->seStatus( i18n( "Archiving finished" ) );
+  mProgressItem->setqStatus( i18n( "Archiving finished" ) );
   mProgressItem->setComplete();
   mProgressItem = 0;
 
@@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage()
     mCurrentMessage = message;
     TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) );
   }
-  else if ( message->parent() ) {
-    mCurrentJob = message->parent()->createJob( message );
+  else if ( message->tqparent() ) {
+    mCurrentJob = message->tqparent()->createJob( message );
     mCurrentJob->setCancellable( false );
     connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
              this, TQT_SLOT( messageRetrieved( KMMessage* ) ) );
@@ -247,7 +247,7 @@ void BackupJob::archiveNextMessage()
   }
   else {
     kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
-                    << " is neither complete nor has a parent!" << endl;
+                    << " is neither complete nor has a tqparent!" << endl;
     abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
               .arg( mCurrentFolder->name() ) );
   }
@@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder()
 
   mCurrentFolder = mPendingFolders.take( 0 );
   kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
-  mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+  mProgressItem->setqStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
   if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
     abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
     return;
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index f6383d66..500e671a 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -48,13 +48,14 @@ namespace KMail
 class BackupJob : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
     // These enum values have to stay in sync with the format combobox of ArchiveFolderDialog!
     enum ArchiveType { Zip = 0, Tar = 1, TarBz2 = 2, TarGz = 3 };
 
-    explicit BackupJob( TQWidget *parent = 0 );
+    explicit BackupJob( TQWidget *tqparent = 0 );
     ~BackupJob();
     void setRootFolder( KMFolder *rootFolder );
     void setSaveLocation( const KURL &savePath );
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index a69c01bf..bd6da060 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty
   return AnyTypeBodyPartFormatter::create();
 }
 
-// OK, tqreplace this with a factory with plugin support later on...
+// OK, replace this with a factory with plugin support later on...
 const KMail::BodyPartFormatter * KMail::BodyPartFormatter::createFor( const char * type, const char * subtype ) {
   if ( type && *type )
     switch ( type[0] ) {
diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h
index eda28a90..1c296582 100644
--- a/kmail/bodypartformatter.h
+++ b/kmail/bodypartformatter.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp
index 680d0c48..f11690d5 100644
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,7 +44,7 @@ using namespace KMail::BodyPartFormatterFactoryPrivate;
 // KDE
 #include <kdebug.h>
 
-// Qt
+// TQt
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqstringlist.h>
@@ -83,7 +83,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
   if ( !type || !*type || !subtype || !*subtype || !formatter || !all )
     return;
 
-  TypeRegistry::iterator type_it = all->find( type );
+  TypeRegistry::iterator type_it = all->tqfind( type );
   if ( type_it == all->end() ) {
     kdDebug( 5006 ) << "BodyPartFormatterFactory: instantiating new Subtype Registry for \""
 		    << type << "\"" << endl;
@@ -92,7 +92,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
   }
 
   SubtypeRegistry & subtype_reg = type_it->second;
-  SubtypeRegistry::iterator subtype_it = subtype_reg.find( subtype );
+  SubtypeRegistry::iterator subtype_it = subtype_reg.tqfind( subtype );
   if ( subtype_it != subtype_reg.end() ) {
     kdDebug( 5006 ) << "BodyPartFormatterFactory: overwriting previously registered formatter for \""
 		    << type << "/" << subtype << "\"" << endl;
@@ -159,9 +159,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
   if ( all->empty() )
     return 0;
 
-  TypeRegistry::const_iterator type_it = all->find( type );
+  TypeRegistry::const_iterator type_it = all->tqfind( type );
   if ( type_it == all->end() )
-    type_it = all->find( "*" );
+    type_it = all->tqfind( "*" );
   if ( type_it == all->end() )
     return 0;
 
@@ -169,9 +169,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
   if ( subtype_reg.empty() )
     return 0;
 
-  SubtypeRegistry::const_iterator subtype_it = subtype_reg.find( subtype );
+  SubtypeRegistry::const_iterator subtype_it = subtype_reg.tqfind( subtype );
   if ( subtype_it == subtype_reg.end() )
-    subtype_it = subtype_reg.find( "*" );
+    subtype_it = subtype_reg.tqfind( "*" );
   if ( subtype_it == subtype_reg.end() )
     return 0;
 
diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h
index 90217153..dd89eb34 100644
--- a/kmail/bodypartformatterfactory.h
+++ b/kmail/bodypartformatterfactory.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h
index 7ca101ab..f18bc22a 100644
--- a/kmail/bodypartformatterfactory_p.h
+++ b/kmail/bodypartformatterfactory_p.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 5c920584..337c843c 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -76,9 +76,9 @@ namespace KMail {
     while ( (part = it.current()) != 0 )
     {
       ++it;
-      // skip this part if the parent part is already loading
-      if ( part->parent() &&
-           selected.tqcontains( part->parent() ) &&
+      // skip this part if the tqparent part is already loading
+      if ( part->tqparent() &&
+           selected.tqcontains( part->tqparent() ) &&
            part->loadPart() )
         continue;
 
@@ -114,9 +114,9 @@ namespace KMail {
         headerCheck = false;
 
       // check whether to load this part or not:
-      // look at the basic list, ask the subclass and check the parent
+      // look at the basic list, ask the subclass and check the tqparent
       if ( mBasicList.tqcontains( part->originalContentTypeStr() ) ||
-           parentNeedsLoading( part ) ||
+           tqparentNeedsLoading( part ) ||
            addPartToList( part ) )
       {
         if ( part->typeStr() != "MULTIPART" ||
@@ -137,18 +137,18 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart )
+  bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart )
   {
     KMMessagePart *part = msgPart;
     while ( part )
     {
-      if ( part->parent() &&
-           ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
+      if ( part->tqparent() &&
+           ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
            ( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" &&
-             part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
+             part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
         return true;
 
-      part = part->parent();
+      part = part->tqparent();
     }
     return false;
   }
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index 519dd86c..4ccd1659 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -60,10 +60,10 @@ namespace KMail {
 
     protected:
       /** 
-       * Checks if one of the parents needs loaded children
+       * Checks if one of the tqparents needs loaded tqchildren
        * This is e.g. needed for multipart/signed where all parts have to be loaded 
        */
-      static bool parentNeedsLoading( KMMessagePart * part );
+      static bool tqparentNeedsLoading( KMMessagePart * part );
       
     protected:
       TQPtrList<KMMessagePart> mParts;
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index f80f5674..2b9ab2a8 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -70,7 +70,7 @@ CachedImapJob::CachedImapJob( const TQValueList<MsgForDownload>& msgs,
 // Put messages
 CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type,
                               KMFolderCachedImap* folder )
-  : FolderJob( msgs, TQString::null, type, folder?folder->folder():0 ), mFolder( folder ),
+  : FolderJob( msgs, TQString(), type, folder?folder->folder():0 ), mFolder( folder ),
     mTotalBytes( msgs.count() ), // we abuse it as "total number of messages"
     mMsg( 0 ), mParentFolder( 0 )
 {
@@ -78,7 +78,7 @@ CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type,
 
 CachedImapJob::CachedImapJob( const TQValueList<unsigned long>& msgs,
 			      JobType type, KMFolderCachedImap* folder )
-  : FolderJob( TQPtrList<KMMessage>(), TQString::null, type, folder?folder->folder():0 ),
+  : FolderJob( TQPtrList<KMMessage>(), TQString(), type, folder?folder->folder():0 ),
     mFolder( folder ), mSerNumMsgList( msgs ), mTotalBytes( msgs.count() ), mMsg( 0 ),
     mParentFolder ( 0 )
 {
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
       mFolder->addMsgInternal( mMsg, true, &index );
 
       if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
-        mFolder->seStatus( index, KMMsgStatusRead, false );
+        mFolder->setqStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -339,7 +339,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   mMsg->setUID(mfd.uid);
   mMsg->setMsgSizeServer(mfd.size);
   if( mfd.flags > 0 )
-    KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
+    KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
   KURL url = mAccount->getUrl();
   url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid));
 
@@ -401,9 +401,9 @@ void CachedImapJob::slotPutNextMessage()
 
   mMsg->setUID( 0 ); // for the index
   TQCString cstr(mMsg->asString());
-  int a = cstr.find("\nX-UID: ");
-  int b = cstr.find('\n', a);
-  if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
+  int a = cstr.tqfind("\nX-UID: ");
+  int b = cstr.tqfind('\n', a);
+  if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a);
   TQCString mData(cstr.length() + cstr.tqcontains('\n'));
   unsigned int i = 0;
   for( char *ch = cstr.data(); *ch; ch++ ) {
@@ -462,7 +462,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
       return;
     }
 
-    if ( data.find( "UID" ) != -1 && mMsg ) {
+    if ( data.tqfind( "UID" ) != -1 && mMsg ) {
       int uid = ( data.right( data.length() - 4 ) ).toInt();
       kdDebug( 5006 ) << k_funcinfo << "Server told us uid is: " << uid << endl;
       mMsg->setUID( uid );
@@ -498,7 +498,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
   emit progress( mSentBytes, mTotalBytes );
 
   int i;
-  if( ( i = mFolder->find(mMsg) ) != -1 ) {
+  if( ( i = mFolder->tqfind(mMsg) ) != -1 ) {
      /*
       * If we have aquired a uid during upload the server supports the uidnext
       * extension and there is no need to redownload this mail, we already have
@@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     }
 
     // make copy of setting, to reset it before potentially destroying 'it'
-    bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload();
-    static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false );
+    bool silentUpload = static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->silentUpload();
+    static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false );
 
     if ( job->error() && !silentUpload ) {
       TQString myError = "<p><b>" + i18n("Error while uploading folder")
@@ -549,11 +549,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
       return;
     } else {
       KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() );
-      KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() );
+      KMFolderCachedImap* tqparentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() );
       Q_ASSERT( storage );
-      Q_ASSERT( parentStorage );
+      Q_ASSERT( tqparentStorage );
       if ( storage->imapPath().isEmpty() ) {
-        TQString path = mAccount->createImapPath( parentStorage->imapPath(), storage->folder()->name() );
+        TQString path = mAccount->createImapPath( tqparentStorage->imapPath(), storage->folder()->name() );
         if ( !storage->imapPathForCreation().isEmpty() )
           path = storage->imapPathForCreation();
         storage->setImapPath( path );
@@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
   url.setPath( path );
 
   if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) {
-    // Associate the jobData with the parent folder, not with the child
+    // Associate the jobData with the tqparent folder, not with the child
     // This is necessary in case of an error while creating the subfolder,
-    // so that folderComplete is called on the parent (and the sync resetted).
+    // so that folderComplete is called on the tqparent (and the sync resetted).
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
@@ -679,14 +679,14 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
 
   if( job->error() ) {
     mErrorCode = job->error();
-    mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' );
+    mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).tqparent->label() ) + '\n' );
     delete this;
     return;
   }
 
   // Check the uidValidity
   TQCString cstr((*it).data.data(), (*it).data.size() + 1);
-  int a = cstr.find("X-uidValidity: ");
+  int a = cstr.tqfind("X-uidValidity: ");
   if (a < 0) {
     // Something is seriously rotten here!
     // TODO: Tell the user that he has a problem
@@ -694,7 +694,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
                   << mFolder->name() << endl;
   }
   else {
-    int b = cstr.find("\r\n", a);
+    int b = cstr.tqfind("\r\n", a);
     if ( (b - a - 15) >= 0 ) {
       TQString uidv = cstr.mid(a + 15, b - a - 15);
       // kdDebug(5006) << "New uidv = " << uidv << ", old uidv = "
@@ -711,11 +711,11 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
                     << mFolder->name() << endl;
   }
 
-  a = cstr.find( "X-PermanentFlags: " );
+  a = cstr.tqfind( "X-PermanentFlags: " );
   if ( a < 0 ) {
     kdDebug(5006) << "no PERMANENTFLAGS response? assumming custom flags are not available" << endl;
   } else {
-    int b = cstr.find( "\r\n", a );
+    int b = cstr.tqfind( "\r\n", a );
     if ( (b - a - 18) >= 0 ) {
       int flags = cstr.mid( a + 18, b - a - 18 ).toInt();
       emit permanentFlags( flags );
@@ -767,7 +767,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
           static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
         if ( !imapFolder->imapPath().isEmpty() )
           // Only rename folders that have been accepted by the server
-          if( imapFolder->imapPath().find( oldPath ) == 0 ) {
+          if( imapFolder->imapPath().tqfind( oldPath ) == 0 ) {
             TQString p = imapFolder->imapPath();
             p = p.mid( oldPath.length() );
             p.prepend( newPath );
@@ -782,7 +782,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
 
 void CachedImapJob::revertLabelChange()
 {
-  TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().find( mFolder->imapPath() );
+  TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().tqfind( mFolder->imapPath() );
   Q_ASSERT( renit != mAccount->renamedFolders().end() );
   if ( renit != mAccount->renamedFolders().end() ) {
     mFolder->folder()->setLabel( (*renit).mOldLabel );
@@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job )
 }
 
 //-----------------------------------------------------------------------------
-void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent )
+void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent )
 {
-  mParentFolder = const_cast<KMFolderCachedImap*>( parent );
+  mParentFolder = const_cast<KMFolderCachedImap*>( tqparent );
 }
 
 }
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index 4a2885b0..cf9dab57 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -20,22 +20,22 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -60,6 +60,7 @@ namespace KMail {
 
 class CachedImapJob : public FolderJob {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Information about a message to be downloaded (from the 'IMAP envelope') */
   struct MsgForDownload {
@@ -94,7 +95,7 @@ public:
 
   virtual ~CachedImapJob();
 
-  void setParentFolder( const KMFolderCachedImap* parent );
+  void setParentFolder( const KMFolderCachedImap* tqparent );
 
 signals:
   // only emitted for uid validity checking jobs with PERMANENTFLAGS responses
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 6f563699..037f8090 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const
     return transports.first();
 
   const TQString defaultTransport = GlobalSettings::self()->defaultTransport();
-  const int defaultIndex = QMAX( 0, transports.findIndex( defaultTransport ) );
+  const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) );
 
   TQString text;
   if ( nullIdentity )
@@ -227,14 +227,14 @@ TQString Callback::receiver() const
 
     // select default identity by default
     const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress();
-    const int defaultIndex = QMAX( 0, addrs.findIndex( defaultAddr ) );
+    const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) );
 
     mReceiver =
       KInputDialog::getItem( i18n( "Select Address" ),
           selectMessage,
           addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() );
     if( !ok )
-      mReceiver = TQString::null;
+      mReceiver = TQString();
   }
 
   return mReceiver;
diff --git a/kmail/callback.h b/kmail/callback.h
index c7f26058..a7e9af79 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index ac4d3278..d88c3164 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -7,10 +7,10 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
+ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
                                           const TQStringList& keys, const TQString& currentKey,
                                           const TQString& lastOptions )
-  : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
+  : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
 {
   TQWidget *page = makeMainWidget();
 
@@ -22,7 +22,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
   mListBox = new KListBox( page );
   mListBox->insertStringList( keys );
   const int current = keys.findIndex( currentKey );
-  mListBox->setSelected( QMAX( 0, current ), true );
+  mListBox->setSelected( TQMAX( 0, current ), true );
   mListBox->ensureCurrentVisible();
   tqlayout->addWidget( mListBox, 1 );
 
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 8ee24c71..3402fd37 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -9,9 +9,10 @@ class TQLabel;
 class ChiasmusKeySelector : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
+  ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
                        const TQStringList& keys, const TQString& currentKey,
                        const TQString& lastOptions );
 
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index 0e6b3a40..a0ebc825 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -29,8 +29,8 @@
 
 #include "colorlistbox.h"
 
-ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
-  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
+  :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
@@ -178,7 +178,7 @@ void ColorListItem::paint( TQPainter *p )
 
   p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() );
 
-  p->setPen( Qt::black );
+  p->setPen( TQt::black );
   p->drawRect( 3, 1, mBoxWidth, h-1 );
   p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
 }
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index 13db01af..bb9e5b17 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -26,9 +26,10 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
+    ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
     void setColor( uint index, const TQColor &color );
     TQColor color( uint index ) const;
 signals:
@@ -52,10 +53,10 @@ signals:
 };
 
 
-class ColorListItem : public QListBoxItem
+class ColorListItem : public TQListBoxItem
 {
   public:
-    ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+    ColorListItem( const TQString &text, const TQColor &color=TQt::black );
     const TQColor &color( void );
     void  setColor( const TQColor &color );
 
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 183b7216..3d3dd6ac 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -28,7 +28,7 @@
 #include "compactionjob.h"
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmfoldermbox.h"
 #include "kmfoldermaildir.h"
 
@@ -97,13 +97,13 @@ int MboxCompactionJob::executeNow( bool silent )
     kdDebug(5006) << storage->location() << " compaction skipped." << endl;
     if ( !mSilent ) {
       TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
-      BroadcasStatus::instance()->seStatusMsg( str );
+      BroadcastqStatus::instance()->seStatusMsg( str );
     }
     return 0;
   }
   kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl;
 
-  if (KMFolderIndex::IndexOk != mbox->indexStatus()) {
+  if (KMFolderIndex::IndexOk != mbox->indextqStatus()) {
       kdDebug(5006) << "Critical error: " << storage->location() <<
           " has been modified by an external application while KMail was running." << endl;
       //      exit(1); backed out due to broken nfs
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcasStatus::instance()->seStatusMsg( str );
+    BroadcastqStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
   if ( storage->isOpened() )
     storage->updateIndex();
   if ( !mSilent )
-    BroadcasStatus::instance()->seStatusMsg( str );
+    BroadcastqStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h
index bb234a04..e11e6ece 100644
--- a/kmail/compactionjob.h
+++ b/kmail/compactionjob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -39,6 +39,7 @@ namespace KMail {
 class MboxCompactionJob : public ScheduledJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /// @p folder should be a folder with a KMFolderMbox storage.
   MboxCompactionJob( KMFolder* folder, bool immediate );
@@ -72,6 +73,7 @@ private:
 class MaildirCompactionJob : public ScheduledJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /// @p folder should be a folder with a KMFolderMaildir storage.
   MaildirCompactionJob( KMFolder* folder, bool immediate );
diff --git a/kmail/composer.h b/kmail/composer.h
index 91c47344..ac903b37 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -35,6 +35,7 @@ namespace KMail {
 
   class Composer : public KMail::SecondaryWindow {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {}
   public: // mailserviceimpl
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index 696334e1..ac1c3055 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ComposerCryptoConfiguration</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ComposerCryptoConfiguration</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>optionsGroup_2</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mAutoSignature</cstring>
                     </property>
@@ -40,7 +40,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>optionsGroup</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mEncToSelf</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowEncryptionResult</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         <string>When this option is enabled, the signed/encrypted text will be shown in a separate window, enabling you to know how it will look before it is sent. This is a good idea when you are verifying that your encryption system works.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mStoreEncrypted</cstring>
                     </property>
@@ -95,7 +95,7 @@ However, there may be local rules that require you to turn this option on. When
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowKeyApprovalDlg</cstring>
                     </property>
@@ -106,7 +106,7 @@ However, there may be local rules that require you to turn this option on. When
                         <string>When this option is enabled, the application will always show you a list of public keys from which you can choose the one it will use for encryption. If it is off, the application will only show the dialog if it cannot find the right key or if there are several which could be used.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mAutoEncrypt</cstring>
                     </property>
@@ -117,7 +117,7 @@ However, there may be local rules that require you to turn this option on. When
                         <string>When this option is enabled, every message you send will be encrypted whenever encryption is possible and desired; of course, it is still possible to disable the automatic encryption for each message individually.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mNeverEncryptWhenSavingInDrafts</cstring>
                     </property>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c5824ead..bc415a88 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -101,7 +101,7 @@ using KMime::DateFormatter;
 #include <kcmultidialog.h>
 #include <kcombobox.h>
 
-// Qt headers:
+// TQt headers:
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
 #include <tqvgroupbox.h>
@@ -214,9 +214,9 @@ namespace {
 }
 
 
-ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
+ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal )
   : KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ),
-                   KGuiItem(), User2, i18n( "Configure" ), parent, name, modal )
+                   KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal )
   , mProfileDialog( 0 )
 {
   KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
@@ -284,8 +284,8 @@ TQString IdentityPage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-identity");
 }
 
-IdentityPage::IdentityPage( TQWidget * parent, const char * name )
-  : ConfigModule( parent, name ),
+IdentityPage::IdentityPage( TQWidget * tqparent, const char * name )
+  : ConfigModule( tqparent, name ),
     mIdentityDialog( 0 )
 {
   TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
@@ -555,8 +555,8 @@ TQString AccountsPage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-accounts");
 }
 
-AccountsPage::AccountsPage( TQWidget * parent, const char * name )
-  : ConfigModuleWithTabs( parent, name )
+AccountsPage::AccountsPage( TQWidget * tqparent, const char * name )
+  : ConfigModuleWithTabs( tqparent, name )
 {
   //
   // "Receiving" tab:
@@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-accounts-sending");
 }
 
-AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   mTransportInfoList.setAutoDelete( true );
   // temp. vars:
@@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
   btn_vlay->addStretch( 1 ); // spacer
 
   // "Common options" groupbox:
-  group = new TQGroupBox( 0, Qt::Vertical,
+  group = new TQGroupBox( 0, TQt::Vertical,
                          i18n("Common Options"), this );
   vlay->addWidget(group);
 
@@ -739,7 +739,7 @@ static inline TQString uniqueName( const TQStringList & list,
 {
   int suffix = 1;
   TQString result = name;
-  while ( list.find( result ) != list.end() ) {
+  while ( list.tqfind( result ) != list.end() ) {
     result = i18n("%1: name; %2: number appended to it to make it unique "
                   "among a list of names", "%1 %2")
       .arg( name ).arg( suffix );
@@ -911,7 +911,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
   KPIM::IdentityManager * im = kmkernel->identityManager();
   for ( KPIM::IdentityManager::Iterator it = im->modifyBegin(); it != im->modifyEnd(); ++it ) {
     if ( item->text( 0 ) == (*it).transport() ) {
-      (*it).setTransport( TQString::null );
+      (*it).setTransport( TQString() );
       changedIdents += (*it).identityName();
     }
   }
@@ -919,7 +919,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
   // if the deleted transport is the currently used transport reset it to default
   const TQString& currentTransport = GlobalSettings::self()->currentTransport();
   if ( item->text( 0 ) == currentTransport ) {
-    GlobalSettings::self()->setCurrentTransport( TQString::null );
+    GlobalSettings::self()->setCurrentTransport( TQString() );
   }
 
   if ( !changedIdents.isEmpty() ) {
@@ -952,7 +952,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
         newCurrent->setText( 1, i18n("sendmail (Default)" ));
       }
     } else {
-      GlobalSettings::self()->setDefaultTransport( TQString::null );
+      GlobalSettings::self()->setDefaultTransport( TQString() );
     }
   }
   delete item;
@@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-accounts-receiving");
 }
 
-AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab ( parent, name )
+AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab ( tqparent, name )
 {
   // temp. vars:
   TQVBoxLayout *vlay;
@@ -1223,7 +1223,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
 
     default:
       // ### FIXME: How should this happen???
-      // tqreplace with assert.
+      // replace with assert.
       KMessageBox::sorry( this, i18n("Unknown account type selected") );
       return;
   }
@@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-appearance");
 }
 
-AppearancePage::AppearancePage( TQWidget * parent, const char * name )
-  : ConfigModuleWithTabs( parent, name )
+AppearancePage::AppearancePage( TQWidget * tqparent, const char * name )
+  : ConfigModuleWithTabs( tqparent, name )
 {
   //
   // "Fonts" tab:
@@ -1551,8 +1551,8 @@ static const struct {
 };
 static const int numFontNames = sizeof fontNames / sizeof *fontNames;
 
-AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 )
+AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 )
 {
   assert( numFontNames == sizeof mFont / sizeof *mFont );
   // tmp. vars:
@@ -1722,15 +1722,15 @@ static const struct {
   { "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") },
   { "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") },
   { "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") },
-  { "ColorbarBackgroundPlain", I18N_NOOP("HTML Status Bar Background - No HTML Message") },
-  { "ColorbarForegroundPlain", I18N_NOOP("HTML Status Bar Foreground - No HTML Message") },
-  { "ColorbarBackgroundHTML",  I18N_NOOP("HTML Status Bar Background - HTML Message") },
-  { "ColorbarForegroundHTML",  I18N_NOOP("HTML Status Bar Foreground - HTML Message") },
+  { "ColorbarBackgroundPlain", I18N_NOOP("HTML tqStatus Bar Background - No HTML Message") },
+  { "ColorbarForegroundPlain", I18N_NOOP("HTML tqStatus Bar Foreground - No HTML Message") },
+  { "ColorbarBackgroundHTML",  I18N_NOOP("HTML tqStatus Bar Background - HTML Message") },
+  { "ColorbarForegroundHTML",  I18N_NOOP("HTML tqStatus Bar Foreground - HTML Message") },
 };
 static const int numColorNames = sizeof colorNames / sizeof *colorNames;
 
-AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout *vlay;
@@ -1801,22 +1801,22 @@ void AppearancePage::ColorsTab::doLoadOther() {
     TQColor( 0x00, 0x60, 0x00 ), // quoted l3
     KGlobalSettings::linkColor(), // link
     KGlobalSettings::visitedLinkColor(), // visited link
-    Qt::red, // misspelled words
-    Qt::red, // new msg
-    Qt::blue, // unread mgs
+    TQt::red, // misspelled words
+    TQt::red, // new msg
+    TQt::blue, // unread mgs
     TQColor( 0x00, 0x7F, 0x00 ), // important msg
-    Qt::blue, // todo mgs
+    TQt::blue, // todo mgs
     TQColor( 0x00, 0x80, 0xFF ), // light blue // pgp encrypted
     TQColor( 0x40, 0xFF, 0x40 ), // light green // pgp ok, trusted key
     TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp ok, untrusted key
     TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp unchk
-    Qt::red, // pgp bad
+    TQt::red, // pgp bad
     TQColor( 0xFF, 0x40, 0x40 ), // warning text color: light red
-    Qt::red, // close to quota
-    Qt::lightGray, // colorbar plain bg
-    Qt::black,     // colorbar plain fg
-    Qt::black,     // colorbar html  bg
-    Qt::white,     // colorbar html  fg
+    TQt::red, // close to quota
+    TQt::lightGray, // colorbar plain bg
+    TQt::black,     // colorbar plain fg
+    TQt::black,     // colorbar html  bg
+    TQt::white,     // colorbar html  fg
   };
 
   for ( int i = 0 ; i < numColorNames ; i++ ) {
@@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = {
   readerWindowModes, DIM(readerWindowModes), 1
 };
 
-AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout * vlay;
@@ -1992,8 +1992,8 @@ static const struct {
 static const int numDateDisplayConfig =
   sizeof dateDisplayConfig / sizeof *dateDisplayConfig;
 
-AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name ),
+AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name ),
     mCustomDateFormatEdit( 0 )
 {
   // tmp. vars:
@@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
              "<li>ss - the seconds with a leading zero (00-59)</li>"
              "<li>z - the milliseconds without leading zeroes (0-999)</li>"
              "<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-             "<li>AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".</li>"
-             "<li>ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".</li>"
+             "<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".</li>"
+             "<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li>"
              "<li>Z - time zone in numeric form (-0500)</li>"
              "</ul>"
              "<p><strong>All other input characters will be ignored."
@@ -2184,7 +2184,7 @@ void AppearancePage::HeadersTab::save() {
     int result = KMessageBox::warningContinueCancel( this,
                    i18n("Changing the global threading setting will override "
                         "all folder specific values."),
-                   TQString::null, KStdGuiItem::cont(), "threadOverride" );
+                   TQString(), KStdGuiItem::cont(), "threadOverride" );
     if ( result == KMessageBox::Continue ) {
       tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
       // remove all threadMessagesOverride keys from all [Folder-*] groups:
@@ -2226,7 +2226,7 @@ static const BoolConfigEntry showColorbarMode = {
 };
 
 static const BoolConfigEntry showSpamStatusMode = {
-  "Reader", "showSpamStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
+  "Reader", "showSpamtqStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
 };
 
 static const BoolConfigEntry showEmoticons = {
@@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-appearance-reader");
 }
 
-AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
+AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent,
                                                   const char * name )
-  : ConfigModuleTab( parent, name )
+  : ConfigModuleTab( tqparent, name )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
@@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
   connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged() ) );
 
-  // "tqreplace smileys by emoticons" check box;
+  // "replace smileys by emoticons" check box;
   populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
   vlay->addWidget( mShowEmoticonsCheck );
   connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
@@ -2415,7 +2415,7 @@ void AppearancePage::ReaderTab::readCurrentOverrideCodec()
     kdWarning(5006) << "Unknown override character encoding \"" << currentOverrideEncoding
                     << "\". Resetting to Auto." << endl;
     mOverrideCharsetCombo->setCurrentItem( 0 );
-    GlobalSettings::self()->setOverrideCharacterEncoding( TQString::null );
+    GlobalSettings::self()->setOverrideCharacterEncoding( TQString() );
   }
 }
 
@@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-appearance-systemtray");
 }
 
-AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
+AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent,
                                                           const char * name )
-  : ConfigModuleTab( parent, name )
+  : ConfigModuleTab( tqparent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(),
                                         KDialog::spacingHint() );
@@ -2540,8 +2540,8 @@ TQString ComposerPage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer");
 }
 
-ComposerPage::ComposerPage( TQWidget * parent, const char * name )
-  : ConfigModuleWithTabs( parent, name )
+ComposerPage::ComposerPage( TQWidget * tqparent, const char * name )
+  : ConfigModuleWithTabs( tqparent, name )
 {
   //
   // "General" tab:
@@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-general");
 }
 
-ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout *vlay;
@@ -2796,7 +2796,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
            mEditorRequester, TQT_SLOT(setEnabled(bool)) );
 
-  label = new TQLabel( i18n("<b>%f</b> will be tqreplaced with the "
+  label = new TQLabel( i18n("<b>%f</b> will be replaced with the "
                            "filename to edit."), group );
   label->setEnabled( false ); // see above
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
@@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-phrases");
 }
 
-ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQGridLayout *glay;
@@ -3037,7 +3037,7 @@ void ComposerPage::PhrasesTab::slotAddNewLanguage( const TQString& lang )
                    locale.translate("Forwarded Message"),
                    locale.translate(">%_") ) );
   mRemoveButton->setEnabled( true );
-  slotLanguageChanged( TQString::null );
+  slotLanguageChanged( TQString() );
 }
 
 void ComposerPage::PhrasesTab::slotRemoveLanguage()
@@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-templates");
 }
 
-ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab ( parent, name )
+ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab ( tqparent, name )
 {
   TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -3149,8 +3149,8 @@ TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-custom-templates");
 }
 
-ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab ( parent, name )
+ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab ( tqparent, name )
 {
   TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -3173,8 +3173,8 @@ TQString ComposerPage::SubjectTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-subject");
 }
 
-ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout *vlay;
@@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-charset");
 }
 
-ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout *vlay;
@@ -3268,7 +3268,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char *
 
   label = new TQLabel( i18n("This list is checked for every outgoing message "
                            "from the top to the bottom for a charset that "
-                           "tqcontains all required characters."), this );
+                           "contains all required characters."), this );
   label->tqsetAlignment( WordBreak);
   vlay->addWidget( label );
 
@@ -3316,7 +3316,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
   }
 
   KMessageBox::sorry( this, i18n("This charset is not supported.") );
-  charset = TQString::null;
+  charset = TQString();
 }
 
 void ComposerPage::CharsetTab::doLoadOther() {
@@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-headers");
 }
 
-ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout *vlay;
@@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-composer-attachments");
 }
 
-ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
+ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent,
                                                         const char * name )
-  : ConfigModuleTab( parent, name ) {
+  : ConfigModuleTab( tqparent, name ) {
   // tmp. vars:
   TQVBoxLayout *vlay;
   TQLabel      *label;
@@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security");
 }
 
-SecurityPage::SecurityPage( TQWidget * parent, const char * name )
-  : ConfigModuleWithTabs( parent, name )
+SecurityPage::SecurityPage( TQWidget * tqparent, const char * name )
+  : ConfigModuleWithTabs( tqparent, name )
 {
   //
   // "Reading" tab:
@@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security-reading");
 }
 
-SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab ( parent, name )
+SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab ( tqparent, name )
 {
   // tmp. vars:
   TQVBoxLayout  *vlay;
@@ -3733,7 +3733,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
-  // QWhat'sThis texts
+  // TQWhat'sThis texts
   TQString htmlWhatsThis = i18n( "<qt><p>Messages sometimes come in both formats. "
               "This option controls whether you want the HTML part or the plain "
               "text part to be displayed.</p>"
@@ -3855,7 +3855,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
   mMDNGroup->insert( radio );
 
   for ( int i = 0 ; i < mMDNGroup->count() ; ++i )
-      TQWhatsThis::add( mMDNGroup->find( i ), receiptWhatsThis );
+      TQWhatsThis::add( mMDNGroup->tqfind( i ), receiptWhatsThis );
 
   w = new TQWidget( hbox ); // spacer
   hbox->setStretchFactor( w, 1 );
@@ -3961,7 +3961,7 @@ void SecurityPage::GeneralTab::save() {
   if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
   {
     if (KMessageBox::warningContinueCancel(this, i18n("Changing the global "
-      "HTML setting will override all folder specific values."), TQString::null,
+      "HTML setting will override all folder specific values."), TQString(),
       KStdGuiItem::cont(), "htmlMailOverride") == KMessageBox::Continue)
     {
       reader.writeEntry( "htmlMail", mHtmlMailCheck->isChecked() );
@@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security-composing");
 }
 
-SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab ( parent, name )
+SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab ( tqparent, name )
 {
   // the margins are inside mWidget itself
   TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4071,8 +4071,8 @@ TQString SecurityPage::WarningTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security-warnings");
 }
 
-SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // the margins are inside mWidget itself
   TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4180,8 +4180,8 @@ TQString SecurityPage::SMimeTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security-smime-validation");
 }
 
-SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // the margins are inside mWidget itself
   TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4498,8 +4498,8 @@ TQString SecurityPage::CryptPlugTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-security-crypto-backends");
 }
 
-SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
@@ -4531,8 +4531,8 @@ TQString MiscPage::helpAnchor() const {
   return TQString::tqfromLatin1("configure-misc");
 }
 
-MiscPage::MiscPage( TQWidget * parent, const char * name )
-  : ConfigModuleWithTabs( parent, name )
+MiscPage::MiscPage( TQWidget * tqparent, const char * name )
+  : ConfigModuleWithTabs( tqparent, name )
 {
   mFolderTab = new FolderTab();
   addTab( mFolderTab, i18n("&Folders") );
@@ -4546,8 +4546,8 @@ TQString MiscPage::FolderTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-misc-folders");
 }
 
-MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
-  : ConfigModuleTab( parent, name )
+MiscPageFolderTab::MiscPageFolderTab( TQWidget * tqparent, const char * name )
+  : ConfigModuleTab( tqparent, name )
 {
   // temp. vars:
   TQVBoxLayout *vlay;
@@ -4781,7 +4781,7 @@ void MiscPage::FolderTab::save() {
   general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
   general.writeEntry( "default-mailbox-format", mMailboxPrefCombo->currentItem() );
   general.writeEntry( "startupFolder", mOnStartupOpenFolder->folder() ?
-                                  mOnStartupOpenFolder->folder()->idString() : TQString::null );
+                                  mOnStartupOpenFolder->folder()->idString() : TQString() );
 
   GlobalSettings::self()->setDelayedMarkAsRead( mDelayedMarkAsRead->isChecked() );
   GlobalSettings::self()->setDelayedMarkTime( mDelayedMarkTime->value() );
@@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const {
   return TQString::tqfromLatin1("configure-misc-groupware");
 }
 
-MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
-  : ConfigModuleTab( parent, name )
+MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name )
+  : ConfigModuleTab( tqparent, name )
 {
   TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(),
                                       KDialog::spacingHint() );
@@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
   mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format
-  toolTip = i18n( "Set the parent of the resource folders" );
+  toolTip = i18n( "Set the tqparent of the resource folders" );
   whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() );
   TQToolTip::add( mFolderComboLabel, toolTip );
   TQWhatsThis::add( mFolderComboLabel, whatsThis );
@@ -4999,7 +4999,7 @@ void MiscPageGroupwareTab::slotLegacyBodyInvitesToggled( bool on )
                         "resulting messages look very odd.<br>People that have email "
                         "programs that do understand invitations will still "
                         "be able to work with this.</qt>" );
-    KMessageBox::information( this, txt, TQString::null,
+    KMessageBox::information( this, txt, TQString(),
                               "LegacyBodyInvitesWarning" );
   }
   // Invitations in the body are autosent in any case (no point in editing raw ICAL)
@@ -5051,7 +5051,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
   KMAccount* selectedAccount = 0;
   int accountId = GlobalSettings::self()->theIMAPResourceAccount();
   if ( accountId )
-    selectedAccount = kmkernel->acctMgr()->find( accountId );
+    selectedAccount = kmkernel->acctMgr()->tqfind( accountId );
   else {
     // Fallback: iterate over accounts to select folderId if found (as an inbox folder)
       for( KMAccount *a = kmkernel->acctMgr()->first(); a!=0;
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index 062bbf78..a44f5db1 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -34,9 +34,10 @@ namespace KMail {
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+  ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
   ~ConfigureDialog();
 
 signals:
@@ -78,6 +79,7 @@ private:
  */
 class AccountUpdater : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
   public:
     AccountUpdater(KMail::ImapAccountBase *account);
     void update();
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index e17e800e..ff473f66 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -1,5 +1,5 @@
 #ifndef KDE_USE_FINAL
-#define QT_NO_CAST_ASCII
+#define TQT_NO_CAST_ASCII
 #endif
 // configuredialog_p.cpp: classes internal to ConfigureDialog
 // see configuredialog.cpp for details.
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-// Qt headers:
+// TQt headers:
 #include <tqheader.h>
 #include <tqtabwidget.h>
 #include <tqradiobutton.h>
@@ -38,9 +38,9 @@
 
 
 NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
-				      TQWidget *parent, const char *name,
+				      TQWidget *tqparent, const char *name,
 				      bool modal )
-  : KDialogBase( parent, name, modal, i18n("New Identity"),
+  : KDialogBase( tqparent, name, modal, i18n("New Identity"),
 		 Ok|Cancel|Help, Ok, true )
 {
   setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
@@ -122,9 +122,9 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) {
   enableButtonOK( true );
 }
 
-ListView::ListView( TQWidget *parent, const char *name,
+ListView::ListView( TQWidget *tqparent, const char *name,
 				     int visibleItem )
-  : KListView( parent, name )
+  : KListView( tqparent, name )
 {
   setVisibleItem(visibleItem);
 }
@@ -166,7 +166,7 @@ void ListView::resizeColums()
 
 void ListView::setVisibleItem( int visibleItem, bool updateSize )
 {
-  mVisibleItem = QMAX( 1, visibleItem );
+  mVisibleItem = TQMAX( 1, visibleItem );
   if( updateSize == true )
   {
     TQSize s = tqsizeHint();
@@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const
 static TQString flagPng = TQString::tqfromLatin1("/flag.png");
 
 NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
-				      TQWidget *parent, const char *name,
+				      TQWidget *tqparent, const char *name,
 				      bool modal )
-  : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
+  : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
 {
   // tqlayout the page (a combobox with label):
   TQWidget *page = makeMainWidget();
@@ -222,7 +222,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
     // we extract it from the path: "/prefix/de/entry.desktop" -> "de"
     TQString acronym = (*it).section( '/', -2, -2 );
 
-    if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
+    if ( suppressedAcronyms.tqfind( acronym ) == suppressedAcronyms.end() ) {
       // not found:
       TQString displayname = TQString::tqfromLatin1("%1 (%2)")
 	.arg( name ).arg( acronym );
@@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const
 }
 
 
-LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name )
-  : TQComboBox( rw, parent, name )
+LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name )
+  : TQComboBox( rw, tqparent, name )
 {
 }
 
@@ -269,10 +269,10 @@ TQString LanguageComboBox::language() const
 
 void LanguageComboBox::setLanguage( const TQString & language )
 {
-  TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
+  TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
   for (int i = 0; i < count(); i++)
     // ### FIXME: use .endWith():
-    if ( text(i).find( parenthizedLanguage ) >= 0 ) {
+    if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) {
       setCurrentItem(i);
       return;
     }
@@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language )
 //
 //
 
-ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
-  : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
+ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal )
+  : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
 {
   // tmp. vars:
   TQWidget * page = makeMainWidget();
@@ -364,9 +364,9 @@ void ProfileDialog::slotOk() {
 }
 
 
-ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent,
+ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent,
 						  const char * name )
-  : ConfigModule( parent, name )
+  : ConfigModule( tqparent, name )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   mTabWidget = new TQTabWidget( this );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index f12c39ba..b1c34379 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -78,12 +78,13 @@ namespace Kleo {
 class NewIdentityDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
 
   NewIdentityDialog( const TQStringList & identities,
-                     TQWidget *parent=0, const char *name=0, bool modal=true );
+                     TQWidget *tqparent=0, const char *name=0, bool modal=true );
 
   TQString identityName() const { return mLineEdit->text(); }
   TQString duplicateIdentity() const { return mComboBox->currentText(); }
@@ -108,10 +109,10 @@ private:
 struct LanguageItem
 {
   LanguageItem() {}
-  LanguageItem( const TQString & language, const TQString & reply=TQString::null,
-                const TQString & replyAll=TQString::null,
-                const TQString & forward=TQString::null,
-                const TQString & indentPrefix=TQString::null ) :
+  LanguageItem( const TQString & language, const TQString & reply=TQString(),
+                const TQString & replyAll=TQString(),
+                const TQString & forward=TQString(),
+                const TQString & indentPrefix=TQString() ) :
     mLanguage( language ), mReply( reply ), mReplyAll( replyAll ),
     mForward( forward ), mIndentPrefix( indentPrefix ) {}
 
@@ -123,9 +124,10 @@ typedef TQValueList<LanguageItem> LanguageItemList;
 class NewLanguageDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
+    NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0,
                        const char *name=0, bool modal=true );
     TQString language() const;
 
@@ -134,12 +136,13 @@ class NewLanguageDialog : public KDialogBase
 };
 
 
-class LanguageComboBox : public QComboBox
+class LanguageComboBox : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
+    LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 );
     int insertLanguage( const TQString & language );
     TQString language() const;
     void setLanguage( const TQString & language );
@@ -153,8 +156,9 @@ class LanguageComboBox : public QComboBox
 
 class ProfileDialog : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
+  ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false );
 
 signals:
   void profileSelected( KConfig * profile );
@@ -174,9 +178,10 @@ private:
 #include <kdialog.h>
 class ConfigModule : public KCModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigModule( TQWidget * parent=0, const char * name=0 )
-     : KCModule ( parent, name )
+  ConfigModule( TQWidget * tqparent=0, const char * name=0 )
+     : KCModule ( tqparent, name )
      {}
   ~ConfigModule() {}
 
@@ -201,9 +206,10 @@ signals:
 // Individual tab of a ConfigModuleWithTabs
 class ConfigModuleTab : public TQWidget {
   Q_OBJECT
+  TQ_OBJECT
 public:
-   ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
-      :TQWidget( parent, name )
+   ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 )
+      :TQWidget( tqparent, name )
       {}
   ~ConfigModuleTab() {}
   void load();
@@ -235,8 +241,9 @@ private:
  */
 class ConfigModuleWithTabs : public ConfigModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
+  ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 );
    ~ConfigModuleWithTabs() {}
 
   // don't reimplement any of those methods
@@ -262,8 +269,9 @@ private:
 
 class KDE_EXPORT IdentityPage : public ConfigModule {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  IdentityPage( TQWidget * parent=0, const char * name=0 );
+  IdentityPage( TQWidget * tqparent=0, const char * name=0 );
   ~IdentityPage() {}
 
   TQString helpAnchor() const;
@@ -312,8 +320,9 @@ private: // data members
 // subclasses: one class per tab:
 class AccountsPageSendingTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
+  AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
   void save();
 
@@ -349,8 +358,9 @@ private:
 
 class AccountsPageReceivingTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
+  AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 );
   ~AccountsPageReceivingTab();
   TQString helpAnchor() const;
   void save();
@@ -393,8 +403,9 @@ private:
 
 class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AccountsPage( TQWidget * parent=0, const char * name=0 );
+  AccountsPage( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
 
@@ -420,8 +431,9 @@ private:
 
 class AppearancePageFontsTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
   void save();
 
@@ -447,8 +459,9 @@ private:
 
 class AppearancePageColorsTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
   void save();
 
@@ -468,8 +481,9 @@ private:
 
 class AppearancePageLayoutTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -490,8 +504,9 @@ private: // data
 
 class AppearancePageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -516,8 +531,9 @@ private: // data
 
 class AppearancePageReaderTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -547,8 +563,9 @@ private: // data
 
 class AppearancePageSystemTrayTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
+  AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -565,8 +582,9 @@ private: // data
 
 class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AppearancePage( TQWidget * parent=0, const char * name=0 );
+  AppearancePage( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -595,8 +613,9 @@ private:
 
 class ComposerPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -628,8 +647,9 @@ private:
 
 class ComposerPagePhrasesTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -659,8 +679,9 @@ private:
 
 class ComposerPageTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -676,8 +697,9 @@ private:
 
 class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -693,8 +715,9 @@ private:
 
 class ComposerPageSubjectTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -711,8 +734,9 @@ private:
 
 class ComposerPageCharsetTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -732,8 +756,9 @@ private:
 
 class ComposerPageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -764,8 +789,9 @@ private:
 
 class ComposerPageAttachmentsTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
+  ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -785,8 +811,9 @@ private:
 
 class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ComposerPage( TQWidget * parent=0, const char * name=0 );
+  ComposerPage( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -819,8 +846,9 @@ private:
 
 class SecurityPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
+  SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   void save();
@@ -844,8 +872,9 @@ private:
 
 class SecurityPageComposerCryptoTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
+  SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -863,8 +892,9 @@ private:
 
 class SecurityPageWarningTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
+  SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -885,9 +915,10 @@ private:
 
 class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
   Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
-  SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
+  SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 );
   ~SecurityPageSMimeTab();
 
   TQString helpAnchor() const;
@@ -912,8 +943,9 @@ private:
 class SecurityPageCryptPlugTab : public ConfigModuleTab
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
+  SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 );
   ~SecurityPageCryptPlugTab();
 
   TQString helpAnchor() const;
@@ -930,8 +962,9 @@ private:
 
 class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecurityPage( TQWidget * parent=0, const char * name=0 );
+  SecurityPage( TQWidget * tqparent=0, const char * name=0 );
 
   TQString helpAnchor() const;
 
@@ -961,8 +994,9 @@ private:
 
 class MiscPageFolderTab : public ConfigModuleTab {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
+  MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 );
 
   void save();
  TQString helpAnchor() const;
@@ -991,8 +1025,9 @@ private:
 
 class MiscPageGroupwareTab : public ConfigModuleTab  {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
+  MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 );
   void save();
   TQString helpAnchor() const;
 
@@ -1032,8 +1067,9 @@ private:
 
 class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MiscPage( TQWidget * parent=0, const char * name=0 );
+  MiscPage( TQWidget * tqparent=0, const char * name=0 );
   TQString helpAnchor() const;
 
   typedef MiscPageFolderTab FolderTab;
@@ -1052,8 +1088,9 @@ private:
 
 class ListView : public KListView {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
+  ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
   void resizeColums();
 
   void setVisibleItem( int visibleItem, bool updateSize=true );
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index ddfa6d25..9be07213 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob()
 
 /*
  * The basic strategy is to first create the target folder, then copy all the mail
- * from the source to the target folder, then recurse for each of the folder's children
+ * from the source to the target folder, then recurse for each of the folder's tqchildren
  */
 void CopyFolderJob::execute()
 {
@@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command )
     rollback();
     return;
   }
-  // if we have children, recurse
+  // if we have tqchildren, recurse
   if ( mStorage->folder()->child() ) {
     slotCopyNextChild();
   } else {
@@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success )
     mNextChildFolder = static_cast<KMFolder*>(node);
     ++mChildFolderNodeIterator;
   } else {
-    // no more children, we are done
+    // no more tqchildren, we are done
     emit folderCopyComplete( true );
     deleteLater();
     return;
@@ -196,8 +196,8 @@ bool CopyFolderJob::createTargetDir()
         KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() );
         connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)),
                  this, TQT_SLOT(folderCreationDone(const TQString&, bool)) );
-        selectedStorage->createFolder(mStorage->folder()->name(), TQString::null); // create it on the server
-        newStorage->initializeFrom( selectedStorage, imapPath, TQString::null );
+        selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server
+        newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
         static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() );
         waitForFolderCreation = true;
         success = true;
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 73311a49..743d8b61 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -50,11 +50,12 @@ namespace KMail {
 class CopyFolderJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a new job
    * @param storage of the folder that should be copied
-   * @param newParent the target parent folder
+   * @param newParent the target tqparent folder
    */
   CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 );
 
@@ -69,7 +70,7 @@ public:
 
 protected slots:
 
-  /** Create the target directory under the new parent. Returns success or failure.*/
+  /** Create the target directory under the new tqparent. Returns success or failure.*/
   bool createTargetDir();
 
   /** Copy all messages from the original folder to mNewFolder */
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index fc411be7..3fe2fd78 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/csshelper.h b/kmail/csshelper.h
index 7015cec5..9e87f5df 100644
--- a/kmail/csshelper.h
+++ b/kmail/csshelper.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 6a0a7f4c..ef3668df 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -52,8 +52,8 @@
 
 #include "customtemplates.h"
 
-CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
-  :CustomTemplatesBase( parent, name ),
+CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name )
+  :CustomTemplatesBase( tqparent, name ),
    mCurrentItem( 0 ),
    mBlockChangeSignal( false )
 {
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index a8c24061..21695824 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -35,6 +35,7 @@ class KShortcut;
 class CustomTemplates : public CustomTemplatesBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -42,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase
 
   public:
 
-    CustomTemplates( TQWidget *parent = 0, const char *name = 0 );
+    CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 );
     ~CustomTemplates();
 
     void load();
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index ab8ecb84..cf068e9e 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomTemplatesBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="tqgeometry">
         <rect>
             <x>0</x>
@@ -13,7 +13,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout9</cstring>
             </property>
@@ -24,7 +24,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout8</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Type</string>
@@ -120,7 +120,7 @@
                         </widget>
             </vbox>
         </widget>
-        <widget class="QFrame" row="0" column="1">
+        <widget class="TQFrame" row="0" column="1">
             <property name="name">
                 <cstring>mEditFrame</cstring>
             </property>
@@ -145,7 +145,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout8</cstring>
                     </property>
@@ -153,7 +153,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>tqlayout6</cstring>
                             </property>
@@ -161,7 +161,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>mToLabel</cstring>
                                     </property>
@@ -169,7 +169,7 @@
                                         <string>To:</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>mCCLabel</cstring>
                                     </property>
@@ -179,7 +179,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>tqlayout7</cstring>
                             </property>
@@ -201,7 +201,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>mEdit</cstring>
                     </property>
@@ -220,7 +220,7 @@
                         <enum>NoWrap</enum>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout4</cstring>
                     </property>
@@ -228,7 +228,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="1" column="2">
+                        <widget class="TQComboBox" row="1" column="2">
                             <item>
                                 <property name="text">
                                     <string>Universal</string>
@@ -253,7 +253,7 @@
                                 <cstring>mType</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
@@ -267,7 +267,7 @@
                                 <cstring>mKeyButton</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="1">
+                        <widget class="TQLabel" row="1" column="1">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -351,10 +351,10 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<slots>
+<Q_SLOTS>
     <slot>mAdd_clicked()</slot>
     <slot>mRemove_clicked()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 947d1deb..85c82b92 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -42,8 +42,8 @@
 
 namespace KMail {
 
-  DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name )
-    : TQComboBox( false, parent, name ),
+  DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name )
+    : TQComboBox( false, tqparent, name ),
       mSpellConfig( 0 ),
       mDefaultDictionary( 0 )
   {
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 1222e125..48160502 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,9 @@ namespace KMail {
 
   class DictionaryComboBox : public TQComboBox {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
+    DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 );
     ~DictionaryComboBox();
 
     TQString currentDictionaryName() const;
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 5f590b3b..62b4fcee 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -43,11 +43,11 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
-class DistributionListItem : public QCheckListItem
+class DistributionListItem : public TQCheckListItem
 {
   public:
     DistributionListItem( TQListView *list )
-      : TQCheckListItem( list, TQString::null, CheckBox )
+      : TQCheckListItem( list, TQString(), CheckBox )
     {
     }
 
@@ -93,9 +93,9 @@ class DistributionListItem : public QCheckListItem
 };
 
 
-DistributionListDialog::DistributionListDialog( TQWidget *parent )
+DistributionListDialog::DistributionListDialog( TQWidget *tqparent )
   : KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel,
-                 User1, parent, 0, false, false, i18n("Save List") )
+                 User1, tqparent, 0, false, false, i18n("Save List") )
 {
   TQFrame *topFrame = plainPage();
   
@@ -112,7 +112,7 @@ DistributionListDialog::DistributionListDialog( TQWidget *parent )
   mTitleEdit->setFocus();
   
   mRecipientsList = new KListView( topFrame );
-  mRecipientsList->addColumn( TQString::null );
+  mRecipientsList->addColumn( TQString() );
   mRecipientsList->addColumn( i18n("Name") );
   mRecipientsList->addColumn( i18n("Email") );
   topLayout->addWidget( mRecipientsList );
@@ -131,7 +131,7 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients )
       if ( !email.isEmpty() ) {
         DistributionListItem *item = new DistributionListItem( mRecipientsList );
         KABC::Addressee::List addressees =
-          KABC::StdAddressBook::self( true )->tqfindByEmail( email );
+          KABC::StdAddressBook::self( true )->findByEmail( email );
         if ( addressees.isEmpty() ) {
           KABC::Addressee a;
           a.setNameFromString( name );
@@ -182,7 +182,7 @@ void DistributionListDialog::slotUser1()
   if ( name.isEmpty() ) {
     bool ok = false;
     name = KInputDialog::getText( i18n("New Distribution List"),
-      i18n("Please enter name:"), TQString::null, &ok, this );
+      i18n("Please enter name:"), TQString(), &ok, this );
     if ( !ok || name.isEmpty() )
       return;
   }
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 6643557c..8d57b6dc 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -31,7 +31,7 @@ class KListView;
 class DistributionListDialog : public KDialogBase
 {
   public:
-    DistributionListDialog( TQWidget *parent );
+    DistributionListDialog( TQWidget *tqparent );
   
     void setRecipients( const Recipient::List & );
 
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index bca75762..e16c19cb 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,8 +49,8 @@
 using namespace KMail;
 
 EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
-                             TQObject * parent, TQWidget *tqparentWidget) :
-    TQObject( parent ),
+                             TQObject * tqparent, TQWidget *tqparentWidget) :
+    TQObject( tqparent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
@@ -73,7 +73,7 @@ bool EditorWatcher::start()
   list.append( mUrl );
   KService::Ptr offer = KServiceTypeProfile::preferredService( mMimeType, "Application" );
   if ( mOpenWith || !offer ) {
-    KOpenWithDlg dlg( list, i18n("Edit with:"), TQString::null, 0 );
+    KOpenWithDlg dlg( list, i18n("Edit with:"), TQString(), 0 );
     if ( !dlg.exec() )
       return false;
     offer = dlg.service();
@@ -118,7 +118,7 @@ void EditorWatcher::inotifyEvent()
   char buffer[4096];
   ioctl( mInotifyFd, FIONREAD, &pending );
   while ( pending > 0 ) {
-    int size = read( mInotifyFd, buffer, QMIN( pending, (int)sizeof(buffer) ) );
+    int size = read( mInotifyFd, buffer, TQMIN( pending, (int)sizeof(buffer) ) );
     pending -= size;
     if ( size < 0 )
       break; // error
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 35504d85..68fdb54e 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -35,19 +35,20 @@ namespace KMail {
   as the edited file are watched to work with as many as possible
   editors.
 */
-class EditorWatcher : public QObject
+class EditorWatcher : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
      * Constructs an EditorWatcher.
-     * @param parent the parent object of this EditorWatcher, which will take care of deleting
-     *               this EditorWatcher if the parent is deleted.
-     * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent
+     * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting
+     *               this EditorWatcher if the tqparent is deleted.
+     * @param tqparentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent
      *                     widget for message dialogs.
      */
     EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
-                   TQObject *parent, TQWidget *tqparentWidget );
+                   TQObject *tqparent, TQWidget *tqparentWidget );
     bool start();
     bool fileChanged() const { return mFileModified; }
   signals:
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index df595b36..cc19e3b1 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -1,5 +1,5 @@
 /*
-    This file was taken from the KDE 4.x libraries and backported to Qt 3.
+    This file was taken from the KDE 4.x libraries and backported to TQt 3.
 
     Copyright (C) 1999 Lars Knoll (knoll@kde.org)
     Copyright (C) 2003 Dirk Mueller (mueller@kde.org)
@@ -51,7 +51,7 @@
 // Multiple scripts per language were removed and the entries were reordered so
 // that simple substring matching will work. For example, bam was put before ba
 // so that the first match will be likely the right match. Otherwise "ba" would
-// match "bam" but we would have to search on to find "bam" which is what we want.
+// match "bam" but we would have to search on to tqfind "bam" which is what we want.
 // The original file is called pango-script-lang-table.h
 
 /* pango-script-lang-table.h:
@@ -856,7 +856,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t
     }
     else
     {
-        //QString->QTextCodec
+        //TQString->TQTextCodec
 
         enc = enc.lower();
          // hebrew visually ordered
@@ -880,7 +880,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t
 
     if (codec->mibEnum() == Mib8859_8)
     {
-        //We do NOT want to use Qt's TQHebrewCodec, since it tries to reorder itself.
+        //We do NOT want to use TQt's TQHebrewCodec, since it tries to reorder itself.
         codec = TQTextCodec::codecForName("iso8859-8-i");
 
         // visually ordered unless one of the following
@@ -1059,13 +1059,13 @@ bool EncodingDetector::analyze(const char *data, int len)
                 TQCString str( ptr, (end-ptr)+1);
                 str = str.lower();
                 int pos=0;
-                        //if( (pos = str.find("http-equiv", pos)) == -1) break;
-                        //if( (pos = str.find("content-type", pos)) == -1) break;
-                if( (pos = str.find("charset")) == -1)
+                        //if( (pos = str.tqfind("http-equiv", pos)) == -1) break;
+                        //if( (pos = str.tqfind("content-type", pos)) == -1) break;
+                if( (pos = str.tqfind("charset")) == -1)
                     continue;
                 pos+=6;
                 // skip to '='
-                if( (pos = str.find('=', pos)) == -1)
+                if( (pos = str.tqfind('=', pos)) == -1)
                     continue;
 
                 // skip whitespace before encoding itself
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index b2dd9766..0f223178 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -1,5 +1,5 @@
 /*
-    This file was taken from the KDE 4.x libraries and backported to Qt 3.
+    This file was taken from the KDE 4.x libraries and backported to TQt 3.
 
     Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2007 Nick Shaforostoff (shafff@ukr.net)
diff --git a/kmail/encodingdetector_ja.cpp b/kmail/encodingdetector_ja.cpp
index d5eeb1e0..659661a0 100644
--- a/kmail/encodingdetector_ja.cpp
+++ b/kmail/encodingdetector_ja.cpp
@@ -23,7 +23,7 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
  * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
diff --git a/kmail/encodingdetector_ja_p.h b/kmail/encodingdetector_ja_p.h
index 27cd067b..d5809c04 100644
--- a/kmail/encodingdetector_ja_p.h
+++ b/kmail/encodingdetector_ja_p.h
@@ -23,7 +23,7 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
  * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
@@ -39,7 +39,7 @@
 #define GUESS_JA_H
 
 #include <tqglobal.h>
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #undef UNICODE
 #endif 
 namespace khtml {
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 010a9d00..6d634d8f 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmcommands.h"
 
 #include <kdebug.h>
@@ -117,7 +117,7 @@ void ExpireJob::slotDoWork()
 {
   // No need to worry about mSrcFolder==0 here. The FolderStorage deletes the jobs on destruction.
   FolderStorage* storage = mSrcFolder->storage();
-  int stopIndex = mImmediate ? 0 : QMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
+  int stopIndex = mImmediate ? 0 : TQMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
 #ifdef DEBUG_SCHEDULER
   kdDebug(5006) << "ExpireJob: checking messages " << mCurrentIndex << " to " << stopIndex << endl;
 #endif
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcasStatus::instance()->seStatusMsg( str );
+    BroadcastqStatus::instance()->seStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
     }
   default: ;
   }
-  BroadcasStatus::instance()->seStatusMsg( msg );
+  BroadcastqStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index 16e4c7bd..49a11a03 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -36,6 +36,7 @@ namespace KMail {
 class ExpireJob : public ScheduledJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   ExpireJob( KMFolder* folder, bool immediate );
   virtual ~ExpireJob();
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index 4913d1c6..c43cefc1 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -23,7 +23,7 @@
 using namespace KMail;
 
 /*
- *  Constructs a ExpiryPropertiesDialog as a child of 'parent', with the
+ *  Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the
  *  name 'name'.
  *
  */
@@ -153,7 +153,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
  */
 ExpiryPropertiesDialog::~ExpiryPropertiesDialog()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 void ExpiryPropertiesDialog::slotOk()
diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h
index d3ef7cfd..2fd55023 100644
--- a/kmail/expirypropertiesdialog.h
+++ b/kmail/expirypropertiesdialog.h
@@ -33,6 +33,7 @@ namespace KMail {
 class ExpiryPropertiesDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder );
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index d7098687..7176cdeb 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -49,8 +49,8 @@
 
 using namespace KMail;
 
-FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder)
-  : KMFolderTreeItem( parent, name, folder ),
+FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder)
+  : KMFolderTreeItem( tqparent, name, folder ),
   mOldName( folder->label() )
 {
   // same stuff as in KMFolderTreeItem again, this time even with virtual methods working
@@ -81,8 +81,8 @@ void FavoriteFolderViewItem::nameChanged()
 
 TQValueList<FavoriteFolderView*> FavoriteFolderView::mInstances;
 
-FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) :
-    FolderTreeBase( mainWidget, parent ),
+FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * tqparent) :
+    FolderTreeBase( mainWidget, tqparent ),
     mContextMenuItem( 0 ),
     mReadingConfig( false )
 {
@@ -399,8 +399,8 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti)
   assert( fti->folder() );
   TQString name = fti->folder()->label();
   TQListViewItem *accountFti = fti;
-  while ( accountFti->parent() )
-    accountFti = accountFti->parent();
+  while ( accountFti->tqparent() )
+    accountFti = accountFti->tqparent();
   if ( fti->type() == KFolderTreeItem::Inbox ) {
     if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) {
       name = i18n( "Local Inbox" );
diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h
index f19dd5d7..e0e34d26 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -28,8 +28,9 @@ class FavoriteFolderView;
 class FavoriteFolderViewItem : public KMFolderTreeItem
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
+    FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder );
 
   protected:
     bool useTopLevelIcon() const { return false; }
@@ -45,15 +46,16 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
 class FavoriteFolderView : public FolderTreeBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );
+    FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 );
     ~FavoriteFolderView();
 
     void readConfig();
     void writeConfig();
 
-    KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString::null,
+    KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString(),
                                  TQListViewItem *after = 0 );
     void addFolder( KMFolderTreeItem *fti );
 
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index 7e937c46..479e6d3e 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h
index b9090c63..87914322 100644
--- a/kmail/filehtmlwriter.h
+++ b/kmail/filehtmlwriter.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index c5780431..3299d1df 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,8 +46,8 @@
 
 using namespace KMail;
 
-FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
-  :KDialogBase( parent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
+FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent )
+  :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
    wasCancelled( false )
 {
   TQWidget *w = new TQWidget( this );
@@ -199,8 +199,8 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>&
 }
 
 
-FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter )
-:mParent( parent), mPopFilter( popFilter )
+FilterImporterExporter::FilterImporterExporter( TQWidget* tqparent, bool popFilter )
+:mParent( tqparent), mPopFilter( popFilter )
 {
 }
 
@@ -210,7 +210,7 @@ FilterImporterExporter::~FilterImporterExporter()
 
 TQValueList<KMFilter*> FilterImporterExporter::importFilters()
 {
-    TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString::null, mParent, i18n("Import Filters") );
+    TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString(), mParent, i18n("Import Filters") );
     if ( fileName.isEmpty() )
         return TQValueList<KMFilter*>(); // cancel
 
@@ -232,7 +232,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters()
 
 void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filters )
 {
-    KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString::null, mParent, i18n("Export Filters") );
+    KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString(), mParent, i18n("Export Filters") );
 
     if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) )
       return;
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 8b9a63bb..8c92e769 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,7 +47,7 @@ namespace KMail
 class FilterImporterExporter
 {
 public:
-      FilterImporterExporter( TQWidget* parent, bool popFilter = false );
+      FilterImporterExporter( TQWidget* tqparent, bool popFilter = false );
       virtual ~FilterImporterExporter();
 
       /** Export the given filter rules to a file which
@@ -68,8 +68,9 @@ private:
 class FilterSelectionDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  FilterSelectionDialog( TQWidget * parent = 0 );
+  FilterSelectionDialog( TQWidget * tqparent = 0 );
 
   virtual ~FilterSelectionDialog();
   virtual void slotCancel();
diff --git a/kmail/filterlog.cpp b/kmail/filterlog.cpp
index 7415c10d..b5e1d391 100644
--- a/kmail/filterlog.cpp
+++ b/kmail/filterlog.cpp
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index f336621a..83a2b383 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,9 +50,10 @@ namespace KMail {
     A signal is emitted whenever a new logentry is added,
     when the log was cleared or any log state was changed.
   */
-  class FilterLog : public QObject
+  class FilterLog : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /** access to the singleton instance */
@@ -135,7 +136,7 @@ namespace KMail {
       /** Non-public constructor needed by the singleton implementation */
       FilterLog();
       
-      /** The list tqcontains the single log pieces */
+      /** The list contains the single log pieces */
       TQStringList mLogEntries;
       
       /** the log status */
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 90eb5926..441390fb 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,8 +52,8 @@
 using namespace KMail;
 
 
-FilterLogDialog::FilterLogDialog( TQWidget * parent )
-: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
+FilterLogDialog::FilterLogDialog( TQWidget * tqparent )
+: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
               User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() )
 {
   setWFlags( WDestructiveClose );
@@ -244,7 +244,7 @@ void FilterLogDialog::slotUser1()
 void FilterLogDialog::slotUser2()
 {
   TQString fileName;
-  KFileDialog fdlg( TQString::null, TQString::null, this, 0, true );
+  KFileDialog fdlg( TQString(), TQString(), this, 0, true );
 
   fdlg.setMode( KFile::File );
   fdlg.setSelection( "kmail-filter.log" );
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index af1be64e..927edb6e 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,10 +48,11 @@ namespace KMail {
   class FilterLogDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
     
     public:
       /** constructor */
-      FilterLogDialog( TQWidget * parent );
+      FilterLogDialog( TQWidget * tqparent );
     
     protected slots:
       void slotLogEntryAdded( TQString logEntry );
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index 54df5167..4d1cb808 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -57,19 +57,19 @@ FolderIface::FolderIface( const TQString& vpath )
   Q_ASSERT( mFolder );
 }
 
-QString
+TQString
 FolderIface::path() const
 {
   return mPath;
 }
 
-QString
+TQString
 FolderIface::displayName() const
 {
   return mFolder->label();
 }
 
-QString
+TQString
 FolderIface::displayPath() const
 {
   return mFolder->prettyURL();
@@ -81,13 +81,13 @@ FolderIface::usesCustomIcons() const
   return mFolder->useCustomIcons();
 }
 
-QString
+TQString
 FolderIface::normalIconPath() const
 {
   return mFolder->normalIconPath();
 }
 
-QString
+TQString
 FolderIface::unreadIconPath() const
 {
   return mFolder->unreadIconPath();
@@ -136,7 +136,7 @@ FolderIface::messageRefs()
     for( int i = 0; i < messageCache.size(); ++i ) {
       KMMsgBase *msg = messageCache[i];
       if ( msg ) {
-        KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) );
+        KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->tqfind( msg ) );
         refList.append( DCOPRef( new MessageIface( fmsg ) ) );
       }
     }
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index d43adedb..645ab541 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -43,6 +43,7 @@ namespace KMail {
                       public DCOPObject
   {
     Q_OBJECT
+//  TQ_OBJECT
     K_DCOP
 
   public:
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 58130a05..90903fdb 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -83,8 +83,8 @@ static const struct {
 };
 
 
-KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name )
-  : KDialogBase( parent, name, true /*modal*/, caption,
+KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name )
+  : KDialogBase( tqparent, name, true /*modal*/, caption,
                  KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ )
   , mUserIdFormat( userIdFormat )
 {
@@ -115,7 +115,7 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt
   }
   topLayout->setRowStretch(2, 10);
 
-  TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page );
+  TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the tqparent folder." ), page );
   topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
 
   connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
@@ -139,7 +139,7 @@ static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat
   if ( userIdFormat == FullEmail )
     return email;
   else { // mUserIdFormat == UserName
-    email.truncate( email.find( '@' ) );
+    email.truncate( email.tqfind( '@' ) );
     return email;
   }
 }
@@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const
 // class KMail::FolderDiaACLTab::ListView : public KListView
 // {
 // public:
-//   ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
+//   ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {}
 // };
 
 class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
@@ -250,7 +250,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin
 void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
 {
   mPermissions = permissions;
-  setText( 1, permissionsToUserString( permissions, TQString::null ) );
+  setText( 1, permissionsToUserString( permissions, TQString() ) );
 }
 
 void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
@@ -260,7 +260,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
   // It's ok in distribution list names though, that's why this check is only done here
   // and also why there's no validator on the lineedit.
   if ( entry.userId.tqcontains( ' ' ) )
-    kdWarning(5006) << "Userid tqcontains a space!!!  '" << entry.userId << "'" << endl;
+    kdWarning(5006) << "Userid contains a space!!!  '" << entry.userId << "'" << endl;
 
   setUserId( entry.userId );
   mPermissions = entry.permissions;
@@ -297,14 +297,14 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
       TQString email = (*it).email;
       if ( email.isEmpty() )
         email = addresseeToUserId( (*it).addressee, userIdFormat );
-      ACLListEntry entry( email, TQString::null, mPermissions );
+      ACLListEntry entry( email, TQString(), mPermissions );
       entry.changed = true;
       aclList.append( entry );
     }
   } else { // it wasn't a distribution list
     ACLListEntry entry( userId(), mInternalRightsList, mPermissions );
     if ( mModified ) {
-      entry.internalRightsList = TQString::null;
+      entry.internalRightsList = TQString();
       entry.changed = true;
     }
     aclList.append( entry );
@@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
 
 ////
 
-KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
-  : FolderDiaTab( parent, name ),
+KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
+  : FolderDiaTab( tqparent, name ),
     mImapAccount( 0 ),
     mUserRights( 0 ),
     mUserRightsState( KMail::ACLJobs::NotFetchedYet ),
@@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
 }
 
-// Warning before save() this will return the url of the _parent_ folder, when creating a new one
+// Warning before save() this will return the url of the _tqparent_ folder, when creating a new one
 KURL KMail::FolderDiaACLTab::imapURL() const
 {
   KURL url = mImapAccount->getUrl();
@@ -398,9 +398,9 @@ void KMail::FolderDiaACLTab::load()
   if ( mDlg->folder() ) {
     // existing folder
     initializeWithValuesFromFolder( mDlg->folder() );
-  } else if ( mDlg->parentFolder() ) {
+  } else if ( mDlg->tqparentFolder() ) {
     // new folder
-    initializeWithValuesFromFolder( mDlg->parentFolder() );
+    initializeWithValuesFromFolder( mDlg->tqparentFolder() );
     mChanged = true; // ensure that saving happens
   }
 
@@ -412,7 +412,7 @@ void KMail::FolderDiaACLTab::load()
   // but the default value is determined from the current user's own id.
   TQString defaultFormat = "fullemail";
   // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap...  (bug?)
-  if ( mImapAccount && mImapAccount->login().find('@') == -1 )
+  if ( mImapAccount && mImapAccount->login().tqfind('@') == -1 )
     defaultFormat = "username"; // no @ found, so we assume it's just the username
   KConfigGroup configGroup( kmkernel->config(), "IMAP" );
   TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
@@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load()
     mUserIdFormat = UserName;
 
   if ( mFolderType == KMFolderTypeCachedImap ) {
-    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
     KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() );
     if ( mUserRightsState == KMail::ACLJobs::FetchFailed ||
          folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) {
@@ -450,18 +450,18 @@ void KMail::FolderDiaACLTab::load()
     mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
     return;
   }
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
   mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
-    slotConnectionResult( -1, TQString::null );
+    slotConnectionResult( -1, TQString() );
   } else if ( state == ImapAccountBase::Connecting ) {
     connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
              this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   } else { // Connected
-    slotConnectionResult( 0, TQString::null );
+    slotConnectionResult( 0, TQString() );
   }
 }
 
@@ -481,7 +481,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
   if ( mUserRightsState != KMail::ACLJobs::Ok ) {
     connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
              this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
-    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
     mImapAccount->getUserRights( folder, mImapPath );
   }
   else
@@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
     return;
   }
 
-  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
+  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
     KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
     mUserRights = folderImap->userRights();
     mUserRightsState = folderImap->userRightsState();
@@ -505,15 +505,15 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
 
 void KMail::FolderDiaACLTab::startListing()
 {
-  // List ACLs of folder - or its parent, if creating a new folder
-  mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
+  // List ACLs of folder - or its tqparent, if creating a new folder
+  mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), mImapPath );
   connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
            this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 }
 
 void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
 {
-  if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
+  if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) {
     disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
                 this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
   emit changed(true);
 }
 
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately
@@ -706,7 +706,7 @@ bool KMail::FolderDiaACLTab::save()
   for ( TQStringList::ConstIterator rit = mRemovedACLs.begin(); rit != mRemovedACLs.end(); ++rit ) {
     // We use permissions == -1 to signify deleting. At least on cyrus, setacl(0) or deleteacl are the same,
     // but I'm not sure if that's true for all servers.
-    ACLListEntry entry( *rit, TQString::null, -1 );
+    ACLListEntry entry( *rit, TQString(), -1 );
     entry.changed = true;
     aclList.append( entry );
   }
@@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save()
 
   mACLList = aclList;
 
-  KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0;
+  KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) : 0;
 
   if ( mDlg->isNewFolder() ) {
     // The folder isn't created yet, wait for it
     // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete
-    connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+    connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
              this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
   } else {
-      slotDirectoryListingFinished( parentImap );
+      slotDirectoryListingFinished( tqparentImap );
   }
   return true;
 }
@@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save()
 void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
 {
   if ( !f ||
-       f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) ||
+       f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) ||
        !mDlg->folder() ||
        !mDlg->folder()->storage() ) {
     emit readyForAccept();
@@ -754,7 +754,7 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
 
   KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
   ImapAccountBase::jobData jd;
-  jd.total = 1; jd.done = 0; jd.parent = 0;
+  jd.total = 1; jd.done = 0; jd.tqparent = 0;
   mImapAccount->insertJob(job, jd);
 
   connect(job, TQT_SIGNAL(result(KIO::Job *)),
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index d9116a6b..85565517 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -59,9 +59,10 @@ class ImapAccountBase;
  */
 class ACLEntryDialog :public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
+  ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 );
 
   void setValues( const TQString& userId, unsigned int permissions );
 
@@ -86,13 +87,14 @@ private:
 class FolderDiaACLTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
+  FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
 
   virtual void load();
   virtual bool save();
-  virtual AccepStatus accept();
+  virtual AcceptqStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 99954cc2..4215ba72 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -50,8 +50,8 @@
 
 using namespace KMail;
 
-KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
-  : FolderDiaTab( parent, name ),
+KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
+  : FolderDiaTab( tqparent, name ),
     mImapAccount( 0 ),
     mDlg( dlg )
 {
@@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load()
   if ( mDlg->folder() ) {
     // existing folder
     initializeWithValuesFromFolder( mDlg->folder() );
-  } else if ( mDlg->parentFolder() ) {
+  } else if ( mDlg->tqparentFolder() ) {
     // new folder
-    initializeWithValuesFromFolder( mDlg->parentFolder() );
+    initializeWithValuesFromFolder( mDlg->tqparentFolder() );
   }
 
   if ( mFolderType == KMFolderTypeCachedImap ) {
@@ -114,18 +114,18 @@ void KMail::FolderDiaQuotaTab::load()
     mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
     return;
   }
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
   mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
-    slotConnectionResult( -1, TQString::null );
+    slotConnectionResult( -1, TQString() );
   } else if ( state == ImapAccountBase::Connecting ) {
     connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
              this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   } else { // Connected
-    slotConnectionResult( 0, TQString::null );
+    slotConnectionResult( 0, TQString() );
   }
 
 }
@@ -144,7 +144,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
   }
   connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
           this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
   mImapAccount->getStorageQuotaInfo( folder, mImapPath );
 }
 
@@ -152,7 +152,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
                                                       KIO::Job* job,
                                                       const KMail::QuotaInfo& info )
 {
-  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
+  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
     //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
 
     disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept()
 {
   if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
     return Accepted;
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 2fc956e9..570c7e82 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -20,17 +20,17 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
  */
-#ifndef FOLDERDIAQUOTA_H
-#define FOLDERDIAQUOTA_H
+#ifndef FOLDERDIATQUOTA_H
+#define FOLDERDIATQUOTA_H
 
 #include "kmfolderdia.h"
 #include "kmfoldertype.h"
@@ -53,13 +53,14 @@ class ImapAccountBase;
 class FolderDiaQuotaTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
+  FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
 
   virtual void load();
   virtual bool save();
-  virtual AccepStatus accept();
+  virtual AcceptqStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
@@ -87,5 +88,5 @@ private:
 
 } // end of namespace KMail
 
-#endif /* FOLDERDIAQUOTA_H */
+#endif /* FOLDERDIATQUOTA_H */
 
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index 86d399d8..d8f8f44c 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -51,8 +51,8 @@ using namespace KMail;
 
 struct QuotaInfo;
 
-QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
-        :TQWidget( parent, name )
+QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name )
+        :TQWidget( tqparent, name )
 {
       TQVBoxLayout *box = new TQVBoxLayout(this);
       TQWidget *stuff = new TQWidget( this );
@@ -66,7 +66,7 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
       tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
       tqlayout->addWidget( mRootLabel, 0, 1 );
       tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
-      //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
+      //tqlayout->addWidget( new TQLabel( i18n("tqStatus:"), stuff ), 2, 0 );
       tqlayout->addWidget( mInfoLabel, 1, 1 );
       tqlayout->addWidget( mProgressBar, 2, 1 );
       box->addWidget( stuff );
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 68b5c19f..776ae1d7 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -19,19 +19,19 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
  */
 
 
-#ifndef FOLDERDIAQUOTA_P_H
-#define FOLDERDIAQUOTA_P_H
+#ifndef FOLDERDIATQUOTA_P_H
+#define FOLDERDIATQUOTA_P_H
 
 
 #include <tqlabel.h>
@@ -45,8 +45,9 @@ namespace KMail {
 class QuotaWidget : public TQWidget {
 
  Q_OBJECT
+  TQ_OBJECT
 public:
-    QuotaWidget( TQWidget* parent, const char* name = 0 );
+    QuotaWidget( TQWidget* tqparent, const char* name = 0 );
     virtual ~QuotaWidget() { }
     void setQuotaInfo( const KMail::QuotaInfo& info );
 
@@ -60,4 +61,4 @@ private:
 
 }//end of namespace KMail
 
-#endif /* FOLDERDIAQUOTA_H */
+#endif /* FOLDERDIATQUOTA_H */
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 69a1557a..655e18d7 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 2988c925..3d662e76 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,9 +41,10 @@ class KMFolder;
 
 namespace KMail {
 
-class FolderJob : public QObject
+class FolderJob : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder,
@@ -52,21 +53,21 @@ public:
                  tCopyMessage, tMoveMessage, tOther /* used by subclasses */ };
   /**
    * Constructs a new job, operating on the message msg, of type
-   * @p jt and with a parent folder @p folder.
+   * @p jt and with a tqparent folder @p folder.
    */
   FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0,
-        TQString partSpecifier = TQString::null );
+        TQString partSpecifier = TQString() );
 
   /**
    * Constructs a new job, operating on a message list @p msgList,
-   * set @sets, JobType @p jt and with the parent folder @p folder.
+   * set @sets, JobType @p jt and with the tqparent folder @p folder.
    *
    */
   FolderJob( const TQPtrList<KMMessage>& msgList, const TQString& sets,
 	     JobType jt = tGetMessage, KMFolder *folder = 0 );
   /**
    * This one should ONLY be used in derived folders, when a job
-   * does something internal and needs to construct an empty parent
+   * does something internal and needs to construct an empty tqparent
    * FolderJob
    */
   FolderJob( JobType jt );
@@ -153,7 +154,7 @@ signals:
   void result( KMail::FolderJob* job );
 
   /**
-   * This progress signal tqcontains the "done" and the "total" numbers so
+   * This progress signal contains the "done" and the "total" numbers so
    * that the caller can either make a % out of it, or combine it into
    * a higher-level progress info.
    */
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 45fa7015..984885c1 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KMFolderDialogUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KMFolderDialogUI</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="6">
+                <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="6">
                     <property name="name">
                         <cstring>mNameEdit</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <enum>Sunken</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -55,7 +55,7 @@
                         <cstring>mNameEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="8">
+                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="8">
                     <property name="name">
                         <cstring>mHoldsMailingList</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -111,7 +111,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -204,7 +204,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="5">
+                <widget class="TQLabel" row="2" column="5">
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -235,7 +235,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="8">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="8">
                     <property name="name">
                         <cstring>mIconsCheckBox</cstring>
                     </property>
@@ -243,7 +243,7 @@
                         <string>Use custom &amp;icons</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="4" column="4" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="4" column="4" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>mMailingListPostAddress</cstring>
                     </property>
@@ -261,7 +261,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox3</cstring>
             </property>
@@ -272,7 +272,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>TextLabel2_3</cstring>
                     </property>
@@ -303,7 +303,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>mExpireRead</cstring>
                     </property>
@@ -328,7 +328,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>TextLabel2_3_2</cstring>
                     </property>
@@ -342,7 +342,7 @@
                         <cstring>mExpireUnreadNum</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>mExpireUnread</cstring>
                     </property>
@@ -443,7 +443,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -454,7 +454,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -465,7 +465,7 @@
                         <cstring>mIdentity</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>mIdentity</cstring>
                     </property>
@@ -475,7 +475,7 @@
                         <cstring>mMailboxType</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -486,7 +486,7 @@
                         <cstring>mMailboxType</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel1_3</cstring>
                     </property>
@@ -514,7 +514,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>Sender</string>
@@ -630,9 +630,9 @@
     <variable>QValueList&lt;QGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
     <variable>KMFolderDir *mFolderDIr;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotChangeIcon( QString )</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kmail/folderpropertiesdialog.ui.h b/kmail/folderpropertiesdialog.ui.h
index c7251124..99a956ab 100644
--- a/kmail/folderpropertiesdialog.ui.h
+++ b/kmail/folderpropertiesdialog.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions respectively slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 2be44c5a..06374664 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,8 +41,8 @@
 
 namespace KMail {
 
-FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
-  : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ),
+FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
+  : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ),
     mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true )
 {
   TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
@@ -116,7 +116,7 @@ void FolderRequester::setFolder( const TQString &idString )
 //-----------------------------------------------------------------------------
 void FolderRequester::keyPressEvent( TQKeyEvent * e )
 {
-  if ( e->key() == Qt::Key_Space )
+  if ( e->key() == TQt::Key_Space )
     slotOpenDialog();
   else
     e->ignore();
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 9d7493c8..a13ab6d2 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -38,22 +38,23 @@ class KMFolderTree;
 namespace KMail {
 
   /**
-   * A widget that tqcontains a KLineEdit which shows the current folder
+   * A widget that contains a KLineEdit which shows the current folder
    * and a button that fires a KMFolderSelDlg
    * The dialog is set to disable readonly folders by default
    * Search folders are excluded
    */ 
-  class FolderRequester: public QWidget
+  class FolderRequester: public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /** 
        * Constructor
-       * @param parent the parent widget
+       * @param tqparent the tqparent widget
        * @param tree the KMFolderTree to get the folders
        */
-      FolderRequester( TQWidget *parent, KMFolderTree* tree );
+      FolderRequester( TQWidget *tqparent, KMFolderTree* tree );
       virtual ~FolderRequester();
 
       /** Returns selected folder */
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index 147d98a0..45748b2f 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -27,8 +27,8 @@
 
 using namespace KMail;
 
-FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent )
-  : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
+FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent )
+  : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
 {
   assert( ft );
 
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 5d51db31..97cc3860 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -29,9 +29,10 @@ namespace KMail {
 class FolderSetSelector : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );
+    FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 );
 
     TQValueList<int> selectedFolders();
     void setSelectedFolders( const TQValueList<int> &folderIds );
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 80e1b28f..b4897afe 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -53,9 +53,9 @@ using namespace KMail;
 
 FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
                                             KMMainWidget *mainwidget,
-                                            TQWidget *parent,
+                                            TQWidget *tqparent,
                                             const char *name )
-:  KDialogBase( parent, name, true,
+:  KDialogBase( tqparent, name, true,
                i18n( "Shortcut for Folder %1" ).arg( folder->label() ),
                KDialogBase::Ok | KDialogBase::Cancel ),
    mFolder( folder ), mMainWidget( mainwidget )
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index 1934ad23..da249e1a 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -51,9 +51,10 @@ namespace KMail
 class FolderShortcutDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, 
-                        TQWidget *parent=0, const char *name=0 );
+                        TQWidget *tqparent=0, const char *name=0 );
 	~FolderShortcutDialog();
 
 
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 6744e136..e1a7f364 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -113,7 +113,7 @@ void FolderStorage::close( const char* owner, bool aForced )
 TQString FolderStorage::dotEscape(const TQString& aStr)
 {
   if (aStr[0] != '.') return aStr;
-  return aStr.left(aStr.find(TQRegExp("[^\\.]"))) + aStr;
+  return aStr.left(aStr.tqfind(TQRegExp("[^\\.]"))) + aStr;
 }
 
 void FolderStorage::addJob( FolderJob* job ) const
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
     if (!(msgBase = getMsgBase(i))) continue;
     if (msgBase->isNew())
     {
-      msgBase->seStatus(KMMsgStatusUnread);
+      msgBase->setqStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx)
 bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret)
 {
   if (aIndex_ret) *aIndex_ret = -1;
-  KMFolder *msgParent = aMsg->parent();
-  // If the message has a parent and is in transfer, bail out. If it does not
-  // have a parent we want to be able to add it even if it is in transfer.
+  KMFolder *msgParent = aMsg->tqparent();
+  // If the message has a tqparent and is in transfer, bail out. If it does not
+  // have a tqparent we want to be able to add it even if it is in transfer.
   if (aMsg->transferInProgress() && msgParent)
       return false;
   if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap)
@@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg)
     return;
   aMsg->setTransferInProgress( false );
   aMsg->setComplete( true );
-  KMFolder *aFolder = aMsg->parent();
+  KMFolder *aFolder = aMsg->tqparent();
   int index;
   ulong serNum = aMsg->getMsgSerNum();
   bool undo = aMsg->enableUndo();
@@ -350,8 +350,8 @@ void FolderStorage::reallyAddCopyOfMsg(KMMessage* aMsg)
   unGetMsg( count() - 1 );
 }
 
-int FolderStorage::find( const KMMessage * msg ) const {
-  return find( &msg->toMsgBase() );
+int FolderStorage::tqfind( const KMMessage * msg ) const {
+  return tqfind( &msg->toMsgBase() );
 }
 
 //-----------------------------------------------------------------------------
@@ -359,7 +359,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMsgBase>& msgList, bool imapQuie
 {
   for( TQPtrListIterator<KMMsgBase> it( msgList ); *it; ++it )
   {
-    int idx = find(it.current());
+    int idx = tqfind(it.current());
     assert( idx != -1);
     removeMsg(idx, imapQuiet);
   }
@@ -370,7 +370,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMessage>& msgList, bool imapQuie
 {
   for( TQPtrListIterator<KMMessage> it( msgList ); *it; ++it )
   {
-    int idx = find(it.current());
+    int idx = tqfind(it.current());
     assert( idx != -1);
     removeMsg(idx, imapQuiet);
   }
@@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList)
 {
   for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
   {
-    if (msg->parent())
+    if (msg->tqparent())
     {
-      int idx = msg->parent()->find(msg);
+      int idx = msg->tqparent()->tqfind(msg);
       if ( idx >= 0 )
         take(idx);
     }
@@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList<KMMessage>& msgList, const TQStri
 int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret)
 {
   assert(aMsg != 0);
-  KMFolder* msgParent = aMsg->parent();
+  KMFolder* msgParent = aMsg->tqparent();
 
   if (msgParent)
     msgParent->open("moveMsgSrc");
@@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList<KMMessage> msglist, int* aIndex_ret)
 {
   KMMessage* aMsg = msglist.first();
   assert(aMsg != 0);
-  KMFolder* msgParent = aMsg->parent();
+  KMFolder* msgParent = aMsg->tqparent();
 
   if (msgParent)
     msgParent->open("foldermovemsg");
@@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
   close("rename", true);
 
   oldName = folder()->fileName();
-  oldParent = folder()->parent();
+  oldParent = folder()->tqparent();
   if (newParent)
     folder()->setParent( newParent );
 
@@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
     }
 
     // if the folder is being moved then move its node and, if necessary, also
-    // the associated subfolder directory node to the new parent
+    // the associated subfolder directory node to the new tqparent
     if (newParent) {
       if (oldParent->findRef( folder() ) != -1)
         oldParent->take();
       newParent->inSort( folder() );
       if ( child ) {
-        if ( child->parent()->findRef( child ) != -1 )
-          child->parent()->take();
+        if ( child->tqparent()->findRef( child ) != -1 )
+          child->tqparent()->take();
         newParent->inSort( child );
         child->setParent( newParent );
       }
@@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
-  const KMMsgStatus newStatus, int idx)
+void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
+  const KMMsgtqStatus newtqStatus, int idx)
 {
   int oldUnread = 0;
   int newUnread = 0;
 
-  if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) &&
-      !(oldStatus & KMMsgStatusIgnored)) ||
+  if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) &&
+      !(oldtqStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     oldUnread = 1;
-  if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) &&
-      !(newStatus & KMMsgStatusIgnored)) ||
+  if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) &&
+      !(newtqStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     newUnread = 1;
   int deltaUnread = newUnread - oldUnread;
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
 void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
 {
   if (idx < 0)
-    idx = aMsg->parent()->find( aMsg );
+    idx = aMsg->tqparent()->tqfind( aMsg );
 
   if (idx >= 0 )
   {
@@ -1022,7 +1022,7 @@ int FolderStorage::appendToFolderIdsFile( int idx )
   return ret;
 }
 
-void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
   KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
-      msg->toggleStatus(status, idx);
+      msg->toggletqStatus(status, idx);
     else
-      msg->seStatus(status, idx);
+      msg->setqStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
 {
   for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::seStatus(*it, status, toggle);
+    FolderStorage::setqStatus(*it, status, toggle);
   }
 }
 
@@ -1136,7 +1136,7 @@ void FolderStorage::slotProcessNextSearchBatch()
   if ( !mSearchPattern )
     return;
   TQValueList<TQ_UINT32> matchingSerNums;
-  const int end = QMIN( mCurrentSearchedMsg + 15, count() );
+  const int end = TQMIN( mCurrentSearchedMsg + 15, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
     TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index b7effe08..ab58d4fd 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -71,20 +71,21 @@ typedef TQValueList<TQ_UINT32> SerNumList;
  *
  * @section Accounts
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the children of the folder. They are only stored here
+ *   represented as the tqchildren of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
 
-class FolderStorage : public QObject
+class FolderStorage : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
 
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   FolderStorage( KMFolder* folder, const char* name=0 );
   virtual ~FolderStorage();
@@ -108,10 +109,10 @@ public:
   /** Specify, that the folder can't contain mails. */
   virtual void setNoContent(bool aNoContent);
 
-  /** Returns, if the folder can't have children */
+  /** Returns, if the folder can't have tqchildren */
   virtual bool noChildren() const { return mNoChildren; }
 
-  /** Specify, that the folder can't have children */
+  /** Specify, that the folder can't have tqchildren */
   virtual void setNoChildren( bool aNoChildren );
 
   enum ChildrenState {
@@ -119,11 +120,11 @@ public:
     HasNoChildren,
     ChildrenUnknown
   };
-  /** Returns if the folder has children,
-   *  has no children or we don't know */
+  /** Returns if the folder has tqchildren,
+   *  has no tqchildren or we don't know */
   virtual ChildrenState hasChildren() const { return mHasChildren; }
 
-  /** Specify if the folder has children */
+  /** Specify if the folder has tqchildren */
   virtual void setHasChildren( ChildrenState state )
     { mHasChildren = state; }
 
@@ -158,7 +159,7 @@ public:
    * for each derived KMFolder).
    */
   virtual FolderJob* createJob( KMMessage *msg, FolderJob::JobType jt = FolderJob::tGetMessage,
-                                KMFolder *folder = 0, TQString partSpecifier = TQString::null,
+                                KMFolder *folder = 0, TQString partSpecifier = TQString(),
                                 const AttachmentStrategy *as = 0 ) const;
   virtual FolderJob* createJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
                                 FolderJob::JobType jt = FolderJob::tGetMessage,
@@ -228,8 +229,8 @@ public:
   virtual int moveMsg(TQPtrList<KMMessage>, int* index_return = 0);
 
   /** Returns the index of the given message or -1 if not found. */
-  virtual int find(const KMMsgBase* msg) const = 0;
-  int find( const KMMessage * msg ) const;
+  virtual int tqfind(const KMMsgBase* msg) const = 0;
+  int tqfind( const KMMessage * msg ) const;
 
   /** Number of messages in this folder. */
   virtual int count(bool cache = false) const;
@@ -244,10 +245,10 @@ public:
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::seStatus when status of a message has changed
+  /** Called by KMMsgBase::setqStatus when status of a message has changed
       required to keep the number unread messages variable current. */
-  virtual void msgStatusChanged( const KMMsgStatus oldStatus,
-                                 const KMMsgStatus newStatus,
+  virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
+                                 const KMMsgtqStatus newtqStatus,
 				 int idx);
 
   /** Open folder for access.
@@ -324,7 +325,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns TRUE if the folder tqcontains deleted messages */
+  /** Returns TRUE if the folder contains deleted messages */
   bool needsCompacting() const { return needsCompact; }
   virtual void setNeedsCompacting(bool f) { needsCompact = f; }
 
@@ -363,10 +364,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+  virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false);
 
   void removeJobs();
 
@@ -581,7 +582,7 @@ friend class KMMsgDict;
 
   /** Replaces the serial number for the message @p msg at index @p idx with
    * @p sernum */
-  void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
+  void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
 
    /** Called when serial numbers for a folder are tqinvalidated,
   tqinvalidates/recreates data structures dependent on the
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index e126263f..0397692a 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -39,8 +39,8 @@ using KPIM::MailListDrag;
 
 using namespace KMail;
 
-FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) :
-    KFolderTree( parent, name ),
+FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) :
+    KFolderTree( tqparent, name ),
     mMainWidget( mainWidget )
 {
   addAcceptableDropMimetype(MailListDrag::format(), false);
@@ -212,7 +212,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
       fti->setFolderIsCloseToQuota( folder->storage()->isCloseToQuota() );
   }
 
-  if (fti->parent() && !fti->parent()->isOpen())
+  if (fti->tqparent() && !fti->tqparent()->isOpen())
     tqrepaint = false; // we're not visible
   if (tqrepaint) {
     fti->setNeedsRepaint( true );
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index 0c8f9720..71018663 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -29,8 +29,9 @@ namespace KMail {
 class FolderTreeBase : public KFolderTree
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
+    FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 );
 
     /** Returns the main widget that this widget is a child of. */
     KMMainWidget* mainWidget() const { return mMainWidget; }
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 8e65fff2..e5a604b8 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -28,39 +28,39 @@
 using namespace KMail;
 using namespace FolderUtil;
 
-KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
+KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir,
                                               const TQString &folderName, const TQString &namespaceName,
                                               KMFolderType localFolderType )
 {
   KMFolder *newFolder = 0;
 
-  if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) {
-    KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() );
+  if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) {
+    KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->storage() );
     KMAcctImap *anAccount = selectedStorage->account();
     // check if a connection is available BEFORE creating the folder
     if (anAccount->makeConnection() == ImapAccountBase::Connected) {
-      newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir );
+      newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir );
       if ( newFolder ) {
-        TQString imapPath, parent;
+        TQString imapPath, tqparent;
         if ( !namespaceName.isEmpty() ) {
           // create folder with namespace
-          parent = anAccount->addPathToNamespace( namespaceName );
-          imapPath = anAccount->createImapPath( parent, folderName );
+          tqparent = anAccount->addPathToNamespace( namespaceName );
+          imapPath = anAccount->createImapPath( tqparent, folderName );
         } else {
           imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName );
         }
         KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() );
-        selectedStorage->createFolder(folderName, parent); // create it on the server
-        newStorage->initializeFrom( selectedStorage, imapPath, TQString::null );
-        static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() );
+        selectedStorage->createFolder(folderName, tqparent); // create it on the server
+        newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
+        static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() );
         return newFolder;
       }
     }
-  } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) {
+  } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) {
     newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap,
-                                                          parentDir );
+                                                          tqparentDir );
     if ( newFolder ) {
-      KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() );
+      KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() );
       KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() );
       newStorage->initializeFrom( selectedStorage );
       if ( !namespaceName.isEmpty() ) {
@@ -75,21 +75,21 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
     // local folder
     Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox );
     newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType,
-                                                     parentDir );
+                                                     tqparentDir );
     return newFolder;
   }
 
   return newFolder;
 }
 
-void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent )
+void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent )
 {
   if ( folderToDelete->hasAccounts() ) {
     // this folder has an account, so we need to change that to the inbox
     for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ),
            end( folderToDelete->acctList()->end() ); it != end; ++it ) {
       (*it)->setFolder( kmkernel->inboxFolder() );
-      KMessageBox::information(parent,
+      KMessageBox::information(tqparent,
           i18n("<qt>The folder you deleted was associated with the account "
             "<b>%1</b> which delivered mail into it. The folder the account "
             "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name()));
diff --git a/kmail/folderutil.h b/kmail/folderutil.h
index fbb4d069..9e1ac419 100644
--- a/kmail/folderutil.h
+++ b/kmail/folderutil.h
@@ -35,16 +35,16 @@ namespace FolderUtil
 /**
  * Low-level function to create a subfolder for a folder of any kind.
  *
- * @param parentFolder parent folder of the folder that should be created. Can be 0 in case of
+ * @param tqparentFolder tqparent folder of the folder that should be created. Can be 0 in case of
  *                     local folders
- * @param parentDir parent folder directory, which should be the folder directory of parentFolder
+ * @param tqparentDir tqparent folder directory, which should be the folder directory of tqparentFolder
  * @param folderName the name the newly created folder should have
  * @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty.
  * @param localFolderType for local folders, this determines if the folder should be MBOX or maildir
  *
  * @return the newly created folder or 0 in case an error occured
  */
-KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
+KMFolder *createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir,
                            const TQString &folderName, const TQString &namespaceName,
                            KMFolderType localFolderType );
 
@@ -53,10 +53,10 @@ KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
  * Handles all types of folders correctly, as well as folders with accounts
  *
  * @param folderToDelete the folder which is going to be deleted
- * @param parent the parent widget, which is used when displaying a messagebox,
+ * @param tqparent the tqparent widget, which is used when displaying a messagebox,
  *               which happens when removing a folder with an associated account
  */
-void deleteFolder( KMFolder *folderToDelete, TQWidget *parent );
+void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent );
 
 }
 
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index ee813bf4..5ffac8d4 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -7,12 +7,12 @@
 
 namespace KMail {
 
-class FolderViewToolTip : public QToolTip
+class FolderViewToolTip : public TQToolTip
 {
   public:
-    FolderViewToolTip( TQListView* parent ) :
-      TQToolTip( parent->viewport() ),
-      mListView( parent ) {}
+    FolderViewToolTip( TQListView* tqparent ) :
+      TQToolTip( tqparent->viewport() ),
+      mListView( tqparent ) {}
 
   protected:
     void maybeTip( const TQPoint &point )
diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp
index b7430949..c09b0591 100644
--- a/kmail/globalsettings.cpp
+++ b/kmail/globalsettings.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "globalsettings.h"
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index eedac97a..6b3df406 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KMAIL_GLOBALSETTINGS_H
@@ -31,6 +31,7 @@ class TQTimer;
 class GlobalSettings : public TQObject, public GlobalSettingsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   virtual ~GlobalSettings();
 
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 684dd590..230b6499 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -42,8 +42,8 @@
 using namespace KMail;
 
 // Constuction a new list view item with the given colors and pixmap
-HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
-  : KListViewItem( parent ),
+HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
+  : KListViewItem( tqparent ),
   mMsgId( msgId ),
   mKey( key ),
   mAboutToBeDeleted( false ),
@@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
   irefresh();
 }
 
-// Constuction a new list view item with the given parent, colors, & pixmap
-HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key )
-  : KListViewItem( parent ),
+// Constuction a new list view item with the given tqparent, colors, & pixmap
+HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key )
+  : KListViewItem( tqparent ),
   mMsgId( msgId ),
   mKey( key ),
   mAboutToBeDeleted( false ),
@@ -92,7 +92,7 @@ void HeaderItem::irefresh()
     return; //default to closed
 
   // otherwise threadingPolicy == OpenUnread
-  if (parent() && parent()->isOpen()) {
+  if (tqparent() && tqparent()->isOpen()) {
     setOpen(true);
     return;
   }
@@ -103,8 +103,8 @@ void HeaderItem::irefresh()
       || mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) {
     setOpen(true);
     HeaderItem * topOfThread = this;
-    while(topOfThread->parent())
-      topOfThread = (HeaderItem*)topOfThread->parent();
+    while(topOfThread->tqparent())
+      topOfThread = (HeaderItem*)topOfThread->tqparent();
     topOfThread->setOpenRecursive(true);
   }
 }
@@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const
 
 // Update this item to summarise a new folder and message
 
-//Opens all children in the thread
+//Opens all tqchildren in the thread
 void HeaderItem::setOpenRecursive( bool open )
 {
   if (open){
@@ -198,7 +198,7 @@ TQString HeaderItem::text( int col) const
     tmp = headers->mDate.dateString( mMsgBase->date() );
   } else if(col == headers->paintInfo()->sizeCol
       && headers->paintInfo()->showSize) {
-    if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
+    if ( mMsgBase->tqparent()->folderType() == KMFolderTypeImap ) {
       tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
     } else {
       tmp = KIO::convertSize( mMsgBase->msgSize() );
@@ -212,8 +212,8 @@ void HeaderItem::setup()
   widthChanged();
   const int ph = KMHeaders::pixNew->height();
   TQListView *v = listView();
-  int h = QMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin();
-  h = QMAX( h, TQApplication::globalStrut().height());
+  int h = TQMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin();
+  h = TQMAX( h, TQApplication::globalStrut().height());
   if ( h % 2 > 0 )
     h++;
   setHeight( h );
@@ -228,7 +228,7 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
   for ( PixmapList::ConstIterator it = pixmaps.begin();
       it != pixmaps.end(); ++it ) {
     width += (*it).width();
-    height = QMAX( height, (*it).height() );
+    height = TQMAX( height, (*it).height() );
   }
 
   TQPixmap res( width, height );
@@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const
       if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched;
     }
 
-    if ( !headers->mPaintInfo.showStatus ) {
+    if ( !headers->mPaintInfo.showtqStatus ) {
       const TQPixmap *pix = statusIcon(msgBase);
       if ( pix ) pixmaps << *pix;
     }
@@ -402,23 +402,23 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg,
   if ( mMsgBase->isTodo() ) {
     color = const_cast<TQColor*>( &headers->paintInfo()->colTodo );
     font = headers->todoFont();
-    weight = QMAX( weight, font.weight() );
+    weight = TQMAX( weight, font.weight() );
   }
   if ( mMsgBase->isUnread() ) {
     color = const_cast<TQColor*>( &headers->paintInfo()->colUnread );
     font = headers->unreadFont();
-    weight = QMAX( weight, font.weight() );
+    weight = TQMAX( weight, font.weight() );
   }
   if ( mMsgBase->isNew() ) {
     color = const_cast<TQColor*>( &headers->paintInfo()->colNew );
     font = headers->newFont();
-    weight = QMAX( weight, font.weight() );
+    weight = TQMAX( weight, font.weight() );
   }
 
   if ( mMsgBase->isImportant() ) {
     color = const_cast<TQColor*>( &headers->paintInfo()->colFlag );
     font = headers->importantFont();
-    weight = QMAX( weight, font.weight() );
+    weight = TQMAX( weight, font.weight() );
   }
   if ( column == headers->paintInfo()->dateCol ) {
     font = headers->dateFont();
@@ -451,10 +451,10 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
     const KPaintInfo *paintInfo,
     int sortOrder )
 {
-  // It appears, that TQListView in Qt-3.0 asks for the key
+  // It appears, that TQListView in TQt-3.0 asks for the key
   // in TQListView::clear(), which is called from
   // readSortOrder()
-  if (!msg) return TQString::null;
+  if (!msg) return TQString();
 
   int column = sortOrder & ((1 << 5) - 1);
   TQString ret = TQChar( (char)sortOrder );
@@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
   }
   else if (column == paintInfo->sizeCol) {
     TQString len;
-    if ( msg->parent()->folderType() == KMFolderTypeImap )
+    if ( msg->tqparent()->folderType() == KMFolderTypeImap )
     {
       len = TQString::number( msg->msgSizeServer() );
     } else {
@@ -603,7 +603,7 @@ int HeaderItem::compare( TQListViewItem *i, int col, bool ascending ) const
     res = key( col, ascending ).compare( i->key( col, ascending ) );
   } else if ( col == headers->paintInfo()->dateCol ) {
     res = key( col, ascending ).compare( i->key( col, ascending ) );
-    if (i->parent() && !ascending)
+    if (i->tqparent() && !ascending)
       res = -res;
   } else if ( col == headers->paintInfo()->subCol ||
       col == headers->paintInfo()->senderCol ||
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index 4ada5112..1912d901 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -63,14 +63,14 @@ public:
           mImperfectlyThreaded (true), mSubjThreadingList(0) { }
     ~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); }
 
-    /** The parent node of the item in the threading hierarchy. 0 if the item
-     * is at top level, which is the default. Can only be set by parents. */
-    SortCacheItem *parent() const { return mParent; }
+    /** The tqparent node of the item in the threading hierarchy. 0 if the item
+     * is at top level, which is the default. Can only be set by tqparents. */
+    SortCacheItem *tqparent() const { return mParent; }
     /**
      * Returs whether the item is so far imperfectly threaded.
      * If an item is imperfectly threaded (by References or subject, not by
      * In-Reply-To) it will be reevalutated when a new mail comes in. It could be
-     * the perfect parent. */
+     * the perfect tqparent. */
     bool isImperfectlyThreaded() const
         { return mImperfectlyThreaded; }
     /** Set whether the item is currently imperfectly threaded (by References
@@ -80,20 +80,20 @@ public:
     /** Returns whether the item has other items below it. */
     bool hasChildren() const
         { return mSortedChildren.count() || mUnsortedCount; }
-    /** The sorted children are an array of sortcache items we know are below the
+    /** The sorted tqchildren are an array of sortcache items we know are below the
      * current one and are already properly sorted (as read from the cache ) */
     const TQPtrList<SortCacheItem> *sortedChildren() const
         { return &mSortedChildren; }
-    /** The unsorted children are an array of sortcache items we know are below the
+    /** The unsorted tqchildren are an array of sortcache items we know are below the
      * current one, but are yet to be threaded and sorted properly. */
     SortCacheItem **unsortedChildren(int &count) const
         { count = mUnsortedCount; return mUnsortedChildren; }
-    /** Add an item to this itme's list of already sorted children. */
+    /** Add an item to this itme's list of already sorted tqchildren. */
     void addSortedChild(SortCacheItem *i) {
         i->mParent = this;
         mSortedChildren.append(i);
     }
-    /** Add an item to this itme's list of unsorted children. */
+    /** Add an item to this itme's list of unsorted tqchildren. */
     void addUnsortedChild(SortCacheItem *i) {
         i->mParent = this;
         if(!mUnsortedChildren)
@@ -104,7 +104,7 @@ public:
         mUnsortedChildren[mUnsortedCount++] = i;
     }
 
-    /** Clear the sorted and unsorted children datastructures. */
+    /** Clear the sorted and unsorted tqchildren datastructures. */
     void clearChildren() {
       mSortedChildren.clear();
       free( mUnsortedChildren );
@@ -130,7 +130,7 @@ public:
     void setOffset(int x) { mSortOffset = x; }
 
     void updateSortFile( FILE *sortStream, KMFolder *folder,
-                         bool waiting_for_parent = false,
+                         bool waiting_for_tqparent = false,
                          bool update_discovered_count = false);
 
     /** Set the list of mails with a certain subject that this item is on.
@@ -163,8 +163,8 @@ private:
 class HeaderItem : public KListViewItem
 {
 public:
-  HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString::null );
-  HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString::null );
+  HeaderItem( TQListView* tqparent, int msgId, const TQString& key = TQString() );
+  HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() );
   ~HeaderItem ();
 
   /** Set the message id of this item, which is the offset/index in the folder
@@ -185,7 +185,7 @@ public:
   // Return the serial number of the message associated with this item;
   TQ_UINT32 msgSerNum() const;
 
-  /** Expands all children of the list view item. */
+  /** Expands all tqchildren of the list view item. */
   void setOpenRecursive( bool open );
 
   /** Returns the text of the list view item. */
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index a2262744..39df6dc9 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,11 +47,11 @@
 
 namespace KMail {
 
-HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
+HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
                                               KListView *listView,
                                               KActionCollection *actionCollection,
                                               const char *name )
-  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0),  statusList()
+  : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0),  statusList()
 {
   KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
                                            TQApplication::reverseLayout()
@@ -61,27 +61,27 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
                                            TQT_SLOT( reset() ),
                                            actionCollection,
                                            "reset_quicksearch" );
-  resetQuickSearch->plug( parent );
+  resetQuickSearch->plug( tqparent );
   resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
                                         "Resets the quick search so that "
                                         "all messages are shown again." ) );
 
-  TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" );
+  TQLabel *label = new TQLabel( i18n("Stat&us:"), tqparent, "kde toolbar widget" );
 
-  mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
+  mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" );
   mStatusCombo->setSizeLimit( 12 );
-  mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
-
-  inserStatus( StatusUnread );
-  inserStatus( StatusNew );
-  inserStatus( StatusImportant );
-  inserStatus( StatusReplied );
-  inserStatus( StatusForwarded );
-  inserStatus( StatusToDo );
-  inserStatus( StatusHasAttachment );
-  inserStatus( StatusInvitation );
-  inserStatus( StatusWatched );
-  inserStatus( StatusIgnored );
+  mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") );
+
+  insertqStatus( StatusUnread );
+  insertqStatus( StatusNew );
+  insertqStatus( StatusImportant );
+  insertqStatus( StatusReplied );
+  insertqStatus( StatusForwarded );
+  insertqStatus( StatusToDo );
+  insertqStatus( StatusHasAttachment );
+  insertqStatus( StatusInvitation );
+  insertqStatus( StatusWatched );
+  insertqStatus( StatusIgnored );
   mStatusCombo->setCurrentItem( 0 );
   mStatusCombo->installEventFilter( this );
   connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
@@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
 
   label->setBuddy( mStatusCombo );
 
-  KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent,
+  KToolBarButton * btn = new KToolBarButton( "mail_tqfind", 0, tqparent,
                                             0, i18n( "Open Full Search" ) );
   connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
 
@@ -115,7 +115,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
   if ( watched == mStatusCombo ) {
     KMMainWidget *mainWidget = 0;
 
-    // Travel up the parents list until we find the main widget
+    // Travel up the tqparents list until we find the main widget
     for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
       mainWidget = ::qt_cast<KMMainWidget *>( curWidget );
       if ( mainWidget )
@@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
 bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const
 {
   mCurrentSearchTerm = s; // bit of a hack, but works
-  if ( mStatus != 0 ) {
+  if ( mtqStatus != 0 ) {
     KMHeaders *headers = static_cast<KMHeaders*>( item->listView() );
     const KMMsgBase *msg = headers->getMsgBaseForItem( item );
-    if ( !msg || ! ( msg->status() & mStatus ) )
+    if ( !msg || ! ( msg->status() & mtqStatus ) )
       return false;
   }
 
@@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset()
 void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
-    mStatus = 0;
+    mtqStatus = 0;
   else
-    mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] );
+    mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] );
   updateSearch();
 }
 
-void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currenStatus() const
+int HeaderListQuickSearch::currentqStatus() const
 {
-    return mStatus;
+    return mtqStatus;
 }
 
 } // namespace KMail
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index ddef0b40..df326a0a 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -18,20 +18,20 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef KMAILHEADERLISQUICKSEARCH_H
-#define KMAILHEADERLISQUICKSEARCH_H
+#ifndef KMAILHEADERLISTQUICKSEARCH_H
+#define KMAILHEADERLISTQUICKSEARCH_H
 
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
 #include "kmsearchpattern.h"
 #include <klistviewsearchline.h>
 #include <tqvaluevector.h>
@@ -45,8 +45,9 @@ namespace KMail {
 class HeaderListQuickSearch : public KListViewSearchLine
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    HeaderListQuickSearch( TQWidget *parent,
+    HeaderListQuickSearch( TQWidget *tqparent,
                                              KListView *listView,
                                              KActionCollection *actionCollection,
                                              const char *name = 0 );
@@ -66,7 +67,7 @@ public:
     /**
      * Returns the currently selected status filter.
      */
-    int currenStatus() const;
+    int currentqStatus() const;
 
 public slots:
    void reset();
@@ -76,23 +77,23 @@ signals:
 
 protected:
     /**
-     * checks whether @param item tqcontains the search string and has the status
-     * currently in mStatus
+     * checks whether @param item contains the search string and has the status
+     * currently in mtqStatus
      */
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
 
 private slots:
   /**
-   * cache the status in mStatus so as to avoid having to do the comparatively
+   * cache the status in mtqStatus so as to avoid having to do the comparatively
    * expensive string comparison for each item in itemMatches
    */
   void sloStatusChanged( int index );
 
 private:
     /** Helper method for the filling of the status combo. */
-    void inserStatus(KMail::StatusValueTypes which);
+    void insertqStatus(KMail::StatusValueTypes which);
     TQComboBox *mStatusCombo;
-    KMMsgStatus mStatus;
+    KMMsgtqStatus mtqStatus;
     TQValueVector<TQString> statusList;
     mutable TQString mCurrentSearchTerm;
 };
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 3fed82ab..99cc4f5f 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h
index 4f49d549..ebb61012 100644
--- a/kmail/headerstrategy.h
+++ b/kmail/headerstrategy.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 3f3073ef..0b728444 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -119,7 +119,7 @@ namespace KMail {
                                     const HeaderStrategy * strategy,
                                     const TQString & vCardName, bool printing, bool topLevel ) const {
     Q_UNUSED( topLevel );
-    if ( !message ) return TQString::null;
+    if ( !message ) return TQString();
     if ( !strategy )
       strategy = HeaderStrategy::brief();
 
@@ -218,7 +218,7 @@ namespace KMail {
                                     const HeaderStrategy * strategy,
                                     const TQString & vCardName, bool printing, bool topLevel ) const {
     Q_UNUSED( topLevel );
-    if ( !message ) return TQString::null;
+    if ( !message ) return TQString();
     if ( !strategy )
       strategy = HeaderStrategy::rich();
 
@@ -400,7 +400,7 @@ namespace KMail {
       meterBar.fill( 22 );
     else {
       meterBar.fill( 21 );
-      int max = QMIN( 20, static_cast<int>( percent ) / 5 );
+      int max = TQMIN( 20, static_cast<int>( percent ) / 5 );
       for ( int i = 0; i < max; ++i ) {
         meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
                                       gradient[i][2] ) );
@@ -419,7 +419,7 @@ namespace KMail {
                                     const HeaderStrategy * strategy,
                                     const TQString & vCardName, bool printing, bool topLevel ) const {
     Q_UNUSED( topLevel );
-    if ( !message ) return TQString::null;
+    if ( !message ) return TQString();
     if ( !strategy )
       strategy = HeaderStrategy::rich();
 
@@ -457,13 +457,13 @@ namespace KMail {
     }
 
     // Spam header display.
-    // If the spamSpamStatus config value is true then we look for headers
+    // If the spamSpamtqStatus config value is true then we look for headers
     // from a few spam filters and try to create visually meaningful graphics
     // out of the spam scores.
 
     TQString spamHTML;
 
-    if ( configReader.readBoolEntry( "showSpamStatus", true ) ) {
+    if ( configReader.readBoolEntry( "showSpamtqStatus", true ) ) {
       SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message );
       for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it )
         spamHTML += (*it).agent() + " " +
@@ -478,7 +478,7 @@ namespace KMail {
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
     KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
@@ -646,7 +646,7 @@ namespace KMail {
 				
 				// kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl;
 				
-				TQTime currTime = TQTime::currentTime( Qt::UTC );
+				TQTime currTime = TQTime::currentTime( TQt::UTC );
 				
 				// kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl;
 				
@@ -662,7 +662,7 @@ namespace KMail {
 				  color = "white";
 				  bg_color = "#000B6B";
 				  bg_image = "url(data:image/png;base64,"
-				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lEQVQI11WOsRGAQAzDOG/LHoz9"
+				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lETQVQI11WOsRGATQAzDOG/LHoz9"
 				    "kikIcF+kSBxbPs7LoNGVapAI0Zn+O+8NUwldozn6io7G7kdS/5zi7i+BvUM/5uSXlIfzMHx/bmWR"
 				    "k++yj9rZAAAAAElFTkSuQmCC)";
 				}
@@ -671,8 +671,8 @@ namespace KMail {
 				  color = "white";
 				  bg_color = "#00A6FF";
 				  bg_image = "url(data:image/png;base64,"
-				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI122OQQ7DMAzDaP3/dfuO"
-				    "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
+				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI122OQQ7DMAzDaP3/dfuO"
+				    "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJTQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
 				    "zu4uSh7kn67/DNv+C4tsZOtjAWEHAAAAAElFTkSuQmCC)";
 				}
 				else if ( currTime > TQTime( 12, 0, 0 ) && currTime <= TQTime( 18, 0, 0 ) ) {
@@ -680,8 +680,8 @@ namespace KMail {
 				  color = "black";
 				  bg_color = "#00A6FF";
 				  bg_image = "url(data:image/png;base64,"
-				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlEQVQI132OwQ0AIAwCSfcfw91c"
-				    "QsCfRm399HFwoWjdDhMICQhxHSWMQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
+				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlETQVQI132OwQ0AIAwCSfcfw91c"
+				    "QsCfRm399HFwoWjdDhMICQhxHSWMTQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
 				    "rkJggg==)";
 				}
 				else {
@@ -689,8 +689,8 @@ namespace KMail {
 				  color = "white";
 				  bg_color = "#0014CC";
 				  bg_image = "url(data:image/png;base64,"
-				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI11WOyRHAMAgDNQuUlBrS"
-				    "fyFpAfKwje0PwyEt0vN+hVsJpzS6QML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
+				    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI11WOyRHAMAgDNQuUlBrS"
+				    "fyFpAfKwje0PwyEt0vN+hVsJpzS6TQML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
 				    "xx7JjrtshlbXlLDSD+WhJ+hwqWo8AAAAAElFTkSuQmCC)";
 				}
 				
@@ -830,8 +830,8 @@ namespace KMail {
       headerStr.append( TQString( "<tr><th>%1</th>\n"
                                  "<td dir=\"%2\">%3</td></tr>\n")
                                     .arg(i18n("Sender status: "))
-                                    .arg( directionOf( onlineStatus ) )
-                                    .arg(onlineStatus));
+                                    .arg( directionOf( onlinetqStatus ) )
+                                    .arg(onlinetqStatus));
     */
     headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) );
     headerStr.append(
@@ -841,7 +841,7 @@ namespace KMail {
 
     if ( !spamHTML.isEmpty() )
       headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
-                        .arg( subjectDir, i18n("Spam Status:"), spamHTML ) );
+                        .arg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) );
 
     headerStr += "</div>\n\n";
     return headerStr;
@@ -877,7 +877,7 @@ namespace KMail {
     TQString EnterpriseHeaderStyle::format( const KMMessage * message,
                                     const HeaderStrategy * strategy,
                                     const TQString & vCardName, bool printing, bool topLevel ) const {
-	if ( !message ) return TQString::null;
+	if ( !message ) return TQString();
 	if ( !strategy )
 	    strategy = HeaderStrategy::brief();
 
@@ -899,7 +899,7 @@ namespace KMail {
 	    subjectDir = directionOf( i18n("No Subject") );
 
 	// colors depend on if its encapsulated or not
-        TQColor fontColor(Qt::white);
+        TQColor fontColor(TQt::white);
 	TQString linkColor = "class =\"white\"";
 	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h
index 2613f6be..ff7228d3 100644
--- a/kmail/headerstyle.h
+++ b/kmail/headerstyle.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 111ce6cd..371a48d1 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,8 +48,8 @@
 #include <tqcolor.h>
 #include <tqstring.h>
 
-KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f )
-  : TQLabel( parent, name, f ),
+KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f )
+  : TQLabel( tqparent, name, f ),
     mMode( Normal )
 {
   tqsetAlignment( AlignHCenter|AlignTop );
@@ -96,7 +96,7 @@ TQString KMail::HtmlStatusBar::message() const {
 		 "<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>" );
   default:
   case Neutral:
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -114,12 +114,12 @@ TQColor KMail::HtmlStatusBar::fgColor() const {
   KConfigGroup conf( config(), "Reader" );
   switch ( mode() ) {
   case Html:
-    return conf.readColorEntry( "ColorbarForegroundHTML", &Qt::white );
+    return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white );
   case Normal:
-    return conf.readColorEntry( "ColorbarForegroundPlain", &Qt::black );
+    return conf.readColorEntry( "ColorbarForegroundPlain", &TQt::black );
   default:
   case Neutral:
-    return Qt::black;
+    return TQt::black;
   }
 }
 
@@ -128,12 +128,12 @@ TQColor KMail::HtmlStatusBar::bgColor() const {
 
   switch ( mode() ) {
   case Html:
-    return conf.readColorEntry( "ColorbarBackgroundHTML", &Qt::black );
+    return conf.readColorEntry( "ColorbarBackgroundHTML", &TQt::black );
   case Normal:
-    return conf.readColorEntry( "ColorbarBackgroundPlain", &Qt::lightGray );
+    return conf.readColorEntry( "ColorbarBackgroundPlain", &TQt::lightGray );
   default:
   case Neutral:
-    return Qt::white;
+    return TQt::white;
   }
 }
 
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index dd7da106..c23193fa 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -60,8 +60,9 @@ namespace KMail {
    **/
   class HtmlStatusBar : public TQLabel {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
+    HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
     virtual ~HtmlStatusBar();
 
     enum Mode {
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 5c3f7df6..1ec367ee 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -69,7 +69,7 @@ using KMail::FolderRequester;
 #include <kdebug.h>
 #include <kpushbutton.h>
 
-// Qt headers:
+// TQt headers:
 #include <tqtabwidget.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -89,9 +89,9 @@ using namespace KPIM;
 
 namespace KMail {
 
-  IdentityDialog::IdentityDialog( TQWidget * parent, const char * name )
+  IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name )
     : KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok,
-                   parent, name )
+                   tqparent, name )
   {
     // tmp. vars:
     TQWidget * tab;
@@ -165,7 +165,7 @@ namespace KMail {
     label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
     glay->addWidget( label, row, 0, TQt::AlignTop );
     msg = i18n("<qt><h3>Email aliases</h3>"
-               "<p>This field tqcontains alias addresses that should also "
+               "<p>This field contains alias addresses that should also "
                "be considered as belonging to this identity (as opposed "
                "to representing a different identity).</p>"
                "<p>Example:</p>"
@@ -490,7 +490,7 @@ namespace KMail {
 
     TQString DoesntMatchEMailAddress::extractEmail( const char * e ) {
       if ( !e || !*e )
-	return TQString::null;
+	return TQString();
       const TQString em = TQString::fromUtf8( e );
       if ( e[0] == '<' )
 	return em.mid( 1, em.length() - 2 );
@@ -699,14 +699,14 @@ void IdentityDialog::slotOk() {
     ident.setReplyToAddr( mReplyToEdit->text() );
     ident.setBcc( mBccEdit->text() );
     ident.setTransport( ( mTransportCheck->isChecked() ) ?
-                        mTransportCombo->currentText() : TQString::null );
+                        mTransportCombo->currentText() : TQString() );
     ident.setDictionary( mDictionaryCombo->currentDictionary() );
     ident.setFcc( mFccCombo->folder() ?
-                  mFccCombo->folder()->idString() : TQString::null );
+                  mFccCombo->folder()->idString() : TQString() );
     ident.setDrafts( mDraftsCombo->folder() ?
-                     mDraftsCombo->folder()->idString() : TQString::null );
+                     mDraftsCombo->folder()->idString() : TQString() );
     ident.setTemplates( mTemplatesCombo->folder() ?
-                     mTemplatesCombo->folder()->idString() : TQString::null );
+                     mTemplatesCombo->folder()->idString() : TQString() );
     // "Templates" tab:
     uint identity = ident.uoid();
     TQString iid = TQString("IDENTITY_%1").arg( identity );
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index f8e71073..82bca1c4 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -61,8 +61,9 @@ namespace KMail {
 
   class IdentityDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    IdentityDialog( TQWidget * parent=0, const char * name = 0 );
+    IdentityDialog( TQWidget * tqparent=0, const char * name = 0 );
     virtual ~IdentityDialog();
 
     void setIdentity( /*_not_ const*/ KPIM::Identity & ident );
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index 85520637..106cb589 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index f48e1a3c..a93095ff 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,6 +43,7 @@ namespace KMail {
   **/
   class IdentityDrag : public TQDragObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     IdentityDrag( const KPIM::Identity & ident,
 		  TQWidget * dragSource=0, const char * name=0 );
@@ -50,7 +51,7 @@ namespace KMail {
   public:
     virtual ~IdentityDrag() {}
 
-    const char * format( int i ) const; // reimp. QMimeSource
+    const char * format( int i ) const; // reimp. TQMimeSource
     TQByteArray tqencodedData( const char * mimetype ) const; // dto.
 
     static bool canDecode( const TQMimeSource * e );
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index d4067380..319bd32a 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,13 +52,13 @@ namespace KMail {
   //
   //
 
-  IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident )
-    : KListViewItem( parent ), mUOID( ident.uoid() ) {
+  IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident )
+    : KListViewItem( tqparent ), mUOID( ident.uoid() ) {
     init( ident );
   }
 
-  IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident )
-    : KListViewItem( parent, after ), mUOID( ident.uoid() ) {
+  IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident )
+    : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) {
     init( ident );
   }
 
@@ -95,8 +95,8 @@ namespace KMail {
   //
   //
 
-  IdentityListView::IdentityListView( TQWidget * parent, const char * name )
-    : KListView( parent, name )
+  IdentityListView::IdentityListView( TQWidget * tqparent, const char * name )
+    : KListView( tqparent, name )
   {
     setFullWidth( true );
     setDragEnabled( true );
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index 556132bf..b2c48418 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -36,7 +36,7 @@
 
 namespace KPIM { class Identity; }
 class TQDropEvent;
-class QDragEvent;
+class TQDragEvent;
 
 namespace KMail {
 
@@ -47,9 +47,9 @@ namespace KMail {
   **/
   class IdentityListViewItem : public KListViewItem {
   public:
-    IdentityListViewItem( IdentityListView * parent,
+    IdentityListViewItem( IdentityListView * tqparent,
 			  const KPIM::Identity & ident );
-    IdentityListViewItem( IdentityListView * parent, TQListViewItem * after,
+    IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after,
 			  const KPIM::Identity & ident );
 
     uint uoid() const { return mUOID; }
@@ -68,8 +68,9 @@ namespace KMail {
   **/
   class IdentityListView : public KListView {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    IdentityListView( TQWidget * parent=0, const char * name=0 );
+    IdentityListView( TQWidget * tqparent=0, const char * name=0 );
     virtual ~IdentityListView() {}
 
   public slots:
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 01e1324c..04dc2933 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -32,7 +32,7 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmmainwin.h"
 #include "kmfolderimap.h"
 #include "kmmainwidget.h"
@@ -79,8 +79,8 @@ namespace KMail {
   //
   //
 
-  ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id )
-    : NetworkAccount( parent, name, id ),
+  ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id )
+    : NetworkAccount( tqparent, name, id ),
       mIdleTimer( 0, "mIdleTimer" ),
       mNoopTimer( 0, "mNoopTimer" ),
       mTotal( 0 ),
@@ -301,7 +301,7 @@ namespace KMail {
       if (ret != TQDialog::Accepted ) {
         mPasswordDialogIsActive = false;
         mAskAgain = false;
-        emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null );
+        emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
         return Error;
       }
       mPasswordDialogIsActive = false;
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -412,19 +412,19 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever
-  void ImapAccountBase::getUserRights( KMFolder* parent, const TQString& imapPath )
+  // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever
+  void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath )
   {
     // There isn't much point in asking the server about a user's rights on his own inbox,
     // it might not be the effective permissions (at least with Cyrus, one can admin his own inbox,
-    // even after a SETACL that removes the admin permissions. Other imap servers apparently
+    // even after a SETACL that removes the admin permissions. Other imap servers aptqparently
     // don't even allow removing one's own admin permission, so this code won't hurt either).
     if ( imapPath == "/INBOX/" ) {
-      if ( parent->folderType() == KMFolderTypeImap )
-        static_cast<KMFolderImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
-      else if ( parent->folderType() == KMFolderTypeCachedImap )
-        static_cast<KMFolderCachedImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
-      emit receivedUserRights( parent ); // warning, you need to connect first to get that one
+      if ( tqparent->folderType() == KMFolderTypeImap )
+        static_cast<KMFolderImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+      else if ( tqparent->folderType() == KMFolderTypeCachedImap )
+        static_cast<KMFolderCachedImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+      emit receivedUserRights( tqparent ); // warning, you need to connect first to get that one
       return;
     }
 
@@ -433,7 +433,7 @@ namespace KMail {
 
     ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url );
 
-    jobData jd( url.url(), parent );
+    jobData jd( url.url(), tqparent );
     jd.cancellable = true;
     insertJob(job, jd);
 
@@ -447,7 +447,7 @@ namespace KMail {
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
 
-    KMFolder* folder = (*it).parent;
+    KMFolder* folder = (*it).tqparent;
     if ( job->error() ) {
       if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
           mACLSupport = false;
@@ -471,13 +471,13 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath )
+  void ImapAccountBase::getACL( KMFolder* tqparent, const TQString& imapPath )
   {
     KURL url = getUrl();
     url.setPath(imapPath);
 
     ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url );
-    jobData jd( url.url(), parent );
+    jobData jd( url.url(), tqparent );
     jd.cancellable = true;
     insertJob(job, jd);
 
@@ -491,21 +491,21 @@ namespace KMail {
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
 
-    KMFolder* folder = (*it).parent;
+    KMFolder* folder = (*it).tqparent;
     emit receivedACL( folder, job, job->entries() );
     if (mSlave) removeJob(job);
   }
 
   //-----------------------------------------------------------------------------
-  // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0.
-  void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath )
+  // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0.
+  void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath )
   {
     if ( !mSlave ) return;
     KURL url = getUrl();
     url.setPath(imapPath);
 
     QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url );
-    jobData jd( url.url(), parent );
+    jobData jd( url.url(), tqparent );
     jd.cancellable = true;
     insertJob(job, jd);
 
@@ -521,7 +521,7 @@ namespace KMail {
     if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
       setHasNoQuotaSupport();
 
-    KMFolder* folder = (*it).parent; // can be 0
+    KMFolder* folder = (*it).tqparent; // can be 0
     emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() );
     if (mSlave) removeJob(job);
   }
@@ -570,7 +570,7 @@ namespace KMail {
       const TQString &errorMsg)
   {
     if (aSlave != mSlave) return;
-    handleError( errorCode, errorMsg, 0, TQString::null, true );
+    handleError( errorCode, errorMsg, 0, TQString(), true );
     if ( mAskAgain )
       if ( makeConnection() != ImapAccountBase::Error )
         return;
@@ -593,7 +593,7 @@ namespace KMail {
     if (aSlave != mSlave) return;
     mSlaveConnected = true;
     mNoopTimer.start( 60000 ); // make sure we start sending noops
-    emit connectionResult( 0, TQString::null ); // success
+    emit connectionResult( 0, TQString() ); // success
 
     if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) {
       connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
@@ -643,7 +643,7 @@ namespace KMail {
     jd.progressItem = ProgressManager::createProgressItem(
         ProgressManager::getUniqueID(),
         i18n("Retrieving Namespaces"),
-        TQString::null, true, useSSL() || useTLS() );
+        TQString(), true, useSSL() || useTLS() );
     jd.progressItem->setTotalItems( 1 );
     connect ( jd.progressItem,
         TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -737,7 +737,7 @@ namespace KMail {
             "configuration of the account \"%1\" which is obsolete with the "
             "support of IMAP namespaces.").arg( name() );
         if ( list.tqcontains( "" ) ) {
-          // tqreplace empty entry with the old prefix
+          // replace empty entry with the old prefix
           list.remove( "" );
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
@@ -746,11 +746,11 @@ namespace KMail {
             mNamespaceToDelimiter.remove( "" );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - tqreplaced empty with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else if ( list.count() == 1 ) {
-          // only one entry in the personal namespace so tqreplace it
+          // only one entry in the personal namespace so replace it
           TQString old = list.first();
           list.clear();
           list += mOldPrefix;
@@ -760,7 +760,7 @@ namespace KMail {
             mNamespaceToDelimiter.remove( old );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else {
@@ -799,12 +799,12 @@ namespace KMail {
           ns = ns.left( ns.length()-1 );
         }
         // first ignore an empty prefix as it would match always
-        if ( !ns.isEmpty() && path.find( ns ) != -1 ) {
+        if ( !ns.isEmpty() && path.tqfind( ns ) != -1 ) {
           return (*strit);
         }
       }
     }
-    return TQString::null;
+    return TQString();
   }
 
   //-----------------------------------------------------------------------------
@@ -820,7 +820,7 @@ namespace KMail {
     // exclude empty namespace
     for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin();
           it != mNamespaceToDelimiter.end(); ++it ) {
-      // the namespace definition sometimes tqcontains the delimiter
+      // the namespace definition sometimes contains the delimiter
       // make sure we also match this version
       TQString stripped = it.key().left( it.key().length() - 1 );
       if ( !it.key().isEmpty() &&
@@ -835,7 +835,7 @@ namespace KMail {
     }
     // well, we tried
     //kdDebug(5006) << "delimiterForNamespace - not found" << endl;
-    return TQString::null;
+    return TQString();
   }
 
   //-----------------------------------------------------------------------------
@@ -858,7 +858,7 @@ namespace KMail {
     }
     if (job->error()) {
       if (!quiet)
-        handleJobError(job, TQString::null );
+        handleJobError(job, TQString() );
       else {
         if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) {
           // make sure ERR_CONNECTION_BROKEN is properly handled and the slave
@@ -894,13 +894,13 @@ namespace KMail {
   TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
   {
       TQString error = _error;
-      if ( error.find( "quota", 0, false ) == -1 ) return error;
+      if ( error.tqfind( "quota", 0, false ) == -1 ) return error;
       // this is a quota error, prettify it a bit
       JobIterator it = findJob( job );
       TQString quotaAsString( i18n("No detailed quota information available.") );
       bool readOnly = false;
       if (it != mapJobData.end()) {
-          const KMFolder * const folder = (*it).parent;
+          const KMFolder * const folder = (*it).tqparent;
           if( !folder ) return _error;
           const KMFolderCachedImap * const imap = dynamic_cast<const KMFolderCachedImap*>( folder->storage() );
           if ( imap ) {
@@ -961,10 +961,10 @@ namespace KMail {
           KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
-            KPIM::BroadcasStatus::instance()->seStatusMsg(
+            KPIM::BroadcastqStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcasStatus::instance()->seStatusMsg(
+            KPIM::BroadcastqStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
@@ -1031,9 +1031,9 @@ namespace KMail {
     mCheckingSingleFolder = ( type == Single );
     if ( checkingMail() )
     {
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
-      connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                this, TQT_SLOT( slotCheckQueuedFolders() ) );
     } else {
       slotCheckQueuedFolders();
@@ -1043,7 +1043,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::slotCheckQueuedFolders()
   {
-    disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+    disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                 this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
@@ -1109,7 +1109,7 @@ namespace KMail {
       // more than 50% of the parts have to be loaded anyway so it is faster
       // to load the message completely
       kdDebug(5006) << "Falling back to normal mode" << endl;
-      FolderJob *job = msg->parent()->createJob(
+      FolderJob *job = msg->tqparent()->createJob(
           msg, FolderJob::tGetMessage, 0, "TEXT" );
       job->start();
       return;
@@ -1123,14 +1123,14 @@ namespace KMail {
       if ( part->loadHeaders() )
       {
         kdDebug(5006) << "load HEADER" << endl;
-        FolderJob *job = msg->parent()->createJob(
+        FolderJob *job = msg->tqparent()->createJob(
             msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" );
         job->start();
       }
       if ( part->loadPart() )
       {
         kdDebug(5006) << "load Part" << endl;
-        FolderJob *job = msg->parent()->createJob(
+        FolderJob *job = msg->tqparent()->createJob(
             msg, FolderJob::tGetMessage, 0, part->partSpecifier() );
         job->start();
       }
@@ -1138,26 +1138,26 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
-                                        DwBodyPart * parent, const DwMessage * dwmsg )
+  void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart,
+                                        DwBodyPart * tqparent, const DwMessage * dwmsg )
   {
-    int children;
+    int tqchildren;
     for (int i = 0; i < count; i++)
     {
-      stream >> children;
+      stream >> tqchildren;
       KMMessagePart* part = new KMMessagePart( stream );
-      part->setParent( parentKMPart );
+      part->setParent( tqparentKMPart );
       mBodyPartList.append( part );
       kdDebug(5006) << "ImapAccountBase::constructParts - created id " << part->partSpecifier()
         << " of type " << part->originalContentTypeStr() << endl;
       DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part );
 
-      if ( parent )
+      if ( tqparent )
       {
-        // add to parent body
-        parent->Body().AddBodyPart( dwpart );
+        // add to tqparent body
+        tqparent->Body().AddBodyPart( dwpart );
         dwpart->Parse();
-//        kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
+//        kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
 //          << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
       } else if ( part->partSpecifier() != "0" &&
                   !part->partSpecifier().endsWith(".HEADER") )
@@ -1165,39 +1165,39 @@ namespace KMail {
         // add to message
         dwmsg->Body().AddBodyPart( dwpart );
         dwpart->Parse();
-//        kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
+//        kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
 //          << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
       } else
         dwpart = 0;
 
-      if ( !parentKMPart )
-        parentKMPart = part;
+      if ( !tqparentKMPart )
+        tqparentKMPart = part;
 
-      if (children > 0)
+      if (tqchildren > 0)
       {
-        DwBodyPart* newparent = dwpart;
+        DwBodyPart* newtqparent = dwpart;
         const DwMessage* newmsg = dwmsg;
         if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
              dwpart->Body().Message() )
         {
           // set the encapsulated message as the new message
-          newparent = 0;
+          newtqparent = 0;
           newmsg = dwpart->Body().Message();
         }
         KMMessagePart* newParentKMPart = part;
-        if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
-          newParentKMPart = parentKMPart;
+        if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent
+          newParentKMPart = tqparentKMPart;
 
-        constructParts( stream, children, newParentKMPart, newparent, newmsg );
+        constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg );
       }
     }
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
+  void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
   {
      // set the status on the server, the uids are integrated in the path
-     kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
+     kdDebug(5006) << "setImaptqStatus path=" << path << " to: " << flags << endl;
      KURL url = getUrl();
      url.setPath(path);
 
@@ -1218,7 +1218,7 @@ namespace KMail {
            TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
-  void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
+  void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen)
   {
      KURL url = getUrl();
      url.setPath(path);
@@ -1246,16 +1246,16 @@ namespace KMail {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
      int errorCode = job->error();
-     KMFolder * const parent = (*it).parent;
+     KMFolder * const tqparent = (*it).tqparent;
      const TQString path = (*it).path;
      if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
      {
        bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
-       emit imapStatusChanged( parent, path, cont );
+       emit imapStatusChanged( tqparent, path, cont );
      }
      else
      {
-       emit imapStatusChanged( parent, path, true );
+       emit imapStatusChanged( tqparent, path, true );
        removeJob(it);
      }
   }
@@ -1370,11 +1370,11 @@ namespace KMail {
   }
 
   //------------------------------------------------------------------------------
-  TQString ImapAccountBase::createImapPath( const TQString& parent,
+  TQString ImapAccountBase::createImapPath( const TQString& tqparent,
                                            const TQString& folderName )
   {
-    kdDebug(5006) << "createImapPath parent="<<parent<<", folderName="<<folderName<<endl;
-    TQString newName = parent;
+    kdDebug(5006) << "createImapPath tqparent="<<tqparent<<", folderName="<<folderName<<endl;
+    TQString newName = tqparent;
     // strip / at the end
     if ( newName.endsWith("/") ) {
       newName = newName.left( newName.length() - 1 );
@@ -1399,14 +1399,14 @@ namespace KMail {
   }
 
   //------------------------------------------------------------------------------
-  TQString ImapAccountBase::createImapPath( FolderStorage* parent,
+  TQString ImapAccountBase::createImapPath( FolderStorage* tqparent,
                                            const TQString& folderName )
   {
     TQString path;
-    if ( parent->folderType() == KMFolderTypeImap ) {
-      path = static_cast<KMFolderImap*>( parent )->imapPath();
-    } else if ( parent->folderType() == KMFolderTypeCachedImap ) {
-      path = static_cast<KMFolderCachedImap*>( parent )->imapPath();
+    if ( tqparent->folderType() == KMFolderTypeImap ) {
+      path = static_cast<KMFolderImap*>( tqparent )->imapPath();
+    } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) {
+      path = static_cast<KMFolderCachedImap*>( tqparent )->imapPath();
     } else {
       // error
       return path;
@@ -1418,7 +1418,7 @@ namespace KMail {
 
   bool ImapAccountBase::locallySubscribedTo( const TQString& imapPath )
   {
-      return mLocalSubscriptionBlackList.find( imapPath ) == mLocalSubscriptionBlackList.end();
+      return mLocalSubscriptionBlackList.tqfind( imapPath ) == mLocalSubscriptionBlackList.end();
   }
 
   void ImapAccountBase::changeLocalSubscription( const TQString& imapPath, bool subscribe )
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 0795eb2a..eee46417 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -58,8 +58,9 @@ namespace KMail {
 
   class ImapAccountBase : public KMail::NetworkAccount {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
+    ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id );
   public:
     virtual ~ImapAccountBase();
 
@@ -141,13 +142,13 @@ namespace KMail {
     struct jobData
     {
       // Needed by TQMap, don't use
-      jobData() : url(TQString::null), parent(0), current(0), total(1), done(0), offset(0), progressItem(0),
+      jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0),
                   onlySubscribed(false), quiet(false), cancellable(false) {}
       // Real constructor
-      jobData( const TQString& _url, KMFolder *_parent = 0,
+      jobData( const TQString& _url, KMFolder *_tqparent = 0,
           int _total = 1, int _done = 0, bool _quiet = false,
           bool _cancelable = false )
-        : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0),
+        : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0),
           progressItem(0), quiet(_quiet), cancellable(_cancelable) {}
 
       TQString path;
@@ -156,7 +157,7 @@ namespace KMail {
       TQByteArray data;
       TQCString cdata;
       TQStringList items;
-      KMFolder *parent, *current;
+      KMFolder *tqparent, *current;
       TQPtrList<KMMessage> msgList;
       int total, done, offset;
       KPIM::ProgressItem *progressItem;
@@ -173,7 +174,7 @@ namespace KMail {
     /**
      * Look for the jobData related to a given job. Compare with end()
      */
-    JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+    JobIterator findJob( KIO::Job* job ) { return mapJobData.tqfind( job ); }
     JobIterator jobsEnd() { return mapJobData.end(); }
     /**
      * Call this when a job is finished.
@@ -230,13 +231,13 @@ namespace KMail {
      * Set the status on the server
      * Emits imapStatusChanged signal on success/error.
      */
-    void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
+    void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
 
     /**
      * Set seen status on the server.
      * Emits imapStatusChanged signal on success/error.
      */
-    void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
+    void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen );
 
     /**
      * The KIO-Slave died
@@ -400,16 +401,16 @@ namespace KMail {
       return mCapabilities.tqcontains( capa ); }
 
      /**
-      * Create an IMAP path for a parent folder and a foldername
+      * Create an IMAP path for a tqparent folder and a foldername
       * Parent and folder are separated with the delimiter of the account
       * The path starts and ends with '/'
       */
-     TQString createImapPath( FolderStorage* parent, const TQString& folderName );
+     TQString createImapPath( FolderStorage* tqparent, const TQString& folderName );
 
      /**
-      * Create an IMAP path for a parent imapPath and a folderName
+      * Create an IMAP path for a tqparent imapPath and a folderName
       */
-     TQString createImapPath( const TQString& parent, const TQString& folderName );
+     TQString createImapPath( const TQString& tqparent, const TQString& folderName );
 
 
   public slots:
@@ -509,8 +510,8 @@ namespace KMail {
     /**
      * Build KMMessageParts and DwBodyParts from the bodystructure-stream
      */
-    void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
-       DwBodyPart * parent, const DwMessage * dwmsg );
+    void constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart,
+       DwBodyPart * tqparent, const DwMessage * dwmsg );
 
     /** Migrate the prefix */
     void migratePrefix();
@@ -590,13 +591,13 @@ namespace KMail {
 
     /**
      * Emitted when changeSubscription() failed.
-     * @param errorMessage the error message that tqcontains the reason for the failure
+     * @param errorMessage the error message that contains the reason for the failure
      */
     void subscriptionChangeFailed( const TQString &errorMessage );
 
     /**
      * Emitted upon completion of the job for setting the status for a group of UIDs,
-     * as a result of a setImapStatus call.
+     * as a result of a setImaptqStatus call.
      * On error, if the user chooses abort (not continue), cont is set to false.
      */
     void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont );
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index b76c6d2c..fe773a9d 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
   if (folder) {
     folder->open("imapjobdest");
   }
-  KMFolder *msg_parent = msg->parent();
-  if (msg_parent) {
-    msg_parent->open("imapjobsrc");
+  KMFolder *msg_tqparent = msg->tqparent();
+  if (msg_tqparent) {
+    msg_tqparent->open("imapjobsrc");
   }
-  mSrcFolder = msg_parent;
+  mSrcFolder = msg_tqparent;
   // If there is a destination folder, this is a copy, move or put to an
   // imap folder, use its account for keeping track of the job. Otherwise,
   // this is a get job and the src folder is an imap one. Use its account
@@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
   if (folder) {
     account = folder->account();
   } else {
-    if ( msg_parent && msg_parent->storage() )
-      account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
+    if ( msg_tqparent && msg_tqparent->storage() )
+      account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account();
   }
   if ( !account ||
        account->makeConnection() == ImapAccountBase::Error ) {
@@ -118,21 +118,21 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       ++it;
       if ( mSrcFolder && !curMsg->isMessage() )
       {
-        int idx = mSrcFolder->find( curMsg );
+        int idx = mSrcFolder->tqfind( curMsg );
         curMsg = mSrcFolder->getMsg( idx );
       }
       KURL url = account->getUrl();
       TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() );
       url.setPath( folder->imapPath() + ";SECTION=" + flags );
       ImapAccountBase::jobData jd;
-      jd.parent = 0; jd.offset = 0; jd.done = 0;
+      jd.tqparent = 0; jd.offset = 0; jd.done = 0;
       jd.total = ( curMsg->msgSizeServer() > 0 ) ?
         curMsg->msgSizeServer() : curMsg->msgSize();
       jd.msgList.append( curMsg );
       TQCString cstr( curMsg->asString() );
-      int a = cstr.find("\nX-UID: ");
-      int b = cstr.find('\n', a);
-      if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
+      int a = cstr.tqfind("\nX-UID: ");
+      int b = cstr.tqfind('\n', a);
+      if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a);
       jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) );
       unsigned int i = 0;
       char prevChar = '\0';
@@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
     KURL url = account->getUrl();
     KURL destUrl = account->getUrl();
     destUrl.setPath(folder->imapPath());
-    KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage());
+    KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_tqparent->storage());
     url.setPath( imapDestFolder->imapPath() + ";UID=" + sets );
     ImapAccountBase::jobData jd;
-    jd.parent = 0; jd.offset = 0;
+    jd.tqparent = 0; jd.offset = 0;
     jd.total = 1; jd.done = 0;
     jd.msgList = msgList;
 
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
                           "ImapJobCopyMove"+ProgressManager::getUniqueID(),
                           i18n("Server operation"),
                           i18n("Source folder: %1 - Destination folder: %2")
-                            .arg( TQStyleSheet::escape( msg_parent->prettyURL() ),
+                            .arg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
                                   TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
                           true,
                           account->useSSL() || account->useTLS() );
@@ -285,12 +285,12 @@ void ImapJob::slotGetNextMessage()
   KURL url = account->getUrl();
   TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID());
   ImapAccountBase::jobData jd;
-  jd.parent = 0; jd.offset = 0;
+  jd.tqparent = 0; jd.offset = 0;
   jd.total = 1; jd.done = 0;
   jd.msgList.append( msg );
   if ( !mPartSpecifier.isEmpty() )
   {
-    if ( mPartSpecifier.find ("STRUCTURE", 0, false) != -1 ) {
+    if ( mPartSpecifier.tqfind ("STRUCTURE", 0, false) != -1 ) {
       path += ";SECTION=STRUCTURE";
     } else if ( mPartSpecifier == "HEADER" ) {
       path += ";SECTION=HEADER";
@@ -325,7 +325,7 @@ void ImapJob::slotGetNextMessage()
   KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
   mJob = simpleJob;
   account->insertJob( mJob, jd );
-  if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
+  if ( mPartSpecifier.tqfind( "STRUCTURE", 0, false ) != -1 )
   {
     connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
              this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) );
@@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage()
 void ImapJob::slotGetMessageResult( KIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
-  if (!msg || !msg->parent() || !job) {
+  if (!msg || !msg->tqparent() || !job) {
     emit messageRetrieved( 0 );
     deleteLater();
     return;
   }
-  KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
+  KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
   if (msg->transferInProgress())
     msg->setTransferInProgress( false );
-  KMAcctImap *account = parent->account();
+  KMAcctImap *account = tqparent->account();
   if ( !account ) {
     emit messageRetrieved( 0 );
     deleteLater();
@@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
   {
     TQString errorStr = i18n( "Error while retrieving messages from the server." );
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( errorStr );
+      (*it).progressItem->setqStatus( errorStr );
     account->handleJobError( job, errorStr );
     return;
   } else {
@@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
         // During the construction of the message from the byteArray it does
         // not have a uid. Therefore we have to make sure that no connected
         // slots are called, since they would operate on uid == 0.
-        msg->parent()->storage()->blockSignals( true );
+        msg->tqparent()->storage()->blockSignals( true );
         msg->fromByteArray( (*it).data );
         // now let others react
-        msg->parent()->storage()->blockSignals( false );
+        msg->tqparent()->storage()->blockSignals( false );
         if ( size > 0 && msg->msgSizeServer() == 0 ) {
           msg->setMsgSizeServer(size);
         }
@@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
       /* we got an answer but not data
        * this means that the msg is not on the server anymore so delete it */
       emit messageRetrieved( 0 );
-      parent->ignoreJobsForMessage( msg );
-      int idx = parent->find( msg );
-      if (idx != -1) parent->removeMsg( idx, true );
+      tqparent->ignoreJobsForMessage( msg );
+      int idx = tqparent->tqfind( msg );
+      if (idx != -1) tqparent->removeMsg( idx, true );
       // the removeMsg will unGet the message, which will delete all
       // jobs, including this one
       return;
@@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
 void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
-  if (!msg || !msg->parent() || !job) {
+  if (!msg || !msg->tqparent() || !job) {
     deleteLater();
     return;
   }
-  KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
+  KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
   if (msg->transferInProgress())
     msg->setTransferInProgress( false );
-  KMAcctImap *account = parent->account();
+  KMAcctImap *account = tqparent->account();
   if ( !account ) {
     deleteLater();
     return;
@@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
   if (job->error())
   {
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
+      (*it).progressItem->setqStatus( i18n("Uploading message data failed.") );
     account->handlePutError( job, *it, mDestFolder );
     return;
   } else {
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( i18n("Uploading message data completed.") );
+      (*it).progressItem->setqStatus( i18n("Uploading message data completed.") );
     if ( mParentProgressItem )
     {
       mParentProgressItem->incCompletedItems();
@@ -583,7 +583,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
   ImapAccountBase::JobIterator it = account->findJob( job );
   if ( it == account->jobsEnd() ) return;
 
-  if (data.find("UID") != -1)
+  if (data.tqfind("UID") != -1)
   {
     // split
     TQString oldUid = data.section(' ', 1, 1);
@@ -622,7 +622,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
   ImapAccountBase::JobIterator it = account->findJob( job );
   if ( it == account->jobsEnd() ) return;
 
-  if ( data.find("UID") != -1 )
+  if ( data.tqfind("UID") != -1 )
   {
     ulong uid = ( data.right(data.length()-4) ).toInt();
     if ( !(*it).msgList.isEmpty() )
@@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
     mErrorCode = job->error();
     TQString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( errStr );
+      (*it).progressItem->setqStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
@@ -678,9 +678,9 @@ void ImapJob::execute()
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::setParentFolder( const KMFolderImap* parent )
+void ImapJob::setParentFolder( const KMFolderImap* tqparent )
 {
-  mParentFolder = const_cast<KMFolderImap*>( parent );
+  mParentFolder = const_cast<KMFolderImap*>( tqparent );
 }
 
 //-----------------------------------------------------------------------------
@@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
   if (!msg || !job) {
     return;
   }
-  KMFolderImap* parent = 0;
-  if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap )
-    parent = static_cast<KMFolderImap*>(msg->parent()->storage());
+  KMFolderImap* tqparent = 0;
+  if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap )
+    tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage());
   else if (mDestFolder) // put
-    parent = static_cast<KMFolderImap*>(mDestFolder->storage());
-  if (!parent) return;
-  KMAcctImap *account = parent->account();
+    tqparent = static_cast<KMFolderImap*>(mDestFolder->storage());
+  if (!tqparent) return;
+  KMAcctImap *account = tqparent->account();
   if ( !account ) return;
   ImapAccountBase::JobIterator it = account->findJob( job );
   if ( it == account->jobsEnd() ) return;
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 94be48d1..55aa02dd 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -54,17 +54,18 @@ class AttachmentStrategy;
 class ImapJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMAcctImap;
 
 public:
   ImapJob( KMMessage *msg, JobType jt = tGetMessage, KMFolderImap *folder = 0,
-           TQString partSpecifier = TQString::null, const AttachmentStrategy *as = 0 );
+           TQString partSpecifier = TQString(), const AttachmentStrategy *as = 0 );
   ImapJob( TQPtrList<KMMessage>& msgList, TQString sets,
            JobType jt = tGetMessage, KMFolderImap *folder = 0 );
   virtual ~ImapJob();
 
-  void setParentFolder( const KMFolderImap* parent );
-  KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; }
+  void setParentFolder( const KMFolderImap* tqparent );
+  KPIM::ProgressItem* tqparentProgressItem() const { return mParentProgressItem; }
   void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
 
 private slots:
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index b446ba0b..e820f113 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -32,11 +32,11 @@
 
 using namespace KMail;
 
-ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags )
-  : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ),
+ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags )
+  : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ),
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, true ),
-    mParentWidget( parent )
+    mParentWidget( tqparent )
 {
   setWFlags( flags );
   TQWidget *mainWidget = new TQWidget( this );
@@ -48,7 +48,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla
   int row = 0;
 
   // TODO: Explaination label
-  // TODO: Use QFormLayout in KDE4
+  // TODO: Use TQFormLayout in KDE4
   // TODO: better label for "Ok" button
 
   TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget );
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index 0b04d9b8..f8c15bab 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -32,10 +32,11 @@ class FolderRequester;
 class ImportArchiveDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags );
+    ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags );
     void setFolder( KMFolder *defaultFolder );
 
   protected slots:
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index cddf6a65..f7c44d19 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
   deleteLater();
 }
 
-KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions )
+KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions )
 {
-  KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
+  KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
                                                      KMFolderTypeMaildir );
   if ( !newFolder ) {
-    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) );
+    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparent->name() ) );
     return 0;
   }
   else {
@@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder *
   const KArchiveDirectory *messageDir = dynamic_cast<const KArchiveDirectory*>( dir->entry( "cur" ) );
   if ( messageDir ) {
     Messages messagesToQueue;
-    messagesToQueue.parent = folder;
+    messagesToQueue.tqparent = folder;
     const TQStringList entries = messageDir->entries();
     for ( uint i = 0; i < entries.size(); i++ ) {
       const KArchiveEntry *entry = messageDir->entry( entries[i] );
@@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage()
     return;
   }
 
-  KMFolder *folder = messages.parent;
+  KMFolder *folder = messages.tqparent;
   if ( folder != mCurrentFolder ) {
     kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl;
     if ( mCurrentFolder ) {
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+    mProgressItem->setqStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
   }
 
   mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage()
   messages.files.removeFirst();
 
   mCurrentMessage = new KMMessage();
-  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
+  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setqStatus */ );
   int retIndex;
 
   // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
@@ -273,26 +273,26 @@ static TQString folderNameForDirectoryName( const TQString &dirName )
   Q_ASSERT( dirName.startsWith( "." ) );
   const TQString end = ".directory";
   const int expectedIndex = dirName.length() - end.length();
-  if ( dirName.lower().find( end ) != expectedIndex )
+  if ( dirName.lower().tqfind( end ) != expectedIndex )
     return TQString();
   TQString returnName = dirName.left( dirName.length() - end.length() );
   returnName = returnName.right( returnName.length() - 1 );
   return returnName;
 }
 
-KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
+KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName,
                                            mode_t subFolderPermissions )
 {
-  if ( !parentFolder->createChildFolder() ) {
-    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) );
+  if ( !tqparentFolder->createChildFolder() ) {
+    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparentFolder->name() ) );
     return 0;
   }
 
   KMFolder *subFolder = 0;
-  subFolder = dynamic_cast<KMFolder*>( parentFolder->child()->hasNamedFolder( subFolderName ) );
+  subFolder = dynamic_cast<KMFolder*>( tqparentFolder->child()->hasNamedFolder( subFolderName ) );
 
   if ( !subFolder ) {
-    subFolder = createSubFolder( parentFolder, subFolderName, subFolderPermissions );
+    subFolder = createSubFolder( tqparentFolder, subFolderName, subFolderPermissions );
   }
   return subFolder;
 }
@@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory()
   }
 
   Folder folder = mQueuedDirectories.first();
-  KMFolder *currentFolder = folder.parent;
+  KMFolder *currentFolder = folder.tqparent;
   mQueuedDirectories.pop_front();
   kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl;
 
@@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory()
 
         Folder newFolder;
         newFolder.archiveDir = dir;
-        newFolder.parent = subFolder;
+        newFolder.tqparent = subFolder;
         kdDebug(5006) << "Enqueueing directory " << entry->name() << endl;
         mQueuedDirectories.push_back( newFolder );
       }
@@ -388,7 +388,7 @@ void KMail::ImportJob::start()
 
   Folder nextFolder;
   nextFolder.archiveDir = mArchive->directory();
-  nextFolder.parent = mRootFolder;
+  nextFolder.tqparent = mRootFolder;
   mQueuedDirectories.push_back( nextFolder );
   importNextDirectory();
 }
diff --git a/kmail/importjob.h b/kmail/importjob.h
index 17044141..ddb00911 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -52,6 +52,7 @@ namespace KMail
 class ImportJob : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -71,13 +72,13 @@ class ImportJob : public TQObject
 
     struct Folder
     {
-      KMFolder *parent;
+      KMFolder *tqparent;
       const KArchiveDirectory *archiveDir;
     };
 
     struct Messages
     {
-      KMFolder *parent;
+      KMFolder *tqparent;
       TQPtrList<KArchiveFile> files;
     };
 
@@ -85,8 +86,8 @@ class ImportJob : public TQObject
     void abort( const TQString &errorMessage );
     void queueFolders();
     void importNextDirectory();
-    KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions );
-    KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
+    KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions );
+    KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName,
                                     mode_t subFolderPermissions );
     void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder );
     void messageAdded();
@@ -101,11 +102,11 @@ class ImportJob : public TQObject
     KURL mArchiveFile;
     int mNumberOfImportedMessages;
 
-    // List of archive folders with their corresponding KMail parent folder that are awaiting
+    // List of archive folders with their corresponding KMail tqparent folder that are awaiting
     // processing
     TQValueList<Folder> mQueuedDirectories;
 
-    // List of list of messages and their parent folders which are awaiting processing
+    // List of list of messages and their tqparent folders which are awaiting processing
     TQValueList<Messages> mQueuedMessages;
 
     // The folder to which we are currently importing messages
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 632315a5..f824880f 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -16,11 +16,11 @@
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -60,14 +60,14 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
 
 #ifdef HAVE_INDEXLIB
 static
-TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) {
+TQValueList<int> vectorToTQValueList( const std::vector<TQ_UINT32>& input ) {
 	TQValueList<int> res;
 	std::copy( input.begin(), input.end(), std::back_inserter( res ) );
 	return res;
 }
 
 static
-std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
+std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) {
 	std::vector<TQ_UINT32> res;
 	// res.assign( input.begin(), input.end() ) doesn't work for some reason
 	for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
@@ -77,8 +77,8 @@ std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
 }
 #endif
 
-KMMsgIndex::KMMsgIndex( TQObject* parent ):
-	TQObject( parent, "index" ),
+KMMsgIndex::KMMsgIndex( TQObject* tqparent ):
+	TQObject( tqparent, "index" ),
 	mState( s_idle ),
 #ifdef HAVE_INDEXLIB
 	mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ),
@@ -123,8 +123,8 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 			TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) );
 			mState = s_creating;
 		} else {
-			mPendingMsgs = QValueListToVector( cfg.readIntListEntry( "pending" ) );
-			mRemovedMsgs = QValueListToVector( cfg.readIntListEntry( "removed" ) );
+			mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) );
+			mRemovedMsgs = TQValueListToVector( cfg.readIntListEntry( "removed" ) );
 		}
 	}
 	mIndex = 0;
@@ -143,17 +143,17 @@ KMMsgIndex::~KMMsgIndex() {
 	TQValueList<int> pendingMsg;
 	if ( mState == s_processing ) {
 		Q_ASSERT( mAddedMsgs.empty() );
-		pendingMsg = vectorToQValueList( mPendingMsgs );
+		pendingMsg = vectorToTQValueList( mPendingMsgs );
 	}
 	cfg.writeEntry( "pending", pendingMsg );
-	cfg.writeEntry( "removed", vectorToQValueList( mRemovedMsgs ) );
+	cfg.writeEntry( "removed", vectorToTQValueList( mRemovedMsgs ) );
 	delete mIndex;
 #endif
 }
 
 bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
-	if ( !folder || !folder->parent() ) return false;
-	const KMFolderMgr* manager = folder->parent()->manager();
+	if ( !folder || !folder->tqparent() ) return false;
+	const KMFolderMgr* manager = folder->tqparent()->manager();
 	return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr();
 }
 
@@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
 				// create() will notice that folder is disabled
 				break;
 			case s_creating:
-				if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
+				if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
 					// easy:
-					mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
+					mPendingFolders.erase( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
 					break;
 				}
 				//else  fall-through
@@ -433,7 +433,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
 //}
 
 void KMMsgIndex::removeSearch( TQObject* destroyed ) {
-	mSearches.erase( std::find( mSearches.begin(), mSearches.end(), destroyed ) );
+	mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) );
 }
 
 
diff --git a/kmail/index.h b/kmail/index.h
index 5e7f16dc..f24dc47b 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -20,11 +20,11 @@
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -51,8 +51,9 @@ class KMSearchPattern;
 
 class KMMsgIndex : public TQObject {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		explicit KMMsgIndex( TQObject* parent );
+		explicit KMMsgIndex( TQObject* tqparent );
 		~KMMsgIndex();
 
 	public:
@@ -194,6 +195,7 @@ class KMMsgIndex : public TQObject {
 
 class KMMsgIndex::Search : public TQObject {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		explicit Search( KMSearch* s );
 		~Search();
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index 8d3e1bbc..251d61af 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -84,7 +84,7 @@ namespace KMail {
       /**
 	 @return the decoded (CTE, canonicalisation, and charset
 	 encoding undone) text contained in the body part, or
-	 TQString::null, it the body part is not of type "text".
+	 TQString(), it the body part is not of type "text".
       */
       virtual TQString asText() const = 0;
 
@@ -96,7 +96,7 @@ namespace KMail {
 
       /**
 	 @return the value of the content-type header field parameter
-	 with name \a parameter, or TQString::null, if that that
+	 with name \a parameter, or TQString(), if that that
 	 parameter is not present in the body's content-type header
 	 field. RFC 2231 encoding is removed first.
 
@@ -114,7 +114,7 @@ namespace KMail {
 
       /**
 	 @return the content of the content-description header field,
-	 or TQString::null if that header is not present in this body
+	 or TQString() if that header is not present in this body
 	 part. RFC 2047 encoding is decoded first.
       */
       virtual TQString contentDescription() const = 0;
@@ -122,7 +122,7 @@ namespace KMail {
       //virtual int contentDisposition() const = 0;
       /**
 	 @return the value of the content-disposition header field
-	 parameter with name \a parameter, or TQString::null if that
+	 parameter with name \a parameter, or TQString() if that
 	 parameter is not present in the body's content-disposition
 	 header field. RFC 2231 encoding is removed first.
 
diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h
index 9bc947f5..14fedc61 100644
--- a/kmail/interfaces/bodypartformatter.h
+++ b/kmail/interfaces/bodypartformatter.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index be34e74a..01f64adb 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -81,7 +81,7 @@ namespace KMail {
 
       /** Called when RMB-clicking on a link in the reader. Should
 	  show a context menu at the specified point with the
-	  specified widget as parent.
+	  specified widget as tqparent.
 
 	  @return true if the right-click was handled by this handler,
 	  false otherwise.
@@ -91,7 +91,7 @@ namespace KMail {
       /** Called when hovering over a link.
 
           @return a string to be shown in the status bar while
-	  hovering over this link or TQString::null if the link was not
+	  hovering over this link or TQString() if the link was not
 	  handled by this handler.
       */
       virtual TQString statusBarMessage( BodyPart * part, const TQString & path ) const = 0;
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 96383535..93235016 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h
index 184ee318..10d14dfa 100644
--- a/kmail/interfaces/observable.h
+++ b/kmail/interfaces/observable.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h
index 5f1d9b88..31cbc80a 100644
--- a/kmail/interfaces/observer.h
+++ b/kmail/interfaces/observer.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h
index 4d3eca8b..33095223 100644
--- a/kmail/interfaces/rulewidgethandler.h
+++ b/kmail/interfaces/rulewidgethandler.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 38ada083..702efa41 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -94,7 +94,7 @@ namespace KMail {
 
     /** Called when RMB-clicking on a link in the reader. Should show
 	a context menu at the specified point with the specified
-	widget as parent.
+	widget as tqparent.
 
 	@return true if the right-click was handled by this
 	URLHandler, false otherwise.
diff --git a/kmail/isubject.h b/kmail/isubject.h
index 93a84a29..8bad40c4 100644
--- a/kmail/isubject.h
+++ b/kmail/isubject.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp
index 89cabec9..caf4759f 100644
--- a/kmail/jobscheduler.cpp
+++ b/kmail/jobscheduler.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -34,8 +34,8 @@
 
 using namespace KMail;
 
-JobScheduler::JobScheduler( TQObject* parent, const char* name )
-  : TQObject( parent, name ), mTimer( this, "mTimer" ),
+JobScheduler::JobScheduler( TQObject* tqparent, const char* name )
+  : TQObject( tqparent, name ), mTimer( this, "mTimer" ),
     mPendingImmediateTasks( 0 ),
     mCurrentTask( 0 ), mCurrentJob( 0 )
 {
@@ -109,7 +109,7 @@ void JobScheduler::notifyOpeningFolder( KMFolder* folder )
     } else {
       // Jobs scheduled from here should always be cancellable.
       // One exception though, is when ExpireJob does its final KMMoveCommand.
-      // Then that command shouldn't kill its own parent job just because it opens a folder...
+      // Then that command shouldn't kill its own tqparent job just because it opens a folder...
       if ( mCurrentJob->isCancellable() )
         interruptCurrentTask();
     }
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index 2dd04d4a..c35121dd 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -93,11 +93,12 @@ private:
  * using too much CPU for too long. Tasks for opened folders are not executed until
  * the folder is closed.
  */
-class JobScheduler : public QObject
+class JobScheduler : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  JobScheduler( TQObject* parent, const char* name = 0 );
+  JobScheduler( TQObject* tqparent, const char* name = 0 );
   ~JobScheduler();
 
   /// Register a task to be done for a given folder
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 3ba43637..6cb28374 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,55 +31,55 @@
 //----------------------------
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *tqparent, const char * )
   {
-    MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
+    MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" );
     return page;
   }
 }
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * )
   {
     AppearancePage *page =
-       new AppearancePage( parent, "kcmkmail_config_appearance" );
+       new AppearancePage( tqparent, "kcmkmail_config_appearance" );
     return page;
   }
 }
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * )
   {
-    ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
+    ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" );
     return page;
   }
 }
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * )
   {
-    IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
+    IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" );
     return page;
   }
 }
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * )
   {
-    AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
+    AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" );
     return page;
   }
 }
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * )
   {
-    SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
+    SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" );
     return page;
   }
 }
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index a93e92af..3f6526d7 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -10,11 +10,11 @@
  * As soon as it gets out of scope, it will restore the original
  * cursor.
  */
-class KCursorSaver : public Qt
+class KCursorSaver : public TQt
 {
 public:
     /// constructor taking TQCursor tqshapes
-    KCursorSaver(Qt::tqCursorShape tqshape) {
+    KCursorSaver(TQt::tqCursorShape tqshape) {
         TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 94edd591..bd4d4a51 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -555,7 +555,7 @@ namespace {
 
 static TQString canonicalAddress( const TQString & _address ) {
   const TQString address = KPIM::getEmailAddress( _address );
-  if ( address.find('@') == -1 ) {
+  if ( address.tqfind('@') == -1 ) {
     // local address
     //char hostname[1024];
     //gethostname(hostname,1024);
@@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
   dump();
   for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys
     if ( !( f & concreteCryptoMessageFormats[i] ) )
       continue;
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() {
 std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.find( f );
+    d->mFormatInfoMap.tqfind( f );
   return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ;
 }
 
 std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.find( f );
+    d->mFormatInfoMap.tqfind( f );
   return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ;
 }
 
@@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f )
 
 
 std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
-  const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats );
-  const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
+  const bool opgp = containsOpenPGP( mCryptoMessageFormats );
+  const bool x509 = containsSMIME( mCryptoMessageFormats );
 
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1765,12 +1765,12 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) {
 Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const
 {
   const Private::ContactPreferencesMap::iterator it =
-    d->mContactPreferencesMap.find( address );
+    d->mContactPreferencesMap.tqfind( address );
   if ( it != d->mContactPreferencesMap.end() )
     return it->second;
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->tqfindByEmail( address );
+  const KABC::Addressee::List res = ab->findByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
     KABC::Addressee addr = res.first();
@@ -1792,12 +1792,12 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
 {
   d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  KABC::Addressee::List res = ab->tqfindByEmail( email );
+  KABC::Addressee::List res = ab->findByEmail( email );
 
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
      bool ok = true;
-     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString::null, &ok );
+     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
     if ( ok ) {
       addr.setNameFromString( fullName );
       addr.insertEmail( email, true );
diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h
index f39a0f96..0765459f 100644
--- a/kmail/keyresolver.h
+++ b/kmail/keyresolver.h
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -101,14 +101,14 @@ namespace Kleo {
      \section Step 4: Get signing keys.
 
      If, after key resolving, signing is still requested and
-     apparently possible, you can get the result of all this by
+     aptqparently possible, you can get the result of all this by
      iterating over the available message formats and retrieving the
      set of signing keys to use with a call to \c signingKeys().
 
      \section Step 5: Get encrytion key sets.
 
      If after key resolving, encryption is still requested and
-     apparently possible, you can get the result of all this by
+     aptqparently possible, you can get the result of all this by
      calling \c encryptionItems() with the current message format at
      hand as its argument.
 
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 900264cd..64f085f9 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,8 @@
 namespace KMail {
 
   KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
-					    TQObject * parent, const char * name )
-    : TQObject( parent, name ), HtmlWriter(),
+					    TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ), HtmlWriter(),
       mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
   {
     assert( part );
@@ -140,7 +140,7 @@ namespace KMail {
       DOM::HTMLImageElement image( node );
       KURL url( image.src().string() );
       if ( url.protocol() == "cid" ) {
-        EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.find( url.path() );
+        EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.tqfind( url.path() );
         if ( it != mEmbeddedPartMap.end() ) {
           kdDebug(5006) << "Replacing " << url.prettyURL() << " by " << it.data() << endl;
           image.setSrc( it.data() );
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 482d9b2c..3db102f7 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,11 +45,12 @@ namespace KMail {
 
   class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter {
     Q_OBJECT
+  TQ_OBJECT
   public:
     // Key is Content-Id, value is URL
     typedef TQMap<TQString, TQString> EmbeddedPartMap;
     KHtmlPartHtmlWriter( KHTMLPart * part,
-			 TQObject * parent=0, const char * name = 0 );
+			 TQObject * tqparent=0, const char * name = 0 );
     virtual ~KHtmlPartHtmlWriter();
 
     void begin( const TQString & cssDefs );
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index 6baa874b..7cf11ebd 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) {
   return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
 }
 
-static inline bool tqcontainsSMIME( unsigned int f ) {
+static inline bool containsSMIME( unsigned int f ) {
   return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
 }
 
-static inline bool tqcontainsOpenPGP( unsigned int f ) {
+static inline bool containsOpenPGP( unsigned int f ) {
   return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
 }
 
diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp
index 4249d3bf..530ffaf4 100644
--- a/kmail/klistboxdialog.cpp
+++ b/kmail/klistboxdialog.cpp
@@ -11,10 +11,10 @@
 KListBoxDialog::KListBoxDialog( TQString& _selectedString,
                                 const TQString& caption,
                                 const TQString& labelText,
-                                TQWidget* parent,
+                                TQWidget* tqparent,
                                 const char* name,
                                 bool modal )
-    : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
+    : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
       selectedString( _selectedString )
 
 {
@@ -52,7 +52,7 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString,
  */
 KListBoxDialog::~KListBoxDialog()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 void KListBoxDialog::setLabelAbove(const TQString& label)
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index e245d1df..cf155075 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -9,12 +9,13 @@ class TQListBox;
 class KListBoxDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KListBoxDialog( TQString& _selectedString,
                     const TQString& caption,
                     const TQString& labelText,
-                    TQWidget*    parent = 0,
+                    TQWidget*    tqparent = 0,
                     const char* name   = 0,
                     bool        modal  = true );
     ~KListBoxDialog();
diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp
index 78a20dc5..f556c07d 100644
--- a/kmail/klistviewindexedsearchline.cpp
+++ b/kmail/klistviewindexedsearchline.cpp
@@ -17,11 +17,11 @@
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -38,8 +38,8 @@
 
 using KMail::HeaderListQuickSearch;
 
-KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ):
-	HeaderListQuickSearch( parent, listView, actionCollection, name ),
+KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ):
+	HeaderListQuickSearch( tqparent, listView, actionCollection, name ),
 	mFiltering( false )
 {
 }
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index 5bd67e4b..f8aaf176 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -19,11 +19,11 @@
  * 
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
  * combinations including the two.  You must obey the GNU General
  * Public License in all respects for all of the code used other than
- * Qt.  If you modify this file, you may extend this exception to
+ * TQt.  If you modify this file, you may extend this exception to
  * your version of the file, but you are not obligated to do so.  If
  * you do not wish to do so, delete this exception statement from
  * your version.
@@ -49,10 +49,11 @@ class KListViewSearchLine;
 class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0);
+    explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0);
     ~KListViewIndexedSearchLine();
 
 public slots:
@@ -60,7 +61,7 @@ public slots:
      * Updates search to only make visible the items that match \a s.  If
      * \a s is null then the line edit's text will be used.
      */
-    virtual void updateSearch(const TQString &s = TQString::null);
+    virtual void updateSearch(const TQString &s = TQString());
 
 protected:
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 8ddf6899..eebe99f7 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -12,7 +12,7 @@ using KMail::AccountManager;
 #include "messagesender.h"
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmfoldercachedimap.h"
 
 #include "progressmanager.h"
@@ -42,10 +42,10 @@ using KMail::FolderJob;
 #include "kmaccount.moc"
 
 //-----------------------------------------------------------------------------
-KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
-  : TQObject(parent), mPrecommand(precommand)
+KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
+  : TQObject(tqparent), mPrecommand(precommand)
 {
-  BroadcasStatus::instance()->seStatusMsg(
+  BroadcastqStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
@@ -181,7 +181,7 @@ void KMAccount::writeConfig(KConfig& config)
   KAccount::writeConfig(config);
 
   config.writeEntry("Type", type());
-  config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString::null);
+  config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString());
   config.writeEntry("check-interval", mInterval);
   config.writeEntry("check-exclude", mExclude);
   config.writePathEntry("precommand", mPrecommand);
@@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
   assert(aMsg != 0);
 
   // Save this one for readding
-  KMFolderCachedImap* parent = 0;
+  KMFolderCachedImap* tqparent = 0;
   if( type() == "cachedimap" )
-    parent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
+    tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
 
   // checks whether we should send delivery receipts
   // and sends them.
@@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
   // This is only valid for pop accounts and produces wrong stati for imap.
   if ( type() != "cachedimap" && type() != "imap" ) {
     if ( aMsg->isOld() )
-      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->seStatus(KMMsgStatusRead);
+      aMsg->setqStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->setqStatus(KMMsgStatusRead);
     else
-      aMsg->seStatus(KMMsgStatusNew);
+      aMsg->setqStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
   else if (processResult == 1)
   {
     if( type() == "cachedimap" )
-      ; // already done by caller: parent->addMsgInternal( aMsg, false );
+      ; // already done by caller: tqparent->addMsgInternal( aMsg, false );
     else {
       // TODO: Perhaps it would be best, if this if was handled by a virtual
       // method, so the if( !dimap ) above could die?
@@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) {
   // Count number of new messages for each folder
   TQString folderId;
   if ( processResult == 1 ) {
-    folderId = ( type() == "cachedimap" ) ? parent->folder()->idString()
+    folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString()
                                           : mFolder->idString();
   }
   else {
-    folderId = aMsg->parent()->idString();
+    folderId = aMsg->tqparent()->idString();
   }
   addToNewInFolder( folderId, 1 );
 
@@ -312,7 +312,7 @@ int KMAccount::checkInterval() const
 {
   if ( mInterval <= 0 )
     return mInterval;
-  return QMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() );
+  return TQMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() );
 }
 
 //----------------------------------------------------------------------------
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcasStatus::instance()->seStatusMsg(
+  BroadcastqStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
@@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) {
 }
 
 //-----------------------------------------------------------------------------
-void KMAccount::checkDone( bool newmail, CheckStatus status )
+void KMAccount::checkDone( bool newmail, ChecktqStatus status )
 {
     setCheckingMail( false );
   // Reset the timeout for automatic mailchecking. The user might have
@@ -493,7 +493,7 @@ void KMAccount::checkDone( bool newmail, CheckStatus status )
 //-----------------------------------------------------------------------------
 void KMAccount::addToNewInFolder( TQString folderId, int num )
 {
-  if ( mNewInFolder.find( folderId ) == mNewInFolder.end() )
+  if ( mNewInFolder.tqfind( folderId ) == mNewInFolder.end() )
     mNewInFolder[folderId] = num;
   else
     mNewInFolder[folderId] += num;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 2872b111..02df2421 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -49,12 +49,13 @@ using KPIM::ProgressItem;
 class KMAccount;
 typedef TQValueList< ::KMAccount* > AccountList;
 
-class KMPrecommand : public QObject
+class KMPrecommand : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMPrecommand(const TQString &precommand, TQObject *parent = 0);
+  KMPrecommand(const TQString &precommand, TQObject *tqparent = 0);
   virtual ~KMPrecommand();
   bool start();
 
@@ -73,6 +74,7 @@ protected:
 class KMAccount: public TQObject, public KAccount
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KMail::AccountManager;
   friend class ::KMail::FolderJob;
   friend class ::AccountsPageReceivingTab; // part of the config dialog
@@ -81,7 +83,7 @@ class KMAccount: public TQObject, public KAccount
 public:
   virtual ~KMAccount();
 
-  enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
+  enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
                      CheckError };
 
   /** The default check interval */
@@ -90,7 +92,7 @@ public:
   /**
    * Returns type of the account
    */
-  virtual TQString type() const { return TQString::null; }
+  virtual TQString type() const { return TQString(); }
 
   /**
    * Reimplemented, set account name
@@ -229,7 +231,7 @@ public:
    * @param newMail true if new mail arrived
    * @param status the status of the mail check
    */
-  void checkDone( bool newMail, CheckStatus status );
+  void checkDone( bool newMail, ChecktqStatus status );
 
   /**
    * Abort all running mail checks. Used when closing the last KMMainWin.
@@ -258,7 +260,7 @@ signals:
    * @param newMail true if there was new mail
    * @param status the status of the mail check
    **/
-  virtual void finishedCheck( bool newMail, CheckStatus status );
+  virtual void finishedCheck( bool newMail, ChecktqStatus status );
 
   /**
    * Emitted after the mail check is finished.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 4fc57d2c..134a7102 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -134,8 +134,8 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   TQValueList<KMFolderCachedImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ((*it).parent)
-      folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+    if ((*it).tqparent)
+      folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
     // Kill the job - except if it's the one that already died and is calling us
     if ( !it.key()->error() && mSlave ) {
       it.key()->kill();
@@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck()
   TQValueList<KMFolderCachedImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ( (*it).cancellable && (*it).parent )
-      folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+    if ( (*it).cancellable && (*it).tqparent )
+      folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
   }
   // Kill jobs
   ImapAccountBase::cancelMailCheck();
@@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders()
     mMailCheckFolders.append( mFoldersQueuedForChecking.front() );
     mFoldersQueuedForChecking.pop_front();
     if ( mFoldersQueuedForChecking.isEmpty() )
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     kmkernel->acctMgr()->singleCheckMail(this, true);
@@ -243,7 +243,7 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder,
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + TQString::number( id() ),
     TQStyleSheet::escape( folder->label() ), // will be changed immediately in serverSync anyway
-    TQString::null,
+    TQString(),
     true, // can be cancelled
     useSSL() || useTLS() );
   connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -287,7 +287,7 @@ void KMAcctCachedImap::addUnreadMsgCount( const KMFolderCachedImap *folder,
     // therefore doesn't need to be counted here
     const TQString folderId = folder->folder()->idString();
     int newInFolder = countUnread;
-    if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+    if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
       newInFolder -= mUnreadBeforeCheck[folderId];
     if ( newInFolder > 0 )
       addToNewInFolder( folderId, newInFolder );
@@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
 
 void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   ImapAccountBase::readConfig( config );
-  // Apparently this method is only ever called once (from KMKernel::init) so this is ok
+  // Aptqparently this method is only ever called once (from KMKernel::init) so this is ok
   mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
   mDeletedFolders.clear(); // but just in case...
   const TQStringList oldPaths = config.readListEntry( "renamed-folders-paths" );
@@ -318,7 +318,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   TQStringList::const_iterator it = oldPaths.begin();
   TQStringList::const_iterator nameit = newNames.begin();
   for( ; it != oldPaths.end() && nameit != newNames.end(); ++it, ++nameit ) {
-    addRenamedFolder( *it, TQString::null, *nameit );
+    addRenamedFolder( *it, TQString(), *nameit );
   }
   mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
 }
@@ -351,7 +351,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
   TQStringList strList;
   TQValueList<TQGuardedPtr<KMFolder> > folderList;
   kmkernel->dimapFolderMgr()->createFolderList( &strList, &folderList,
-                                                folder->folder()->child(), TQString::null,
+                                                folder->folder()->child(), TQString(),
                                                 false );
   TQValueList<TQGuardedPtr<KMFolder> >::Iterator it;
   mCountLastUnread = 0;
@@ -417,12 +417,12 @@ TQStringList KMAcctCachedImap::deletedFolderPaths( const TQString& subFolderPath
 
 bool KMAcctCachedImap::isDeletedFolder( const TQString& subFolderPath ) const
 {
-  return mDeletedFolders.find( subFolderPath ) != mDeletedFolders.end();
+  return mDeletedFolders.tqfind( subFolderPath ) != mDeletedFolders.end();
 }
 
 bool KMAcctCachedImap::isPreviouslyDeletedFolder( const TQString& subFolderPath ) const
 {
-  return mPreviouslyDeletedFolders.find( subFolderPath ) != mPreviouslyDeletedFolders.end();
+  return mPreviouslyDeletedFolders.tqfind( subFolderPath ) != mPreviouslyDeletedFolders.end();
 }
 
 void KMAcctCachedImap::removeDeletedFolder( const TQString& subFolderPath )
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
   killAllJobs( abortConnection );
   if ( abortConnection ) {
     // If we were trying to connect, tell kmfoldercachedimap so that it moves on
-    emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null );
+    emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
   }
 }
 
@@ -459,10 +459,10 @@ FolderStorage* KMAcctCachedImap::rootFolder() const
 
 TQString KMAcctCachedImap::renamedFolder( const TQString& imapPath ) const
 {
-  TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.find( imapPath );
+  TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.tqfind( imapPath );
   if ( renit != mRenamedFolders.end() )
     return (*renit).mNewName;
-  return TQString::null;
+  return TQString();
 }
 
 #include "kmacctcachedimap.moc"
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 5c3aa6c3..f045ca7f 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -54,6 +54,7 @@ namespace KIO {
 class KMAcctCachedImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMail::ImapJob;
   friend class ::KMail::CachedImapJob;
 
@@ -144,7 +145,7 @@ public:
   void removeRenamedFolder( const TQString& subFolderPath );
 
   struct RenamedFolder {
-    RenamedFolder() {} // for QMap
+    RenamedFolder() {} // for TQMap
     RenamedFolder( const TQString& oldLabel, const TQString& newName )
       : mOldLabel( oldLabel ), mNewName( newName ) {}
     TQString mOldLabel;
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 6545d4e6..488142a9 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -24,7 +24,7 @@
 
 class KMAccount;
 
-/** Simple wrapper class that tqcontains the kmail account handling
+/** Simple wrapper class that contains the kmail account handling
  * stuff that is usually not required outside kmail.
  *
  * WARNING: do not add virtual methods in this class. This class is
@@ -48,7 +48,7 @@ public:
   void clearAccountList();
 
 private:
-  KMAcctFolder( KMFolderDir* parent, const TQString& name,
+  KMAcctFolder( KMFolderDir* tqparent, const TQString& name,
                      KMFolderType aFolderType );
 };
 
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 12d17af8..6942bab5 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
@@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
           msg->setTransferInProgress( false );
        }
     }
-    if ((*it).parent)
+    if ((*it).tqparent)
     {
       // clear folder state
-      KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->storage());
+      KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage());
       fld->setCheckingValidity(false);
       fld->quiet(false);
       fld->setContentState(KMFolderImap::imapNoInformation);
@@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
   {
     ImapJob *job = it.current();
     ++it;
-    if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder )
+    if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder )
     {
       job->kill();
     }
@@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
   while ( it != mapJobData.end() ) {
      TQMap<KIO::Job*, jobData>::Iterator i = it;
      it++;
-     if ( (*i).parent ) {
-        if ( (*i).parent == folder ) {
+     if ( (*i).tqparent ) {
+        if ( (*i).tqparent == folder ) {
            mapJobData.remove(i);
         }
      }
@@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck()
   TQValueList<KMFolderImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ( (*it).cancellable && (*it).parent ) {
-      folderList << static_cast<KMFolderImap*>((*it).parent->storage());
+    if ( (*it).cancellable && (*it).tqparent ) {
+      folderList << static_cast<KMFolderImap*>((*it).tqparent->storage());
     }
   }
   // Kill jobs
@@ -298,7 +298,7 @@ void KMAcctImap::processNewMail(bool interactive)
     ProgressManager::createProgressItem(
         "MailCheckAccount" + name(),
         i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ),
-        TQString::null, // status
+        TQString(), // status
         true, // can be canceled
         useSSL() || useTLS() );
 
@@ -395,14 +395,14 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
   // count the unread messages
   const TQString folderId = folder->idString();
   int newInFolder = folder->countUnread();
-  if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+  if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
     newInFolder -= mUnreadBeforeCheck[folderId];
   if ( newInFolder > 0 ) {
     addToNewInFolder( folderId, newInFolder );
@@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count
     // when we check only one folder (=selected) and we have new mails
     // then do not display a summary as the normal status message is better
-    bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
-    ImapAccountBase::postProcessNewMail( showStatus );
+    bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
+    ImapAccountBase::postProcessNewMail( showtqStatus );
     mUnreadBeforeCheck.clear();
     mCheckingSingleFolder = false;
   }
@@ -512,7 +512,7 @@ void KMAcctImap::slotUpdateFolderList()
   TQStringList strList;
   mMailCheckFolders.clear();
   kmkernel->imapFolderMgr()->createFolderList(&strList, &mMailCheckFolders,
-    mFolder->folder()->child(), TQString::null, false);
+    mFolder->folder()->child(), TQString(), false);
   // the new list
   TQValueList<TQGuardedPtr<KMFolder> > includedFolders;
   // check for excluded folders
@@ -580,7 +580,7 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
 void KMAcctImap::execFilters(TQ_UINT32 serNum)
 {
   if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
-  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum );
+  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.tqfind( serNum );
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
@@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
     kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
     return 2;
   }
-  if (msg->parent()) { // unGet this msg
+  if (msg->tqparent()) { // unGet this msg
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
-    assert( p == msg->parent() ); assert( idx >= 0 );
+    assert( p == msg->tqparent() ); assert( idx >= 0 );
     p->unGetMsg( idx );
   }
 
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index f3fcc693..1a6c4882 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -40,6 +40,7 @@ class FolderStorage;
 class KMAcctImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KMail::ImapJob;
 
 public:
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 47e04f33..6062f354 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcasStatus::instance()->reset();
-  BroadcasStatus::instance()->seStatusMsg(
+  //BroadcastqStatus::instance()->reset();
+  BroadcastqStatus::instance()->seStatusMsg(
         i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
     return false;
   }
 
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
     kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
@@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
       .arg( mMailFolder->location() );
-    BroadcasStatus::instance()->seStatusMsg( errMsg );
+    BroadcastqStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
 
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
     .arg(mMailFolder->location()).arg( mNumMsgs );
 
-  //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
+  //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
-  //BroadcasStatus::instance()->seStatusMsg( statusMsg );
+  //BroadcastqStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->seStatus( statusMsg );
+  mMailCheckProgressItem->setqStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,8 +214,8 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    msg->seStatus(msg->headerField("Status").latin1(),
-      msg->headerField("X-Status").latin1());
+    msg->setqStatus(msg->headerField("tqStatus").latin1(),
+      msg->headerField("X-tqStatus").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
     msg->setComplete(true);
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->seStatus(
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->setqStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
               mNumMsgs ).arg( mMailFolder->location() ) );
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index ca378920..7b83dcf8 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcasStatus::instance()->seStatusMsg(
+  BroadcastqStatus::instance()->seStatusMsg(
 	i18n("Preparing transmission from \"%1\"...").arg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
     KMessageBox::sorry(0, aStr);
     kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
+      BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -165,13 +165,13 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( statusMsg );
+    mMailCheckProgressItem->setqStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->seStatus(msg->headerField("Status").latin1(),
-        msg->headerField("X-Status").latin1());
+      msg->setqStatus(msg->headerField("tqStatus").latin1(),
+        msg->headerField("X-tqStatus").latin1());
       msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
       msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
 
@@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->seStatus(
+    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->setqStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
             num ).arg(mailFolder.location() ) );
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
   if (addedOk)
   {
-    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
+    BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index 44df37c6..caa2a215 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -32,8 +32,8 @@
 
 #include "kmacctseldlg.moc"
 
-KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal )
-  : KDialogBase( parent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
+KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal )
+  : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
 {
   TQFrame *page = makeMainWidget();
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h
index 3aad59b1..62a0012b 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -30,9 +30,10 @@
 class KMAcctSelDlg: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
+    KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true );
 
     /**
      * Returns selected button from the account selection group:
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 055b29fc..8fdc5554 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -56,18 +56,18 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
     for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
       email = *mit;
       if (!email.isEmpty()) {
-	if (n.isEmpty() || (email.find( '<' ) != -1))
-	  addr = TQString::null;
+	if (n.isEmpty() || (email.tqfind( '<' ) != -1))
+	  addr = TQString();
 	else { // do we really need quotes around this name ?
-          if (n.find(needQuotes) != -1)
+          if (n.tqfind(needQuotes) != -1)
 	    addr = '"' + n + endQuote;
 	  else
 	    addr = n + ' ';
 	}
 
-	if (!addr.isEmpty() && (email.find( '<' ) == -1)
-	    && (email.find( '>' ) == -1)
-	    && (email.find( ',' ) == -1))
+	if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
+	    && (email.tqfind( '>' ) == -1)
+	    && (email.tqfind( ',' ) == -1))
 	  addr += '<' + email + '>';
 	else
 	  addr += email;
@@ -99,7 +99,7 @@ TQStringList KabcBridge::addresses()
 TQString KabcBridge::expandNickName( const TQString& nickName )
 {
   if ( nickName.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const TQString lowerNickName = nickName.lower();
   const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -108,7 +108,7 @@ TQString KabcBridge::expandNickName( const TQString& nickName )
     if ( (*it).nickName().lower() == lowerNickName )
       return (*it).fullEmail();
   }
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -126,7 +126,7 @@ TQStringList KabcBridge::categories()
     for ( TQStringList::ConstIterator itAux = aux.begin();
           itAux != aux.end(); ++itAux ) {
       // don't have duplicates in allcategories
-      if ( allcategories.find( *itAux ) == allcategories.end() )
+      if ( allcategories.tqfind( *itAux ) == allcategories.end() )
         allcategories += *itAux;
     }
   }
diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc
index 098f80c2..2bef9ad0 100644
--- a/kmail/kmail.antispamrc
+++ b/kmail/kmail.antispamrc
@@ -20,7 +20,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -139,7 +139,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -163,7 +163,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check
 PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm
 ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam
 ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good
-DetectionHeader=X-CRM114-Status
+DetectionHeader=X-CRM114-tqStatus
 DetectionPattern=SPAM
 DetectionPattern2=UNSURE
 DetectionOnly=0
@@ -230,7 +230,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=1
 ScoreName=CRM114
-ScoreHeader=X-CRM114-Status
+ScoreHeader=X-CRM114-tqStatus
 ScoreType=Bool
 ScoreValueRegexp=SPAM
 ScoreThresholdRegexp=
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 4bbd1be6..88370a45 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -97,7 +97,7 @@
     </group>
 
     <group name="General">
-      <entry name="disregardUmask" type="Bool">
+      <entry name="disregardUtqmask" type="Bool">
         <label>Disregard the users umask setting and use "read-write for the user only" instead</label>
         <default>false</default>
       </entry>
@@ -257,7 +257,7 @@
       </entry>
 
       <entry name="TheIMAPResourceFolderParent" type="String">
-        <whatsthis>&lt;p&gt;This chooses the parent of the IMAP resource folders.&lt;/p&gt;&lt;p&gt;By default, the Kolab server sets the IMAP inbox to be the parent.&lt;/p&gt;</whatsthis>
+        <whatsthis>&lt;p&gt;This chooses the tqparent of the IMAP resource folders.&lt;/p&gt;&lt;p&gt;By default, the Kolab server sets the IMAP inbox to be the tqparent.&lt;/p&gt;</whatsthis>
         <default>inbox</default>
       </entry>
 
@@ -451,14 +451,14 @@
       <entry name="ReplyPrefixes" type="StringList" key="reply-prefixes">
         <default>Re\\s*:,Re\\[\\d+\\]:,Re\\d+:</default>
       </entry>
-      <entry name="ReplaceReplyPrefix" type="Bool" key="replace-reply-prefix">
+      <entry name="ReplaceReplyPrefix" type="Bool" key="tqreplace-reply-prefix">
         <label>Replace recognized prefi&amp;x with "Re:"</label>
 	<default>true</default>
       </entry>
       <entry name="ForwardPrefixes" type="StringList" key="forward-prefixes">
         <default>Fwd:,FW:</default>
       </entry>
-      <entry name="ReplaceForwardPrefix" type="Bool" key="replace-forward-prefix">
+      <entry name="ReplaceForwardPrefix" type="Bool" key="tqreplace-forward-prefix">
         <label>Replace recognized prefix with "&amp;Fwd:"</label>
         <default>true</default>
       </entry>
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index cb40bc30..70c90cb0 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
 
 KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
-		     TQObject *parent, const char *name, const TQStringList &) :
-  DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
+		     TQObject *tqparent, const char *name, const TQStringList &) :
+  DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name),
   mParentWidget( tqparentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScripStatus();
+  mainWidget->updateVactionScriptqStatus();
 }
 
 void KMailPart::exit()
@@ -237,8 +237,8 @@ TQWidget* KMailPart::tqparentWidget() const
 }
 
 
-KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
-  : KParts::StatusBarExtension( parent ), mParent( parent )
+KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent )
+  : KParts::StatusBarExtension( tqparent ), mParent( tqparent )
 {
 }
 
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 69203db9..414ff384 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KMail_PART_H
 #define KMail_PART_H
@@ -52,9 +52,10 @@ class ActionManager;
 class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KMailPart(TQWidget *tqparentWidget, const char *widgetName,
-              TQObject *parent, const char *name, const TQStringList &);
+              TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~KMailPart();
 
     TQWidget* tqparentWidget() const;
@@ -88,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 class KMailStatusBarExtension : public KParts::StatusBarExtension
 {
 public:
-  KMailStatusBarExtension( KMailPart *parent );
+  KMailStatusBarExtension( KMailPart *tqparent );
 
   KMainWindow *mainWindow() const;
 
diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc
index fb4794df..5c4d034f 100644
--- a/kmail/kmail_part.rc
+++ b/kmail/kmail_part.rc
@@ -22,7 +22,7 @@
    <Action name="file_print" />
    <Separator/>
    <Action name="expire_all_folders" />
-   <Action name="file_invalidate_imap_cache"/>
+   <Action name="file_tqinvalidate_imap_cache"/>
    <Action name="empty_trash"/>
    <Separator/>
    <Action name="online_status" />
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index 91f15df5..cd4ef29c 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,7 +50,7 @@ public:
 k_dcop:
   struct SubResource {
     //dcopidl barfs on those constructors, but dcopidlng works
-    SubResource() {} // for QValueList
+    SubResource() {} // for TQValueList
     SubResource( const TQString& loc, const TQString& lab, bool rw, bool ar )
       : location( loc ), label( lab ), writable( rw ), alarmRelevant( ar ) {}
     TQString location; // unique
@@ -115,11 +115,11 @@ k_dcop:
 
    /**
    * Trigger the creation of a new resource folder with name @param resource
-   * under parent @param.
+   * under tqparent @param.
    * @return success or failure
    */
   virtual bool addSubresource( const TQString& resource,
-                               const TQString& parent,
+                               const TQString& tqparent,
                                const TQString& contentsType ) = 0;
   /**
    * Trigger the deletion of a new resource folder with id @param resource.
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 41e9f96d..81237473 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {}
 
 // Add (or overwrite, resp.) an attachment in an existing mail,
 // attachments must be local files, they are identified by their names.
-// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
+// If lookupByName if false the attachment to replace is looked up by mimetype.
 // return value: wrong if attachment could not be added/updated
 bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
                                            const TQString& attachmentURL,
@@ -260,7 +260,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
       KMMessagePart msgPart;
       msgPart.setName( attachmentName );
 
-      const int iSlash = attachmentMimetype.find('/');
+      const int iSlash = attachmentMimetype.tqfind('/');
       const TQCString sType    = attachmentMimetype.left( iSlash   ).latin1();
       const TQCString sSubtype = attachmentMimetype.mid(  iSlash+1 ).latin1();
       msgPart.setTypeStr( sType );
@@ -309,7 +309,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
 // Look for the attachment with the right mimetype
 bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQString& mimetype, TQString& s )
 {
-  const int iSlash = mimetype.find('/');
+  const int iSlash = mimetype.tqfind('/');
   const TQCString sType    = mimetype.left( iSlash   ).latin1();
   const TQCString sSubtype = mimetype.mid(  iSlash+1 ).latin1();
   DwBodyPart* part = findBodyPartByMimeType( msg, sType, sSubtype, true /* starts with sSubtype, to accept application/x-vnd.kolab.contact.distlist */ );
@@ -556,7 +556,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString&
   kdDebug(5006) << "The folder has " << f->count() << " messages." << endl;
 
   int stopIndex = nbMessages == -1 ? f->count() :
-                  QMIN( f->count(), startIndex + nbMessages );
+                  TQMIN( f->count(), startIndex + nbMessages );
 
   for(int i = startIndex; i < stopIndex; ++i) {
 #if 0
@@ -566,7 +566,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString&
     KMMessage* msg = f->storage()->readTemporaryMsg(i);
 #endif
     if ( msg ) {
-      const int iSlash = mimetype.find('/');
+      const int iSlash = mimetype.tqfind('/');
       const TQCString sType    = mimetype.left( iSlash   ).latin1();
       const TQCString sSubtype = mimetype.mid(  iSlash+1 ).latin1();
       if ( sType.isEmpty() || sSubtype.isEmpty() ) {
@@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 {
   if( !msg ) return;
 
-  KMFolder *parent = msg->parent();
-  Q_ASSERT( parent );
+  KMFolder *tqparent = msg->tqparent();
+  Q_ASSERT( tqparent );
   TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
-  Accumulator *ac = mAccumulators.find( parent->location() );
+  Accumulator *ac = mAccumulators.tqfind( tqparent->location() );
   if( ac ) {
     TQString s;
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
@@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
   } else {
     /* We are not accumulating for this folder, so this one was added
      * by KMail. Do your thang. */
-     slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
+     slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() );
   }
 
   if ( mTheUnGetMes.tqcontains( sernum ) ) {
@@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
-    const KMFolder *parent = folder;
-    while ( parent->parent() && parent->parent()->owner() ) {
-      parent = parent->parent()->owner();
-      if ( parent->isSystemFolder() ) {
+    const KMFolder *tqparent = folder;
+    while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) {
+      tqparent = tqparent->tqparent()->owner();
+      if ( tqparent->isSystemFolder() ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
@@ -720,7 +720,7 @@ TQValueList<KMailICalIfaceImpl::SubResource> KMailICalIfaceImpl::subresourcesKol
   TQValueList<SubResource> subResources;
 
   // Add the default one
-  KMFolder* f = folderFromType( contentsType, TQString::null );
+  KMFolder* f = folderFromType( contentsType, TQString() );
   if ( f ) {
     subResources.append( SubResource( f->location(), subresourceLabelForPresentation( f ),
                                       f->isWritable(), folderIsAlarmRelevant( f ) ) );
@@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
     // go get the rest of it, then try again
     // TODO: Till, port me
     if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true );
-    FolderJob *job = msg->parent()->createJob( msg );
+    FolderJob *job = msg->tqparent()->createJob( msg );
     connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
         this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
     job->start();
@@ -1199,7 +1199,7 @@ void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
 void KMailICalIfaceImpl::slotRefresh( const TQString& type )
 {
   if( mUseResourceIMAP ) {
-    signalRefresh( type, TQString::null /* PENDING(bo) folder->location() */ );
+    signalRefresh( type, TQString() /* PENDING(bo) folder->location() */ );
     kdDebug(5006) << "Emitting DCOP signal signalRefresh( " << type << " )" << endl;
   }
 }
@@ -1213,7 +1213,7 @@ void KMailICalIfaceImpl::slotRefreshFolder( KMFolder* folder)
   if( mUseResourceIMAP && folder ) {
     if( folder == mCalendar || folder == mContacts
         || folder == mNotes || folder == mTasks
-        || folder == mJournals || mExtraFolders.find( folder->location() ) ) {
+        || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) {
       // Refresh the folder of this type
       KMail::FolderContentsType ct = folder->storage()->contentsType();
       slotRefresh( s_folderContentsType[ct].contentsTypeStr );
@@ -1257,7 +1257,7 @@ KMFolder* KMailICalIfaceImpl::folderFromType( const TQString& type,
 bool KMailICalIfaceImpl::isResourceFolder( KMFolder* folder ) const
 {
   return mUseResourceIMAP && folder &&
-    ( isStandardResourceFolder( folder ) || mExtraFolders.find( folder->location() )!=0 );
+    ( isStandardResourceFolder( folder ) || mExtraFolders.tqfind( folder->location() )!=0 );
 }
 
 bool KMailICalIfaceImpl::isStandardResourceFolder( KMFolder* folder ) const
@@ -1286,7 +1286,7 @@ KFolderTreeItem::Type KMailICalIfaceImpl::folderType( KMFolder* folder ) const
   if( mUseResourceIMAP && folder ) {
     if( folder == mCalendar || folder == mContacts
         || folder == mNotes || folder == mTasks
-        || folder == mJournals || mExtraFolders.find( folder->location() ) ) {
+        || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) {
       KMail::FolderContentsType ct = folder->storage()->contentsType();
       return s_folderContentsType[ct].treeItemType;
     }
@@ -1385,9 +1385,9 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg )
 {
   if( !msg ) return;
   // Commands are now delayed; can't use that anymore, we need immediate deletion
-  //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start();
-  KMFolder *srcFolder = msg->parent();
-  int idx = srcFolder->find(msg);
+  //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start();
+  KMFolder *srcFolder = msg->tqparent();
+  int idx = srcFolder->tqfind(msg);
   assert(idx != -1);
   // kill existing jobs since we are about to delete the message
   srcFolder->ignoreJobsForMessage( msg );
@@ -1415,7 +1415,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
 
   // Check if already know that 'extra folder'
   const TQString location = folder->location();
-  ExtraFolder* ef = mExtraFolders.find( location );
+  ExtraFolder* ef = mExtraFolders.tqfind( location );
   if ( ef && ef->folder ) {
     // Notify that the old folder resource is no longer available
     subresourceDeleted(folderContentsType( folder->storage()->contentsType() ), location );
@@ -1469,7 +1469,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type,
   if ( t < 1 || t > 5 )
     return 0;
 
-  ExtraFolder* ef = mExtraFolders.find( folder );
+  ExtraFolder* ef = mExtraFolders.tqfind( folder );
   if ( ef && ef->folder && ef->folder->storage()->contentsType() == t )
     return ef->folder;
 
@@ -1478,7 +1478,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type,
 
 KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* folder ) const
 {
-  FolderInfoMap::ConstIterator it = mFolderInfoMap.find( folder );
+  FolderInfoMap::ConstIterator it = mFolderInfoMap.tqfind( folder );
   if ( it != mFolderInfoMap.end() )
     return (*it).mStorageFormat;
   return globalStorageFormat();
@@ -1486,7 +1486,7 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* f
 
 void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat format )
 {
-  FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+  FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
   if ( it != mFolderInfoMap.end() ) {
     (*it).mStorageFormat = format;
   } else {
@@ -1500,7 +1500,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
 
 void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges changes )
 {
-  FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+  FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
   if ( it != mFolderInfoMap.end() ) {
     (*it).mChanges = static_cast<FolderChanges>( (*it).mChanges | changes );
   } else { // Otherwise, well, it's a folder we don't care about.
@@ -1529,7 +1529,7 @@ KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolde
 
 void KMailICalIfaceImpl::folderSynced( KMFolder* folder, const KURL& folderURL )
 {
-  FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+  FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
   if ( it != mFolderInfoMap.end() && (*it).mChanges ) {
     handleFolderSynced( folder, folderURL, (*it).mChanges );
     (*it).mChanges = NoChange;
@@ -1569,13 +1569,13 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
   // IMAP path is either /INBOX/<path> or /user/someone/<path>
   TQString path = folderURL.path( -1 );
   Q_ASSERT( path.startsWith( "/" ) );
-  int secondSlash = path.find( '/', 1 );
+  int secondSlash = path.tqfind( '/', 1 );
   if ( secondSlash == -1 ) {
     kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl;
     return;
   }
   if ( path.startsWith( "/INBOX/", false ) ) {
-    // If INBOX, tqreplace it with the username (which is user@domain)
+    // If INBOX, replace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
   } else {
@@ -1585,7 +1585,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
   }
 
   httpURL.setPath( "/freebusy/trigger/" + path + ".pfb" );
-  httpURL.setQuery( TQString::null );
+  httpURL.setQuery( TQString() );
   // Ensure that we encode everything with UTF8
   httpURL = KURL( httpURL.url(0,106), 106 );
   kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
@@ -1617,7 +1617,7 @@ void KMailICalIfaceImpl::slotFolderLocationChanged( const TQString &oldLocation,
                                                     const TQString &newLocation )
 {
   KMFolder *folder = findResourceFolder( oldLocation );
-  ExtraFolder* ef = mExtraFolders.find( oldLocation );
+  ExtraFolder* ef = mExtraFolders.tqfind( oldLocation );
   if ( ef ) {
     // reuse the ExtraFolder entry, but adjust the key
     mExtraFolders.setAutoDelete( false );
@@ -1645,7 +1645,7 @@ KMFolder* KMailICalIfaceImpl::findResourceFolder( const TQString& resource )
     return mJournals;
 
   // No luck. Try the extrafolders
-  ExtraFolder* ef = mExtraFolders.find( resource );
+  ExtraFolder* ef = mExtraFolders.tqfind( resource );
   if ( ef )
     return ef->folder;
 
@@ -1702,24 +1702,24 @@ void KMailICalIfaceImpl::readConfig()
 
   // Read remaining options
   const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
-  TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+  TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
 
-  // Find the folder parent
+  // Find the folder tqparent
   KMFolderDir* folderParentDir;
   KMFolderType folderType;
-  KMFolder* folderParent = kmkernel->findFolderById( parentName );
+  KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
   if( folderParent == 0 ) {
     // Parent folder not found. It was probably deleted. The user will have to
     // configure things again.
-    kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl;
+    kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl;
     // Or maybe the inbox simply wasn't created on the first startup
-    KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
+    KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() );
     Q_ASSERT( account );
     if ( account ) {
       // just in case we were connected already
-      disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                this, TQT_SLOT( slotCheckDone() ) );
-      connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                this, TQT_SLOT( slotCheckDone() ) );
     }
     mUseResourceIMAP = false;
@@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig()
   KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast<KMFolderCachedImap *>( folderParent->storage() )->account()->groupwareType();
 
   if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) {
-    // Make sure the folder parent has the subdirs
+    // Make sure the folder tqparent has the subdirs
     // Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK
     bool noneFound = true;
     bool mustFix = false; // true when at least one was found by heuristics
@@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig()
 
     if( noneFound || mustFix ) {
       TQString msg;
-      TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
+      TQString tqparentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
       if ( noneFound ) {
         // No subfolder was found, so ask if we can make them
         msg = i18n("KMail will now create the required groupware folders"
                    " as subfolders of %1; if you do not want this, cancel"
-                   " and the IMAP resource will be disabled").arg(parentFolderName);
+                   " and the IMAP resource will be disabled").arg(tqparentFolderName);
       } else {
         // Some subfolders were found, be more precise
         TQString operations = "<ul>";
@@ -1794,7 +1794,7 @@ void KMailICalIfaceImpl::readConfig()
 
         msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
                    "<br>If you do not want this, cancel"
-                   " and the IMAP resource will be disabled").arg(parentFolderName, operations);
+                   " and the IMAP resource will be disabled").arg(tqparentFolderName, operations);
 
       }
 
@@ -1959,14 +1959,14 @@ void KMailICalIfaceImpl::readConfig()
 
 void KMailICalIfaceImpl::slotCheckDone()
 {
-  TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
-  KMFolder* folderParent = kmkernel->findFolderById( parentName );
+  TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+  KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
   //kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl;
   if ( folderParent )  // cool it exists now
   {
-    KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
+    KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() );
     if ( account )
-      disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                   this, TQT_SLOT( slotCheckDone() ) );
     readConfig();
   }
@@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
     folder =
       mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type );
     if( mFolderType == KMFolderTypeImap ) {
-      KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
-      parentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
-      static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() );
+      KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
+      tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
+      static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() );
     }
     // Groupware folder created, use the global setting for storage format
     setStorageFormat( folder, globalStorageFormat() );
@@ -2136,7 +2136,7 @@ void KMailICalIfaceImpl::cleanup()
 TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
 {
   if( !mUseResourceIMAP )
-    return TQString::null;
+    return TQString();
 
   if( type == KFolderTreeItem::Contacts )
     return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
@@ -2149,7 +2149,7 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
   else if( type == KFolderTreeItem::Journals )
     return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
 
-  return TQString::null;
+  return TQString();
 }
 
 static void reloadFolderTree()
@@ -2287,17 +2287,17 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
 
 
 bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
-                                         const TQString& parent,
+                                         const TQString& tqparent,
                                          const TQString& contentsType )
 {
-  kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
+  kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
   kdDebug(5006) << "contents type: " << contentsType << endl;
-  KMFolder *folder = findResourceFolder( parent );
-  KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
-  if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
+  KMFolder *folder = findResourceFolder( tqparent );
+  KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+  if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false;
 
   TQString msg;
-  if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) {
+  if ( tqparentFolderDir->owner() && !tqparentFolderDir->owner()->isValidName( resource, msg ) ) {
     KMessageBox::error( 0, msg );
     return false;
   }
@@ -2305,7 +2305,7 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
   KMFolderType type = mFolderType;
   if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir;
 
-  KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type );
+  KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type );
   if ( !newFolder ) return false;
   if( mFolderType == KMFolderTypeImap )
     static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource );
@@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const
   KMFolderCachedImap *dimapFolder = dynamic_cast<KMFolderCachedImap*>( folder->storage() );
   if ( !dimapFolder )
     return;
-  // check if the folder exists already, otherwise sync its parent as well to create it
+  // check if the folder exists already, otherwise sync its tqparent as well to create it
   if ( dimapFolder->imapPath().isEmpty() ) {
-    if ( folder->parent() && folder->parent()->owner() )
-      syncFolder( folder->parent()->owner() );
+    if ( folder->tqparent() && folder->tqparent()->owner() )
+      syncFolder( folder->tqparent()->owner() );
     else
       return;
   }
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index ae2d1d6e..3cec23c6 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -21,17 +21,17 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-/** @file This file tqcontains the class KMailICalIfaceImpl which actually
+/** @file This file contains the class KMailICalIfaceImpl which actually
 * implements the ICal (DCOP) interface for KMail.
 */
 
@@ -83,6 +83,7 @@ public:
 /** The implementation of the interface. */
 class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface {
   Q_OBJECT
+  TQ_OBJECT
 public:
   KMailICalIfaceImpl();
 
@@ -135,7 +136,7 @@ public:
   bool removeSubresource( const TQString& );
 
   bool addSubresource( const TQString& resource,
-                       const TQString& parent,
+                       const TQString& tqparent,
                        const TQString& contentsType );
 
   // tell KOrganizer about messages to be deleted
@@ -178,7 +179,7 @@ public:
 
   /**
    * Returns the name of the standard icon for a folder of given type or
-   * TQString::null if the type is no groupware type.
+   * TQString() if the type is no groupware type.
    */
   TQString folderPixmap( KFolderTreeItem::Type type ) const;
 
@@ -315,7 +316,7 @@ private:
   // The reason for storing it here is that it can be shared between
   // kmfoldercachedimap and kmfolderimap, and that it's groupware data anyway.
   struct FolderInfo {
-    FolderInfo() {} // for QMap
+    FolderInfo() {} // for TQMap
     FolderInfo( StorageFormat f, FolderChanges c ) :
       mStorageFormat( f ), mChanges( c ) {}
     StorageFormat mStorageFormat;
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 84967646..7a507c3f 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -9,9 +9,9 @@
 #include <tqcheckbox.h>
 #include <tqheader.h>
 
-KMAtmListViewItem::KMAtmListViewItem( TQListView *parent )
+KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent )
   : TQObject(),
-    TQListViewItem( parent )
+    TQListViewItem( tqparent )
 {
   mCBCompress = new TQCheckBox( listView()->viewport() );
   mCBEncrypt = new TQCheckBox( listView()->viewport() );
@@ -70,7 +70,7 @@ void KMAtmListViewItem::updateAllCheckBoxes()
 // as well. This is necessary to keep the positions of the checkboxes
 // up-to-date. The signals which are, in the constructor of this class,
 // connected to the update slots are not sufficent because unfortunatly,
-// Qt does not provide a signal for changed item positions, e.g. during
+// TQt does not provide a signal for changed item positions, e.g. during
 // deleting or adding items. The problem with this is that this function does
 // not catch updates which are off-screen, which means under some circumstances
 // checkboxes have invalid positions. This should not happen anymore, but was
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index 35a65859..72ae6e25 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -12,12 +12,13 @@ class KMComposeWin;
 class MessageComposer;
 class TQCheckBox;
 
-class KMAtmListViewItem : public TQObject, public QListViewItem
+class KMAtmListViewItem : public TQObject, public TQListViewItem
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMAtmListViewItem( TQListView *parent );
+  KMAtmListViewItem( TQListView *tqparent );
   virtual ~KMAtmListViewItem();
 
   //A custom compare function is needed because the size column is
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 907d2110..1473d3d6 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -156,28 +156,28 @@ private:
 };
 
 
-KMCommand::KMCommand( TQWidget *parent )
+KMCommand::KMCommand( TQWidget *tqparent )
   : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
-    mEmitsCompletedItself( false ), mParent( parent )
+    mEmitsCompletedItself( false ), mParent( tqparent )
 {
 }
 
-KMCommand::KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList )
+KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList )
   : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
-    mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList )
+    mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList )
 {
 }
 
-KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase )
+KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase )
   : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
-    mEmitsCompletedItself( false ), mParent( parent )
+    mEmitsCompletedItself( false ), mParent( tqparent )
 {
   mMsgList.append( msgBase );
 }
 
-KMCommand::KMCommand( TQWidget *parent, KMMessage *msg )
+KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg )
   : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
-    mEmitsCompletedItself( false ), mParent( parent )
+    mEmitsCompletedItself( false ), mParent( tqparent )
 {
   if (msg)
     mMsgList.append( &msg->toMsgBase() );
@@ -229,14 +229,14 @@ void KMCommand::slotStart()
            this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) );
   kmkernel->filterMgr()->ref();
 
-  if (mMsgList.find(0) != -1) {
+  if (mMsgList.tqfind(0) != -1) {
       emit messagesTransfered( Failed );
       return;
   }
 
   if ((mMsgList.count() == 1) &&
       (mMsgList.getFirst()->isMessage()) &&
-      (mMsgList.getFirst()->parent() == 0))
+      (mMsgList.getFirst()->tqparent() == 0))
   {
     // Special case of operating on message that isn't in a folder
     mRetrievedMsgs.append((KMMessage*)mMsgList.getFirst());
@@ -246,11 +246,11 @@ void KMCommand::slotStart()
 
   for ( KMMsgBase *mb = mMsgList.first(); mb; mb = mMsgList.next() ) {
     if ( mb ) {
-      if ( !mb->parent() ) {
+      if ( !mb->tqparent() ) {
         emit messagesTransfered( Failed );
         return;
       } else {
-        keepFolderOpen( mb->parent() );
+        keepFolderOpen( mb->tqparent() );
       }
     }
   }
@@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result )
   while ( (msg = it.current()) != 0 )
   {
     ++it;
-    if (msg->parent())
+    if (msg->tqparent())
       msg->setTransferInProgress(false);
   }
   kmkernel->filterMgr()->deref();
@@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs()
       thisMsg = static_cast<KMMessage*>(mb);
     else
     {
-      KMFolder *folder = mb->parent();
-      int idx = folder->find(mb);
+      KMFolder *folder = mb->tqparent();
+      int idx = folder->tqfind(mb);
       if (idx < 0) continue;
       thisMsg = folder->getMsg(idx);
     }
     if (!thisMsg) continue;
     if ( thisMsg->transferInProgress() &&
-         thisMsg->parent()->folderType() == KMFolderTypeImap )
+         thisMsg->tqparent()->folderType() == KMFolderTypeImap )
     {
       thisMsg->setTransferInProgress( false, true );
-      thisMsg->parent()->ignoreJobsForMessage( thisMsg );
+      thisMsg->tqparent()->ignoreJobsForMessage( thisMsg );
     }
 
-    if ( thisMsg->parent() && !thisMsg->isComplete() &&
+    if ( thisMsg->tqparent() && !thisMsg->isComplete() &&
          ( !mProgressDialog || !mProgressDialog->wasCancelled() ) )
     {
       kdDebug(5006)<<"### INCOMPLETE\n";
       // the message needs to be transferred first
       complete = false;
       KMCommand::mCountJobs++;
-      FolderJob *job = thisMsg->parent()->createJob(thisMsg);
+      FolderJob *job = thisMsg->tqparent()->createJob(thisMsg);
       job->setCancellable( false );
       totalSize += thisMsg->msgSizeServer();
       // emitted when the message was transferred successfully
@@ -436,12 +436,12 @@ void KMCommand::slotTransferCancelled()
   KMMessage* msg;
   while ( (msg = it.current()) != 0 )
   {
-    KMFolder *folder = msg->parent();
+    KMFolder *folder = msg->tqparent();
     ++it;
     if (!folder)
       continue;
     msg->setTransferInProgress(false);
-    int idx = folder->find(msg);
+    int idx = folder->tqfind(msg);
     if (idx > 0) folder->unGetMsg(idx);
   }
   mRetrievedMsgs.clear();
@@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute()
   KMMessage *msg = new KMMessage;
   uint id = 0;
 
-  if ( mMessage && mMessage->parent() )
-    id = mMessage->parent()->identity();
+  if ( mMessage && mMessage->tqparent() )
+    id = mMessage->tqparent()->identity();
 
   msg->initHeader(id);
   msg->setCharset("utf-8");
@@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute()
 }
 
 
-KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent,
+KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent,
    const KURL &url, KMMessage *msg, const TQString &selection )
-  :KMCommand( parent, msg ), mUrl( url ), mSelection( selection  )
+  :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection  )
 {
 }
 
@@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute()
 }
 
 
-KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent,
+KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent,
    const KURL &url, KMMessage *msg )
-  :KMCommand( parent, msg ), mUrl( url )
+  :KMCommand( tqparent, msg ), mUrl( url )
 {
 }
 
@@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute()
 }
 
 
-KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent )
-  : KMCommand( parent ), mUrl( url )
+KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent )
+  : KMCommand( tqparent ), mUrl( url )
 {
 }
 
@@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute()
 }
 
 KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
-   TQWidget *parent )
-  : KMCommand( parent ), mUrl( url )
+   TQWidget *tqparent )
+  : KMCommand( tqparent ), mUrl( url )
 {
 }
 
@@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute()
 
 
 KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
-   TQWidget *parent )
-  : KMCommand( parent ), mUrl( url )
+   TQWidget *tqparent )
+  : KMCommand( tqparent ), mUrl( url )
 {
 }
 
@@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget )
 
 KMCommand::Result KMUrlCopyCommand::execute()
 {
-  QClipboard* clip = TQApplication::clipboard();
+  TQClipboard* clip = TQApplication::clipboard();
 
   if (mUrl.protocol() == "mailto") {
     // put the url into the mouse selection and the clipboard
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
   } else {
     // put the url into the mouse selection and the clipboard
     clip->setSelectionMode( true );
     clip->setText( mUrl.url() );
     clip->setSelectionMode( false );
     clip->setText( mUrl.url() );
-    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute()
 }
 
 
-KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent )
-  : KMCommand( parent ), mUrl( url )
+KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent )
+  : KMCommand( tqparent ), mUrl( url )
 {
 }
 
@@ -632,14 +632,14 @@ KMCommand::Result KMUrlSaveCommand::execute()
 {
   if ( mUrl.isEmpty() )
     return OK;
-  KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null,
+  KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString(),
                                          tqparentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
   if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
-        i18n("<qt>File <b>%1</b> exists.<br>Do you want to tqreplace it?</qt>")
+        i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
         .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
@@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
 }
 
 
-KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg )
-  :KMCommand( parent, msg )
+KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg )
+  :KMCommand( tqparent, msg )
 {
 }
 
 KMCommand::Result KMEditMsgCommand::execute()
 {
   KMMessage *msg = retrievedMessage();
-  if ( !msg || !msg->parent() ||
-       ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) &&
-         !kmkernel->folderIsTemplates( msg->parent() ) ) )
+  if ( !msg || !msg->tqparent() ||
+       ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) &&
+         !kmkernel->folderIsTemplates( msg->tqparent() ) ) )
     return Failed;
 
-  // Remember the old parent, we need it a bit further down to be able
+  // Remember the old tqparent, we need it a bit further down to be able
   // to put the unchanged messsage back in the original folder if the nth
   // edit is discarded, for n > 1.
-  KMFolder *parent = msg->parent();
-  if ( parent )
-    parent->take( parent->find( msg ) );
+  KMFolder *tqparent = msg->tqparent();
+  if ( tqparent )
+    tqparent->take( tqparent->tqfind( msg ) );
 
   KMail::Composer * win = KMail::makeComposer();
   msg->setTransferInProgress(false); // From here on on, the composer owns the message.
   win->setMsg(msg, false, true);
-  win->setFolder( parent );
+  win->setFolder( tqparent );
   win->show();
 
   return OK;
 }
 
-KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg )
-  :KMCommand( parent, msg )
+KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg )
+  :KMCommand( tqparent, msg )
 {
 }
 
 KMCommand::Result KMUseTemplateCommand::execute()
 {
   KMMessage *msg = retrievedMessage();
-  if ( !msg || !msg->parent() ||
-       !kmkernel->folderIsTemplates( msg->parent() ) )
+  if ( !msg || !msg->tqparent() ||
+       !kmkernel->folderIsTemplates( msg->tqparent() ) )
     return Failed;
 
   // Take a copy of the original message, which remains unchanged.
@@ -721,9 +721,9 @@ KMCommand::Result KMUseTemplateCommand::execute()
   return OK;
 }
 
-KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent,
+KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *tqparent,
   KMMessage *msg, bool fixedFont )
-  :KMCommand( parent, msg ), mFixedFont( fixedFont )
+  :KMCommand( tqparent, msg ), mFixedFont( fixedFont )
 {
   // remember complete state
   mMsgWasComplete = msg->isComplete();
@@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
 
 static KURL subjectToUrl( const TQString & subject )
 {
-  // We need to tqreplace colons with underscores since those cause problems with KFileDialog (bug
+  // We need to replace colons with underscores since those cause problems with KFileDialog (bug
   // in KFileDialog though) and also on Windows filesystems.
   // We also look at the special case of ": ", since converting that to "_ " would look strange,
   // simply "_" looks better.
@@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject )
   return KFileDialog::getSaveURL( cleanSubject, filter );
 }
 
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
-  : KMCommand( parent ),
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
+  : KMCommand( tqparent ),
     mMsgListIndex( 0 ),
     mStandAloneMessage( 0 ),
     mOffset( 0 ),
@@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
   // from an .eml file.
   if ( msg->getMsgSerNum() != 0 ) {
     mMsgList.append( msg->getMsgSerNum() );
-    if ( msg->parent() ) {
-      msg->parent()->open( "kmsavemsgcommand" );
+    if ( msg->tqparent() ) {
+      msg->tqparent()->open( "kmsavemsgcommand" );
     }
   } else {
     mStandAloneMessage = msg;
@@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
   mUrl = subjectToUrl( msg->cleanSubject() );
 }
 
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
                                     const TQPtrList<KMMsgBase> &msgList )
-  : KMCommand( parent ),
+  : KMCommand( tqparent ),
     mMsgListIndex( 0 ),
     mStandAloneMessage( 0 ),
     mOffset( 0 ),
@@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
   while ( it.current() ) {
     mMsgList.append( (*it)->getMsgSerNum() );
     mTotalSize += (*it)->msgSize();
-    if ((*it)->parent() != 0)
-      (*it)->parent()->open("kmcommand");
+    if ((*it)->tqparent() != 0)
+      (*it)->tqparent()->open("kmcommand");
     ++it;
   }
   mMsgListIndex = 0;
@@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq()
         slotMessageRetrievedForSaving( msg );
       } else {
         // retrieve Message first
-        if ( msg->parent()  && !msg->isComplete() ) {
-          FolderJob *job = msg->parent()->createJob( msg );
+        if ( msg->tqparent()  && !msg->isComplete() ) {
+          FolderJob *job = msg->tqparent()->createJob( msg );
           job->setCancellable( false );
           connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
                   this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) );
@@ -944,12 +944,12 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   }
   ++mMsgListIndex;
   // Get rid of the message.
-  if ( msg && msg->parent() && msg->getMsgSerNum() &&
+  if ( msg && msg->tqparent() && msg->getMsgSerNum() &&
        mUngetMsgs.tqcontains( msg ) ) {
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
-    assert( p == msg->parent() ); assert( idx >= 0 );
+    assert( p == msg->tqparent() ); assert( idx >= 0 );
     p->unGetMsg( idx );
     p->close("kmcommand");
   }
@@ -962,7 +962,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to tqreplace it?")
+        i18n("File %1 exists.\nDo you want to replace it?")
         .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
@@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
 
 //-----------------------------------------------------------------------------
 
-KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url,
+KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url,
                                     const TQString & encoding )
-  : KMCommand( parent ),
+  : KMCommand( tqparent ),
     mUrl( url ),
     mEncoding( encoding )
 {
@@ -1041,7 +1041,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
   else {
     int startOfMessage = 0;
     if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) {
-      startOfMessage = mMsgString.find( '\n' );
+      startOfMessage = mMsgString.tqfind( '\n' );
       if ( startOfMessage == -1 ) {
         KMessageBox::sorry( tqparentWidget(),
                             i18n( "The file does not contain a message." ) );
@@ -1060,7 +1060,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     }
     // check for multiple messages in the file
     bool multipleMessages = true;
-    int endOfMessage = mMsgString.find( "\nFrom " );
+    int endOfMessage = mMsgString.tqfind( "\nFrom " );
     if ( endOfMessage == -1 ) {
       endOfMessage = mMsgString.length();
       multipleMessages = false;
@@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     win->show();
     if ( multipleMessages )
       KMessageBox::information( win,
-                                i18n( "The file tqcontains multiple messages. "
+                                i18n( "The file contains multiple messages. "
                                       "Only the first message is shown." ) );
     setResult( OK );
     emit completed( this );
@@ -1102,9 +1102,9 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
 
 //TODO: ReplyTo, NoQuoteReplyTo, ReplyList, ReplyToAll, ReplyAuthor
 //      are all similar and should be factored
-KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg,
+KMReplyToCommand::KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
                                     const TQString &selection )
-  : KMCommand( parent, msg ), mSelection( selection )
+  : KMCommand( tqparent, msg ), mSelection( selection )
 {
 }
 
@@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute()
 }
 
 
-KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent,
+KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent,
                                                   KMMessage *msg )
-  : KMCommand( parent, msg )
+  : KMCommand( tqparent, msg )
 {
 }
 
@@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute()
 }
 
 
-KMReplyListCommand::KMReplyListCommand( TQWidget *parent,
+KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent,
   KMMessage *msg, const TQString &selection )
- : KMCommand( parent, msg ), mSelection( selection )
+ : KMCommand( tqparent, msg ), mSelection( selection )
 {
 }
 
@@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute()
 }
 
 
-KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent,
+KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent,
   KMMessage *msg, const TQString &selection )
-  :KMCommand( parent, msg ), mSelection( selection )
+  :KMCommand( tqparent, msg ), mSelection( selection )
 {
 }
 
@@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute()
 }
 
 
-KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
+KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
                                             const TQString &selection )
-  : KMCommand( parent, msg ), mSelection( selection )
+  : KMCommand( tqparent, msg ), mSelection( selection )
 {
 }
 
@@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute()
 }
 
 
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
   const TQPtrList<KMMsgBase> &msgList, uint identity )
-  : KMCommand( parent, msgList ),
+  : KMCommand( tqparent, msgList ),
     mIdentity( identity )
 {
 }
 
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
   KMMessage *msg, uint identity )
-  : KMCommand( parent, msg ),
+  : KMCommand( tqparent, msg ),
     mIdentity( identity )
 {
 }
@@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute()
 }
 
 
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
            const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
-  : KMCommand( parent, msgList ), mIdentity( identity ),
+  : KMCommand( tqparent, msgList ), mIdentity( identity ),
     mWin( TQGuardedPtr<KMail::Composer>( win ))
 {
 }
 
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
            KMMessage * msg, uint identity, KMail::Composer *win )
-  : KMCommand( parent, msg ), mIdentity( identity ),
+  : KMCommand( tqparent, msg ), mIdentity( identity ),
     mWin( TQGuardedPtr< KMail::Composer >( win ))
 {
 }
@@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute()
 }
 
 
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
            const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
-  : KMCommand( parent, msgList ), mIdentity( identity ),
+  : KMCommand( tqparent, msgList ), mIdentity( identity ),
     mWin( TQGuardedPtr<KMail::Composer>( win ))
 {
 }
 
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
            KMMessage * msg, uint identity, KMail::Composer *win )
-  : KMCommand( parent, msg ), mIdentity( identity ),
+  : KMCommand( tqparent, msg ), mIdentity( identity ),
     mWin( TQGuardedPtr< KMail::Composer >( win ))
 {
 }
@@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute()
   return OK;
 }
 
-KMRedirectCommand::KMRedirectCommand( TQWidget *parent,
+KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent,
                                       KMMessage *msg )
-  : KMCommand( parent, msg )
+  : KMCommand( tqparent, msg )
 {
 }
 
@@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute()
 }
 
 
-KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
+KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
                                                 const TQString &selection,
                                                 const TQString &tmpl )
-  : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
+  : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
 {
 }
 
@@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute()
 }
 
 
-KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
+KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
                                                       const TQString &selection,
                                                       const TQString &tmpl )
-  : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
+  : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
 {
 }
 
@@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute()
 }
 
 
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
   const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl )
-  : KMCommand( parent, msgList ),
+  : KMCommand( tqparent, msgList ),
     mIdentity( identity ), mTemplate( tmpl )
 {
 }
 
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
   KMMessage *msg, uint identity, const TQString &tmpl )
-  : KMCommand( parent, msg ),
+  : KMCommand( tqparent, msg ),
     mIdentity( identity ), mTemplate( tmpl )
 {
 }
@@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute()
 }
 
 
-KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
+KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
                                 const KMail::HeaderStyle *headerStyle,
                                 const KMail::HeaderStrategy *headerStrategy,
                                 bool htmlOverride, bool htmlLoadExtOverride,
                                 bool useFixedFont, const TQString & encoding )
-  : KMCommand( parent, msg ),
+  : KMCommand( tqparent, msg ),
     mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
     mHtmlOverride( htmlOverride ),
     mHtmlLoadExtOverride( htmlLoadExtOverride ),
@@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
+KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status,
   const TQValueList<TQ_UINT32> &serNums, bool toggle )
-  : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
+  : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
@@ -1650,19 +1650,19 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQValueListIterator<TQ_UINT32> it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parenStatus = false;
+  bool tqparentqStatus = false;
 
   // Toggle actions on threads toggle the whole thread
-  // depending on the state of the parent.
+  // depending on the state of the tqparent.
   if (mToggle) {
     KMMsgBase *msg;
     KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
     if (folder) {
       msg = folder->getMsgBase(idx);
-      if (msg && (msg->status()&mStatus))
-        parenStatus = true;
+      if (msg && (msg->status()&mtqStatus))
+        tqparentqStatus = true;
       else
-        parenStatus = false;
+        tqparentqStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute()
         KMMsgBase *msg = folder->getMsgBase(idx);
         // check if we are already at the target toggle state
         if (msg) {
-          bool myStatus;
-          if (msg->status()&mStatus)
-            myStatus = true;
+          bool mytqStatus;
+          if (msg->status()&mtqStatus)
+            mytqStatus = true;
           else
-            myStatus = false;
-          if (myStatus != parenStatus)
+            mytqStatus = false;
+          if (mytqStatus != tqparentqStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->seStatus( (*it2), mStatus, mToggle );
+     f->setqStatus( (*it2), mtqStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute()
 }
 
 
-KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent,
+KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent,
                                               const TQPtrList<KMMsgBase> &msgList,
                                               KMFilter *filter )
-  : KMCommand( parent, msgList ), mFilter( filter  )
+  : KMCommand( tqparent, msgList ), mFilter( filter  )
 {
   TQPtrListIterator<KMMsgBase> it(msgList);
   while ( it.current() ) {
@@ -1742,7 +1742,7 @@ KMCommand::Result KMFilterActionCommand::execute()
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-      KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
+      KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action )
   mAction = action;
 }
 
-KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent,
+KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent,
                                                         KMMessage *msg )
-  : KMCommand( parent, msg )
+  : KMCommand( tqparent, msg )
 {
 }
 
@@ -1984,12 +1984,12 @@ KMCommand::Result KMCopyCommand::execute()
 
   for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() )
   {
-    KMFolder *srcFolder = msgBase->parent();
+    KMFolder *srcFolder = msgBase->tqparent();
     if (( isMessage = msgBase->isMessage() ))
     {
       msg = static_cast<KMMessage*>(msgBase);
     } else {
-      idx = srcFolder->find(msgBase);
+      idx = srcFolder->tqfind(msgBase);
       assert(idx != -1);
       msg = srcFolder->getMsg(idx);
       // corrupt IMAP cache, see FolderStorage::getMsg()
@@ -2015,12 +2015,12 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->seStatus(msg->status());
+      newMsg->setqStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
         // imap => others
-        newMsg->setParent(msg->parent());
+        newMsg->setParent(msg->tqparent());
         FolderJob *job = srcFolder->createJob(newMsg);
         job->setCancellable( false );
         mPendingJobs << job;
@@ -2307,7 +2307,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe
 
 void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
 {
-  if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) {
+  if ( folder != mDestFolder || mLostBoys.tqfind( serNum ) == mLostBoys.end() ) {
     //kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different "
     //                 "folder or invalid serial number." << endl;
     return;
@@ -2421,7 +2421,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
     TQString query=mUrl.query();
     while (!query.isEmpty()) {
       TQString queryPart;
-      int secondQuery = query.find('?',1);
+      int secondQuery = query.tqfind('?',1);
       if (secondQuery != -1)
         queryPart = query.left(secondQuery);
       else
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
@@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
         mime->name() == "application/x-shellscript" )
     {
       if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" )
-        .arg( mUrl.prettyURL() ), TQString::null, i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
+        .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
         return Canceled;
     }
     KRun * runner = new KRun( mUrl );
@@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute()
   return OK;
 }
 
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg )
-  : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg )
+  : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false )
 {
 }
 
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs )
-  : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs )
+  : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false )
 {
 }
 
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode>& attachments,
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode>& attachments,
                                                     KMMessage *msg, bool encoded )
-  : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded )
+  : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded )
 {
   for ( TQPtrListIterator<partNode> it( attachments ); it.current(); ++it ) {
     mAttachmentMap.insert( it.current(), msg );
@@ -2534,7 +2534,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
       // considered attachments
       if ( it.key()->msgPart().fileName().stripWhiteSpace().isEmpty() &&
            ( it.key()->msgPart().name().stripWhiteSpace().isEmpty() ||
-             !it.key()->parentNode() ) ) {
+             !it.key()->tqparentNode() ) ) {
         PartNodeMessageMap::iterator delIt = it;
         ++it;
         mAttachmentMap.remove( delIt );
@@ -2554,7 +2554,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   KURL url, dirUrl;
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
-    dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false,
+    dirUrl = KDirSelectDialog::selectDirectory( TQString(), false,
                                                 tqparentWidget(),
                                                 i18n("Save Attachments To") );
     if ( !dirUrl.isValid() ) {
@@ -2570,15 +2570,15 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   else {
     // only one item, get the desired filename
     partNode *node = mAttachmentMap.begin().key();
-    // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes
+    // replace all ':' with '_' because ':' isn't allowed on FAT volumes
     TQString s =
       node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
       s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
       s = i18n("filename for an unnamed attachment", "attachment.1");
-    url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(),
-                                   TQString::null );
+    url = KFileDialog::getSaveURL( s, TQString(), tqparentWidget(),
+                                   TQString() );
     if ( url.isEmpty() ) {
       setResult( Canceled );
       emit completed( this );
@@ -2759,7 +2759,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     }
 
     // #79685 by default use the umask the user defined, but let it be configurable
-    if ( GlobalSettings::self()->disregardUmask() )
+    if ( GlobalSettings::self()->disregardUtqmask() )
       fchmod( file.handle(), S_IRUSR | S_IWUSR );
 
     ds.setDevice( &file );
@@ -2814,7 +2814,7 @@ void KMLoadPartsCommand::slotStart()
          !it.key()->msgPart().partSpecifier().isEmpty() ) {
       // incomplete part, so retrieve it first
       ++mNeedsRetrieval;
-      KMFolder* curFolder = it.data()->parent();
+      KMFolder* curFolder = it.data()->tqparent();
       if ( curFolder ) {
         FolderJob *job =
           curFolder->createJob( it.data(), FolderJob::tGetMessage,
@@ -2824,7 +2824,7 @@ void KMLoadPartsCommand::slotStart()
                  this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) );
         job->start();
       } else
-        kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl;
+        kdWarning(5006) << "KMLoadPartsCommand - msg has no tqparent" << endl;
     }
   }
   if ( mNeedsRetrieval == 0 )
@@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute()
   return OK;
 }
 
-KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent,
+KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent,
    KMMessage *msg )
-  :KMCommand( parent, msg )
+  :KMCommand( tqparent, msg )
 {
 }
 
@@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute()
    return OK;
 }
 
-KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder )
-  : KMCommand( parent ), mFolder( folder )
+KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMCommand( tqparent ), mFolder( folder )
 {
 }
 
@@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command )
   deleteLater();
 }
 
-KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder )
-  : KMMailingListCommand( parent, folder )
+KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMMailingListCommand( tqparent, folder )
 {
 }
 KURL::List KMMailingListPostCommand::urls() const
@@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const
   return mFolder->mailingList().postURLS();
 }
 
-KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder )
-  : KMMailingListCommand( parent, folder )
+KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMMailingListCommand( tqparent, folder )
 {
 }
 KURL::List KMMailingListSubscribeCommand::urls() const
@@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const
   return mFolder->mailingList().subscribeURLS();
 }
 
-KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder )
-  : KMMailingListCommand( parent, folder )
+KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMMailingListCommand( tqparent, folder )
 {
 }
 KURL::List KMMailingListUnsubscribeCommand::urls() const
@@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const
   return mFolder->mailingList().unsubscribeURLS();
 }
 
-KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder )
-  : KMMailingListCommand( parent, folder )
+KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMMailingListCommand( tqparent, folder )
 {
 }
 KURL::List KMMailingListArchivesCommand::urls() const
@@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const
   return mFolder->mailingList().archiveURLS();
 }
 
-KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder )
-  : KMMailingListCommand( parent, folder )
+KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder )
+  : KMMailingListCommand( tqparent, folder )
 {
 }
 KURL::List KMMailingListHelpCommand::urls() const
@@ -2987,7 +2987,7 @@ KMCommand::Result KMIMChatCommand::execute()
   TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() );
   // find UID for mail address
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ;
+  KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
 
   // start chat
   if( addressees.count() == 1 ) {
@@ -3022,8 +3022,8 @@ KMCommand::Result KMIMChatCommand::execute()
 
 KMHandleAttachmentCommand::KMHandleAttachmentCommand( partNode* node,
      KMMessage* msg, int atmId, const TQString& atmName,
-     AttachmentAction action, KService::Ptr offer, TQWidget* parent )
-: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
+     AttachmentAction action, KService::Ptr offer, TQWidget* tqparent )
+: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
   mAction( action ), mOffer( offer ), mJob( 0 )
 {
 }
@@ -3109,7 +3109,7 @@ TQString KMHandleAttachmentCommand::createAtmFileLink() const
   if ( ::link(TQFile::encodeName( mAtmName ), TQFile::encodeName( linkName )) == 0 ) {
     return linkName; // success
   }
-  return TQString::null;
+  return TQString();
 }
 
 KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
@@ -3128,13 +3128,13 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
   mimetype = KMimeType::mimeType( contentTypeStr );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::tqfindByPath( mAtmName, 0, true /* no disk access */ );
+    mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::tqfindByFileContent( mAtmName );
+    mimetype = KMimeType::findByFileContent( mAtmName );
   }
   return KServiceTypeProfile::preferredService( mimetype->name(), "Application" );
 }
@@ -3325,7 +3325,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     return;
   }
 
-  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() );
+  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), tqparentWidget() );
   if ( url.isEmpty() )
     return;
 
@@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job
 }
 
 
-AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
-    KMCommand( parent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+    KMCommand( tqparent, msg ),
     mPartIndex( node->nodeId() ),
     mSernum( 0 )
 {
 }
 
-AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent )
-  : KMCommand( parent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+  : KMCommand( tqparent, msg ),
     mPartIndex( nodeId ),
     mSernum( 0 )
 {
@@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute()
     return Failed;
   mSernum = msg->getMsgSerNum();
 
-  mFolder = msg->parent();
+  mFolder = msg->tqparent();
   if ( !mFolder || !mFolder->storage() )
     return Failed;
 
@@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd)
   deleteLater();
 }
 
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
-    AttachmentModifyCommand( node, msg, parent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+    AttachmentModifyCommand( node, msg, tqparent )
 {
   kdDebug(5006) << k_funcinfo << endl;
 }
 
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
-  : AttachmentModifyCommand( nodeId, msg, parent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+  : AttachmentModifyCommand( nodeId, msg, tqparent )
 {
   kdDebug(5006) << k_funcinfo << endl;
 }
@@ -3452,22 +3452,22 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->seStatus( msg->status() );
+  newMsg->setqStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
 }
 
 
-KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
-    AttachmentModifyCommand( node, msg, parent )
+KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+    AttachmentModifyCommand( node, msg, tqparent )
 {
   kdDebug(5006) << k_funcinfo << endl;
   mTempFile.setAutoDelete( true );
 }
 
-KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
-  : AttachmentModifyCommand( nodeId, msg, parent )
+KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+  : AttachmentModifyCommand( nodeId, msg, tqparent )
 {
   kdDebug(5006) << k_funcinfo << endl;
   mTempFile.setAutoDelete( true );
@@ -3529,28 +3529,28 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
   DwBodyPart *dwpart = msg->findPart( mPartIndex );
   KMMessage::bodyPart( dwpart, &part, true );
 
-  DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
-  assert( parentNode );
-  parentNode->RemoveBodyPart( dwpart );
+  DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
+  assert( tqparentNode );
+  tqparentNode->RemoveBodyPart( dwpart );
 
   KMMessagePart att;
   att.duplicate( part );
   att.setBodyEncodedBinary( data );
 
   DwBodyPart* newDwPart = msg->createDWBodyPart( &att );
-  parentNode->AddBodyPart( newDwPart );
+  tqparentNode->AddBodyPart( newDwPart );
   msg->getTopLevelPart()->Assemble();
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->seStatus( msg->status() );
+  newMsg->setqStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
 
 
-CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg)
-  : KMCommand( parent, msg )
+CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg)
+  : KMCommand( tqparent, msg )
 {
 }
 
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 5fbebb65..173f98ee 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -11,7 +11,7 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 #include <kio/job.h>
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
 #include <mimelib/string.h>
 #include <kdepimmacros.h>
 #include <kservice.h>
@@ -48,22 +48,23 @@ namespace Kleo { class SpecialJob; }
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
 typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap;
 
-class KDE_EXPORT KMCommand : public QObject
+class KDE_EXPORT KMCommand : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
     friend class LaterDeleterWithCommandCompletion;
 
 public:
   enum Result { Undefined, OK, Canceled, Failed };
 
   // Trival constructor, don't retrieve any messages
-  KMCommand( TQWidget *parent = 0 );
+  KMCommand( TQWidget *tqparent = 0 );
   // Retrieve all messages in msgList when start is called.
-  KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
+  KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList );
   // Retrieve the single message msgBase when start is called.
-  KMCommand( TQWidget *parent, KMMsgBase *msgBase );
+  KMCommand( TQWidget *tqparent, KMMsgBase *msgBase );
   // Retrieve the single message msgBase when start is called.
-  KMCommand( TQWidget *parent, KMMessage *message );
+  KMCommand( TQWidget *tqparent, KMMessage *message );
   virtual ~KMCommand();
 
   /** These folders will be closed by the dtor, handy, if you need to keep
@@ -97,7 +98,7 @@ protected:
   const TQPtrList<KMMessage> retrievedMsgs() const;
   // Returns the single message retrieved
   KMMessage *retrievedMessage() const;
-  // Returns the parent widget
+  // Returns the tqparent widget
   TQWidget *tqparentWidget() const;
 
   bool deletesItself() { return mDeletesItself; }
@@ -164,6 +165,7 @@ private:
 class KDE_EXPORT KMMailtoComposeCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 );
@@ -178,9 +180,10 @@ private:
 class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
+  KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url,
 			KMMessage *msg, const TQString &selection );
 
 private:
@@ -193,9 +196,10 @@ private:
 class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
+  KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url,
 			  KMMessage *msg );
 
 private:
@@ -207,9 +211,10 @@ private:
 class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
+  KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent );
 
 private:
   virtual Result execute();
@@ -220,9 +225,10 @@ private:
 class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
+  KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent );
 
 private:
   virtual Result execute();
@@ -234,9 +240,10 @@ private:
 class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
+  KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *tqparent );
 
 private:
   virtual Result execute();
@@ -247,6 +254,7 @@ private:
 class KDE_EXPORT KMUrlCopyCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget = 0 );
@@ -261,6 +269,7 @@ private:
 class KDE_EXPORT KMUrlOpenCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMUrlOpenCommand( const KURL &url, KMReaderWin *readerWin );
@@ -275,9 +284,10 @@ private:
 class KDE_EXPORT KMUrlSaveCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMUrlSaveCommand( const KURL &url, TQWidget *parent );
+  KMUrlSaveCommand( const KURL &url, TQWidget *tqparent );
 
 private slots:
   void slotUrlSaveResult( KIO::Job *job );
@@ -291,9 +301,10 @@ private:
 class KDE_EXPORT KMEditMsgCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMEditMsgCommand( TQWidget *parent, KMMessage *msg );
+  KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg );
 
 private:
   virtual Result execute();
@@ -302,9 +313,10 @@ private:
 class KDE_EXPORT KMUseTemplateCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMUseTemplateCommand( TQWidget *parent, KMMessage *msg );
+  KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg );
 
 private:
   virtual Result execute();
@@ -313,9 +325,10 @@ private:
 class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg,
+  KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg,
 		       bool fixedFont );
   virtual Result execute();
 
@@ -327,10 +340,11 @@ private:
 class KDE_EXPORT KMSaveMsgCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
-  KMSaveMsgCommand( TQWidget *parent, KMMessage * msg );
+  KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList );
+  KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg );
   KURL url();
 
 private:
@@ -358,9 +372,10 @@ private:
 class KDE_EXPORT KMOpenMsgCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(),
+  KMOpenMsgCommand( TQWidget *tqparent, const KURL & url = KURL(),
                     const TQString & encoding = TQString() );
 
 private:
@@ -381,26 +396,27 @@ private:
 class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Use this to save all attachments of the given message.
-      @param parent  The parent widget of the command used for message boxes.
+      @param tqparent  The tqparent widget of the command used for message boxes.
       @param msg     The message of which the attachments should be saved.
    */
-  KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg  );
+  KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg  );
   /** Use this to save all attachments of the given messages.
-      @param parent  The parent widget of the command used for message boxes.
+      @param tqparent  The tqparent widget of the command used for message boxes.
       @param msgs    The messages of which the attachments should be saved.
    */
-  KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs );
+  KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs );
   /** Use this to save the specified attachments of the given message.
-      @param parent       The parent widget of the command used for message
+      @param tqparent       The tqparent widget of the command used for message
                           boxes.
       @param attachments  The attachments that should be saved.
       @param msg          The message that the attachments belong to.
       @param encoded      True if the transport encoding should not be removed
                           when the attachment is saved.
    */
-  KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode> &attachments,
+  KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode> &attachments,
                             KMMessage *msg, bool encoded = false  );
 
 private slots:
@@ -419,10 +435,11 @@ private:
 class KDE_EXPORT KMReplyToCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMReplyToCommand( TQWidget *parent, KMMessage *msg,
-                    const TQString &selection = TQString::null );
+  KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+                    const TQString &selection = TQString() );
 
 private:
   virtual Result execute();
@@ -434,9 +451,10 @@ private:
 class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg );
+  KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg );
 
 private:
   virtual Result execute();
@@ -445,10 +463,11 @@ private:
 class KMReplyListCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMReplyListCommand( TQWidget *parent, KMMessage *msg,
-		      const TQString &selection = TQString::null );
+  KMReplyListCommand( TQWidget *tqparent, KMMessage *msg,
+		      const TQString &selection = TQString() );
 
 private:
   virtual Result execute();
@@ -460,10 +479,11 @@ private:
 class KDE_EXPORT KMReplyToAllCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMReplyToAllCommand( TQWidget *parent, KMMessage *msg,
-		       const TQString &selection = TQString::null );
+  KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg,
+		       const TQString &selection = TQString() );
 
 private:
   virtual Result execute();
@@ -475,10 +495,11 @@ private:
 class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
-                        const TQString &selection = TQString::null );
+  KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
+                        const TQString &selection = TQString() );
 
 private:
   virtual Result execute();
@@ -490,11 +511,12 @@ private:
 class KDE_EXPORT KMForwardInlineCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
+  KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
                           uint identity = 0 );
-  KMForwardInlineCommand( TQWidget *parent, KMMessage * msg,
+  KMForwardInlineCommand( TQWidget *tqparent, KMMessage * msg,
                           uint identity = 0 );
 
 private:
@@ -507,11 +529,12 @@ private:
 class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
+  KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
 			    uint identity = 0, KMail::Composer *win = 0 );
-  KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg,
+  KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg,
 			    uint identity = 0, KMail::Composer *win = 0 );
 
 private:
@@ -524,11 +547,12 @@ private:
 class KDE_EXPORT KMForwardDigestCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
+  KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
 			    uint identity = 0, KMail::Composer *win = 0 );
-  KMForwardDigestCommand( TQWidget *parent, KMMessage * msg,
+  KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg,
 			    uint identity = 0, KMail::Composer *win = 0 );
 
 private:
@@ -541,9 +565,10 @@ private:
 class KDE_EXPORT KMRedirectCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMRedirectCommand( TQWidget *parent, KMMessage *msg );
+  KMRedirectCommand( TQWidget *tqparent, KMMessage *msg );
 
 private:
   virtual Result execute();
@@ -552,9 +577,10 @@ private:
 class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
+  KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
                           const TQString &selection,
                           const TQString &tmpl );
 
@@ -569,9 +595,10 @@ private:
 class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
+  KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
                           const TQString &selection,
                           const TQString &tmpl );
 
@@ -586,11 +613,12 @@ private:
 class KDE_EXPORT KMCustomForwardCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
+  KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
                           uint identity, const TQString &tmpl );
-  KMCustomForwardCommand( TQWidget *parent, KMMessage * msg,
+  KMCustomForwardCommand( TQWidget *tqparent, KMMessage * msg,
                           uint identity, const TQString &tmpl );
 
 private:
@@ -603,9 +631,10 @@ private:
 class KDE_EXPORT KMPrintCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMPrintCommand( TQWidget *parent, KMMessage *msg,
+  KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
                   const KMail::HeaderStyle *headerStyle = 0,
                   const KMail::HeaderStrategy *headerStrategy = 0,
                   bool htmlOverride = false,
@@ -630,16 +659,17 @@ private:
 class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   // Serial numbers
-  KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &,
+  KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &,
                       bool toggle=false );
 
 private:
   virtual Result execute();
 
-  KMMsgStatus mStatus;
+  KMMsgtqStatus mtqStatus;
   TQValueList<TQ_UINT32> mSerNums;
   TQValueList<int> mIds;
   bool mToggle;
@@ -648,6 +678,7 @@ private:
 class KDE_EXPORT KMFilterCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFilterCommand( const TQCString &field, const TQString &value );
@@ -663,9 +694,10 @@ private:
 class KDE_EXPORT KMFilterActionCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFilterActionCommand( TQWidget *parent,
+  KMFilterActionCommand( TQWidget *tqparent,
 			 const TQPtrList<KMMsgBase> &msgList,
 			 KMFilter *filter );
 
@@ -676,9 +708,10 @@ private:
 };
 
 
-class KDE_EXPORT KMMetaFilterActionCommand : public QObject
+class KDE_EXPORT KMMetaFilterActionCommand : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMMetaFilterActionCommand( KMFilter *filter, KMHeaders *headers,
@@ -693,9 +726,10 @@ private:
   KMMainWidget *mMainWidget;
 };
 
-class KDE_EXPORT FolderShortcutCommand : public QObject
+class KDE_EXPORT FolderShortcutCommand : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   FolderShortcutCommand( KMMainWidget* mainwidget, KMFolder *folder );
@@ -718,9 +752,10 @@ private:
 class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg );
+  KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg );
 
 private:
   virtual Result execute();
@@ -737,6 +772,7 @@ private:
 class KDE_EXPORT KMMenuCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   static void folderToPopupMenu(bool move, TQObject *receiver,
@@ -749,6 +785,7 @@ public:
 class KDE_EXPORT KMCopyCommand : public KMMenuCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMCopyCommand( KMFolder* destFolder,
@@ -774,6 +811,7 @@ namespace KPIM {
 class KDE_EXPORT KMMoveCommand : public KMMenuCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMMoveCommand( KMFolder* destFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -809,6 +847,7 @@ private:
 class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -823,6 +862,7 @@ private:
 class KDE_EXPORT KMUrlClickedCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMUrlClickedCommand( const KURL &url, uint identity,
@@ -841,6 +881,7 @@ private:
 class KDE_EXPORT KMLoadPartsCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMLoadPartsCommand( TQPtrList<partNode>& parts, KMMessage* msg );
@@ -866,9 +907,10 @@ private:
 class KDE_EXPORT KMResendMessageCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 );
+  KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg=0 );
 
 private:
   virtual Result execute();
@@ -877,8 +919,9 @@ private:
 class KDE_EXPORT KMMailingListCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListCommand( TQWidget *tqparent, KMFolder *folder );
 private:
   virtual Result execute();
 private slots:
@@ -892,8 +935,9 @@ protected:
 class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder );
 protected:
   virtual KURL::List urls() const;
 };
@@ -901,8 +945,9 @@ protected:
 class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder );
 protected:
   virtual KURL::List urls() const;
 };
@@ -910,8 +955,9 @@ protected:
 class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder );
 protected:
   virtual KURL::List urls() const;
 };
@@ -919,8 +965,9 @@ protected:
 class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder );
 protected:
   virtual KURL::List urls() const;
 };
@@ -928,8 +975,9 @@ protected:
 class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
+  KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder );
 protected:
   virtual KURL::List urls() const;
 };
@@ -937,6 +985,7 @@ protected:
 class KDE_EXPORT KMIMChatCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMIMChatCommand( const KURL &url, KMMessage *msg=0 );
@@ -957,6 +1006,7 @@ private:
 class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /** Supported types of attachment handling */
@@ -979,7 +1029,7 @@ public:
    * @param offer specify a KService that should handle the "open" action, 0 otherwise
    */
   KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId,
-      const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* parent );
+      const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* tqparent );
 
 
 signals:
@@ -1043,9 +1093,10 @@ private:
 class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
-    AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent );
+    AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
+    AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
     ~AttachmentModifyCommand();
 
   protected:
@@ -1070,9 +1121,10 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
-    KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
+    KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
+    KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
     ~KMDeleteAttachmentCommand();
 
   protected:
@@ -1083,9 +1135,10 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
-    KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
+    KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
+    KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
     ~KMEditAttachmentCommand();
 
   protected:
@@ -1101,8 +1154,9 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT CreateTodoCommand : public KMCommand
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    CreateTodoCommand( TQWidget *parent, KMMessage *msg );
+    CreateTodoCommand( TQWidget *tqparent, KMMessage *msg );
 
   private:
     Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index e6ec6f96..98a5c6e0 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -196,7 +196,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     setInstance( kmkernel->xmlGuiInstance() );
   mMainWidget = new TQWidget(this);
   // splitter between the headers area and the actual editor
-  mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
+  mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
   mHeadersToEditorSplitter->setChildrenCollapsible( false );
   mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
   mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
@@ -331,9 +331,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mFixedFontAction = 0;
   mTempDir = 0;
   // the attachment view is separated from the editor by a splitter
-  mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
+  mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
   mSplitter->setChildrenCollapsible( false );
-  mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter");
+  mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter");
   mSnippetSplitter->setChildrenCollapsible( false );
 
   TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter );
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->tqsetAlignment( Qt::AlignHCenter );
+      mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
       KConfigGroup reader( KMKernel::config(), "Reader" );
@@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setPalette( p );
 
       mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter );
+      mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -369,7 +369,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mSplitter->setOpaqueResize( true );
 
   mEditor->initializeAutoSpellChecking();
-  mEditor->setTextFormat(Qt::PlainText);
+  mEditor->setTextFormat(TQt::PlainText);
   mEditor->setAcceptDrops( true );
 
   TQWhatsThis::add( mBtnIdentity,
@@ -557,7 +557,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString
   connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&)));
   for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) {
     if (!addAttach( *itr ))
-      mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url
+      mAttachFilesPending.remove(mAttachFilesPending.tqfind(*itr)); // only remove one copy of the url
   }
 
   if (mAttachFilesPending.isEmpty() && mAttachFilesSend == how)
@@ -571,7 +571,7 @@ void KMComposeWin::slotAttachedFile(const KURL &url)
 {
   if (mAttachFilesPending.isEmpty())
     return;
-  mAttachFilesPending.remove(mAttachFilesPending.find(url)); // only remove one copy of url
+  mAttachFilesPending.remove(mAttachFilesPending.tqfind(url)); // only remove one copy of url
   if (mAttachFilesPending.isEmpty())
   {
     send(mAttachFilesSend);
@@ -618,7 +618,7 @@ void KMComposeWin::slotAttachPNGImageData(const TQByteArray &image)
 {
   bool ok;
 
-  TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString::null, &ok, this );
+  TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString(), &ok, this );
   if ( !ok )
     return;
 
@@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
   w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label.
   w->adjustSize();
   w->show();
-  return QMAX( width, w->tqsizeHint().width() );
+  return TQMAX( width, w->tqsizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
@@ -1336,8 +1336,8 @@ void KMComposeWin::setupActions(void)
   KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection());
   KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
 
-  KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfind (this, TQT_SLOT(slotFind()), actionCollection());
+  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
 
   KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
@@ -1714,7 +1714,7 @@ TQString KMComposeWin::to() const
   } else if ( mRecipientsEditor ) {
     return mRecipientsEditor->recipientString( Recipient::To );
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -1726,7 +1726,7 @@ TQString KMComposeWin::cc() const
   } else if ( mRecipientsEditor ) {
     return mRecipientsEditor->recipientString( Recipient::Cc );
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -1738,7 +1738,7 @@ TQString KMComposeWin::bcc() const
   } else if ( mRecipientsEditor ) {
     return mRecipientsEditor->recipientString( Recipient::Bcc );
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -1754,7 +1754,7 @@ TQString KMComposeWin::replyTo() const
   if ( mEdtReplyTo ) {
     return cleanedUpHeaderString( mEdtReplyTo->text() );
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -2010,7 +2010,7 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
   mEditor->setText( otp.textualContent() );
   mCharset = otp.textualContentCharset();
   if ( partNode * n = root->findType( DwMime::kTypeText, DwMime::kSubtypeHtml ) )
-    if ( partNode * p = n->parentNode() )
+    if ( partNode * p = n->tqparentNode() )
       if ( p->hasType( DwMime::kTypeMultipart ) &&
            p->hasSubType( DwMime::kSubtypeAlternative ) )
         if ( mMsg->headerField( "X-KMail-Markup" ) == "true" ) {
@@ -2068,9 +2068,9 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
       partNode *root = partNode::fromMessage( mMsg );
       partNode *node = root->findType( DwMime::kTypeText,
                                        DwMime::kSubtypeHtml );
-      if ( node && node->parentNode() &&
-           node->parentNode()->hasType( DwMime::kTypeMultipart ) &&
-           node->parentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) {
+      if ( node && node->tqparentNode() &&
+           node->tqparentNode()->hasType( DwMime::kTypeMultipart ) &&
+           node->tqparentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) {
         // we have a mp/al body part with a text and an html body
       kdDebug(5006) << "KMComposeWin::setMsg() : text/html found" << endl;
       firstAttachment = 2;
@@ -2245,7 +2245,7 @@ bool KMComposeWin::queryClose ()
     const int rc = KMessageBox::warningYesNoCancel( this,
            i18n("Do you want to save the message for later or discard it?"),
            i18n("Close Composer"),
-           KGuiItem(savebut, "filesave", TQString::null, savetext),
+           KGuiItem(savebut, "filesave", TQString(), savetext),
            KStdGuiItem::discard() );
     if ( rc == KMessageBox::Cancel )
       return false;
@@ -2292,14 +2292,14 @@ bool KMComposeWin::userForgotAttachment()
 
   bool gotMatch = false;
 
-  // check whether the subject tqcontains one of the attachment key words
+  // check whether the subject contains one of the attachment key words
   // unless the message is a reply or a forwarded message
   TQString subj = subject();
   gotMatch =    ( KMMessage::stripOffPrefixes( subj ) == subj )
              && ( rx.search( subj ) >= 0 );
 
   if ( !gotMatch ) {
-    // check whether the non-quoted text tqcontains one of the attachment key
+    // check whether the non-quoted text contains one of the attachment key
     // words
     TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+");
     for ( int i = 0; i < mEditor->numLines(); ++i ) {
@@ -2751,13 +2751,13 @@ void KMComposeWin::slotAttachFile()
 
   // Handle the case where the last savedir is gone. kolab/issue4057
   TQString recent;
-  KURL recentURL = KFileDialog::getStartURL( TQString::null, recent );
+  KURL recentURL = KFileDialog::getStartURL( TQString(), recent );
   if ( !recentURL.url().isEmpty() &&
        !KIO::NetAccess::exists( recentURL, true, this ) ) {
     recentURL = KURL( TQDir::homeDirPath() );
   }
 
-  KFileDialog fdlg( recentURL.url(), TQString::null, this, 0, true );
+  KFileDialog fdlg( recentURL.url(), TQString(), this, 0, true );
   fdlg.setOperationMode( KFileDialog::Other );
   fdlg.setCaption( i18n( "Attach File" ) );
   fdlg.okButton()->setGuiItem( KGuiItem( i18n( "&Attach" ),"fileopen" ) );
@@ -2773,7 +2773,7 @@ void KMComposeWin::slotAttachFile()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job);
   assert(it != mMapAtmLoadData.end());
   TQBuffer buff((*it).data);
   buff.open(IO_WriteOnly | IO_Append);
@@ -2785,10 +2785,10 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotAttachFileResult(KIO::Job *job)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job);
   assert(it != mMapAtmLoadData.end());
   KURL attachURL;
-  TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
+  TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.tqfind(job);
   bool attachURLfound = (jit != mAttachJobs.end());
   if (attachURLfound)
   {
@@ -2886,7 +2886,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
                                !kmkernel->msgSender()->sendQuotedPrintable());
     kdDebug(5006) << "autodetected cte: " << msgPart->cteStr() << endl;
   }
-  int slash = mimeType.find( '/' );
+  int slash = mimeType.tqfind( '/' );
   if( slash == -1 )
     slash = mimeType.length();
   msgPart->setTypeStr( mimeType.left( slash ).latin1() );
@@ -2938,7 +2938,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotInsertFile()
 {
-  KFileDialog fdlg(TQString::null, TQString::null, this, 0, true);
+  KFileDialog fdlg(TQString(), TQString(), this, 0, true);
   fdlg.setOperationMode( KFileDialog::Opening );
   fdlg.okButton()->setText(i18n("&Insert"));
   fdlg.setCaption(i18n("Insert File"));
@@ -3162,7 +3162,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ
 
   // add the new attachment to the list
   addAttach(msgPart);
-  rethinkFields(); //work around initial-size bug in Qt-1.32
+  rethinkFields(); //work around initial-size bug in TQt-1.32
 }
 
 //-----------------------------------------------------------------------------
@@ -3309,7 +3309,7 @@ void KMComposeWin::compressAttach( int idx )
   zip.close();
   if ( array.size() >= decoded.size() ) {
     if ( KMessageBox::questionYesNo( this, i18n("The compressed file is larger "
-        "than the original. Do you want to keep the original one?" ), TQString::null, i18n("Keep"), i18n("Compress") )
+        "than the original. Do you want to keep the original one?" ), TQString(), i18n("Keep"), i18n("Compress") )
          == KMessageBox::Yes ) {
       static_cast<KMAtmListViewItem*>( mAtmItemList.at( i ) )->setCompress( false );
       return;
@@ -3583,7 +3583,7 @@ void KMComposeWin::slotAttachSave()
   pname = msgPart->name();
   if (pname.isEmpty()) pname="unnamed";
 
-  KURL url = KFileDialog::getSaveURL(pname, TQString::null, 0, i18n("Save Attachment As"));
+  KURL url = KFileDialog::getSaveURL(pname, TQString(), 0, i18n("Save Attachment As"));
 
   if( url.isEmpty() )
     return;
@@ -3649,7 +3649,7 @@ void KMComposeWin::slotUpdateFont()
 TQString KMComposeWin::quotePrefixName() const
 {
     if ( !msg() )
-        return TQString::null;
+        return TQString();
 
     int languageNr = GlobalSettings::self()->replyCurrentLanguage();
     ReplyPhrases replyPhrases( TQString::number(languageNr) );
@@ -3673,9 +3673,9 @@ void KMComposeWin::slotPasteClipboardAsQuotation()
 
 void KMComposeWin::slotPasteClipboardAsAttachment()
 {
-  KURL url( TQApplication::clipboard()->text( QClipboard::Clipboard ) );
+  KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
   if ( url.isValid() ) {
-    addAttach(TQApplication::clipboard()->text( QClipboard::Clipboard ) );
+    addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
     return;
   }
 
@@ -3685,7 +3685,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
   }
   else {
     bool ok;
-    TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString::null, &ok, this );
+    TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString(), &ok, this );
     if ( !ok )
       return;
     KMMessagePart *msgPart = new KMMessagePart;
@@ -3824,10 +3824,10 @@ void KMComposeWin::slotCopy()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotPasteClipboard()
 {
-  paste( QClipboard::Clipboard );
+  paste( TQClipboard::Clipboard );
 }
 
-void KMComposeWin::paste( QClipboard::Mode mode )
+void KMComposeWin::paste( TQClipboard::Mode mode )
 {
   TQWidget* fw = tqfocusWidget();
   if (!fw) return;
@@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc )
 }
 
 //----------------------------------------------------------------------------
-bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses )
+bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses )
 {
   TQString brokenAddress;
   KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress );
@@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addres
     TQString errorMsg( "<qt><p><b>" + brokenAddress +
                       "</b></p><p>" + KPIM::emailParseResultToString( errorCode ) +
                       "</p></qt>" );
-    KMessageBox::sorry( parent, errorMsg, i18n("Invalid Email Address") );
+    KMessageBox::sorry( tqparent, errorMsg, i18n("Invalid Email Address") );
     return false;
   }
   return true;
@@ -4210,11 +4210,11 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method,
   connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
            TQT_SLOT( slotContinueDoSend( bool ) ) );
 
-  if ( mEditor->textFormat() == Qt::RichText )
+  if ( mEditor->textFormat() == TQt::RichText )
     mMsg->setHeaderField( "X-KMail-Markup", "true" );
   else
     mMsg->removeHeaderField( "X-KMail-Markup" );
-  if ( mEditor->textFormat() == Qt::RichText && inlineSigningEncryptionSelected() ) {
+  if ( mEditor->textFormat() == TQt::RichText && inlineSigningEncryptionSelected() ) {
     TQString keepBtnText = mEncryptAction->isChecked() ?
       mSignAction->isChecked() ? i18n( "&Keep markup, do not sign/encrypt" )
                                : i18n( "&Keep markup, do not encrypt" )
@@ -4625,7 +4625,7 @@ void KMComposeWin::slotCleanSpace()
   // show cleared text area) to get back the original, pre-cleaned text.
   // If you use mEditor->setText( s ) then the undo history is cleared so
   // that isn't a good solution either.
-  // TODO: is Qt4 better at handling the undo history??
+  // TODO: is TQt4 better at handling the undo history??
   if ( !mEditor->hasMarkedText() )
     mEditor->clear();
   mEditor->insert( s );
@@ -4666,7 +4666,7 @@ void KMComposeWin::toggleMarkup(bool markup)
       textItalicAction->setChecked(_italic);
       mEditor->setSelection ( paraFrom, indexFrom, paraTo, indexTo);
 
-      mEditor->setTextFormat(Qt::RichText);
+      mEditor->setTextFormat(TQt::RichText);
       mEditor->setModified(true);
       markupAction->setChecked(true);
       toolBar( "htmlToolBar" )->show();
@@ -4680,7 +4680,7 @@ void KMComposeWin::toggleMarkup(bool markup)
     toolBar("htmlToolBar")->hide();
     if ( mUseHTMLEditor ) { // it was turned on
       mUseHTMLEditor = false;
-      mEditor->setTextFormat(Qt::PlainText);
+      mEditor->setTextFormat(TQt::PlainText);
       TQString text = mEditor->text();
       mEditor->setText(text); // otherwise the text still looks formatted
       mEditor->setModified(true);
@@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result)
       statusBar()->changeItem(i18n(" Spell check complete."),0);
       break;
   }
-  TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) );
+  TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) );
 }
 
-void KMComposeWin::slotSpellcheckDoneClearStatus()
+void KMComposeWin::slotSpellcheckDoneCleartqStatus()
 {
   statusBar()->changeItem("", 0);
 }
@@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // don't overwrite the BCC field under certain circomstances
   // NOT edited and preset BCC from the identity
   if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
-    // BCC NOT empty AND tqcontains a diff adress then the preset BCC
+    // BCC NOT empty AND contains a diff adress then the preset BCC
     // of the new identity
     if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) {
       mEdtBcc->setText( ident.bcc() );
@@ -4931,7 +4931,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
     }
     mEditor->setText( edtText );
   } else {
-    const int pos = edtText.find( mOldSigText );
+    const int pos = edtText.tqfind( mOldSigText );
     if ( pos >= 0 && !mOldSigText.isEmpty() ) {
       const int oldLength = mOldSigText.length();
       mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 30362e85..b76aa911 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -99,6 +99,7 @@ namespace GpgME {
 class KMComposeWin : public KMail::Composer, public MailComposerIface
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMEdit;
   friend class ::MessageComposer;
 
@@ -271,7 +272,7 @@ private: // kmedit:
   }
   bool subjectTextWasSpellChecked() const { return mSubjectTextWasSpellChecked; }
 
-  void paste( QClipboard::Mode mode );
+  void paste( TQClipboard::Mode mode );
 
 public: // callback
   /** Disabled signing and encryption completely for this composer window. */
@@ -469,7 +470,7 @@ private slots:
 
 //  void slotSpellConfigure();
   void slotSpellcheckDone(int result);
-  void slotSpellcheckDoneClearStatus();
+  void slotSpellcheckDoneCleartqStatus();
 
 public slots: // kmkernel
   void autoSaveMessage();
@@ -552,8 +553,8 @@ private:
   void rethinkHeaderLine( int aValue, int aMask, int& aRow,
                           TQLabel* aLbl,
                           TQLineEdit* aEdt, TQPushButton* aBtn = 0,
-                          const TQString &toolTip = TQString::null,
-                          const TQString &whatsThis = TQString::null );
+                          const TQString &toolTip = TQString(),
+                          const TQString &whatsThis = TQString() );
 
   void rethinkHeaderLine( int value, int tqmask, int& row,
                           TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk );
@@ -671,7 +672,7 @@ private:
   /**
    * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text
    * block with a clear text signature. This is only done if the given
-   * string tqcontains exactly one OpenPGP block.
+   * string contains exactly one OpenPGP block.
    * This function is for example used to restore the unencrypted/unsigned
    * message text for editting.
    */
@@ -715,7 +716,7 @@ private:
    * @return true if all addresses are valid.
    * @return false if one or several addresses are invalid.
    */
-  static bool validateAddresses( TQWidget * parent, const TQString & addresses );
+  static bool validateAddresses( TQWidget * tqparent, const TQString & addresses );
 
   /**
    * Sets the transport combobox to @p transport. If @p transport is empty
diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp
index de4ed86f..0ba60ed5 100644
--- a/kmail/kmdict.cpp
+++ b/kmail/kmdict.cpp
@@ -104,7 +104,7 @@ void KMDict::removeFollowing(KMDictItem *item, long key)
 
 //-----------------------------------------------------------------------------
 
-KMDictItem *KMDict::find(long key)
+KMDictItem *KMDict::tqfind(long key)
 {
   int idx = (unsigned long)key % mSize;
   KMDictItem *item = mVecs[idx];
diff --git a/kmail/kmdict.h b/kmail/kmdict.h
index 374577c2..0b365acb 100644
--- a/kmail/kmdict.h
+++ b/kmail/kmdict.h
@@ -1,5 +1,5 @@
 /*
- * simple hash table for kmail.  inspired by QDict
+ * simple hash table for kmail.  inspired by TQDict
  */
 
 #ifndef __KMDICT
@@ -49,7 +49,7 @@ public:
   void remove(long key);
   
   /** Find an item by key.  Returns pointer to it, or 0 if not found. */
-  KMDictItem *find(long key);
+  KMDictItem *tqfind(long key);
   
 private:
   /** Removes all items _following_ @p item with key @p key. */
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 46fd2a83..5442bef4 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -82,7 +82,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
         int line, col;
         getCursorPosition( &line, &col );
         TQString lineText = text( line );
-        // returns line with additional trailing space (bug in Qt?), cut it off
+        // returns line with additional trailing space (bug in TQt?), cut it off
         lineText.truncate( lineText.length() - 1 );
         // special treatment of quoted lines only if the cursor is neither at
         // the begin nor at the end of the line
@@ -112,7 +112,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                 && ( col >= int( bot ) ) ) {
 
 		// The cursor position might have changed unpredictably if there was selected
-		// text which got tqreplaced by a new line, so we query it again:
+		// text which got replaced by a new line, so we query it again:
 		getCursorPosition( &line, &col );
                 TQString newLine = text( line );
                 // remove leading white space from the new line and instead
@@ -209,10 +209,10 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
     }
 }
 
-KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
+KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer,
                KSpellConfig* autoSpellConfig,
                const char *name)
-  : KEdit( parent, name ),
+  : KEdit( tqparent, name ),
     mComposer( composer ),
     mKSpellForDialog( 0 ),
     mSpeller( 0 ),
@@ -225,7 +225,7 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
     mWasModifiedBeforeSpellCheck( false ),
     mHighlighter( 0 ),
     mSpellLineEdit( false ),
-    mPasteMode( QClipboard::Clipboard )
+    mPasteMode( TQClipboard::Clipboard )
 {
   connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
   installEventFilter(this);
@@ -253,7 +253,7 @@ void KMEdit::initializeAutoSpellChecking()
   TQColor defaultColor3( 0x00, 0x60, 0x00 );
   TQColor defaultForeground( kapp->palette().active().text() );
 
-  TQColor c = Qt::red;
+  TQColor c = TQt::red;
   KConfigGroup readerConfig( KMKernel::config(), "Reader" );
   TQColor col1;
   if ( !readerConfig.readBoolEntry(  "defaultColors", true ) )
@@ -356,7 +356,7 @@ unsigned int KMEdit::lineBreakColumn() const
   unsigned int lineBreakColumn = 0;
   unsigned int numlines = numLines();
   while ( numlines-- ) {
-    lineBreakColumn = QMAX( lineBreakColumn, textLine( numlines ).length() );
+    lineBreakColumn = TQMAX( lineBreakColumn, textLine( numlines ).length() );
   }
   return lineBreakColumn;
 }
@@ -447,8 +447,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       sysLine += " ";
       while (!sysLine.isEmpty())
       {
-        *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit();
-        sysLine.remove(0, sysLine.find(" ") + 1);
+        *mExtEditorProcess << sysLine.left(sysLine.tqfind(" ")).local8Bit();
+        sysLine.remove(0, sysLine.tqfind(" ") + 1);
       }
       connect(mExtEditorProcess, TQT_SIGNAL(processExited(KProcess*)),
               TQT_SLOT(slotExternalEditorDone(KProcess*)));
@@ -498,7 +498,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       //Get word right clicked on
       const TQRegExp wordBoundary( "[\\s\\W]" );
       firstSpace = paraText.findRev( wordBoundary, charPos ) + 1;
-      lastSpace = paraText.find( wordBoundary, charPos );
+      lastSpace = paraText.tqfind( wordBoundary, charPos );
       if( lastSpace == -1 )
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
@@ -581,7 +581,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
 
 int KMEdit::autoSpellChecking( bool on )
 {
-  if ( textFormat() == Qt::RichText ) {
+  if ( textFormat() == TQt::RichText ) {
      // syntax highlighter doesn't support extended text properties
      if ( on )
        KMessageBox::sorry(this, i18n("Automatic spellchecking is not possible on text with markup."));
@@ -649,7 +649,7 @@ void KMEdit::spellcheck()
   mWasModifiedBeforeSpellCheck = isModified();
   mSpellLineEdit = !mSpellLineEdit;
 //  maybe for later, for now plaintext is given to KSpell
-//  if (textFormat() == Qt::RichText ) {
+//  if (textFormat() == TQt::RichText ) {
 //    kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl;
 //    mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this,
 //                    TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML);
@@ -679,21 +679,21 @@ void KMEdit::spellcheck()
 void KMEdit::cut()
 {
   KEdit::cut();
-  if ( textFormat() != Qt::RichText && mHighlighter )
+  if ( textFormat() != TQt::RichText && mHighlighter )
     mHighlighter->restartBackgroundSpellCheck();
 }
 
 void KMEdit::clear()
 {
   KEdit::clear();
-  if ( textFormat() != Qt::RichText && mHighlighter )
+  if ( textFormat() != TQt::RichText && mHighlighter )
     mHighlighter->restartBackgroundSpellCheck();
 }
 
 void KMEdit::del()
 {
   KEdit::del();
-  if ( textFormat() != Qt::RichText && mHighlighter )
+  if ( textFormat() != TQt::RichText && mHighlighter )
     mHighlighter->restartBackgroundSpellCheck();
 }
 
@@ -709,11 +709,11 @@ void KMEdit::paste()
 // Roll our own internal flag.
 void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
 {
-  if( e->button() != Qt::MidButton )
+  if( e->button() != TQt::MidButton )
     return KEdit::contentsMouseReleaseEvent( e );
-  mPasteMode = QClipboard::Selection;
+  mPasteMode = TQClipboard::Selection;
   KEdit::contentsMouseReleaseEvent( e );
-  mPasteMode = QClipboard::Clipboard;
+  mPasteMode = TQClipboard::Clipboard;
 }
 
 void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e )
@@ -828,7 +828,7 @@ void KMEdit::slotSpellcheck2(KSpell*)
         kdDebug(5006) << "spelling: new SpellingFilter with prefix=\"" << quotePrefix << "\"" << endl;
         TQTextEdit plaintext;
         plaintext.setText(text());
-        plaintext.setTextFormat(Qt::PlainText);
+        plaintext.setTextFormat(TQt::PlainText);
         mSpellingFilter = new SpellingFilter(plaintext.text(), quotePrefix, SpellingFilter::FilterUrls,
                                              SpellingFilter::FilterEmailAddresses);
 
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index 855c29ea..08ed687d 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -65,8 +65,9 @@ class KMSyntaxHighter : public KDictSpellingHighlighter
 
 class KMEdit : public KEdit {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMEdit(TQWidget *parent=0,KMComposeWin* composer=0,
+  KMEdit(TQWidget *tqparent=0,KMComposeWin* composer=0,
          KSpellConfig* spellConfig = 0,
 	 const char *name=0);
   ~KMEdit();
@@ -193,7 +194,7 @@ private:
   bool      mWasModifiedBeforeSpellCheck;
   KMSyntaxHighter *mHighlighter;
   bool mSpellLineEdit;
-  QClipboard::Mode mPasteMode;
+  TQClipboard::Mode mPasteMode;
 };
 
 #endif // __KMAIL_KMEDIT_H__
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 2316321f..c495ffbb 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -25,15 +25,15 @@
 //
 //=============================================================================
 
-KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* parent, const char* name )
-  : TQWidget( parent, name )
+KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* tqparent, const char* name )
+  : TQWidget( tqparent, name )
 {
   TQHBoxLayout *hbl = new TQHBoxLayout(this);
   hbl->setSpacing(4);
   mLineEdit = new KLineEdit(this);
   mLineEdit->setName( "addressEdit" );
   hbl->addWidget( mLineEdit, 1 /*stretch*/ );
-  mBtn = new TQPushButton( TQString::null ,this );
+  mBtn = new TQPushButton( TQString() ,this );
   mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
   mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() );
   TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
@@ -69,8 +69,8 @@ void KMFilterActionWithAddressWidget::slotAddrBook()
   mLineEdit->setText( txt + addrList.join(",") );
 }
 
-KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name)
-    : TQWidget( parent, name)
+KMSoundTestWidget::KMSoundTestWidget(TQWidget *tqparent, const char *name)
+    : TQWidget( tqparent, name)
 {
     TQHBoxLayout *lay1 = new TQHBoxLayout( this );
     m_playButton = new TQPushButton( this, "m_playButton" );
diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h
index 5a6990a8..c0605874 100644
--- a/kmail/kmfawidgets.h
+++ b/kmail/kmfawidgets.h
@@ -15,11 +15,12 @@
 class TQPushButton;
 class KURLRequester;
 
-class KMFilterActionWithAddressWidget : public QWidget
+class KMFilterActionWithAddressWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 );
+  KMFilterActionWithAddressWidget( TQWidget* tqparent=0, const char* name=0 );
 
   void clear() { mLineEdit->clear(); }
   TQString text() const { return mLineEdit->text(); }
@@ -37,11 +38,12 @@ private:
   TQLineEdit*   mLineEdit;
 };
 
-class KMSoundTestWidget : public QWidget
+class KMSoundTestWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMSoundTestWidget( TQWidget * parent, const char * name=0 );
+  KMSoundTestWidget( TQWidget * tqparent, const char * name=0 );
   ~KMSoundTestWidget();
   TQString url() const;
   void setUrl( const TQString & url );
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 1d36677d..6d1f50c1 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -198,7 +198,7 @@ bool KMFilter::applyOnAccount( uint id ) const
   if ( applicability() == All )
     return true;
   if ( applicability() == ButImap ) {
-    KMAccount *account = kmkernel->acctMgr()->find( id );
+    KMAccount *account = kmkernel->acctMgr()->tqfind( id );
     bool result =  account && !dynamic_cast<KMAcctImap*>(account);
     return result;
   }
@@ -363,7 +363,7 @@ void KMFilter::purify()
     // Remove invalid accounts from mAccounts - just to be tidy
     TQValueListIterator<int> it2 = mAccounts.begin();
     while ( it2 != mAccounts.end() ) {
-      if ( !kmkernel->acctMgr()->find( *it2 ) )
+      if ( !kmkernel->acctMgr()->tqfind( *it2 ) )
          it2 = mAccounts.remove( it2 );
       else
          ++it2;
@@ -418,8 +418,8 @@ const TQString KMFilter::asString() const
       if ( mAccounts.isEmpty() )
         result += " None";
       else for ( it2 = mAccounts.begin() ; it2 != mAccounts.end() ; ++it2 )
-        if ( kmkernel->acctMgr()->find( *it2 ) )
-          result += " " + kmkernel->acctMgr()->find( *it2 )->name();
+        if ( kmkernel->acctMgr()->tqfind( *it2 ) )
+          result += " " + kmkernel->acctMgr()->tqfind( *it2 )->name();
       result += "\n";
     }
     if ( bStopProcessingHere )
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 180c2746..c23a5644 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -88,9 +88,9 @@ KMFilterAction* KMFilterAction::newAction()
   return 0;
 }
 
-TQWidget* KMFilterAction::createParamWidget(TQWidget* parent) const
+TQWidget* KMFilterAction::createParamWidget(TQWidget* tqparent) const
 {
-  return new TQWidget(parent);
+  return new TQWidget(tqparent);
 }
 
 void KMFilterAction::applyParamWidgetValue(TQWidget*)
@@ -201,9 +201,9 @@ KMFilterActionWithString::KMFilterActionWithString( const char* aName, const TQS
 {
 }
 
-TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* tqparent ) const
 {
-  TQLineEdit *le = new KLineEdit(parent);
+  TQLineEdit *le = new KLineEdit(tqparent);
   le->setText( mParameter );
   return le;
 }
@@ -251,9 +251,9 @@ KMFilterActionWithStringList::KMFilterActionWithStringList( const char* aName, c
 {
 }
 
-TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* tqparent ) const
 {
-  TQComboBox *cb = new TQComboBox( false, parent );
+  TQComboBox *cb = new TQComboBox( false, tqparent );
   cb->insertStringList( mParameterList );
   setParamWidgetValue( cb );
   return cb;
@@ -298,9 +298,9 @@ KMFilterActionWithFolder::KMFilterActionWithFolder( const char* aName, const TQS
   mFolder = 0;
 }
 
-TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* tqparent ) const
 {
-  FolderRequester *req = new FolderRequester( parent,
+  FolderRequester *req = new FolderRequester( tqparent,
       kmkernel->getKMMainWidget()->folderTree() );
   setParamWidgetValue( req );
   return req;
@@ -380,9 +380,9 @@ KMFilterActionWithAddress::KMFilterActionWithAddress( const char* aName, const T
 {
 }
 
-TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* tqparent ) const
 {
-  KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(parent);
+  KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(tqparent);
   w->setText( mParameter );
   return w;
 }
@@ -413,9 +413,9 @@ KMFilterActionWithCommand::KMFilterActionWithCommand( const char* aName, const T
 {
 }
 
-TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* tqparent ) const
 {
-  return KMFilterActionWithUrl::createParamWidget( parent );
+  return KMFilterActionWithUrl::createParamWidget( tqparent );
 }
 
 void KMFilterActionWithCommand::applyParamWidgetValue( TQWidget* paramWidget )
@@ -464,7 +464,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
         tf->close();
         delete tf;
         kdDebug(5006) << "KMFilterActionWithCommand: Could not create temp file!" << endl;
-        return TQString::null;
+        return TQString();
       }
       tf->setAutoDelete(true);
       aTempFileList.append( tf );
@@ -490,14 +490,14 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
     else result = result.arg( tempFileName );
   }
 
-  // And finally, tqreplace the %{foo} with the content of the foo
+  // And finally, replace the %{foo} with the content of the foo
   // header field:
   TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false );
   int idx = 0;
   while ( ( idx = header_rx.search( result, idx ) ) != -1 ) {
-    TQString tqreplacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
-    result.tqreplace( idx, header_rx.matchedLength(), tqreplacement );
-    idx += tqreplacement.length();
+    TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
+    result.tqreplace( idx, header_rx.matchedLength(), replacement );
+    idx += replacement.length();
   }
 
   return result;
@@ -524,7 +524,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage*
   if ( commandLine.isEmpty() )
     return ErrorButGoOn;
 
-  // The parentheses force the creation of a subshell
+  // The tqparentheses force the creation of a subshell
   // in which the user-specified command is executed.
   // This is to really catch all output of the command as well
   // as to avoid clashes of our redirection with the ones
@@ -689,9 +689,9 @@ public:
   virtual ReturnCode process(KMMessage* msg) const;
   static KMFilterAction* newAction();
 
-  TQWidget * createParamWidget( TQWidget * parent ) const;
-  void applyParamWidgetValue( TQWidget * parent );
-  void setParamWidgetValue( TQWidget * parent ) const;
+  TQWidget * createParamWidget( TQWidget * tqparent ) const;
+  void applyParamWidgetValue( TQWidget * tqparent );
+  void setParamWidgetValue( TQWidget * tqparent ) const;
   void clearParamWidget( TQWidget * param ) const;
 };
 
@@ -712,9 +712,9 @@ KMFilterAction::ReturnCode KMFilterActionIdentity::process(KMMessage* msg) const
   return GoOn;
 }
 
-TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * parent ) const
+TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * tqparent ) const
 {
-  KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), parent );
+  KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), tqparent );
   ic->setCurrentIdentity( mParameter );
   return ic;
 }
@@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const
 }
 
 //=============================================================================
-// KMFilterActionSeStatus - set status to
+// KMFilterActionSetqStatus - set status to
 // Set the status of messages
 //=============================================================================
-class KMFilterActionSeStatus: public KMFilterActionWithStringList
+class KMFilterActionSetqStatus: public KMFilterActionWithStringList
 {
 public:
-  KMFilterActionSeStatus();
+  KMFilterActionSetqStatus();
   virtual ReturnCode process(KMMessage* msg) const;
   virtual bool requiresBody(KMMsgBase*) const;
 
@@ -762,7 +762,7 @@ public:
 };
 
 
-static const KMMsgStatus stati[] =
+static const KMMsgtqStatus stati[] =
 {
   KMMsgStatusFlag,
   KMMsgStatusRead,
@@ -776,18 +776,18 @@ static const KMMsgStatus stati[] =
   KMMsgStatusSpam,
   KMMsgStatusHam
 };
-static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus );
+static const int StatiCount = sizeof( stati ) / sizeof( KMMsgtqStatus );
 
-KMFilterAction* KMFilterActionSeStatus::newAction()
+KMFilterAction* KMFilterActionSetqStatus::newAction()
 {
-  return (new KMFilterActionSeStatus);
+  return (new KMFilterActionSetqStatus);
 }
 
-KMFilterActionSeStatus::KMFilterActionSeStatus()
+KMFilterActionSetqStatus::KMFilterActionSetqStatus()
   : KMFilterActionWithStringList( "set status", i18n("Mark As") )
 {
   // if you change this list, also update
-  // KMFilterActionSeStatus::stati above
+  // KMFilterActionSetqStatus::stati above
   mParameterList.append( "" );
   mParameterList.append( i18n("msg status","Important") );
   mParameterList.append( i18n("msg status","Read") );
@@ -804,22 +804,22 @@ KMFilterActionSeStatus::KMFilterActionSeStatus()
   mParameter = *mParameterList.at(0);
 }
 
-KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
+KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return ErrorButGoOn;
 
-  KMMsgStatus status = stati[idx-1] ;
-  msg->seStatus( status );
+  KMMsgtqStatus status = stati[idx-1] ;
+  msg->setqStatus( status );
   return GoOn;
 }
 
-bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const
+bool KMFilterActionSetqStatus::requiresBody(KMMsgBase*) const
 {
   return false;
 }
 
-void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
+void KMFilterActionSetqStatus::argsFromString( const TQString argsStr )
 {
   if ( argsStr.length() == 1 ) {
     for ( int i = 0 ; i < StatiCount ; i++ )
@@ -831,16 +831,16 @@ void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
   mParameter = *mParameterList.at(0);
 }
 
-const TQString KMFilterActionSeStatus::argsAsString() const
+const TQString KMFilterActionSetqStatus::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
-  if ( idx < 1 ) return TQString::null;
+  if ( idx < 1 ) return TQString();
 
-  KMMsgStatus status = stati[idx-1];
+  KMMsgtqStatus status = stati[idx-1];
   return KMMsgBase::statusToStr(status);
 }
 
-const TQString KMFilterActionSeStatus::displayString() const
+const TQString KMFilterActionSetqStatus::displayString() const
 {
   // FIXME after string freeze:
   // return i18n("").arg( );
@@ -930,7 +930,7 @@ void KMFilterActionFakeDisposition::argsFromString( const TQString argsStr )
 const TQString KMFilterActionFakeDisposition::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
-  if ( idx < 1 ) return TQString::null;
+  if ( idx < 1 ) return TQString();
 
   return TQString( TQChar( idx < 2 ? 'I' : char(mdns[idx-2]) ) );
 }
@@ -951,7 +951,7 @@ class KMFilterActionRemoveHeader: public KMFilterActionWithStringList
 public:
   KMFilterActionRemoveHeader();
   virtual ReturnCode process(KMMessage* msg) const;
-  virtual TQWidget* createParamWidget( TQWidget* parent ) const;
+  virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
   virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
 
   static KMFilterAction* newAction();
@@ -974,9 +974,9 @@ KMFilterActionRemoveHeader::KMFilterActionRemoveHeader()
   mParameter = *mParameterList.at(0);
 }
 
-TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* tqparent ) const
 {
-  TQComboBox *cb = new TQComboBox( true/*editable*/, parent );
+  TQComboBox *cb = new TQComboBox( true/*editable*/, tqparent );
   cb->setInsertionPolicy( TQComboBox::AtBottom );
   setParamWidgetValue( cb );
   return cb;
@@ -1017,7 +1017,7 @@ class KMFilterActionAddHeader: public KMFilterActionWithStringList
 public:
   KMFilterActionAddHeader();
   virtual ReturnCode process(KMMessage* msg) const;
-  virtual TQWidget* createParamWidget( TQWidget* parent ) const;
+  virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
   virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
   virtual void applyParamWidgetValue( TQWidget* paramWidget );
   virtual void clearParamWidget( TQWidget* paramWidget ) const;
@@ -1055,9 +1055,9 @@ KMFilterAction::ReturnCode KMFilterActionAddHeader::process(KMMessage* msg) cons
   return GoOn;
 }
 
-TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* tqparent ) const
 {
-  TQWidget *w = new TQWidget( parent );
+  TQWidget *w = new TQWidget( tqparent );
   TQHBoxLayout *hbl = new TQHBoxLayout( w );
   hbl->setSpacing( 4 );
   TQComboBox *cb = new TQComboBox( true, w, "combo" );
@@ -1157,7 +1157,7 @@ class KMFilterActionRewriteHeader: public KMFilterActionWithStringList
 public:
   KMFilterActionRewriteHeader();
   virtual ReturnCode process(KMMessage* msg) const;
-  virtual TQWidget* createParamWidget( TQWidget* parent ) const;
+  virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
   virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
   virtual void applyParamWidgetValue( TQWidget* paramWidget );
   virtual void clearParamWidget( TQWidget* paramWidget ) const;
@@ -1194,7 +1194,7 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
   if ( mParameter.isEmpty() || !mRegExp.isValid() )
     return ErrorButGoOn;
 
-  KRegExp3 rx = mRegExp; // KRegExp3::tqreplace is not const.
+  KRegExp3 rx = mRegExp; // KRegExp3::replace is not const.
 
   TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ),
                                      mReplacementString );
@@ -1203,9 +1203,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
   return GoOn;
 }
 
-TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) const
 {
-  TQWidget *w = new TQWidget( parent );
+  TQWidget *w = new TQWidget( tqparent );
   TQHBoxLayout *hbl = new TQHBoxLayout( w );
   hbl->setSpacing( 4 );
 
@@ -1366,7 +1366,7 @@ KMFilterAction::ReturnCode KMFilterActionMove::process(KMMessage* msg) const
 
 bool KMFilterActionMove::requiresBody(KMMsgBase*) const
 {
-    return false; //iff mFolder->folderMgr == msgBase->parent()->folderMgr;
+    return false; //iff mFolder->folderMgr == msgBase->tqparent()->folderMgr;
 }
 
 
@@ -1443,7 +1443,7 @@ class KMFilterActionForward: public KMFilterActionWithAddress
 public:
   KMFilterActionForward();
   virtual ReturnCode process( KMMessage* msg ) const;
-  virtual TQWidget* createParamWidget( TQWidget* parent ) const;
+  virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
   virtual void applyParamWidgetValue( TQWidget* paramWidget );
   virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
   virtual void clearParamWidget( TQWidget* paramWidget ) const;
@@ -1495,9 +1495,9 @@ KMFilterAction::ReturnCode KMFilterActionForward::process(KMMessage* aMsg) const
   return GoOn;
 }
 
-TQWidget* KMFilterActionForward::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionForward::createParamWidget( TQWidget* tqparent ) const
 {
-  TQWidget *addressAndTemplate = new TQWidget( parent );
+  TQWidget *addressAndTemplate = new TQWidget( tqparent );
   TQHBoxLayout *hBox = new TQHBoxLayout( addressAndTemplate );
   TQWidget *addressEdit = KMFilterActionWithAddress::createParamWidget( addressAndTemplate );
   addressEdit->setName( "addressEdit" );
@@ -1540,7 +1540,7 @@ void KMFilterActionForward::applyParamWidgetValue( TQWidget* paramWidget )
 
   if ( templateCombo->currentItem() == 0 ) {
     // Default template, so don't use a custom one
-    mTemplate = TQString::null;
+    mTemplate = TQString();
   }
   else {
     mTemplate = templateCombo->currentText();
@@ -1573,7 +1573,7 @@ void KMFilterActionForward::setParamWidgetValue( TQWidget* paramWidget ) const
       templateCombo->setCurrentItem( templateIndex );
     }
     else {
-      mTemplate = TQString::null;
+      mTemplate = TQString();
     }
   }
 }
@@ -1596,7 +1596,7 @@ static const TQString forwardFilterArgsSeperator = "@$$@";
 
 void KMFilterActionForward::argsFromString( const TQString argsStr )
 {
-  int seperatorPos = argsStr.find( forwardFilterArgsSeperator );
+  int seperatorPos = argsStr.tqfind( forwardFilterArgsSeperator );
 
   if ( seperatorPos == - 1 ) {
     // Old config, assume that the whole string is the addressee
@@ -1699,8 +1699,8 @@ KMFilterAction::ReturnCode KMFilterActionExec::process(KMMessage *aMsg) const
 class PipeJob : public KPIM::ThreadWeaver::Job
 {
   public:
-    PipeJob(TQObject* parent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 )
-      : Job (parent, name),
+    PipeJob(TQObject* tqparent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 )
+      : Job (tqparent, name),
         mTempFileName(tempFileName),
         mCmd(cmd),
         mMsg( aMsg )
@@ -1737,17 +1737,17 @@ class PipeJob : public KPIM::ThreadWeaver::Job
       pclose(p);
       if ( !ba.isEmpty() ) {
         KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", TQString(ba).latin1() );
-        KMFolder *filterFolder =  mMsg->parent();
+        KMFolder *filterFolder =  mMsg->tqparent();
         ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
 
         mMsg->fromByteArray( ba );
         if ( !origSerNum.isEmpty() )
           mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
         if ( filterFolder && handler ) {
-          bool oldStatus = handler->ignoreChanges( true );
-          filterFolder->take( filterFolder->find( mMsg ) );
+          bool oldtqStatus = handler->ignoreChanges( true );
+          filterFolder->take( filterFolder->tqfind( mMsg ) );
           filterFolder->addMsg( mMsg );
-          handler->ignoreChanges( oldStatus );
+          handler->ignoreChanges( oldtqStatus );
         } else {
           kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
         }
@@ -1800,7 +1800,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const
   if ( commandLine.isEmpty() )
     handler->actionMessage( ErrorButGoOn );
 
-  // The parentheses force the creation of a subshell
+  // The tqparentheses force the creation of a subshell
   // in which the user-specified command is executed.
   // This is to really catch all output of the command as well
   // as to avoid clashes of our redirection with the ones
@@ -1842,9 +1842,9 @@ KMFilterActionWithTest::~KMFilterActionWithTest()
 {
 }
 
-TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* tqparent ) const
 {
-  KMSoundTestWidget *le = new KMSoundTestWidget(parent);
+  KMSoundTestWidget *le = new KMSoundTestWidget(tqparent);
   le->setUrl( mParameter );
   return le;
 }
@@ -1919,9 +1919,9 @@ KMFilterActionWithUrl::~KMFilterActionWithUrl()
 {
 }
 
-TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* parent ) const
+TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* tqparent ) const
 {
-  KURLRequester *le = new KURLRequester(parent);
+  KURLRequester *le = new KURLRequester(tqparent);
   le->setURL( mParameter );
   return le;
 }
@@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void)
   insert( KMFilterActionMove::newAction );
   insert( KMFilterActionCopy::newAction );
   insert( KMFilterActionIdentity::newAction );
-  insert( KMFilterActionSeStatus::newAction );
+  insert( KMFilterActionSetqStatus::newAction );
   insert( KMFilterActionFakeDisposition::newAction );
   insert( KMFilterActionTransport::newAction );
   insert( KMFilterActionReplyTo::newAction );
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index 55aba2cf..21fa0e73 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -111,7 +111,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -190,8 +190,8 @@ public:
   virtual void argsFromString(const TQString) {};
 
   /** Return extra arguments as string. Must not contain newlines. We
-      return TQString::null, because we have no parameter. */
-  virtual const TQString argsAsString() const { return TQString::null; }
+      return TQString(), because we have no parameter. */
+  virtual const TQString argsAsString() const { return TQString(); }
 
   /** Returns a translated string describing this filter for visualization
       purposes, e.g. in the filter log. */
@@ -234,7 +234,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -345,7 +345,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -404,7 +404,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -469,7 +469,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -493,7 +493,7 @@ public:
 
 
 /** Abstract base class for KMail's filter actions that need a command
-    line as parameter, e.g. 'forward to'. Can create a QLineEdit
+    line as parameter, e.g. 'forward to'. Can create a TQLineEdit
     (are there better widgets in the depths of the kdelibs?) as
     parameter widget. A subclass of this must provide at least
     implementations for the following methods:
@@ -526,7 +526,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -565,7 +565,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -607,7 +607,7 @@ public:
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
-  virtual TQWidget* createParamWidget(TQWidget* parent) const;
+  virtual TQWidget* createParamWidget(TQWidget* tqparent) const;
 
   /** The filter action shall set it's parameter from the widget's
       contents. It is allowed that the value is read by the action
@@ -648,7 +648,7 @@ struct KMFilterActionDesc
   KMFilterActionNewFunc create;
 };
 
-/** Dictionary that tqcontains a list of all registered filter actions
+/** Dictionary that contains a list of all registered filter actions
     with their creation functions. They are hard-coded into the
     constructor. If you want to add a new KMFilterAction, make
     sure you add the details of it in init, too.
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index c9e42d1c..a83b6eec 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -32,7 +32,7 @@ using KMail::FilterImporterExporter;
 #include <klistview.h>
 #include <kpushbutton.h>
 
-// other Qt headers:
+// other TQt headers:
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
@@ -128,8 +128,8 @@ const char * KMPopFilterDlgHelpAnchor =  "popfilters-id" ;
 //
 //=============================================================================
 
-KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter )
-  : KDialogBase( parent, name,  false  /* modality */,
+KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, bool createDummyFilter )
+  : KDialogBase( tqparent, name,  false  /* modality */,
 		 (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/,
 		 Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */,
 		 Ok /* default btn */,  false  /* separator */),
@@ -173,21 +173,21 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   hbl->setStretchFactor( vbl, 2 );
 
   mPatternEdit = new KMSearchPatternEdit( i18n("Filter Criteria"), bPopFilter ? w : page1 , "spe", bPopFilter);
-  vbl->addWidget( mPatternEdit, 0, Qt::AlignTop );
+  vbl->addWidget( mPatternEdit, 0, TQt::AlignTop );
 
   if(bPopFilter){
     mActionGroup = new KMPopFilterActionWidget( i18n("Filter Action"), w );
-    vbl->addWidget( mActionGroup, 0, Qt::AlignTop );
+    vbl->addWidget( mActionGroup, 0, TQt::AlignTop );
 
     mGlobalsBox = new TQVGroupBox(i18n("Global Options"), w);
     mShowLaterBtn = new TQCheckBox(i18n("Always &show matched 'Download Later' messages in confirmation dialog"), mGlobalsBox);
     TQWhatsThis::add( mShowLaterBtn, i18n(_wt_filterdlg_showLater) );
-    vbl->addWidget( mGlobalsBox, 0, Qt::AlignTop );
+    vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop );
   }
   else {
     TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Vertical, i18n("Filter Actions"), page1 );
     mActionLister = new KMFilterActionWidgetLister( agb );
-    vbl->addWidget( agb, 0, Qt::AlignTop );
+    vbl->addWidget( agb, 0, TQt::AlignTop );
 
     mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Vertical,
 				    i18n("Advanced Options"), page2);
@@ -257,7 +257,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
 
       gl->addMultiCellWidget( hbox, 9, 9, 0, 3 );
     }
-    vbl2->addWidget( mAdvOptsGroup, 0, Qt::AlignTop );
+    vbl2->addWidget( mAdvOptsGroup, 0, TQt::AlignTop );
   }
   // spacer:
   vbl->addStretch( 1 );
@@ -577,8 +577,8 @@ void KMFilterDlg::slotUpdateAccountList()
 //
 //=============================================================================
 
-KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter )
-  : TQGroupBox( 1, Horizontal, title, parent, name ),
+KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter )
+  : TQGroupBox( 1, Horizontal, title, tqparent, name ),
     bPopFilter(popFilter)
 {
   mFilterList.setAutoDelete( true );
@@ -592,19 +592,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   //----------- the first row of buttons
   TQHBox *hb = new TQHBox(this);
   hb->setSpacing(4);
-  mBtnTop = new KPushButton( TQString::null, hb );
+  mBtnTop = new KPushButton( TQString(), hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
   mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
-  mBtnUp = new KPushButton( TQString::null, hb );
+  mBtnUp = new KPushButton( TQString(), hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
   mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
-  mBtnDown = new KPushButton( TQString::null, hb );
+  mBtnDown = new KPushButton( TQString(), hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
   mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
-  mBtnBot = new KPushButton( TQString::null, hb );
+  mBtnBot = new KPushButton( TQString(), hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
   mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 );
@@ -620,13 +620,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   //----------- the second row of buttons
   hb = new TQHBox(this);
   hb->setSpacing(4);
-  mBtnNew = new TQPushButton( TQString::null, hb );
+  mBtnNew = new TQPushButton( TQString(), hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
   mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
-  mBtnCopy = new TQPushButton( TQString::null, hb );
+  mBtnCopy = new TQPushButton( TQString(), hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
   mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
-  mBtnDelete = new TQPushButton( TQString::null, hb );
+  mBtnDelete = new TQPushButton( TQString(), hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
   mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 );
   mBtnRename = new TQPushButton( i18n("Rename..."), hb );
@@ -757,7 +757,7 @@ void KMFilterListBox::slotApplyFilterChanges()
 		       "IMAP account. Such filters will only be applied "
 		       "when manually filtering and when filtering "
 		       "incoming online IMAP mail.");
-    KMessageBox::information( this, str, TQString::null,
+    KMessageBox::information( this, str, TQString(),
 			      "filterDlgOnlineImapCheck" );
   }
 }
@@ -786,7 +786,7 @@ TQValueList<KMFilter*> KMFilterListBox::filtersForSaving() const
         TQString msg = i18n("The following filters have not been saved because they "
                    "were invalid (e.g. containing no actions or no search "
                    "rules).");
-        KMessageBox::informationList( 0, msg, emptyFilters, TQString::null,
+        KMessageBox::informationList( 0, msg, emptyFilters, TQString(),
                       "ShowInvalidFilterWarning" );
       }
       return filters;
@@ -1108,8 +1108,8 @@ void KMFilterListBox::swapFilters( int from, int to )
 //
 //=============================================================================
 
-KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
-  : TQHBox( parent, name )
+KMFilterActionWidget::KMFilterActionWidget( TQWidget *tqparent, const char* name )
+  : TQHBox( tqparent, name )
 {
   int i;
   mActionList.setAutoDelete( true );
@@ -1162,7 +1162,7 @@ void KMFilterActionWidget::setAction( const KMFilterAction* aAction )
   int i=0;
   bool found =  false ;
   int count = mComboBox->count() - 1 ; // last entry is the empty one
-  TQString label = ( aAction ) ? aAction->label() : TQString::null ;
+  TQString label = ( aAction ) ? aAction->label() : TQString() ;
 
   // find the index of typeOf(aAction) in mComboBox
   // and clear the other widgets on the way.
@@ -1209,8 +1209,8 @@ KMFilterAction * KMFilterActionWidget::action()
 //
 //=============================================================================
 
-KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *parent, const char* name )
-  : KWidgetLister( 1, FILTER_MAX_ACTIONS, parent, name )
+KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *tqparent, const char* name )
+  : KWidgetLister( 1, FILTER_MAX_ACTIONS, tqparent, name )
 {
   mActionList = 0;
 }
@@ -1228,7 +1228,7 @@ void KMFilterActionWidgetLister::setActionList( TQPtrList<KMFilterAction> *aList
 
   mActionList = aList;
 
-  ((TQWidget*)parent())->setEnabled( true );
+  ((TQWidget*)tqparent())->setEnabled( true );
 
   if ( aList->count() == 0 ) {
     slotClear();
@@ -1262,12 +1262,12 @@ void KMFilterActionWidgetLister::reset()
 
   mActionList = 0;
   slotClear();
-  ((TQWidget*)parent())->setEnabled(  false  );
+  ((TQWidget*)tqparent())->setEnabled(  false  );
 }
 
-TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *parent )
+TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *tqparent )
 {
-  return new KMFilterActionWidget(parent);
+  return new KMFilterActionWidget(tqparent);
 }
 
 void KMFilterActionWidgetLister::clearWidget( TQWidget *aWidget )
@@ -1297,8 +1297,8 @@ void KMFilterActionWidgetLister::regenerateActionListFromWidgets()
 //
 //=============================================================================
 
-KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *parent, const char* name )
-  : TQVButtonGroup( title, parent, name )
+KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *tqparent, const char* name )
+  : TQVButtonGroup( title, tqparent, name )
 {
   mActionMap[Down] = new TQRadioButton( i18n("&Download mail"), this );
   mActionMap[Later] = new TQRadioButton( i18n("Download mail la&ter"), this );
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 4b8d67a7..a664fad9 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -57,12 +57,13 @@ class KListView;
     @see KMFilter KMFilterDlg KMFilterActionEdit KMSearchPatternEdit
 
  */
-class KMFilterListBox : public QGroupBox
+class KMFilterListBox : public TQGroupBox
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Constuctor. */
-  KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false);
+  KMFilterListBox( const TQString & title, TQWidget* tqparent=0, const char* name=0, bool popFilter = false);
 
   /** Called from KMFilterDlg. Creates a new filter and presets
       the first rule with "field equals value". It's there mainly to
@@ -192,13 +193,14 @@ private:
     @see KMFilterAction KMFilter KMFilterActionWidgetLister
 
  */
-class KMFilterActionWidget : public QHBox
+class KMFilterActionWidget : public TQHBox
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Constructor. Creates a filter action widget with no type
       selected. */
-  KMFilterActionWidget( TQWidget* parent=0, const char* name=0 );
+  KMFilterActionWidget( TQWidget* tqparent=0, const char* name=0 );
 
   /** Set an action. The action's type is determined and the
       corresponding widget it loaded with @p aAction's parameters and
@@ -216,7 +218,7 @@ private:
       that they are 'forced' to create parameter widgets for the
       widget stack and to clear them on setAction. */
   TQPtrList<KMFilterAction> mActionList;
-  /** The combo box that tqcontains the labels of all KMFilterActions.
+  /** The combo box that contains the labels of all KMFilterActions.
       It's @p activated(int) signal is internally
       connected to the @p raiseWidget(int) slot of @p mWidgetStack. */
   TQComboBox      *mComboBox;
@@ -225,11 +227,12 @@ private:
   TQWidgetStack   *mWidgetStack;
 };
 
-class KMPopFilterActionWidget : public QVButtonGroup
+class KMPopFilterActionWidget : public TQVButtonGroup
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 );
+  KMPopFilterActionWidget( const TQString &title, TQWidget* tqparent=0, const char* name=0 );
   void setAction( KMPopFilterAction aAction );
   KMPopFilterAction action();
 
@@ -252,8 +255,9 @@ signals: // Signals
 class KMFilterActionWidgetLister : public KWidgetLister
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 );
+  KMFilterActionWidgetLister( TQWidget *tqparent=0, const char* name=0 );
 
   virtual ~KMFilterActionWidgetLister();
 
@@ -267,7 +271,7 @@ public slots:
 
 protected:
   virtual void clearWidget( TQWidget *aWidget );
-  virtual TQWidget* createWidget( TQWidget *parent );
+  virtual TQWidget* createWidget( TQWidget *tqparent );
 
 private:
   void regenerateActionListFromWidgets();
@@ -335,11 +339,12 @@ private:
 class KMFilterDlg: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Create the filter dialog. The only class which should be able to
       do this is KMFilterMgr. This ensures that there is only a
       single filter dialog */
-  KMFilterDlg( TQWidget* parent=0, const char* name=0, bool popFilter=false,
+  KMFilterDlg( TQWidget* tqparent=0, const char* name=0, bool popFilter=false,
                bool createDummyFilter=true );
 
   /** Called from KMFilterMgr. Creates a new filter and presets
@@ -386,7 +391,7 @@ protected slots:
   void slotExportFilters();
 
 protected:
-  /** The widget that tqcontains the ListBox showing the filters, and
+  /** The widget that contains the ListBox showing the filters, and
       the controls to remove filters, add new ones and to change their
       order. */
   KMFilterListBox *mFilterList;
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 2d1e6c91..b16769c5 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -25,7 +25,7 @@ using KMail::MessageProperty;
 #include <klocale.h>
 #include <kconfig.h>
 
-// other Qt headers
+// other TQt headers
 #include <tqregexp.h>
 #include <tqvaluevector.h>
 
@@ -125,16 +125,16 @@ int KMFilterMgr::moveMessage(KMMessage *msg) const
 
 void KMFilterMgr::endFiltering(KMMsgBase *msgBase) const
 {
-  KMFolder *parent = msgBase->parent();
-  if ( parent ) {
-    if ( parent == MessageProperty::filterFolder( msgBase ) ) {
-      parent->take( parent->find( msgBase ) );
+  KMFolder *tqparent = msgBase->tqparent();
+  if ( tqparent ) {
+    if ( tqparent == MessageProperty::filterFolder( msgBase ) ) {
+      tqparent->take( tqparent->tqfind( msgBase ) );
     }
     else if ( ! MessageProperty::filterFolder( msgBase ) ) {
-      int index = parent->find( msgBase );
-      KMMessage *msg = parent->getMsg( index );
-      parent->take( index );
-      parent->addMsgKeepUID( msg );
+      int index = tqparent->tqfind( msgBase );
+      KMMessage *msg = tqparent->getMsg( index );
+      tqparent->take( index );
+      tqparent->addMsgKeepUID( msg );
     }
   }
   MessageProperty::setFiltering( msgBase, false );
@@ -392,7 +392,7 @@ void KMFilterMgr::openDialog( TQWidget *, bool checkForEmptyFilterList )
   if( !mEditDialog )
   {
     //
-    // We can't use the parent as long as the dialog is modeless
+    // We can't use the tqparent as long as the dialog is modeless
     // and there is one shared dialog for all top level windows.
     //
     mEditDialog = new KMFilterDlg( 0, "filterdialog", bPopFilter,
@@ -437,11 +437,11 @@ const TQString KMFilterMgr::createUniqueName( const TQString & name )
 
 //-----------------------------------------------------------------------------
 void KMFilterMgr::appendFilters( const TQValueList<KMFilter*> &filters,
-                                 bool tqreplaceIfNameExists )
+                                 bool replaceIfNameExists )
 {
   mDirtyBufferedFolderTarget = true;
   beginUpdate();
-  if ( tqreplaceIfNameExists ) {
+  if ( replaceIfNameExists ) {
     TQValueListConstIterator<KMFilter*> it1 = filters.constBegin();
     for ( ; it1 != filters.constEnd() ; ++it1 ) {
       TQValueListConstIterator<KMFilter*> it2 = mFilters.constBegin();
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index eabfe093..4aae1991 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -31,9 +31,10 @@ class KMFilterDlg;
 template <typename T> class TQValueVector;
 template <typename T> class TQValueList;
 
-class KMFilterMgr: public QObject
+class KMFilterMgr: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFilterMgr(bool popFilter = false);
@@ -54,7 +55,7 @@ public:
   /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter
       is created to improve the visibility of the dialog in case no filter
       has been defined so far. */
-  void openDialog( TQWidget *parent, bool checkForEmptyFilterList = true );
+  void openDialog( TQWidget *tqparent, bool checkForEmptyFilterList = true );
 
   /** Open an edit dialog, create a new filter and preset the first
       rule with "field equals value" */
@@ -89,7 +90,7 @@ public:
       write everything back into the configuration. The filter manager
       takes ownership of the filters in the list. */
   void appendFilters( const TQValueList<KMFilter*> &filters,
-                      bool tqreplaceIfNameExists = false );
+                      bool replaceIfNameExists = false );
 
   /** Replace the list of filters under control of the filter manager.
    * The manager takes ownershipt of the filters. */
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 3825d1ee..307823c9 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -90,13 +90,13 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
     connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
              aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
     connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
-             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+             tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
     connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
-             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
+             tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
     connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*,  int ) ),
-             parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
+             tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
     connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ),
-             parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
+             tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
   }
 
   // Resend all mStorage signals
@@ -237,17 +237,17 @@ KMFolderType KMFolder::folderType() const
 
 TQString KMFolder::fileName() const
 {
-  return mStorage ? mStorage->fileName() : TQString::null;
+  return mStorage ? mStorage->fileName() : TQString();
 }
 
 TQString KMFolder::location() const
 {
-  return mStorage ? mStorage->location() : TQString::null;
+  return mStorage ? mStorage->location() : TQString();
 }
 
 TQString KMFolder::indexLocation() const
 {
-  return mStorage ? mStorage->indexLocation() : TQString::null;
+  return mStorage ? mStorage->indexLocation() : TQString();
 }
 
 TQString KMFolder::subdirLocation() const
@@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder()
   else if( folderType() == KMFolderTypeImap )
     newType = KMImapDir;
 
-  mChild = new KMFolderDir( this, parent(), childName, newType );
+  mChild = new KMFolderDir( this, tqparent(), childName, newType );
   if( !mChild )
     return 0;
   mChild->reload();
-  parent()->append( mChild );
+  tqparent()->append( mChild );
   return mChild;
 }
 
@@ -432,14 +432,14 @@ int KMFolder::moveMsg(TQPtrList<KMMessage> q, int* index_return )
   return mStorage->moveMsg( q, index_return );
 }
 
-int KMFolder::find( const KMMsgBase* msg ) const
+int KMFolder::tqfind( const KMMsgBase* msg ) const
 {
-  return mStorage ? mStorage->find( msg ) : -1;
+  return mStorage ? mStorage->tqfind( msg ) : -1;
 }
 
-int KMFolder::find( const KMMessage* msg ) const
+int KMFolder::tqfind( const KMMessage* msg ) const
 {
-  return mStorage ? mStorage->find( msg ) : -1;
+  return mStorage ? mStorage->tqfind( msg ) : -1;
 }
 
 int KMFolder::count( bool cache ) const
@@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive()
   return count;
 }
 
-void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus,
-                                 const KMMsgStatus newStatus, int idx )
+void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus,
+                                 const KMMsgtqStatus newtqStatus, int idx )
 {
-  mStorage->msgStatusChanged( oldStatus, newStatus, idx );
+  mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx );
 }
 
 int KMFolder::open(const char *owner)
@@ -592,11 +592,11 @@ TQString KMFolder::label() const
 //-----------------------------------------------------------------------------
 TQString KMFolder::prettyURL() const
 {
-  TQString parentUrl;
-  if ( parent() )
-    parentUrl = parent()->prettyURL();
-  if ( !parentUrl.isEmpty() )
-    return parentUrl + '/' + label();
+  TQString tqparentUrl;
+  if ( tqparent() )
+    tqparentUrl = tqparent()->prettyURL();
+  if ( !tqparentUrl.isEmpty() )
+    return tqparentUrl + '/' + label();
   else
     return label();
 }
@@ -614,7 +614,7 @@ TQString KMFolder::mailingListPostAddress() const
         return (*it).path();
     }
   }
-  return TQString::null;
+  return TQString();
 }
 
 void KMFolder::setMailingListEnabled( bool enabled )
@@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount()
 
 TQString KMFolder::idString() const
 {
-  KMFolderNode* folderNode = parent();
+  KMFolderNode* folderNode = tqparent();
   if (!folderNode)
     return "";
-  while ( folderNode->parent() )
-    folderNode = folderNode->parent();
+  while ( folderNode->tqparent() )
+    folderNode = folderNode->tqparent();
   TQString myPath = path();
   int pathLen = myPath.length() - folderNode->path().length();
   TQString relativePath = myPath.right( pathLen );
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
+void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle )
 {
-  mStorage->seStatus( idx, status, toggle );
+  mStorage->setqStatus( idx, status, toggle );
 }
 
-void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status,
+void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status,
                           bool toggle )
 {
-  mStorage->seStatus( ids, status, toggle);
+  mStorage->setqStatus( ids, status, toggle);
 }
 
 void KMFolder::setIconPaths( const TQString &normalPath,
@@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type )
 void KMFolder::slotFolderSizeChanged()
 {
   emit folderSizeChanged( this );
-  KMFolder* papa = parent()->manager()->parentFolder( this );
+  KMFolder* papa = tqparent()->manager()->tqparentFolder( this );
   if ( papa && papa != this ) {
     papa->slotFolderSizeChanged();
   }
@@ -901,7 +901,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message )
   KMFolderType fldType = folderType();
 
   // names of local folders must not contain a '/'
-  if ( folderName.find( '/' ) != -1 &&
+  if ( folderName.tqfind( '/' ) != -1 &&
        fldType != KMFolderTypeImap &&
        fldType != KMFolderTypeCachedImap ) {
     message = i18n( "Folder names cannot contain the / (slash) character; please choose another folder name." );
@@ -928,7 +928,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message )
         delimiter = ai->delimiterForFolder( mStorage );
       }
     }
-    if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) {
+    if ( !delimiter.isEmpty() && folderName.tqfind( delimiter ) != -1 ) {
       message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter );
       return false;
     }
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 77979b98..83a4a7a2 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
  *
  * @section Accounts
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the children of the folder. They are only stored here
+ *   represented as the tqchildren of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
@@ -68,14 +68,15 @@ typedef TQValueList<TQ_UINT32> SerNumList;
 class KMFolder: public KMFolderNode
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMFolderJob;
 public:
 
   /**
    * Constructs a new Folder object.
-   * @param parent The directory in the folder storage hierarchy under which
+   * @param tqparent The directory in the folder storage hierarchy under which
    * the folder's storage will be found or created.
-   * @param name If name of the folder. In case there is no parent directory, because
+   * @param name If name of the folder. In case there is no tqparent directory, because
    * the folder is free-standing (/var/spool/mail/foo), this is used for the full path to
    * the folder's storage location.
    * @param aFolderType The type of folder to create.
@@ -86,7 +87,7 @@ public:
    * the global MsgDict for lookup.
    * @return A new folder instance.
    */
-  KMFolder( KMFolderDir* parent, const TQString& name,
+  KMFolder( KMFolderDir* tqparent, const TQString& name,
                 KMFolderType aFolderType, bool withIndex = true,
                 bool exportedSernums = true );
   ~KMFolder();
@@ -168,10 +169,10 @@ public:
   /** Specify, that the folder can't contain mails. */
   void setNoContent(bool aNoContent);
 
-  /** Returns, if the folder can't have children */
+  /** Returns, if the folder can't have tqchildren */
   bool noChildren() const;
 
-  /** Specify, that the folder can't have children */
+  /** Specify, that the folder can't have tqchildren */
   void setNoChildren(bool aNoChildren);
 
   /** Read message at given index. Indexing starts at zero */
@@ -196,7 +197,7 @@ public:
    * for each derived KMFolder).
    */
   FolderJob* createJob( KMMessage *msg, FolderJob::JobType jt = FolderJob::tGetMessage,
-                        KMFolder *folder = 0, TQString partSpecifier = TQString::null,
+                        KMFolder *folder = 0, TQString partSpecifier = TQString(),
                         const AttachmentStrategy *as = 0 ) const;
   FolderJob* createJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
                         FolderJob::JobType jt = FolderJob::tGetMessage,
@@ -259,8 +260,8 @@ public:
   int moveMsg(TQPtrList<KMMessage>, int* index_return = 0);
 
   /** Returns the index of the given message or -1 if not found. */
-  int find(const KMMsgBase* msg) const;
-  int find( const KMMessage * msg ) const;
+  int tqfind(const KMMsgBase* msg) const;
+  int tqfind( const KMMessage * msg ) const;
 
   /** Number of messages in this folder. */
   int count(bool cache = false) const;
@@ -272,10 +273,10 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::seStatus when status of a message has changed
+  /** Called by KMMsgBase::setqStatus when status of a message has changed
       required to keep the number unread messages variable current. */
-  void msgStatusChanged( const KMMsgStatus oldStatus,
-                         const KMMsgStatus newStatus,
+  void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
+                         const KMMsgtqStatus newtqStatus,
                          int idx);
 
   /** Open folder for access.
@@ -337,7 +338,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns true if the folder tqcontains deleted messages */
+  /** Returns true if the folder contains deleted messages */
   bool needsCompacting() const;
   void setNeedsCompacting(bool f);
 
@@ -489,10 +490,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+  void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false);
 
   /** Icon related methods */
   bool useCustomIcons() const { return mUseCustomIcons; }
@@ -541,7 +542,7 @@ public:
 
   /**
   * Returns true if the name is valid for a child of this folder.
-  * If the name tqcontains invalid characters then false is returned and message will contain
+  * If the name contains invalid characters then false is returned and message will contain
   * an explanation that can be presented to the user.
   */
   bool isValidName( const TQString &folderName, TQString &message );
@@ -639,7 +640,7 @@ private:
   bool mExportsSernums :1;
   bool mMoveInProgress :1;
 
-  /** nationalized label or TQString::null (then name() should be used) */
+  /** nationalized label or TQString() (then name() should be used) */
   TQString mLabel;
   TQString mSystemLabel;
 
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 61e155ac..f0b3f0ce 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include "kmglobal.h"
 #include "acljobs.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 
 using KMail::CachedImapJob;
@@ -92,7 +92,7 @@ static TQString incidencesForToString( KMFolderCachedImap::IncidencesFor r ) {
   case KMFolderCachedImap::IncForAdmins: return "admins";
   case KMFolderCachedImap::IncForReaders: return "readers";
   }
-  return TQString::null; // can't happen
+  return TQString(); // can't happen
 }
 
 static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString& str ) {
@@ -102,10 +102,10 @@ static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString
   return KMFolderCachedImap::IncForAdmins; // by default
 }
 
-DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent,
+DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* tqparent,
                                                   const char* name )
   : KDialogBase( Plain, i18n( "Troubleshooting IMAP Cache" ),
-                 Ok | Cancel, Cancel, parent, name, true ),
+                 Ok | Cancel, Cancel, tqparent, name, true ),
     rc( None )
 {
   TQFrame* page = plainPage();
@@ -239,13 +239,13 @@ void KMFolderCachedImap::reallyDoClose( const char* owner )
   KMFolderMaildir::reallyDoClose( owner );
 }
 
-void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
+void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* tqparent )
 {
-  setAccount( parent->account() );
+  setAccount( tqparent->account() );
   // Now that we have an account, tell it that this folder was created:
   // if this folder was just removed, then we don't really want to remove it from the server.
   mAccount->removeDeletedFolder( imapPath() );
-  setUserRights( parent->userRights(), parent->userRightsState() );
+  setUserRights( tqparent->userRights(), tqparent->userRightsState() );
 }
 
 void KMFolderCachedImap::readConfig()
@@ -285,7 +285,7 @@ void KMFolderCachedImap::readConfig()
 
   int storageQuotaUsage = config->readNumEntry( "StorageQuotaUsage", -1 );
   int storageQuotaLimit = config->readNumEntry( "StorageQuotaLimit", -1 );
-  TQString storageQuotaRoot = config->readEntry( "StorageQuotaRoot", TQString::null );
+  TQString storageQuotaRoot = config->readEntry( "StorageQuotaRoot", TQString() );
   if ( !storageQuotaRoot.isNull() ) { // isEmpty() means we know there is no quota set
       mQuotaInfo.setName( "STORAGE" );
       mQuotaInfo.setRoot( storageQuotaRoot );
@@ -674,7 +674,7 @@ KMMsgBase* KMFolderCachedImap::findByUID( ulong uid )
     mapReloaded = true;
   }
 
-  TQMap<ulong,int>::Iterator it = uidMap.find( uid );
+  TQMap<ulong,int>::Iterator it = uidMap.tqfind( uid );
   if( it != uidMap.end() ) {
     KMMsgBase *msg = getMsgBase( *it );
 #if MAIL_LOSS_DEBUGGING
@@ -701,7 +701,7 @@ KMMsgBase* KMFolderCachedImap::findByUID( ulong uid )
     return 0;
   // There could be a problem in the maps. Rebuild them and try again
   reloadUidMap();
-  it = uidMap.find( uid );
+  it = uidMap.tqfind( uid );
   if( it != uidMap.end() )
     // Since the uid map is just rebuilt, no need for the sanity check
     return getMsgBase( *it );
@@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot()
 void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly )
 {
   if( mSyncState != SYNC_STATE_INITIAL ) {
-    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString::null, i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
+    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
       mSyncState = SYNC_STATE_INITIAL;
     } else return;
   }
@@ -828,13 +828,13 @@ TQString KMFolderCachedImap::state2String( int state ) const
   case SYNC_STATE_SET_ANNOTATIONS:     return "SYNC_STATE_SET_ANNOTATIONS";
   case SYNC_STATE_GET_ACLS:            return "SYNC_STATE_GET_ACLS";
   case SYNC_STATE_SET_ACLS:            return "SYNC_STATE_SET_ACLS";
-  case SYNC_STATE_GET_QUOTA:           return "SYNC_STATE_GET_QUOTA";
+  case SYNC_STATE_GET_TQUOTA:           return "SYNC_STATE_GET_TQUOTA";
   case SYNC_STATE_FIND_SUBFOLDERS:     return "SYNC_STATE_FIND_SUBFOLDERS";
   case SYNC_STATE_SYNC_SUBFOLDERS:     return "SYNC_STATE_SYNC_SUBFOLDERS";
   case SYNC_STATE_RENAME_FOLDER:       return "SYNC_STATE_RENAME_FOLDER";
   case SYNC_STATE_CHECK_UIDVALIDITY:   return "SYNC_STATE_CHECK_UIDVALIDITY";
   case SYNC_STATE_CLOSE:               return "SYNC_STATE_CLOSE";
-  case SYNC_STATE_GET_SUBFOLDER_QUOTA: return "SYNC_STATE_GET_SUBFOLDER_QUOTA";
+  case SYNC_STATE_GET_SUBFOLDER_TQUOTA: return "SYNC_STATE_GET_SUBFOLDER_TQUOTA";
   default:                             return "Unknown state";
   }
 }
@@ -1080,7 +1080,7 @@ void KMFolderCachedImap::serverSyncInternal()
     mSyncState = SYNC_STATE_GET_MESSAGES;
     if( !mQuotaOnly && !noContent() ) {
       newState( mProgress, i18n("Expunging deleted messages"));
-      CachedImapJob *job = new CachedImapJob( TQString::null,
+      CachedImapJob *job = new CachedImapJob( TQString(),
                                               CachedImapJob::tExpungeFolder, this );
       connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
       connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
@@ -1170,7 +1170,7 @@ void KMFolderCachedImap::serverSyncInternal()
       // for a folder we didn't create ourselves: get annotation from server
       if ( mAnnotationFolderType == "FROMSERVER" ) {
         needToGetInitialAnnotations = true;
-        mAnnotationFolderType = TQString::null;
+        mAnnotationFolderType = TQString();
       } else {
         updateAnnotationFolderType();
       }
@@ -1293,13 +1293,13 @@ void KMFolderCachedImap::serverSyncInternal()
   case SYNC_STATE_SYNC_SUBFOLDERS:
     syncNextSubFolder( false );
     break;
-  case SYNC_STATE_GET_SUBFOLDER_QUOTA:
+  case SYNC_STATE_GET_SUBFOLDER_TQUOTA:
 
     // Sync the subfolders again, so that the quota information is updated for all. This state is
     // only entered if the close to quota property of one subfolder changed in the previous state.
     syncNextSubFolder( true );
     break;
-  case SYNC_STATE_GET_QUOTA:
+  case SYNC_STATE_GET_TQUOTA:
     mSyncState = SYNC_STATE_CLOSE;
     if( !noContent() && mAccount->hasQuotaSupport() ) {
       mProgress = 98;
@@ -1346,10 +1346,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
   if( mSubfoldersForSync.isEmpty() ) {
 
     // Sync finished, and a close to quota property of an subfolder changed, therefore go into
-    // the SYNC_STATE_GET_SUBFOLDER_QUOTA state and sync again
+    // the SYNC_STATE_GET_SUBFOLDER_TQUOTA state and sync again
     if ( mSomeSubFolderCloseToQuotaChanged && mRecurse && !secondSync ) {
       buildSubFolderList();
-      mSyncState = SYNC_STATE_GET_SUBFOLDER_QUOTA;
+      mSyncState = SYNC_STATE_GET_SUBFOLDER_TQUOTA;
       serverSyncInternal();
     }
 
@@ -1358,7 +1358,7 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
       // Quota checking has to come after syncing subfolder, otherwise the quota information would
       // be outdated, since the subfolders can change in size during the syncing.
       // https://issues.kolab.org/issue4066
-      mSyncState = SYNC_STATE_GET_QUOTA;
+      mSyncState = SYNC_STATE_GET_TQUOTA;
       serverSyncInternal();
     }
   } else {
@@ -1491,7 +1491,7 @@ void KMFolderCachedImap::slotPutProgress( unsigned long done, unsigned long tota
 {
   // (going from mProgress to mProgress+10)
   int progressSpan = 10;
-  newState( mProgress + (progressSpan * done) / total, TQString::null );
+  newState( mProgress + (progressSpan * done) / total, TQString() );
   if ( done == total ) // we're done
     mProgress += progressSpan;
 }
@@ -1511,7 +1511,7 @@ void KMFolderCachedImap::uploadFlags()
       if( !msg || msg->UID() == 0 )
         // Either not a valid message or not one that is on the server yet
         continue;
-      if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+      if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
            && !mStatusChangedLocally ) {
         // This message has not had its status changed locally
         continue;
@@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags()
       // Send off a status setting job for each set.
       for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
         TQString imappath = imapPath() + ";UID=" + ( *slit );
-        mAccount->setImapStatus(folder(), imappath, flags);
+        mAccount->setImaptqStatus(folder(), imappath, flags);
       }
     }
     // FIXME END DUPLICATED FROM KMFOLDERIMAP
@@ -1559,7 +1559,7 @@ void KMFolderCachedImap::uploadSeenFlags()
         // Either not a valid message or not one that is on the server yet
         continue;
 
-      if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+      if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
            && !mStatusChangedLocally ) {
         // This message has not had its status changed locally
         continue;
@@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeenStatus( folder(), imappath, true );
+        mAccount->setImapSeentqStatus( folder(), imappath, true );
       }
     }
     if ( !unseenUids.isEmpty() ) {
@@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeenStatus( folder(), imappath, false );
+        mAccount->setImapSeentqStatus( folder(), imappath, false );
       }
     }
 
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
 }
 
 // This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle)
 {
-  KMFolderMaildir::seStatus( idx, status, toggle );
+  KMFolderMaildir::setqStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
 {
-  KMFolderMaildir::seStatus(ids, status, toggle);
+  KMFolderMaildir::setqStatus(ids, status, toggle);
   for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1691,7 +1691,7 @@ bool KMFolderCachedImap::deleteMessages()
   TQMap<ulong,int>::const_iterator it = uidMap.constBegin();
   for( ; it != uidMap.end(); it++ ) {
     ulong uid ( it.key() );
-    if( uid!=0 && !uidsOnServer.find( uid ) ) {
+    if( uid!=0 && !uidsOnServer.tqfind( uid ) ) {
       uids << TQString::number( uid );
       msgsForDeletion.append( getMsgBase( *it ) );
     }
@@ -1832,28 +1832,28 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
     return;
   }
   (*it).cdata += TQCString(data, data.size() + 1);
-  int pos = (*it).cdata.find("\r\n--IMAPDIGEST");
+  int pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST");
   if (pos > 0) {
-    int a = (*it).cdata.find("\r\nX-uidValidity:");
+    int a = (*it).cdata.tqfind("\r\nX-uidValidity:");
     if (a != -1) {
-      int b = (*it).cdata.find("\r\n", a + 17);
+      int b = (*it).cdata.tqfind("\r\n", a + 17);
       setUidValidity((*it).cdata.mid(a + 17, b - a - 17));
     }
-    a = (*it).cdata.find("\r\nX-Access:");
+    a = (*it).cdata.tqfind("\r\nX-Access:");
     // Only trust X-Access (i.e. the imap select info) if we don't know mUserRights.
     // The latter is more accurate (checked on every sync) whereas X-Access is only
     // updated when selecting the folder again, which might not happen if using
     // RMB / Check Mail in this folder. We don't need two (potentially conflicting)
     // sources for the readonly setting, in any case.
     if (a != -1 && mUserRightsState != KMail::ACLJobs::Ok ) {
-      int b = (*it).cdata.find("\r\n", a + 12);
+      int b = (*it).cdata.tqfind("\r\n", a + 12);
       const TQString access = (*it).cdata.mid(a + 12, b - a - 12);
       setReadOnly( access == "Read only" );
     }
     (*it).cdata.remove(0, pos);
     mFoundAnIMAPDigest = true;
   }
-  pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1);
+  pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1);
   // Start with something largish when rebuilding the cache
   if ( uidsOnServer.size() == 0 )
     uidsOnServer.resize( KMail::nextPrime( 2000 ) );
@@ -1869,16 +1869,16 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
     // The below is optimized for speed, not prettiness. The commented out chunk
     // above was the solution copied from kmfolderimap, and it's 15-20% slower.
     const TQCString& entry( (*it).cdata );
-    const int indexOfUID = entry.find("X-UID", 16);
+    const int indexOfUID = entry.tqfind("X-UID", 16);
     const int startOfUIDValue = indexOfUID  + 7;
-    const int indexOfLength = entry.find("X-Length", startOfUIDValue ); // we know length comes after UID
+    const int indexOfLength = entry.tqfind("X-Length", startOfUIDValue ); // we know length comes after UID
     const int startOfLengthValue = indexOfLength + 10;
-    const int indexOfFlags = entry.find("X-Flags", startOfLengthValue ); // we know flags comes last
+    const int indexOfFlags = entry.tqfind("X-Flags", startOfLengthValue ); // we know flags comes last
     const int startOfFlagsValue = indexOfFlags + 9;
 
-    const int flags = entry.mid( startOfFlagsValue, entry.find( '\r', startOfFlagsValue ) - startOfFlagsValue ).toInt();
-    const ulong size = entry.mid( startOfLengthValue, entry.find( '\r', startOfLengthValue ) - startOfLengthValue ).toULong();
-    const ulong uid = entry.mid( startOfUIDValue, entry.find( '\r', startOfUIDValue ) - startOfUIDValue ).toULong();
+    const int flags = entry.mid( startOfFlagsValue, entry.tqfind( '\r', startOfFlagsValue ) - startOfFlagsValue ).toInt();
+    const ulong size = entry.mid( startOfLengthValue, entry.tqfind( '\r', startOfLengthValue ) - startOfLengthValue ).toULong();
+    const ulong uid = entry.mid( startOfUIDValue, entry.tqfind( '\r', startOfUIDValue ) - startOfUIDValue ).toULong();
 
     const bool deleted = ( flags & 8 );
     if ( !deleted ) {
@@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
           // be considered correct.
           if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
             /* The message is OK, update flags */
-            KMFolderImap::flagsToStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
+            KMFolderImap::flagsTotqStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
           } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) {
-            KMFolderImap::seenFlagToStatus( existingMessage, flags );
+            KMFolderImap::seenFlagTotqStatus( existingMessage, flags );
           }
         }
         // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl;
@@ -1941,7 +1941,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
         kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl;
 #endif
         // The message is new since the last sync, but we might have just uploaded it, in which case
-        // the uid map already tqcontains it.
+        // the uid map already contains it.
         if ( !uidMap.tqcontains( uid ) ) {
           mMsgsForDownload << KMail::CachedImapJob::MsgForDownload(uid, flags, size);
           if( imapPath() == "/INBOX/" )
@@ -1958,7 +1958,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
     }
     (*it).cdata.remove(0, pos);
     (*it).done++;
-    pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1);
+    pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1);
   }
 }
 
@@ -1994,7 +1994,7 @@ void KMFolderCachedImap::slotProgress(unsigned long done, unsigned long total)
 
   // Progress info while retrieving new emails
   // (going from mProgress to mProgress+progressSpan)
-  newState( mProgress + additionalProgress, TQString::null );
+  newState( mProgress + additionalProgress, TQString() );
 }
 
 void KMFolderCachedImap::setAccount(KMAcctCachedImap *aAccount)
@@ -2264,11 +2264,11 @@ void KMFolderCachedImap::listDirectory2()
   }
 
   if ( root && !mSubfolderNames.isEmpty() ) {
-    KMFolderCachedImap* parent =
+    KMFolderCachedImap* tqparent =
       findParent( mSubfolderPaths.first(), mSubfolderNames.first() );
-    if ( parent ) {
+    if ( tqparent ) {
       kdDebug(5006) << "KMFolderCachedImap::listDirectory2 - pass listing to "
-        << parent->label() << endl;
+        << tqparent->label() << endl;
       mSubfolderNames.clear();
     }
   }
@@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2()
       // (could be that the folder was deleted & recreated meanwhile from another client...)
       if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) {
            locallyDeleted = KMessageBox::warningYesNo(
-             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString::null, KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
+             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
       }
 
       if ( locallyDeleted ) {
@@ -2344,7 +2344,7 @@ void KMFolderCachedImap::listDirectory2()
 
     AnnotationJobs::MultiUrlGetAnnotationJob* job =
       AnnotationJobs::multiUrlGetAnnotation( mAccount->slave(), mAccount->getUrl(), paths, KOLAB_FOLDERTYPE );
-    ImapAccountBase::jobData jd( TQString::null, folder() );
+    ImapAccountBase::jobData jd( TQString(), folder() );
     jd.cancellable = true;
     mAccount->insertJob(job, jd);
     connect( job, TQT_SIGNAL(result(KIO::Job *)),
@@ -2392,18 +2392,18 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue
 KMFolderCachedImap* KMFolderCachedImap::findParent( const TQString& path,
                                                     const TQString& name )
 {
-  TQString parent = path.left( path.length() - name.length() - 2 );
-  if ( parent.length() > 1 )
+  TQString tqparent = path.left( path.length() - name.length() - 2 );
+  if ( tqparent.length() > 1 )
   {
-    // extract name of the parent
-    parent = parent.right( parent.length() - 1 );
-    if ( parent != label() )
+    // extract name of the tqparent
+    tqparent = tqparent.right( tqparent.length() - 1 );
+    if ( tqparent != label() )
     {
       KMFolderNode *node = folder()->child()->first();
-      // look for a better parent
+      // look for a better tqparent
       while ( node )
       {
-        if ( node->name() == parent )
+        if ( node->name() == tqparent )
         {
           KMFolder* fld = static_cast<KMFolder*>(node);
           KMFolderCachedImap* imapFld =
@@ -2555,7 +2555,7 @@ KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   if ( job->error() )
     // Display error but don't abort the sync just for this
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->seStatus( str );
+     progressItem->setqStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress()
   mProgress += 5;
 }
 
-void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
+void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
 {
-  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl;
+  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl;
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   if( progressItem )
     progressItem->setCompletedItems( progress );
-  if ( !syncStatus.isEmpty() ) {
+  if ( !synctqStatus.isEmpty() ) {
     TQString str;
     // For a subfolder, show the label. But for the main folder, it's already shown.
     if ( mAccount->imapFolder() == this )
-      str = syncStatus;
+      str = synctqStatus;
     else
-      str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
+      str = TQString( "%1: %2" ).arg( label() ).arg( synctqStatus );
     if( progressItem )
-      progressItem->seStatus( str );
+      progressItem->setqStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -2669,7 +2669,7 @@ void KMFolderCachedImap::updateAnnotationFolderType()
 {
   TQString oldType = mAnnotationFolderType;
   TQString oldSubType;
-  int dot = oldType.find( '.' );
+  int dot = oldType.tqfind( '.' );
   if ( dot != -1 ) {
     oldType.truncate( dot );
     oldSubType = mAnnotationFolderType.mid( dot + 1 );
@@ -2693,7 +2693,7 @@ void KMFolderCachedImap::updateAnnotationFolderType()
 
   //kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: " << newType << " " << newSubType << endl;
   if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) {
-    mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString::null : "."+newSubType );
+    mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType );
     mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync
     kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl;
   }
@@ -2728,7 +2728,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
     if ( found ) {
       TQString type = value;
       TQString subtype;
-      int dot = value.find( '.' );
+      int dot = value.tqfind( '.' );
       if ( dot != -1 ) {
         type.truncate( dot );
         subtype = value.mid( dot + 1 );
@@ -2742,13 +2742,13 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
           if ( contentsType != ContentsTypeMail )
             kmkernel->iCalIface().setStorageFormat( folder(), KMailICalIfaceImpl::StorageXML );
           mAnnotationFolderType = value;
-          if ( folder()->parent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent()
+          if ( folder()->tqparent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent()
                && GlobalSettings::self()->theIMAPResourceEnabled()
                && subtype == "default" ) {
             // Truncate subtype if this folder can't be a default resource folder for us,
-            // although it apparently is for someone else.
+            // although it aptqparently is for someone else.
             mAnnotationFolderType = type;
-            kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: parent folder is " << folder()->parent()->owner()->idString() << " => truncating annotation to " << value << endl;
+            kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl;
           }
           setContentsType( contentsType );
           mAnnotationFolderTypeChanged = false; // we changed it, not the user
@@ -2800,8 +2800,8 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  Q_ASSERT( (*it).parent == folder() );
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  Q_ASSERT( (*it).tqparent == folder() );
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job );
   if ( annjob->error() ) {
@@ -2826,8 +2826,8 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  Q_ASSERT( (*it).parent == folder() );
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  Q_ASSERT( (*it).tqparent == folder() );
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   TQValueVector<int> folders;
   AnnotationJobs::MultiUrlGetAnnotationJob* annjob
@@ -2852,7 +2852,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
       kdDebug(5006) << k_funcinfo << "Folder: " << folderPath << " has type: " << annotation << endl;
       // we're only interested in the main type
       TQString type(annotation);
-      int dot = annotation.find( '.' );
+      int dot = annotation.tqfind( '.' );
       if ( dot != -1 ) type.truncate( dot );
       type = type.simplifyWhiteSpace();
 
@@ -2878,8 +2878,8 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  Q_ASSERT( (*it).parent == folder() );
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  Q_ASSERT( (*it).tqparent == folder() );
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job );
   QuotaInfo empty;
@@ -2921,8 +2921,8 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  Q_ASSERT( (*it).parent == folder() );
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  Q_ASSERT( (*it).tqparent == folder() );
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   mAccount->setAnnotationCheckPassed( true );
   if ( job->error() ) {
@@ -2940,11 +2940,11 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
-  if ( (*it).parent != folder() ) return; // Shouldn't happen
+  if ( (*it).tqparent != folder() ) return; // Shouldn't happen
 
   bool cont = true;
   if ( job->error() ) {
-    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only tqcontains mail
+    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
     if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
@@ -3133,7 +3133,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
           "Please contact your administrator to allow upload of new messages "
           "to you, or move them out of this folder.</p> "
           "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
-    if ( KMessageBox::warningYesNo( 0, msg, TQString::null, i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
+    if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
       KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
           i18n("Move Messages to Folder"), true );
       if ( dlg.exec() ) {
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 61fcfcba..87c15f75 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -66,6 +66,7 @@ using KMail::AttachmentStrategy;
 class DImapTroubleShootDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   enum SelectedOperation {
     None = -1,
@@ -75,7 +76,7 @@ public:
     RefreshCache
   };
 
-  DImapTroubleShootDialog( TQWidget* parent=0, const char* name=0 );
+  DImapTroubleShootDialog( TQWidget* tqparent=0, const char* name=0 );
 
   static int run();
 
@@ -92,14 +93,15 @@ private:
 class KMFolderCachedImap : public KMFolderMaildir
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   static TQString cacheLocation() {
      return locateLocal("data", "kmail/dimap" );
   }
 
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   KMFolderCachedImap(KMFolder* folder, const char* name=0);
   virtual ~KMFolderCachedImap();
@@ -108,7 +110,7 @@ public:
   void reallyDoClose(const char* owner);
 
   /** Initialize this storage from another one. Used when creating a child folder */
-  void initializeFrom( KMFolderCachedImap* parent );
+  void initializeFrom( KMFolderCachedImap* tqparent );
 
   virtual void readConfig();
   virtual void writeConfig();
@@ -283,8 +285,8 @@ public:
   void setACLList( const ACLList& arr );
 
   // Reimplemented so the mStatusChangedLocally bool can be set
-  virtual void seStatus( int id, KMMsgStatus status, bool toggle );
-  virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
+  virtual void setqStatus( int id, KMMsgtqStatus status, bool toggle );
+  virtual void setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle );
 
   TQString annotationFolderType() const { return mAnnotationFolderType; }
 
@@ -322,7 +324,7 @@ public:
 
   /**
    * Specify an imap path that is used to create the folder on the server
-   * Otherwise the parent folder is used to construct the path
+   * Otherwise the tqparent folder is used to construct the path
    */
   const TQString& imapPathForCreation() { return mImapPathCreation; }
   void setImapPathForCreation( const TQString& path ) { mImapPathCreation = path; }
@@ -403,9 +405,9 @@ protected:
   virtual void timerEvent( TQTimerEvent* );
 
   /* update progress status */
-  void newState( int progress, const TQString& syncStatus );
+  void newState( int progress, const TQString& synctqStatus );
 
-  /** See if there is a better parent then this folder */
+  /** See if there is a better tqparent then this folder */
   KMFolderCachedImap* findParent( const TQString& path, const TQString& name );
 
 
@@ -472,8 +474,8 @@ private:
 
   /**
    * Sync the next subfolder in the list of subfolders (mSubfoldersForSync).
-   * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_QUOTA or
-   * to SYNC_STATE_GET_QUOTA.
+   * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_TQUOTA or
+   * to SYNC_STATE_GET_TQUOTA.
    */
   void syncNextSubFolder( bool secondSync );
 
@@ -503,13 +505,13 @@ private:
     SYNC_STATE_SET_ANNOTATIONS,
     SYNC_STATE_GET_ACLS,
     SYNC_STATE_SET_ACLS,
-    SYNC_STATE_GET_QUOTA,
+    SYNC_STATE_GET_TQUOTA,
     SYNC_STATE_FIND_SUBFOLDERS,
     SYNC_STATE_SYNC_SUBFOLDERS,
     SYNC_STATE_CHECK_UIDVALIDITY,
     SYNC_STATE_RENAME_FOLDER,
     SYNC_STATE_CLOSE,
-    SYNC_STATE_GET_SUBFOLDER_QUOTA
+    SYNC_STATE_GET_SUBFOLDER_TQUOTA
   } mSyncState;
 
   int mProgress;
@@ -588,7 +590,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by seStatus. Indicates that the client has changed
+  * UIDs added by setqStatus. Indicates that the client has changed
   * the status of those mails. The mail flags for changed mails will be
   * uploaded to the server, overwriting the server's notion of the status
   * of the mails in this folder.
diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp
index 499d444f..1135b25b 100644
--- a/kmail/kmfoldercombobox.cpp
+++ b/kmail/kmfoldercombobox.cpp
@@ -8,8 +8,8 @@
 
 //-----------------------------------------------------------------------------
 
-KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name )
-  : TQComboBox( parent, name )
+KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name )
+  : TQComboBox( tqparent, name )
 {
   init();
 }
@@ -17,8 +17,8 @@ KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name )
 
 //-----------------------------------------------------------------------------
 
-KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *parent, char *name )
-  : TQComboBox( rw, parent, name )
+KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *tqparent, char *name )
+  : TQComboBox( rw, tqparent, name )
 {
   init();
 }
diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h
index 38268e75..b5351902 100644
--- a/kmail/kmfoldercombobox.h
+++ b/kmail/kmfoldercombobox.h
@@ -11,13 +11,14 @@
 #include <tqcombobox.h>
 #include <tqguardedptr.h>
 
-class KMFolderComboBox : public QComboBox
+class KMFolderComboBox : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFolderComboBox( TQWidget *parent = 0, char *name = 0 );
-  KMFolderComboBox( bool rw, TQWidget *parent = 0, char *name = 0 );
+  KMFolderComboBox( TQWidget *tqparent = 0, char *name = 0 );
+  KMFolderComboBox( bool rw, TQWidget *tqparent = 0, char *name = 0 );
 
   /** Select whether the outbox folder is shown.  Default is yes. */
   void showOutboxFolder(bool shown);
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 4e17ce23..9d514614 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -100,12 +100,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
 
   TQStringList folderNames;
   TQValueList<TQGuardedPtr<KMFolder> > folders;
-  // get all folders but search and folders that can not have children
+  // get all folders but search and folders that can not have tqchildren
   aParent->createFolderList(&folderNames, &folders, true, true,
                             true, false, true, false);
 
   if( mFolderDir ) {
-    // search the parent folder of the folder
+    // search the tqparent folder of the folder
     FolderList::ConstIterator it;
     int i = 1;
     for( it = folders.begin(); it != folders.end(); ++it, ++i ) {
@@ -185,7 +185,7 @@ void KMFolderDialog::slotOk()
 
   mDelayedSavingTabs = 0; // number of tabs which need delayed saving
   for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) {
-    FolderDiaTab::AccepStatus s = mTabs[i]->accept();
+    FolderDiaTab::AcceptqStatus s = mTabs[i]->accept();
     if ( s == FolderDiaTab::Canceled ) {
       slotCancelAccept();
       return;
@@ -234,9 +234,9 @@ void KMFolderDialog::setFolder( KMFolder* folder )
   mFolder = folder;
 }
 
-static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
+static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout )
 {
-   TQFrame *line = new TQFrame( parent, "line" );
+   TQFrame *line = new TQFrame( tqparent, "line" );
    line->setGeometry( TQRect( 80, 150, 250, 20 ) );
    line->setFrameShape( TQFrame::HLine );
    line->setFrameShadow( TQFrame::Sunken );
@@ -247,8 +247,8 @@ static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
 //----------------------------------------------------------------------------
 KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
                                                  const TQString& aName,
-                                                 TQWidget* parent, const char* name )
-  : FolderDiaTab( parent, name ),
+                                                 TQWidget* tqparent, const char* name )
+  : FolderDiaTab( tqparent, name ),
   mSharedSeenFlagsCheckBox( 0 ),
   mDlg( dlg )
 {
@@ -272,8 +272,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     // Determine if we are allowed to rename this folder. Only possible if the folder supports
     // ACLs.
     bool nameChangeAllowed = true;
-    if ( mDlg->folder() && mDlg->parentFolder() &&
-         mDlg->folder()->storage() && mDlg->parentFolder()->storage() &&
+    if ( mDlg->folder() && mDlg->tqparentFolder() &&
+         mDlg->folder()->storage() && mDlg->tqparentFolder()->storage() &&
          ( mDlg->folder()->folderType() == KMFolderTypeCachedImap ||
            mDlg->folder()->folderType() == KMFolderTypeImap ) ) {
       ImapAccountBase *account = 0;
@@ -289,31 +289,31 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
       }
 
       if ( account && account->hasACLSupport() ) {
-        int parentRights = -1;
+        int tqparentRights = -1;
         int folderRights = -1;
-        bool parentRightsOk = false;
+        bool tqparentRightsOk = false;
         bool folderRightsOk = false;
         if ( imap ) {
-          KMFolderImap * const parent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() );
+          KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() );
           folderRights = imap->userRights();
           folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok;
-          if ( parent ) {
-            parentRights = parent->userRights();
-            parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
+          if ( tqparent ) {
+            tqparentRights = tqparent->userRights();
+            tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
           }
         } else if ( dimap ) {
-          KMFolderCachedImap * const parent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() );
+          KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->tqparentFolder()->storage() );
           folderRights = dimap->userRights();
           folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok;
-          if ( parent ) {
-            parentRights = parent->userRights();
-            parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
+          if ( tqparent ) {
+            tqparentRights = tqparent->userRights();
+            tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
           }
         }
 
         // For renaming, we need support for deleting the mailbox and then re-creating it.
-        if ( parentRightsOk && folderRightsOk &&
-             ( !( parentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) {
+        if ( tqparentRightsOk && folderRightsOk &&
+             ( !( tqparentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) {
           nameChangeAllowed = false;
         }
       }
@@ -325,7 +325,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     mNameEdit->setEnabled( nameChangeAllowed );
     if ( !nameChangeAllowed ) {
       TQToolTip::add( mNameEdit, i18n( "Not enough permissions to rename this folder.\n"
-                                      "The parent folder doesn't have write support.\n"
+                                      "The tqparent folder doesn't have write support.\n"
                                       "A sync is needed after changing the permissions." ) );
     }
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
@@ -702,9 +702,9 @@ bool FolderDiaGeneralTab::save()
     else
       fldName = oldFldName;
 
-    if ( mDlg->parentFolder() &&
-         mDlg->parentFolder()->folderType() != KMFolderTypeImap &&
-         mDlg->parentFolder()->folderType() != KMFolderTypeCachedImap )
+    if ( mDlg->tqparentFolder() &&
+         mDlg->tqparentFolder()->folderType() != KMFolderTypeImap &&
+         mDlg->tqparentFolder()->folderType() != KMFolderTypeCachedImap )
       fldName.remove('/');
     fldName.remove(TQRegExp("^\\.*"));
     if (fldName.isEmpty()) fldName = i18n("unnamed");
@@ -796,8 +796,8 @@ void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-r
 
 //----------------------------------------------------------------------------
 KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg,
-                                                     TQWidget* parent )
-  : FolderDiaTab( parent, 0 ), mDlg( dlg )
+                                                     TQWidget* tqparent )
+  : FolderDiaTab( tqparent, 0 ), mDlg( dlg )
 {
 
   mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 31fb26d9..a97d78b3 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -67,12 +67,13 @@ namespace KMail {
  * Feel free to rename and move this base class somewhere else if it
  * can be useful for other dialogs.
  */
-class FolderDiaTab : public QWidget
+class FolderDiaTab : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-   FolderDiaTab( TQWidget *parent=0, const char* name=0 )
-     : TQWidget( parent, name ) {}
+   FolderDiaTab( TQWidget *tqparent=0, const char* name=0 )
+     : TQWidget( tqparent, name ) {}
 
   virtual void load() = 0;
 
@@ -82,12 +83,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AccepStatus { Accepted, Canceled, Delayed };
+  enum AcceptqStatus { Accepted, Canceled, Delayed };
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
   /// operation like a KIO job).
-  virtual AccepStatus accept() {
+  virtual AcceptqStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
@@ -111,11 +112,12 @@ signals:
 class FolderDiaGeneralTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   FolderDiaGeneralTab( KMFolderDialog* dlg,
                        const TQString& aName,
-                       TQWidget* parent, const char* name = 0 );
+                       TQWidget* tqparent, const char* name = 0 );
 
   virtual void load();
   virtual bool save();
@@ -162,9 +164,10 @@ private:
 class FolderDiaTemplatesTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
+  FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *tqparent );
 
   virtual void load();
   virtual bool save();
@@ -196,11 +199,12 @@ private:
 class KMFolderDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,
-		  KMFolderTree* parent, const TQString& caption,
-                  const TQString& name = TQString::null );
+		  KMFolderTree* tqparent, const TQString& caption,
+                  const TQString& name = TQString() );
 
   KMFolder* folder() const { return mFolder; }
   void setFolder( KMFolder* folder );
@@ -211,7 +215,7 @@ public:
   KMFolderDir* folderDir() const { return mFolderDir; }
   typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList;
 
-  KMFolder* parentFolder() const { return mParentFolder; }
+  KMFolder* tqparentFolder() const { return mParentFolder; }
 
   KMFolderTree* folderTree() const { return mFolderTree; }
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index f3b80e3f..1f6019b0 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -55,7 +55,7 @@ TQString KMFolderRootDir::prettyURL() const
   if ( !mBaseURL.isEmpty() )
     return i18n( mBaseURL.data() );
   else
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -75,9 +75,9 @@ KMFolderMgr* KMFolderRootDir::manager() const
 
 //=============================================================================
 //=============================================================================
-KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* parent,
+KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* tqparent,
                           const TQString& name, KMFolderDirType dirType )
-  : KMFolderNode( parent, name ), KMFolderNodeList(),
+  : KMFolderNode( tqparent, name ), KMFolderNodeList(),
     mOwner( owner ), mDirType( dirType )
 {
   setAutoDelete( true );
@@ -129,9 +129,9 @@ TQString KMFolderDir::path() const
 {
   static TQString p;
 
-  if (parent())
+  if (tqparent())
   {
-    p = parent()->path();
+    p = tqparent()->path();
     p.append("/");
     p.append(name());
   }
@@ -147,29 +147,29 @@ TQString KMFolderDir::label() const
   if ( mOwner )
     return mOwner->label();
   else
-    return TQString::null;
+    return TQString();
 }
 
 
 //-----------------------------------------------------------------------------
 TQString KMFolderDir::prettyURL() const
 {
-  TQString parentUrl;
-  if ( parent() )
-    parentUrl = parent()->prettyURL();
-  if ( !parentUrl.isEmpty() )
-    return parentUrl + '/' + label();
+  TQString tqparentUrl;
+  if ( tqparent() )
+    tqparentUrl = tqparent()->prettyURL();
+  if ( !tqparentUrl.isEmpty() )
+    return tqparentUrl + '/' + label();
   else
     return label();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *parentFolder )
+void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *tqparentFolder )
 {
-  KMFolderDir* folderDir = new KMFolderDir( parentFolder, this, dirName, mDirType);
+  KMFolderDir* folderDir = new KMFolderDir( tqparentFolder, this, dirName, mDirType);
   folderDir->reload();
   append( folderDir );
-  parentFolder->setChild( folderDir );
+  tqparentFolder->setChild( folderDir );
 }
 
 // Get the default folder type of the given dir type. This function should only be used when
@@ -179,7 +179,7 @@ KMFolderType dirTypeToFolderType( KMFolderDirType dirType )
   switch( dirType ) {
 
     // Use maildir for normal folder dirs, as this function is only called when finding a dir
-    // without a parent folder, which can only happen with maildir-like folders
+    // without a tqparent folder, which can only happen with maildir-like folders
     case KMStandardDir: return KMFolderTypeMaildir;
 
     case KMImapDir: return KMFolderTypeImap;
@@ -211,7 +211,7 @@ bool KMFolderDir::reload(void)
     return FALSE;
   }
 
-  QFileInfoList* fiList=(QFileInfoList*)dir.entryInfoList();
+  TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList();
   if (!fiList)
   {
     TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath);
@@ -320,8 +320,8 @@ bool KMFolderDir::reload(void)
 
       // .foo.directory => foo
       TQString folderName = *it;
-      int right = folderName.find( ".directory" );
-      int left = folderName.find( "." );
+      int right = folderName.tqfind( ".directory" );
+      int left = folderName.tqfind( "." );
       Q_ASSERT( left != -1 && right != -1 );
       folderName = folderName.mid( left + 1, right - 1 );
 
@@ -354,7 +354,7 @@ KMFolderNode* KMFolderDir::hasNamedFolder(const TQString& aName)
 //-----------------------------------------------------------------------------
 KMFolderMgr* KMFolderDir::manager() const
 {
-  return parent()->manager();
+  return tqparent()->manager();
 }
 
 
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index c93317e5..3df289bc 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -15,10 +15,11 @@ class KMFolderMgr;
 class KMFolderDir: public KMFolderNode, public KMFolderNodeList
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0,
-               const TQString& path = TQString::null,
+  KMFolderDir( KMFolder * owner, KMFolderDir * tqparent = 0,
+               const TQString& path = TQString(),
                KMFolderDirType = KMStandardDir );
   virtual ~KMFolderDir();
 
@@ -27,7 +28,7 @@ public:
   /**
    * Adds the given subdirectory of this directory to the associated folder.
    */
-  void addDirToParent( const TQString &dirName, KMFolder *parentFolder );
+  void addDirToParent( const TQString &dirName, KMFolder *tqparentFolder );
 
   /** Read contents of directory. */
   virtual bool reload();
@@ -54,7 +55,7 @@ public:
   /** Returns the folder manager that manages this folder */
   virtual KMFolderMgr* manager() const;
 
-  /** Returns the folder whose children we are holding */
+  /** Returns the folder whose tqchildren we are holding */
   KMFolder* owner() const { return mOwner; }
 
   virtual KMFolderDirType type() const { return mDirType; }
@@ -70,10 +71,11 @@ protected:
 class KMFolderRootDir: public KMFolderDir
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFolderRootDir( KMFolderMgr* manager,
-                   const TQString& path=TQString::null,
+                   const TQString& path=TQString(),
                    KMFolderDirType dirType = KMStandardDir );
   virtual ~KMFolderRootDir();
   virtual TQString path() const;
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index c924fa8a..28ba493c 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -153,19 +153,19 @@ KMMessage* KMFolderImap::getMsg(int idx)
 KMAcctImap* KMFolderImap::account() const
 {
   if ( !mAccount ) {
-    KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->parent() );
-    if ( !parentFolderDir ) {
-      kdWarning() << k_funcinfo << "No parent folder dir found for " << name() << endl;
+    KMFolderDir *tqparentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() );
+    if ( !tqparentFolderDir ) {
+      kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl;
       return 0;
     }
-    KMFolder *parentFolder = parentFolderDir->owner();
-    if ( !parentFolder ) {
-      kdWarning() << k_funcinfo << "No parent folder found for " << name() << endl;
+    KMFolder *tqparentFolder = tqparentFolderDir->owner();
+    if ( !tqparentFolder ) {
+      kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl;
       return 0;
     }
-    KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() );
-    if ( parentStorage )
-      mAccount = parentStorage->account();
+    KMFolderImap *tqparentStorage = dynamic_cast<KMFolderImap*>( tqparentFolder->storage() );
+    if ( tqparentStorage )
+      mAccount = tqparentStorage->account();
   }
   return mAccount;
 }
@@ -302,7 +302,7 @@ void KMFolderImap::removeMsg( const TQPtrList<KMMessage>& msgList, bool quiet )
   KMMessage *msg;
   while ( (msg = it.current()) != 0 ) {
     ++it;
-    int idx = find(msg);
+    int idx = tqfind(msg);
     assert( idx != -1);
     // ATTENTION port me to maildir
     KMFolderMbox::removeMsg(idx, quiet);
@@ -321,13 +321,13 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent )
 //-----------------------------------------------------------------------------
 void KMFolderImap::addMsgQuiet(KMMessage* aMsg)
 {
-  KMFolder *aFolder = aMsg->parent();
+  KMFolder *aFolder = aMsg->tqparent();
   TQ_UINT32 serNum = 0;
   aMsg->setTransferInProgress( false );
   if (aFolder) {
     serNum = aMsg->getMsgSerNum();
     kmkernel->undoStack()->pushSingleAction( serNum, aFolder, folder() );
-    int idx = aFolder->find( aMsg );
+    int idx = aFolder->tqfind( aMsg );
     assert( idx != -1 );
     aFolder->take( idx );
   }
@@ -351,7 +351,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList)
     mAddMessageProgressItem->setComplete();
     mAddMessageProgressItem = 0;
   }
-  KMFolder *aFolder = msgList.first()->parent();
+  KMFolder *aFolder = msgList.first()->tqparent();
   int undoId = -1;
   bool uidplus = account()->hasCapability("uidplus");
   for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
@@ -371,7 +371,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList)
   if ( aFolder ) {
     aFolder->take( msgList );
   } else {
-    kdDebug(5006) << k_funcinfo << "no parent" << endl;
+    kdDebug(5006) << k_funcinfo << "no tqparent" << endl;
   }
   msgList.setAutoDelete(true);
   msgList.clear();
@@ -392,7 +392,7 @@ int KMFolderImap::addMsg(KMMessage* aMsg, int* aIndex_ret)
 int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex_ret)
 {
   KMMessage *aMsg = msgList.getFirst();
-  KMFolder *msgParent = aMsg->parent();
+  KMFolder *msgParent = aMsg->tqparent();
 
   ImapJob *imapJob = 0;
   if (msgParent)
@@ -412,7 +412,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
           {
             if (!msg->isComplete())
             {
-              int idx = msgParent->find(msg);
+              int idx = msgParent->tqfind(msg);
               assert(idx != -1);
               msg = msgParent->getMsg(idx);
             }
@@ -480,10 +480,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
       if ( !msg->transferInProgress() )
         msg->setTransferInProgress( true );
     }
-    imapJob = new ImapJob( msgList, TQString::null, ImapJob::tPutMessage, this );
+    imapJob = new ImapJob( msgList, TQString(), ImapJob::tPutMessage, this );
     if ( !mAddMessageProgressItem && msgList.count() > 1 )
     {
-      // use a parent progress if we have more than 1 message
+      // use a tqparent progress if we have more than 1 message
       // otherwise the normal progress is more accurate
       mAddMessageProgressItem = ProgressManager::createProgressItem(
           "Uploading"+ProgressManager::getUniqueID(),
@@ -786,17 +786,17 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
     initInbox();
   }
 
-  // see if we have a better parent
-  // if you have a prefix that tqcontains a folder (e.g "INBOX.") the folders
+  // see if we have a better tqparent
+  // if you have a prefix that contains a folder (e.g "INBOX.") the folders
   // need to be created underneath it
   if ( root && !subfolderNames.empty() )
   {
-    KMFolderImap* parent = findParent( subfolderPaths.first(), subfolderNames.first() );
-    if ( parent )
+    KMFolderImap* tqparent = findParent( subfolderPaths.first(), subfolderNames.first() );
+    if ( tqparent )
     {
       kdDebug(5006) << "KMFolderImap::slotListResult - pass listing to "
-        << parent->label() << endl;
-      parent->slotListResult( subfolderNames, subfolderPaths,
+        << tqparent->label() << endl;
+      tqparent->slotListResult( subfolderNames, subfolderPaths,
           subfolderMimeTypes, subfolderAttributes, jobData );
       // cleanup
       TQStringList list;
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
+      account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") );
 
       f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
       f->setChildrenState( subfolderAttributes[i] );
@@ -905,7 +905,7 @@ void KMFolderImap::initInbox()
   }
   if ( f ) {
     f->initializeFrom( this, "/INBOX/", "message/directory" );
-    f->setChildrenState( TQString::null );
+    f->setChildrenState( TQString() );
   }
   // so we have an INBOX
   account()->setHasInbox( true );
@@ -914,18 +914,18 @@ void KMFolderImap::initInbox()
 //-----------------------------------------------------------------------------
 KMFolderImap* KMFolderImap::findParent( const TQString& path, const TQString& name )
 {
-  TQString parent = path.left( path.length() - name.length() - 2 );
-  if ( parent.length() > 1 )
+  TQString tqparent = path.left( path.length() - name.length() - 2 );
+  if ( tqparent.length() > 1 )
   {
-    // extract name of the parent
-    parent = parent.right( parent.length() - 1 );
-    if ( parent != label() )
+    // extract name of the tqparent
+    tqparent = tqparent.right( tqparent.length() - 1 );
+    if ( tqparent != label() )
     {
       KMFolderNode *node = folder()->child()->first();
-      // look for a better parent
+      // look for a better tqparent
       while ( node )
       {
-        if ( node->name() == parent )
+        if ( node->name() == tqparent )
         {
           KMFolder* fld = static_cast<KMFolder*>(node);
           KMFolderImap* imapFld = static_cast<KMFolderImap*>( fld->storage() );
@@ -984,10 +984,10 @@ void KMFolderImap::checkFolders( const TQStringList& subfolderNames,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::initializeFrom( KMFolderImap* parent, TQString folderPath,
+void KMFolderImap::initializeFrom( KMFolderImap* tqparent, TQString folderPath,
                                    TQString mimeType )
 {
-  setAccount( parent->account() );
+  setAccount( tqparent->account() );
   setImapPath( folderPath );
   setNoContent( mimeType == "inode/directory" );
   setNoChildren( mimeType == "message/digest" );
@@ -1003,12 +1003,12 @@ bool KMFolderImap::mailCheckInProgress() const
 //-----------------------------------------------------------------------------
 void KMFolderImap::setChildrenState( TQString attributes )
 {
-  // update children state
-  if ( attributes.find( "haschildren", 0, false ) != -1 )
+  // update tqchildren state
+  if ( attributes.tqfind( "hastqchildren", 0, false ) != -1 )
   {
     setHasChildren( FolderStorage::HasChildren );
-  } else if ( attributes.find( "hasnochildren", 0, false ) != -1 ||
-              attributes.find( "noinferiors", 0, false ) != -1 )
+  } else if ( attributes.tqfind( "hasnotqchildren", 0, false ) != -1 ||
+              attributes.tqfind( "noinferiors", 0, false ) != -1 )
   {
     setHasChildren( FolderStorage::HasNoChildren );
   } else
@@ -1060,10 +1060,10 @@ void KMFolderImap::checkValidity()
   }
   // otherwise we already are inside a mailcheck
   if ( !mMailCheckProgressItem ) {
-    ProgressItem* parent = ( account()->checkingSingleFolder() ? 0 :
+    ProgressItem* tqparent = ( account()->checkingSingleFolder() ? 0 :
         account()->mailCheckProgressItem() );
     mMailCheckProgressItem = ProgressManager::createProgressItem(
-              parent,
+              tqparent,
               "MailCheck" + folder()->prettyURL(),
               TQStyleSheet::escape( folder()->prettyURL() ),
               i18n("checking"),
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
     mMailCheckProgressItem->setProgress(0);
   }
   if ( account()->mailCheckProgressItem() ) {
-    account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() );
+    account()->mailCheckProgressItem()->setqStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
   KIO::SimpleJob *job = KIO::get(url, false, false);
@@ -1123,26 +1123,26 @@ void KMFolderImap::slotCheckValidityResult(KIO::Job * job)
     close("checkvalidity");
   } else {
     TQCString cstr((*it).data.data(), (*it).data.size() + 1);
-    int a = cstr.find("X-uidValidity: ");
-    int b = cstr.find("\r\n", a);
+    int a = cstr.tqfind("X-uidValidity: ");
+    int b = cstr.tqfind("\r\n", a);
     TQString uidv;
     if ( (b - a - 15) >= 0 )
         uidv = cstr.mid(a + 15, b - a - 15);
-    a = cstr.find("X-Access: ");
-    b = cstr.find("\r\n", a);
+    a = cstr.tqfind("X-Access: ");
+    b = cstr.tqfind("\r\n", a);
     TQString access;
     if ( (b - a - 10) >= 0 )
         access = cstr.mid(a + 10, b - a - 10);
     mReadOnly = access == "Read only";
-    a = cstr.find("X-Count: ");
-    b = cstr.find("\r\n", a);
+    a = cstr.tqfind("X-Count: ");
+    b = cstr.tqfind("\r\n", a);
     int exists = -1;
     bool ok = false;
     if ( (b - a - 9) >= 0 )
         exists = cstr.mid(a + 9, b - a - 9).toInt(&ok);
     if ( !ok ) exists = -1;
-    a = cstr.find( "X-PermanentFlags: " );
-    b = cstr.find( "\r\n", a );
+    a = cstr.tqfind( "X-PermanentFlags: " );
+    b = cstr.tqfind( "\r\n", a );
     if ( a >= 0 && (b - a - 18) >= 0 )
       mPermanentFlags = cstr.mid( a + 18, b - a - 18 ).toInt(&ok);
     if ( !ok ) mPermanentFlags = 0;
@@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   if (startUid.isEmpty())
   {
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus( i18n("Retrieving message status") );
+      mMailCheckProgressItem->setqStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
     KIO::SimpleJob *job = KIO::listDir(url, false);
     KIO::Scheduler::assignJobToSlave(account()->slave(), job);
@@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1296,7 +1296,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
       mailUid = msgBase->UID();
       // parse the uid from the server and the flags out of the list from
       // the server. Format: 1234, 1
-      c = (*uid).find(",");
+      c = (*uid).tqfind(",");
       serverUid = (*uid).left( c ).toLong();
       serverFlags = (*uid).mid( c+1 ).toInt();
       if ( mailUid < serverUid ) {
@@ -1309,9 +1309,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
           int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags;
           if ( mReadOnly )
             supportedFlags = INT_MAX;
-          flagsToStatus( msgBase, serverFlags, false, supportedFlags );
+          flagsTotqStatus( msgBase, serverFlags, false, supportedFlags );
         } else
-          seenFlagToStatus( msgBase, serverFlags, false );
+          seenFlagTotqStatus( msgBase, serverFlags, false );
         idx++;
         uid = (*it).items.remove(uid);
         if ( msgBase->getMsgSerNum() > 0 ) {
@@ -1326,8 +1326,8 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
   }
   // strip the flags from the list of uids, so it can be reused
   for (uid = (*it).items.begin(); uid != (*it).items.end(); ++uid)
-    (*uid).truncate((*uid).find(","));
-  ImapAccountBase::jobData jd( TQString::null, (*it).parent );
+    (*uid).truncate((*uid).tqfind(","));
+  ImapAccountBase::jobData jd( TQString(), (*it).tqparent );
   jd.total = (*it).items.count();
   if (jd.total == 0)
   {
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1421,7 +1421,7 @@ void KMFolderImap::slotListFolderEntries(KIO::Job * job,
 //X }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags )
+void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags )
 {
   if ( !msg ) return;
 
@@ -1440,45 +1440,45 @@ void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int sup
   };
   static const int numFlags = sizeof imapFlagMap / sizeof *imapFlagMap;
 
-  const KMMsgStatus oldStatus = msg->status();
+  const KMMsgtqStatus oldtqStatus = msg->status();
   for ( int i = 0; i < numFlags; ++i ) {
     if ( ( (supportedFlags & imapFlagMap[i].imapFlag) == 0 && (supportedFlags & 64) == 0 )
          && !imapFlagMap[i].standardFlag ) {
       continue;
     }
-    if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldStatus & imapFlagMap[i].kmFlag) > 0) ) {
-      msg->toggleStatus( imapFlagMap[i].kmFlag );
+    if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldtqStatus & imapFlagMap[i].kmFlag) > 0) ) {
+      msg->toggletqStatus( imapFlagMap[i].kmFlag );
     }
   }
 
-  seenFlagToStatus( msg, flags, newMsg );
+  seenFlagTotqStatus( msg, flags, newMsg );
 }
 
-void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
+void KMFolderImap::seenFlagTotqStatus(KMMsgBase * msg, int flags, bool newMsg)
 {
   if ( !msg ) return;
 
-  const KMMsgStatus oldStatus = msg->status();
-  if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
-    msg->seStatus( KMMsgStatusOld );
+  const KMMsgtqStatus oldtqStatus = msg->status();
+  if ( (flags & 1) && (oldtqStatus & KMMsgStatusOld) == 0 )
+    msg->setqStatus( KMMsgStatusOld );
 
   // In case the message does not have the seen flag set, override our local
   // notion that it is read. Otherwise the count of unread messages and the
   // number of messages which actually show up as read can go out of sync.
-  if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
+  if ( msg->isOfUnknowntqStatus() || (!(flags&1) && !(oldtqStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
-      if ( (oldStatus & KMMsgStatusNew) == 0 )
-        msg->seStatus( KMMsgStatusNew );
+      if ( (oldtqStatus & KMMsgStatusNew) == 0 )
+        msg->setqStatus( KMMsgStatusNew );
     } else {
-      if ( (oldStatus & KMMsgStatusUnread) == 0 )
-        msg->seStatus( KMMsgStatusUnread );
+      if ( (oldtqStatus & KMMsgStatusUnread) == 0 )
+        msg->setqStatus( KMMsgStatusUnread );
     }
   }
 }
 
 
 //-----------------------------------------------------------------------------
-TQString KMFolderImap::statusToFlags(KMMsgStatus status, int supportedFlags)
+TQString KMFolderImap::statusToFlags(KMMsgtqStatus status, int supportedFlags)
 {
   TQString flags;
   if (status & KMMsgStatusDeleted)
@@ -1509,7 +1509,7 @@ void
 KMFolderImap::ignoreJobsForMessage( KMMessage* msg )
 {
   if ( !msg || msg->transferInProgress() ||
-       !msg->parent() || msg->parent()->folderType() != KMFolderTypeImap )
+       !msg->tqparent() || msg->tqparent()->folderType() != KMFolderTypeImap )
     return;
   KMAcctImap *account;
   if ( !(account = static_cast<KMFolderImap*>(msg->storage())->account()) )
@@ -1525,28 +1525,28 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
   (*it).cdata += TQCString(data, data.size() + 1);
-  int pos = (*it).cdata.find("\r\n--IMAPDIGEST");
+  int pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST");
   if ( pos == -1 ) {
-    // if we do not find the pattern in the complete string we will not find
+    // if we do not find the pattern in the complete string we will not tqfind
     // it in a substring.
     return;
   }
   if (pos > 0)
   {
-    int p = (*it).cdata.find("\r\nX-uidValidity:");
+    int p = (*it).cdata.tqfind("\r\nX-uidValidity:");
     if (p != -1) setUidValidity((*it).cdata
-      .mid(p + 17, (*it).cdata.find("\r\n", p+1) - p - 17));
-    int c = (*it).cdata.find("\r\nX-Count:");
+      .mid(p + 17, (*it).cdata.tqfind("\r\n", p+1) - p - 17));
+    int c = (*it).cdata.tqfind("\r\nX-Count:");
     if ( c != -1 )
     {
       bool ok;
       int exists = (*it).cdata.mid( c+10,
-          (*it).cdata.find("\r\n", c+1) - c-10 ).toInt(&ok);
+          (*it).cdata.tqfind("\r\n", c+1) - c-10 ).toInt(&ok);
       if ( ok && exists < count() ) {
         kdDebug(5006) << "KMFolderImap::slotGetMessagesData - server has less messages (" <<
           exists << ") then folder (" << count() << "), so reload" << endl;
         open("getMessage");
-        reallyGetFolder( TQString::null );
+        reallyGetFolder( TQString() );
         (*it).cdata.remove(0, pos);
         return;
       } else if ( ok ) {
@@ -1558,7 +1558,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
     }
     (*it).cdata.remove(0, pos);
   }
-  pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1);
+  pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1);
   int flags;
   while (pos >= 0)
   {
@@ -1571,7 +1571,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
       flags = msg->headerField("X-Flags").toInt();
       ulong uid = msg->UID();
       KMMsgMetaData *md =  0;
-      if ( mUidMetaDataMap.find( uid ) ) {
+      if ( mUidMetaDataMap.tqfind( uid ) ) {
           md =  mUidMetaDataMap[uid];
       }
       ulong serNum = 0;
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->seStatus( md->status() );
+          msg->setqStatus( md->status() );
         } else if ( !account()->hasCapability("uidplus") ) {
           // see if we have cached the msgIdMD5 and get the status +
           // serial number from there
           TQString id = msg->msgIdMD5();
-          if ( mMetaDataMap.find( id ) ) {
+          if ( mMetaDataMap.tqfind( id ) ) {
             md =  mMetaDataMap[id];
-            msg->seStatus( md->status() );
+            msg->setqStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1613,7 +1613,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         KMFolderMbox::addMsg(msg, 0);
         // Merge with the flags from the server.
-        flagsToStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags);
+        flagsTotqStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags);
         // set the correct size
         msg->setMsgSizeServer( msg->headerField("X-Length").toUInt() );
         msg->setUID(uid);
@@ -1637,7 +1637,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
     }
     (*it).cdata.remove(0, pos);
     (*it).done++;
-    pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1);
+    pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1);
   } // while
 }
 
@@ -1667,7 +1667,7 @@ KMFolderImap::doCreateJob( KMMessage *msg, FolderJob::JobType jt,
   } else {
     // download complete message or part (attachment)
     if ( partSpecifier == "STRUCTURE" ) // hide from outside
-      partSpecifier = TQString::null;
+      partSpecifier = TQString();
 
     ImapJob *job = new ImapJob( msg, jt, kmfi, partSpecifier );
     job->setParentFolder( this );
@@ -1718,18 +1718,18 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job)
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath,
+void KMFolderImap::createFolder(const TQString &name, const TQString& tqparentPath,
                                 bool askUser)
 {
-  kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",parent=" <<
-    parentPath << ",askUser=" << askUser << endl;
+  kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" <<
+    tqparentPath << ",askUser=" << askUser << endl;
   if ( account()->makeConnection() != ImapAccountBase::Connected ) {
     kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl;
     return;
   }
   KURL url = account()->getUrl();
-  TQString parent = ( parentPath.isEmpty() ? imapPath() : parentPath );
-  TQString path = account()->createImapPath( parent, name );
+  TQString tqparent = ( tqparentPath.isEmpty() ? imapPath() : tqparentPath );
+  TQString path = account()->createImapPath( tqparent, name );
   if ( askUser ) {
     path += "/;INFO=ASKUSER";
   }
@@ -1824,7 +1824,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
   mUidMetaDataMap.remove( msg->UID() );
   mMetaDataMap.remove( msg->msgIdMD5() );
   KURL url = account()->getUrl();
-  KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->storage());
+  KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msg->storage());
   ulong uid = msg->UID();
   /* If the uid is empty the delete job below will nuke all mail in the
      folder, so we better safeguard against that. See ::expungeFolder, as
@@ -1834,7 +1834,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
                         "an empty UID. Aborting."  << endl;
      return;
   }
-  url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) );
+  url.setPath(msg_tqparent->imapPath() + ";UID=" + TQString::number(uid) );
   if ( account()->makeConnection() != ImapAccountBase::Connected )
     return;
   KIO::SimpleJob *job = KIO::file_delete(url, false);
@@ -1860,14 +1860,14 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
   TQStringList sets = makeSets(uids);
 
   KURL url = account()->getUrl();
-  KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.getFirst()->storage());
+  KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msgList.getFirst()->storage());
   for ( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
   {
     TQString uid = *it;
     // Don't delete with no uid, that nukes the folder. Should not happen, but
     // better safe than sorry.
     if ( uid.isEmpty() ) continue;
-    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
+    url.setPath(msg_tqparent->imapPath() + ";UID=" + uid);
     if ( account()->makeConnection() != ImapAccountBase::Connected )
       return;
     KIO::SimpleJob *job = KIO::file_delete(url, false);
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
 {
   TQValueList<int> ids; ids.append(idx);
-  seStatus(ids, status, toggle);
+  setqStatus(ids, status, toggle);
 }
 
-void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle)
 {
-  FolderStorage::seStatus(_ids, status, toggle);
+  FolderStorage::setqStatus(_ids, status, toggle);
   TQValueList<int> ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -1929,14 +1929,14 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog
       TQStringList sets = KMFolderImap::makeSets( seenUids, true );
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        account()->setImapSeenStatus( folder(), imappath, true );
+        account()->setImapSeentqStatus( folder(), imappath, true );
       }
     }
     if ( !unseenUids.isEmpty() ) {
       TQStringList sets = KMFolderImap::makeSets( unseenUids, true );
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        account()->setImapSeenStatus( folder(), imappath, false );
+        account()->setImapSeentqStatus( folder(), imappath, false );
       }
     }
     return;
@@ -1960,7 +1960,7 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog
      // Send off a status setting job for each set.
      for (  TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
        TQString imappath = imapPath() + ";UID=" + ( *slit );
-       account()->setImapStatus(folder(), imappath, flags);
+       account()->setImaptqStatus(folder(), imappath, flags);
      }
   }
   if ( mContentState == imapListingInProgress ) {
@@ -1970,7 +1970,7 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog
     kdDebug(5006) << "Set status during folder listing, restarting listing." << endl;
     disconnect(this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
     quiet( false );
-    reallyGetFolder( TQString::null );
+    reallyGetFolder( TQString() );
   }
 }
 
@@ -2185,7 +2185,7 @@ TQValueList<ulong> KMFolderImap::splitSets(const TQString uids)
   TQValueList<ulong> uidlist;
 
   // ex: 1205,1204,1203,1202,1236:1238
-  TQString buffer = TQString::null;
+  TQString buffer = TQString();
   int setstart = -1;
   // iterate over the uids
   for (uint i = 0; i < uids.length(); i++)
@@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state )
   mSubfolderState = state;
   if ( state == imapNoInformation && folder()->child() )
   {
-    // pass through to children
+    // pass through to tqchildren
     KMFolderNode* node;
     TQPtrListIterator<KMFolderNode> it( *folder()->child() );
     for ( ; (node = it.current()); )
@@ -2395,7 +2395,7 @@ bool KMFolderImap::isMoveable() const
 //-----------------------------------------------------------------------------
 ulong KMFolderImap::serNumForUID( ulong uid )
 {
-  if ( mUidMetaDataMap.find( uid ) ) {
+  if ( mUidMetaDataMap.tqfind( uid ) ) {
     KMMsgMetaData *md = mUidMetaDataMap[uid];
     return md->serNum();
   } else {
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 2f85685b..f303325b 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -61,15 +61,15 @@ using KPIM::ProgressItem;
 class KMMsgMetaData
 {
 public:
-  KMMsgMetaData(KMMsgStatus aStatus)
-    :mStatus(aStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
-    :mStatus(aStatus), mSerNum(aSerNum) {}
+  KMMsgMetaData(KMMsgtqStatus atqStatus)
+    :mtqStatus(atqStatus), mSerNum(0) {}
+  KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum)
+    :mtqStatus(atqStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
-  KMMsgStatus status() const { return mStatus; }
+  KMMsgtqStatus status() const { return mtqStatus; }
   TQ_UINT32 serNum() const { return mSerNum; }
 private:
-  KMMsgStatus mStatus;
+  KMMsgtqStatus mtqStatus;
   TQ_UINT32 mSerNum;
 };
 
@@ -78,6 +78,7 @@ private:
 class KMFolderImap : public KMFolderMbox
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMail::ImapJob;
 public:
 
@@ -98,8 +99,8 @@ public:
   virtual imapState getSubfolderState() { return mSubfolderState; }
   virtual void setSubfolderState(imapState state);
 
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   KMFolderImap(KMFolder* folder, const char* name=0);
   virtual ~KMFolderImap();
@@ -167,11 +168,11 @@ public:
    * Create a new subfolder
    * You may specify the root imap path or this folder will be used
    * If you set askUser to false and the server can only handle folders
-   * that contain messages _or_ folders the new folder is set to "tqcontains messages"
+   * that contain messages _or_ folders the new folder is set to "contains messages"
    * by default
    */
   void createFolder(const TQString &name,
-      const TQString& imapPath = TQString::null, bool askUser = true);
+      const TQString& imapPath = TQString(), bool askUser = true);
 
   /**
    * Delete a message
@@ -183,12 +184,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
+  virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
+  virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList<ulong>&, bool sort = true);
@@ -240,7 +241,7 @@ public:
   /**
    * Convert message status to a list of IMAP flags
    */
-  static TQString statusToFlags(KMMsgStatus status, int supportedFalgs);
+  static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs);
 
   /**
    * Return the filename of the folder (reimplemented from KFolder)
@@ -289,7 +290,7 @@ public:
   /**
    * Mark the folder as already removed from the server
    * If set to true the folder will only be deleted locally
-   * This will recursively be applied to all children
+   * This will recursively be applied to all tqchildren
    */
   void setAlreadyRemoved(bool removed);
 
@@ -320,7 +321,7 @@ public:
   virtual bool isMoveable() const;
 
   /** Initialize this storage from another one. Used when creating a child folder */
-  void initializeFrom( KMFolderImap* parent, TQString path, TQString mimeType );
+  void initializeFrom( KMFolderImap* tqparent, TQString path, TQString mimeType );
 
   /** Returns the IMAP flags that can be stored on the server. */
   int permanentFlags() const { return mPermanentFlags; }
@@ -362,7 +363,7 @@ public slots:
   virtual int addMsg(TQPtrList<KMMessage>&, TQValueList<int>& index_return);
 
   /** Copy the messages to this folder */
-  void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* parent*/);
+  void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* tqparent*/);
 
 
   /** Detach message from this folder. Usable to call addMsg() afterwards.
@@ -379,13 +380,13 @@ public slots:
    * Convert IMAP flags to a message status
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
+  static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
 
   /**
    * Convert IMAP seen flag to a message status.
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true );
+  static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true );
 
   /**
    * Connected to the result signal of the copy/move job
@@ -437,7 +438,7 @@ protected:
   /** Create or find the INBOX and initialize it */
   void initInbox();
 
-  /** See if there is a better parent then this folder */
+  /** See if there is a better tqparent then this folder */
   KMFolderImap* findParent( const TQString& path, const TQString& name );
 
   /** See if all folders are still present on server, otherwise delete them */
@@ -456,7 +457,7 @@ protected slots:
   /**
    * Get the folder now (internal)
    */
-  void reallyGetFolder(const TQString &startUid = TQString::null);
+  void reallyGetFolder(const TQString &startUid = TQString());
 
   /**
    * For listing the contents of a folder
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index a6b7f2ce..635afae5 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->seStatus(KMMsgStatusUnread);
+      mi->setqStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv)
 					    "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 					    "This index can be regenerated from your mail folder, but some "
 					    "information, including status flags, may be lost. Do you wish "
-					    "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString::null, i18n("Downgrade"), i18n("Do Not Downgrade") );
+					    "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
       kapp->restoreOverrideCursor();
       if (r == KMessageBox::Yes)
 	  createIndexFromContents();
@@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool)
 }
 
 
-KMFolderIndex::IndexStatus KMFolderIndex::indexStatus()
+KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus()
 {
     if ( !mCompactable )
       return IndexCorrupt;
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
+          msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
         }
         msgInfo->setFrom( msg.from() );
         msgInfo->setTo( msg.to() );
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 2762d143..b0850895 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -37,23 +37,24 @@
 class KMFolderIndex: public FolderStorage
 {
   Q_OBJECT
+  TQ_OBJECT
   //TODO:Have to get rid of this friend declaration and add necessary pure
-  //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder
+  //virtuals to kmfolder.h so that KMMsgBase::tqparent() can be a plain KMFolder
   //rather than a KMFolderIndex. Need this for database indices.
   friend class ::KMMsgBase;
 public:
 
   /** This enum indicates the status of the index file. It's returned by
-      indexStatus().
+      indextqStatus().
    */
-  enum IndexStatus { IndexOk,
+  enum IndextqStatus { IndexOk,
                      IndexMissing,
                      IndexCorrupt,
                      IndexTooOld
   };
 
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   KMFolderIndex(KMFolder* folder, const char* name=0);
   virtual ~KMFolderIndex();
@@ -67,8 +68,8 @@ public:
   virtual const KMMsgBase* getMsgBase(int idx) const { return mMsgList[idx]; }
   virtual KMMsgBase* getMsgBase(int idx) { return mMsgList[idx]; }
 
-  virtual int find(const KMMsgBase* msg) const { return mMsgList.find((KMMsgBase*)msg); }
-  int find( const KMMessage * msg ) const { return FolderStorage::find( msg ); }
+  virtual int tqfind(const KMMsgBase* msg) const { return mMsgList.tqfind((KMMsgBase*)msg); }
+  int tqfind( const KMMessage * msg ) const { return FolderStorage::tqfind( msg ); }
 
   /** Registered unique serial number for the index file */
   int serialIndexId() const { return mIndexId; }
@@ -90,7 +91,7 @@ public:
       Should return IndexOk if the folder doesn't exist anymore "physically"
       or if the index is not older than the contents.
   */
-  virtual IndexStatus indexStatus() = 0;
+  virtual IndextqStatus indextqStatus() = 0;
 
 public slots:
   /** Incrementally update the index if possible else call writeIndex */
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 2ec8326e..ace5a6dd 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -117,7 +117,7 @@ int KMFolderMaildir::open(const char *)
 
   if (!folder()->path().isEmpty())
   {
-    if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed
+    if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed
     {
       TQString str;
       mIndexStream = 0;
@@ -279,7 +279,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
   TQString subdirCur(location() + "/cur/");
 
   unsigned int stopIndex = nbMessages == -1 ? mMsgList.count() :
-                           QMIN( mMsgList.count(), startIndex + nbMessages );
+                           TQMIN( mMsgList.count(), startIndex + nbMessages );
   //kdDebug(5006) << "KMFolderMaildir: compacting from " << startIndex << " to " << stopIndex << endl;
   for(unsigned int idx = startIndex; idx < stopIndex; ++idx) {
     KMMsgInfo* mi = (KMMsgInfo*)mMsgList.at(idx);
@@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
     // we can't have any New messages at this point
     if (mi->isNew())
     {
-      mi->seStatus(KMMsgStatusUnread);
+      mi->setqStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -375,13 +375,13 @@ if( fileD0.open( IO_WriteOnly ) ) {
   int rc;
 
   // take message out of the folder it is currently in, if any
-  msgParent = aMsg->parent();
+  msgParent = aMsg->tqparent();
   if (msgParent)
   {
     if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder()))
         return 0;
 
-    idx = msgParent->find(aMsg);
+    idx = msgParent->tqfind(aMsg);
     msgParent->getMsg( idx );
   }
 
@@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
 
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
   if (aMsg->getMsgSerNum() <= 0)
     aMsg->setMsgSerNum();
   else
-    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // write index entry if desired
   if (mAutoCreateIndex)
@@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
       error |= appendToFolderIdsFile( idx );
 
     if (error) {
-      kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl;
+      kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl;
       if (ftell(mIndexStream) > revert) {
 	kdDebug(5006) << "Undoing changes" << endl;
 	truncate( TQFile::encodeName(indexLocation()), revert );
@@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
       if (busy) kmkernel->kbp()->idle();
       KMessageBox::sorry(0,
         i18n("Unable to add message to folder.\n"
-	     "(No space left on device or insufficient quota?)\n"
+	     "(No space left on tqdevice or insufficient quota?)\n"
 	     "Free space and sufficient quota are required to continue safely."));
       if (busy) kmkernel->kbp()->busy();
       */
@@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx)
 }
 
 
-void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status)
+void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status)
 {
   // we keep our current directory to restore it later
   char path_buffer[PATH_MAX];
@@ -596,7 +596,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
   // actually be some other state (but not New)
   if (status == KMMsgStatusRead)
   {
-    if (file.find(":2,") == -1)
+    if (file.tqfind(":2,") == -1)
       status = KMMsgStatusUnread;
     else if (file.right(5) == ":2,RS")
       status |= KMMsgStatusReplied;
@@ -636,7 +636,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
       msgIdStr = msgIdStr.stripWhiteSpace();
       if( !msgIdStr.isEmpty() ) {
         int rightAngle;
-        rightAngle = msgIdStr.find( '>' );
+        rightAngle = msgIdStr.tqfind( '>' );
         if( rightAngle != -1 )
           msgIdStr.truncate( rightAngle + 1 );
       }
@@ -644,7 +644,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
       replyToIdStr = replyToIdStr.stripWhiteSpace();
       if( !replyToIdStr.isEmpty() ) {
         int rightAngle;
-        rightAngle = replyToIdStr.find( '>' );
+        rightAngle = replyToIdStr.tqfind( '>' );
         if( rightAngle != -1 )
           replyToIdStr.truncate( rightAngle + 1 );
       }
@@ -672,7 +672,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
         // message In-Reply-To points to is not kept in this folder,
         // but e.g. in an Outbox
         replyToAuxIdStr = referencesStr;
-        rightAngle = referencesStr.find( '>' );
+        rightAngle = referencesStr.tqfind( '>' );
         if( rightAngle != -1 )
           replyToAuxIdStr.truncate( rightAngle + 1 );
       }
@@ -697,7 +697,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
       charset = "";
       if ( !contentTypeStr.isEmpty() )
       {
-        int cidx = contentTypeStr.find( "charset=" );
+        int cidx = contentTypeStr.tqfind( "charset=" );
         if ( cidx != -1 ) {
           charset = contentTypeStr.mid( cidx + 8 );
           if ( !charset.isEmpty() && ( charset[0] == '"' ) ) {
@@ -800,7 +800,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
     {
       xmarkStr = TQCString(line+13);
     }
-    else if (strncasecmp(line, "X-Status:", 9) == 0)
+    else if (strncasecmp(line, "X-tqStatus:", 9) == 0)
     {
       statusStr = TQCString(line+9);
     }
@@ -864,8 +864,8 @@ int KMFolderMaildir::createIndexFromContents()
   curDir.setFilter(TQDir::Files);
 
   // then, we look for all the 'cur' files
-  const QFileInfoList *list = curDir.entryInfoList();
-  QFileInfoListIterator it(*list);
+  const TQFileInfoList *list = curDir.entryInfoList();
+  TQFileInfoListIterator it(*list);
   TQFileInfo *fi;
 
   while ((fi = it.current()))
@@ -893,7 +893,7 @@ int KMFolderMaildir::createIndexFromContents()
   correctUnreadMsgsCount();
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
-    KMessageBox::information(0, i18n("Your outbox tqcontains messages which were "
+    KMessageBox::information(0, i18n("Your outbox contains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
@@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents()
   return 0;
 }
 
-KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus()
+KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus()
 {
   if ( !mCompactable )
     return KMFolderIndex::IndexCorrupt;
@@ -989,8 +989,8 @@ static bool removeDirAndContentsRecursively( const TQString & path )
   d.setPath( path );
   d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden | TQDir::NoSymLinks );
 
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
+  const TQFileInfoList *list = d.entryInfoList();
+  TQFileInfoListIterator it( *list );
   TQFileInfo *fi;
 
   while ( (fi = it.current()) != 0 ) {
@@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd;
 //-----------------------------------------------------------------------------
 // static
 TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
-                                                 KMMsgStatus status )
+                                                 KMMsgtqStatus status )
 {
   TQString aFileName( filename );
 
@@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n
 }
 
 //-----------------------------------------------------------------------------
-TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status)
+TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status)
 {
   TQString dest(newLoc);
   // make sure that our destination filename doesn't already exist
@@ -1090,19 +1090,19 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n
 
   TQDir d;
   if (d.rename(oldLoc, dest) == false)
-    return TQString::null;
+    return TQString();
   else
     return dest;
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus,
-  const KMMsgStatus newStatus, int idx)
+void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
+  const KMMsgtqStatus newtqStatus, int idx)
 {
   // if the status of any message changes, then we need to compact
   needsCompact = true;
 
-  KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx);
+  KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx);
 }
 
 /*virtual*/
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index d8be0139..83cb0b68 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -24,10 +24,11 @@ using KMail::AttachmentStrategy;
 class KMFolderMaildir : public KMFolderIndex
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMail::MaildirJob;
 public:
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   KMFolderMaildir(KMFolder* folder, const char* name=0);
   virtual ~KMFolderMaildir();
@@ -55,10 +56,10 @@ public:
   virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::seStatus when status of a message has changed
+  // Called by KMMsgBase::setqStatus when status of a message has changed
   // required to keep the number unread messages variable current.
-  virtual void msgStatusChanged( const KMMsgStatus oldStatus,
-                                 const KMMsgStatus newStatus,
+  virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
+                                 const KMMsgtqStatus newtqStatus,
 				 int idx);
 
   /** Open folder for access.
@@ -86,7 +87,7 @@ public:
   static int createMaildirFolders( const TQString & folderPath );
 
   static TQString constructValidFileName( const TQString & filename = TQString(),
-                                         KMMsgStatus status = KMMsgStatusNew );
+                                         KMMsgtqStatus status = KMMsgStatusNew );
 
   static bool removeFile( const TQString & folderPath,
                           const TQString & filename );
@@ -147,9 +148,9 @@ private slots:
   void slotDirSizeJobResult( KIO::Job* job );
 
 private:
-  void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status);
+  void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status);
   TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, KMMsgInfo* mi);
-  TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status);
+  TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status);
   bool removeFile(const TQString& filename);
 
   /** Tests whether the contents of this folder is newer than the index.
@@ -157,9 +158,9 @@ private:
       Returns IndexMissing if there is no index.
       Returns IndexOk if the index is not older than the contents.
   */
-  virtual IndexStatus indexStatus();
+  virtual IndextqStatus indextqStatus();
 
-  typedef QPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry;
+  typedef TQPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry;
   static TQValueList<DirSizeJobQueueEntry> s_DirSizeJobQueue;
 
   TQStrList mIdxToFileList;
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 025a9d71..287ce576 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner)
 
   if (!folder()->path().isEmpty())
   {
-     KMFolderIndex::IndexStatus index_status = indexStatus();
+     KMFolderIndex::IndextqStatus index_status = indextqStatus();
      // test if index file exists and is up-to-date
      if (KMFolderIndex::IndexOk != index_status)
      {
@@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner)
   Q_UNUSED( owner );
   if (mAutoCreateIndex)
   {
-      if (KMFolderIndex::IndexOk != indexStatus()) {
+      if (KMFolderIndex::IndexOk != indextqStatus()) {
           kdDebug(5006) << "Critical error: " << location() <<
               " has been modified by an external application while KMail was running." << endl;
           //      exit(1); backed out due to broken nfs
@@ -521,7 +521,7 @@ int KMFolderMbox::unlock()
 
 
 //-----------------------------------------------------------------------------
-KMFolderIndex::IndexStatus KMFolderMbox::indexStatus()
+KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus()
 {
   if ( !mCompactable )
     return KMFolderIndex::IndexCorrupt;
@@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents()
   KMMsgInfo* mi;
   TQString msgStr;
   TQRegExp regexp(MSG_SEPERATOR_REGEX);
-  int i, num, numStatus;
-  short needStatus;
+  int i, num, numtqStatus;
+  short needtqStatus;
 
   assert(mStream != 0);
   rewind(mStream);
@@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents()
   mMsgList.clear();
 
   num     = -1;
-  numStatus= 11;
+  numtqStatus= 11;
   off_t offs = 0;
   size_t size = 0;
   dateStr = "";
@@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents()
   replyToAuxIdStr = "";
   referencesStr = "";
   msgIdStr = "";
-  needStatus = 3;
+  needtqStatus = 3;
   size_t sizeServer = 0;
   ulong uid = 0;
 
@@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents()
 
       if (num >= 0)
       {
-        if (numStatus <= 0)
+        if (numtqStatus <= 0)
         {
           msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num);
           emit statusMsg(msgStr);
-          numStatus = 10;
+          numtqStatus = 10;
         }
 
         if (size > 0)
@@ -609,7 +609,7 @@ int KMFolderMbox::createIndexFromContents()
           msgIdStr = msgIdStr.stripWhiteSpace();
           if( !msgIdStr.isEmpty() ) {
             int rightAngle;
-            rightAngle = msgIdStr.find( '>' );
+            rightAngle = msgIdStr.tqfind( '>' );
             if( rightAngle != -1 )
               msgIdStr.truncate( rightAngle + 1 );
           }
@@ -617,7 +617,7 @@ int KMFolderMbox::createIndexFromContents()
           replyToIdStr = replyToIdStr.stripWhiteSpace();
           if( !replyToIdStr.isEmpty() ) {
             int rightAngle;
-            rightAngle = replyToIdStr.find( '>' );
+            rightAngle = replyToIdStr.tqfind( '>' );
             if( rightAngle != -1 )
               replyToIdStr.truncate( rightAngle + 1 );
           }
@@ -645,7 +645,7 @@ int KMFolderMbox::createIndexFromContents()
             // message In-Reply-To points to is not kept in this folder,
             // but e.g. in an Outbox
             replyToAuxIdStr = referencesStr;
-            rightAngle = referencesStr.find( '>' );
+            rightAngle = referencesStr.tqfind( '>' );
             if( rightAngle != -1 )
               replyToAuxIdStr.truncate( rightAngle + 1 );
           }
@@ -654,7 +654,7 @@ int KMFolderMbox::createIndexFromContents()
           charset = "";
           if ( !contentTypeStr.isEmpty() )
           {
-            int cidx = contentTypeStr.find( "charset=" );
+            int cidx = contentTypeStr.tqfind( "charset=" );
             if ( cidx != -1 ) {
               charset = contentTypeStr.mid( cidx + 8 );
               if ( !charset.isEmpty() && ( charset[0] == '"' ) ) {
@@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->seStatus(status, xstatus);
+          mi->setqStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
 
           *status = '\0';
           *xstatus = '\0';
-          needStatus = 3;
+          needtqStatus = 3;
           xmarkStr = "";
           replyToIdStr = "";
           replyToAuxIdStr = "";
@@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents()
           sizeServer = 0;
           uid = 0;
         }
-        else num--,numStatus++;
+        else num--,numtqStatus++;
       }
 
       offs = ftell(mStream);
       num++;
-      numStatus--;
+      numtqStatus--;
       inHeader = true;
       continue;
     }
@@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents()
     /* -sanders Make all messages read when auto-recreating index */
     /* Reverted, as it breaks reading the sent mail status, for example.
        -till */
-    if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
+    if ((needtqStatus & 1) && strncasecmp(line, "tqStatus:", 7) == 0)
     {
       for(i=0; i<4 && line[i+8] > ' '; i++)
         status[i] = line[i+8];
       status[i] = '\0';
-      needStatus &= ~1;
+      needtqStatus &= ~1;
     }
-    else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
+    else if ((needtqStatus & 2) && strncasecmp(line, "X-tqStatus:", 9)==0)
     {
       for(i=0; i<4 && line[i+10] > ' '; i++)
         xstatus[i] = line[i+10];
       xstatus[i] = '\0';
-      needStatus &= ~2;
+      needtqStatus &= ~2;
     }
     else if (strncasecmp(line,"X-KMail-Mark:",13)==0)
         xmarkStr = TQCString(line+13);
@@ -805,7 +805,7 @@ int KMFolderMbox::createIndexFromContents()
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
     KMessageBox::queuedMessageBox(0, KMessageBox::Information,
-                                  i18n("Your outbox tqcontains messages which were "
+                                  i18n("Your outbox contains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
@@ -950,7 +950,7 @@ int KMFolderMbox::addMsg( KMMessage* aMsg, int* aIndex_ret )
   }
 
   // take message out of the folder it is currently in, if any
-  msgParent = aMsg->parent();
+  msgParent = aMsg->tqparent();
   if (msgParent)
   {
     if ( msgParent== folder() )
@@ -965,7 +965,7 @@ int KMFolderMbox::addMsg( KMMessage* aMsg, int* aIndex_ret )
           return 0;
       }
 
-    idx = msgParent->find(aMsg);
+    idx = msgParent->tqfind(aMsg);
     msgParent->getMsg( idx );
   }
 
@@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   clearerr(mStream);
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
     if (busy) kmkernel->kbp()->idle();
     KMessageBox::sorry(0,
           i18n("Unable to add message to folder.\n"
-               "(No space left on device or insufficient quota?)\n"
+               "(No space left on tqdevice or insufficient quota?)\n"
                "Free space and sufficient quota are required to continue safely."));
     if (busy) kmkernel->kbp()->busy();
     kmkernel->kbp()->idle();
@@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   if ( aMsg->getMsgSerNum() <= 0 )
     aMsg->setMsgSerNum();
   else
-    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // change the length of the previous message to encompass white space added
   if ((idx > 0) && (growth > 0)) {
@@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
       error |= appendToFolderIdsFile( idx );
 
     if (error) {
-      kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl;
+      kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl;
       if (ftell(mIndexStream) > revert) {
         kdWarning(5006) << "Undoing changes" << endl;
         truncate( TQFile::encodeName(indexLocation()), revert );
@@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) {
       if ( errno )
         kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno)));
       else
-        kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") );
+        kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") );
 
       /* This code may not be 100% reliable
       bool busy = kmkernel->kbp()->isBusy();
       if (busy) kmkernel->kbp()->idle();
       KMessageBox::sorry(0,
         i18n("Unable to add message to folder.\n"
-             "(No space left on device or insufficient quota?)\n"
+             "(No space left on tqdevice or insufficient quota?)\n"
              "Free space and sufficient quota are required to continue safely."));
       if (busy) kmkernel->kbp()->busy();
       */
@@ -1155,7 +1155,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil
   int rc = 0;
   TQCString mtext;
   unsigned int stopIndex = nbMessages == -1 ? mMsgList.count() :
-                           QMIN( mMsgList.count(), startIndex + nbMessages );
+                           TQMIN( mMsgList.count(), startIndex + nbMessages );
   //kdDebug(5006) << "KMFolderMbox: compacting from " << startIndex << " to " << stopIndex << endl;
   for(unsigned int idx = startIndex; idx < stopIndex; ++idx) {
     KMMsgInfo* mi = (KMMsgInfo*)mMsgList.at(idx);
@@ -1237,10 +1237,10 @@ int KMFolderMbox::compact( bool silent )
   // Note that job autodeletes itself.
 
   // If this is the current folder, the changed signal will ultimately call
-  // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcasStatus::instance()->statusMsg();
+  // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it
+  TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
   emit changed();
-  BroadcasStatus::instance()->seStatusMsg( statusMsg );
+  BroadcastqStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 7c48324e..cf887137 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -39,7 +39,7 @@ using KMail::AttachmentStrategy;
  *
  * Accounts:
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the children of the folder. They are only stored here
+ *   represented as the tqchildren of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
@@ -47,12 +47,13 @@ using KMail::AttachmentStrategy;
 class KMFolderMbox : public KMFolderIndex
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMail::MboxJob;
 public:
 
 
-  /** Usually a parent is given. But in some cases there is no
-    fitting parent object available. Then the name of the folder
+  /** Usually a tqparent is given. But in some cases there is no
+    fitting tqparent object available. Then the name of the folder
     is used as the absolute path to the folder file. */
   KMFolderMbox(KMFolder* folder, const char* name=0);
   virtual ~KMFolderMbox();
@@ -109,7 +110,7 @@ public:
 
   static TQByteArray escapeFrom( const DwString & str );
 
-  virtual IndexStatus indexStatus();
+  virtual IndextqStatus indextqStatus();
 
   /**  reimp */
   virtual TQ_INT64 doFolderSize() const;
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 81b6ca97..3d42a2d3 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -39,7 +39,7 @@ using KMail::CopyFolderJob;
 
 //-----------------------------------------------------------------------------
 KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType):
-  TQObject(), mDir(this, TQString::null, dirType)
+  TQObject(), mDir(this, TQString(), dirType)
 {
   if ( dirType == KMStandardDir )
     mDir.setBaseURL( I18N_NOOP("Local Folders") );
@@ -53,7 +53,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType):
 //-----------------------------------------------------------------------------
 KMFolderMgr::~KMFolderMgr()
 {
-  mBasePath = TQString::null;
+  mBasePath = TQString();
 }
 
 
@@ -219,7 +219,7 @@ KMFolder* KMFolderMgr::createFolder(const TQString& fName, bool sysFldr,
 
 
 //-----------------------------------------------------------------------------
-KMFolder* KMFolderMgr::find(const TQString& folderName, bool foldersOnly)
+KMFolder* KMFolderMgr::tqfind(const TQString& folderName, bool foldersOnly)
 {
   KMFolderNode* node;
 
@@ -234,7 +234,7 @@ KMFolder* KMFolderMgr::find(const TQString& folderName, bool foldersOnly)
 //-----------------------------------------------------------------------------
 KMFolder* KMFolderMgr::findById(const uint id)
 {
-  return findIdString( TQString::null, id );
+  return findIdString( TQString(), id );
 }
 
 //-----------------------------------------------------------------------------
@@ -303,7 +303,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
 {
   KMFolder* folder = 0;
   if ( id == 0 )
-    folder = find(aFolderName);
+    folder = tqfind(aFolderName);
   else
     folder = findById(id);
 
@@ -366,20 +366,20 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder)
   aFolder->remove();
 }
 
-KMFolder* KMFolderMgr::parentFolder( KMFolder* folder )
+KMFolder* KMFolderMgr::tqparentFolder( KMFolder* folder )
 {
-  // find the parent folder by stripping "." and ".directory" from the name
-  KMFolderDir* fdir = folder->parent();
-  TQString parentName = fdir->name();
-  parentName = parentName.mid( 1, parentName.length()-11 );
-  KMFolderNode* parent = fdir->hasNamedFolder( parentName );
-  if ( !parent && fdir->parent() ) // dimap obviously has a different structure
-    parent = fdir->parent()->hasNamedFolder( parentName );
+  // find the tqparent folder by stripping "." and ".directory" from the name
+  KMFolderDir* fdir = folder->tqparent();
+  TQString tqparentName = fdir->name();
+  tqparentName = tqparentName.mid( 1, tqparentName.length()-11 );
+  KMFolderNode* tqparent = fdir->hasNamedFolder( tqparentName );
+  if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure
+    tqparent = fdir->tqparent()->hasNamedFolder( tqparentName );
 
-  KMFolder* parentF = 0;
-  if ( parent )
-    parentF = dynamic_cast<KMFolder*>( parent );
-  return parentF;
+  KMFolder* tqparentF = 0;
+  if ( tqparent )
+    tqparentF = dynamic_cast<KMFolder*>( tqparent );
+  return tqparentF;
 }
 
 void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
@@ -389,7 +389,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
     return;
   }
 
-  KMFolderDir* fdir = aFolder->parent();
+  KMFolderDir* fdir = aFolder->tqparent();
   KMFolderNode* fN;
   for (fN = fdir->first(); fN != 0; fN = fdir->next()) {
     if (fN->isDir() && (fN->name() == "." + aFolder->fileName() + ".directory")) {
@@ -397,24 +397,24 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
       break;
     }
   }
-  KMFolder* parentF = parentFolder( aFolder );
+  KMFolder* tqparentF = tqparentFolder( aFolder );
 
   // aFolder will be deleted by the next call!
-  aFolder->parent()->remove(aFolder);
+  aFolder->tqparent()->remove(aFolder);
 
-  // update the children state
-  if ( parentF )
+  // update the tqchildren state
+  if ( tqparentF )
   {
-    if ( parentF != aFolder )
+    if ( tqparentF != aFolder )
     {
-      parentF->storage()->updateChildrenState();
+      tqparentF->storage()->updateChildrenState();
     }
   }
   else
-    kdWarning(5006) << "Can not find parent folder" << endl;
+    kdWarning(5006) << "Can not find tqparent folder" << endl;
 
   if (aFolder == mRemoveOrig) {
-    // call only if we're removing the original parent folder
+    // call only if we're removing the original tqparent folder
     contentsChanged();
     mRemoveOrig = 0;
   }
@@ -425,7 +425,7 @@ void KMFolderMgr::removeDirAux(KMFolderDir* aFolderDir)
   TQDir dir;
   TQString folderDirLocation = aFolderDir->path();
   aFolderDir->clear();
-  aFolderDir->parent()->remove(aFolderDir);
+  aFolderDir->tqparent()->remove(aFolderDir);
   dir.rmdir(folderDirLocation);
 }
 
@@ -460,7 +460,7 @@ void KMFolderMgr::createFolderList(TQStringList *str,
 void KMFolderMgr::createI18nFolderList(TQStringList *str,
 				   TQValueList<TQGuardedPtr<KMFolder> > *folders)
 {
-  createFolderList( str, folders, 0, TQString::null, true );
+  createFolderList( str, folders, 0, TQString(), true );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index 587d8525..7e6e630d 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -13,9 +13,10 @@
 
 class KMFolder;
 
-class KMFolderMgr: public QObject
+class KMFolderMgr: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFolderMgr(const TQString& basePath, KMFolderDirType dirType = KMStandardDir);
@@ -32,13 +33,13 @@ public:
 
   /** Searches folder and returns it. Skips directories
     (objects of type KMFolderDir) if foldersOnly is TRUE. */
-  virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE);
+  virtual KMFolder* tqfind(const TQString& folderName, bool foldersOnly=TRUE);
 
   /** Searches for a folder with the given id, recurses into directories */
   virtual KMFolder* findIdString(const TQString& folderId,
      const uint id = 0, KMFolderDir *dir = 0);
 
-  /** Uses find() to find given folder. If not found the folder is
+  /** Uses tqfind() to find given folder. If not found the folder is
    * created. Directories are skipped.
    * If an id is passed this searches for it
    */
@@ -50,10 +51,10 @@ public:
   virtual KMFolder* findById(const uint id);
 
   virtual void        getFolderURLS( TQStringList& flist,
-                                     const TQString& prefix=TQString::null,
+                                     const TQString& prefix=TQString(),
                                      KMFolderDir *adir=0 );
   virtual KMFolder*   getFolderByURL( const TQString& vpath,
-                                      const TQString& prefix=TQString::null,
+                                      const TQString& prefix=TQString(),
                                       KMFolderDir *adir=0 );
 
   /** Create a mail folder in the root folder directory dir()
@@ -121,8 +122,8 @@ public:
   /** Copy a folder */
   void copyFolder( KMFolder* folder, KMFolderDir* newParent );
 
-  /** Returns the parent Folder for the given folder or 0 on failure.  */
-  KMFolder* parentFolder( KMFolder* folder );
+  /** Returns the tqparent Folder for the given folder or 0 on failure.  */
+  KMFolder* tqparentFolder( KMFolder* folder );
 
 public slots:
   /** GUI action: compact all folders that need to be compacted */
diff --git a/kmail/kmfoldernode.cpp b/kmail/kmfoldernode.cpp
index e27a88f8..e8ba86f5 100644
--- a/kmail/kmfoldernode.cpp
+++ b/kmail/kmfoldernode.cpp
@@ -7,9 +7,9 @@
 #include "kmfolderdir.h"
 
 //-----------------------------------------------------------------------------
-KMFolderNode::KMFolderNode( KMFolderDir * parent, const TQString & name )
+KMFolderNode::KMFolderNode( KMFolderDir * tqparent, const TQString & name )
   : mName( name ),
-    mParent( parent ),
+    mParent( tqparent ),
     mDir( false ),
     mId( 0 )
 {
@@ -31,8 +31,8 @@ bool KMFolderNode::isDir(void) const
 //-----------------------------------------------------------------------------
 TQString KMFolderNode::path() const
 {
-  if (parent()) return parent()->path();
-  return TQString::null;
+  if (tqparent()) return tqparent()->path();
+  return TQString();
 }
 
 //-----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ TQString KMFolderNode::label(void) const
 }
 
 //-----------------------------------------------------------------------------
-KMFolderDir* KMFolderNode::parent(void) const
+KMFolderDir* KMFolderNode::tqparent(void) const
 {
   return mParent;
 }
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index 2eb197a3..a3bb03c3 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -26,16 +26,17 @@
 
 class KMFolderDir;
 
-class KMFolderNode: public QObject
+class KMFolderNode: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFolderNode( KMFolderDir * parent, const TQString & name );
+  KMFolderNode( KMFolderDir * tqparent, const TQString & name );
   virtual ~KMFolderNode();
 
   /** Is it a directory where mail folders are stored or is it a folder that
-    tqcontains mail ?
+    contains mail ?
     Note that there are some kinds of mail folders like the type mh uses that
     are directories on disk but are handled as folders here. */
   virtual bool isDir(void) const;
@@ -43,12 +44,12 @@ public:
 
   /** Returns ptr to owning directory object or 0 if none. This
     is just a wrapper for convenient access. */
-  KMFolderDir* parent(void) const ;
+  KMFolderDir* tqparent(void) const ;
   void setParent( KMFolderDir* aParent );
-  //	{ return (KMFolderDir*)KMFolderNodeInherited::parent(); }
+  //	{ return (KMFolderDir*)KMFolderNodeInherited::tqparent(); }
 
   /** Returns full path to the directory where this node is stored or 0
-   if the node has no parent. Example: if this object represents a folder
+   if the node has no tqparent. Example: if this object represents a folder
    ~joe/Mail/inbox then path() returns "/home/joe/Mail" and name() returns
    "inbox". */
   virtual TQString path() const;
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 471d2f3e..5ebc8b2c 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -69,8 +69,8 @@
 #define IDS_SEARCH_HEADER_LEN 30
 
 
-KMSearch::KMSearch(TQObject * parent, const char * name)
-    :TQObject(parent, name)
+KMSearch::KMSearch(TQObject * tqparent, const char * name)
+    :TQObject(tqparent, name)
 {
     mRemainingFolders = -1;
     mRecursive = true;
@@ -135,11 +135,11 @@ bool KMSearch::inScope(KMFolder* folder) const
         return false;
 
     KMFolderDir *rootDir = mRoot->child();
-    KMFolderDir *ancestorDir = folder->parent();
+    KMFolderDir *ancestorDir = folder->tqparent();
     while ( ancestorDir ) {
         if ( ancestorDir == rootDir )
             return true;
-        ancestorDir = ancestorDir->parent();
+        ancestorDir = ancestorDir->tqparent();
     }
     return false;
 }
@@ -204,7 +204,7 @@ void KMSearch::start()
     }
 
     mRemainingFolders = mFolders.count();
-    mLastFolder = TQString::null;
+    mLastFolder = TQString();
     mProcessNextBatchTimer->start( 0, true );
 }
 
@@ -237,7 +237,7 @@ void KMSearch::stop()
     mRemainingFolders = -1;
     mOpenedFolders.clear();
     mFolders.clear();
-    mLastFolder = TQString::null;
+    mLastFolder = TQString();
     mRunByIndex = mRunning = false;
     emit finished(false);
 }
@@ -304,7 +304,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
       {
         mRemainingFolders = 0;
         mRunning = false;
-        mLastFolder = TQString::null;
+        mLastFolder = TQString();
         mRemainingFolders = -1;
         mFolders.clear();
         emit finished( true );
@@ -688,7 +688,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
        this folder via the inherited method, then clear the imap ones. */
     FolderStorage::ignoreJobsForMessage( msg );
 
-    if (msg->parent()->folderType() == KMFolderTypeImap) {
+    if (msg->tqparent()->folderType() == KMFolderTypeImap) {
         KMAcctImap *account =
             static_cast<KMFolderImap*>( msg->storage() )->account();
         if( !account )
@@ -698,7 +698,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
 }
 
 
-int KMFolderSearch::find(const KMMsgBase* msg) const
+int KMFolderSearch::tqfind(const KMMsgBase* msg) const
 {
     int pos = 0;
     TQ_UINT32 serNum = msg->getMsgSerNum();
@@ -787,7 +787,7 @@ int KMFolderSearch::writeIndex( bool )
 
 DwString KMFolderSearch::getDwString(int idx)
 {
-    return getMsgBase(idx)->parent()->getDwString( idx );
+    return getMsgBase(idx)->tqparent()->getDwString( idx );
 }
 
 KMMessage* KMFolderSearch::readMsg(int idx)
@@ -910,7 +910,7 @@ KMMsgInfo* KMFolderSearch::setIndexEntry(int idx, KMMessage *msg)
 {
     assert(idx >= 0 && idx < (int)mSerNums.count());
     Q_UNUSED( idx );
-    return msg->storage()->setIndexEntry(msg->parent()->find(msg), msg);
+    return msg->storage()->setIndexEntry(msg->tqparent()->tqfind(msg), msg);
 }
 
 void KMFolderSearch::clearIndex(bool, bool)
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index ced2af35..a3a1bc92 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -49,12 +49,13 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-class KMSearch: public QObject
+class KMSearch: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMSearch(TQObject * parent = 0, const char * name = 0);
+  KMSearch(TQObject * tqparent = 0, const char * name = 0);
   ~KMSearch();
 
   bool write(TQString location) const;
@@ -109,6 +110,7 @@ private:
 class KMFolderSearch: public FolderStorage
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMFolderSearchJob;
 public:
   KMFolderSearch(KMFolder* folder, const char* name=0);
@@ -179,7 +181,7 @@ public:
   virtual bool isReadOnly() const;
   virtual const KMMsgBase* getMsgBase(int idx) const;
   virtual KMMsgBase* getMsgBase(int idx);
-  virtual int find(const KMMsgBase* msg) const;
+  virtual int tqfind(const KMMsgBase* msg) const;
   virtual TQString indexLocation() const;
   virtual int writeIndex( bool createEmptyIndex = false );
   DwString getDwString(int idx);
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index 00849b6e..b1df389a 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -18,20 +18,20 @@
 
 using namespace KMail;
 //-----------------------------------------------------------------------------
-KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption,
+KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption,
     bool mustBeReadWrite, bool useGlobalSettings )
-  : KDialogBase( parent, "folder dialog", true, caption,
+  : KDialogBase( tqparent, "folder dialog", true, caption,
                  Ok|Cancel|User1, Ok, true,
                  KGuiItem(i18n("&New Subfolder..."), "folder_new",
                    i18n("Create a new subfolder under the currently selected folder"))
-               ), // mainwin as parent, modal
+               ), // mainwin as tqparent, modal
     mUseGlobalSettings( useGlobalSettings )
 {
-  KMFolderTree * ft = parent->folderTree();
+  KMFolderTree * ft = tqparent->folderTree();
   assert( ft );
 
   TQString preSelection = mUseGlobalSettings ?
-    GlobalSettings::self()->lastSelectedFolder() : TQString::null;
+    GlobalSettings::self()->lastSelectedFolder() : TQString();
   TQWidget * container = makeVBoxMainWidget();
   new TQLabel( i18n("You can start typing to filter the list of folders"), container );
   mTreeView = new KMail::SimpleFolderTree( container, ft,
@@ -40,17 +40,17 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption,
 }
 
 //----------------------------------------------------------------------------
-KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree,
+KMFolderSelDlg::KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree,
     const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings )
-  : KDialogBase( parent, "folder dialog", true, caption,
+  : KDialogBase( tqparent, "folder dialog", true, caption,
                  Ok|Cancel|User1, Ok, true,
                  KGuiItem(i18n("&New Subfolder..."), "folder_new",
                    i18n("Create a new subfolder under the currently selected folder"))
-               ), // mainwin as parent, modal
+               ), // mainwin as tqparent, modal
     mUseGlobalSettings( useGlobalSettings )
 {
   TQString preSelection = mUseGlobalSettings ?
-    GlobalSettings::self()->lastSelectedFolder() : TQString::null;
+    GlobalSettings::self()->lastSelectedFolder() : TQString();
   TQWidget * container = makeVBoxMainWidget();
   new TQLabel( i18n("You can start typing to filter the list of folders"), container );
   mTreeView = new KMail::SimpleFolderTree( container, tree,
@@ -65,7 +65,7 @@ void KMFolderSelDlg::init()
   connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
            this, TQT_SLOT( slotSelect() ) );
   connect( mTreeView, TQT_SIGNAL( selectionChanged() ),
-           this, TQT_SLOT( slotUpdateBtnStatus() ) );
+           this, TQT_SLOT( slotUpdateBtntqStatus() ) );
 
   readConfig();
 }
@@ -107,7 +107,7 @@ void KMFolderSelDlg::slotUser1()
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderSelDlg::slotUpdateBtnStatus()
+void KMFolderSelDlg::slotUpdateBtntqStatus()
 {
   enableButton( User1, folder() &&
                 ( !folder()->noContent() && !folder()->noChildren() ) );
diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index f1637a2f..81bdd7eb 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -21,17 +21,18 @@ namespace KMail {
   class KMFolderSelDlg: public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /** 
        * Constructor with KMMainWidget
-       * @p parent @em must be a KMMainWin, because we
+       * @p tqparent @em must be a KMMainWin, because we
        *    need its foldertree.
        * @param mustBeReadWrite if true, readonly folders are disabled
        * @param useGlobalSettings if true, the current folder is read and 
        *        written to GlobalSettings
        */
-      KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, 
+      KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption, 
           bool mustBeReadWrite, bool useGlobalSettings = true );
       /**
        * Constructor with separate KMFolderTree
@@ -39,7 +40,7 @@ namespace KMail {
        * @param useGlobalSettings if true, the current folder is read and 
        *        written to GlobalSettings
        */ 
-      KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree,
+      KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree,
           const TQString& caption, bool mustBeReadWrite, 
           bool useGlobalSettings = true );
 
@@ -57,7 +58,7 @@ namespace KMail {
     protected slots:
       void slotSelect();
       void slotUser1();
-      void slotUpdateBtnStatus();
+      void slotUpdateBtntqStatus();
 
     protected:
       void readConfig();
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 86dab412..edd641cc 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -51,10 +51,10 @@ using namespace KPIM;
 
 //=============================================================================
 
-KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                                     KFolderTreeItem::Protocol protocol )
-  : TQObject( parent, name.latin1() ),
-    KFolderTreeItem( parent, name, protocol, Root ),
+  : TQObject( tqparent, name.latin1() ),
+    KFolderTreeItem( tqparent, name, protocol, Root ),
     mFolder( 0 ), mNeedsRepaint( true )
 {
   init();
@@ -62,10 +62,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
 }
 
 //-----------------------------------------------------------------------------
-KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                     KMFolder* folder )
-  : TQObject( parent, name.latin1() ),
-    KFolderTreeItem( parent, name ),
+  : TQObject( tqparent, name.latin1() ),
+    KFolderTreeItem( tqparent, name ),
     mFolder( folder ), mNeedsRepaint( true )
 {
   init();
@@ -73,10 +73,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
 }
 
 //-----------------------------------------------------------------------------
-KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *parent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *tqparent, const TQString & name,
                     KMFolder* folder )
   : TQObject( 0, name.latin1() ),
-    KFolderTreeItem( parent, name ),
+    KFolderTreeItem( tqparent, name ),
     mFolder( folder ), mNeedsRepaint( true )
 {
   init();
@@ -136,7 +136,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const
     }
     // non-root search folders
     if ( protocol() == KMFolderTreeItem::Search ) {
-      icon = "mail_find";
+      icon = "mail_tqfind";
     }
     if ( mFolder && mFolder->noContent() ) {
       icon = "folder_grey";
@@ -373,9 +373,9 @@ void KMFolderTreeItem::updateCount()
 //=============================================================================
 
 
-KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
+KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent,
                             const char *name )
-  : KMail::FolderTreeBase( mainWidget, parent, name )
+  : KMail::FolderTreeBase( mainWidget, tqparent, name )
   , mUpdateTimer( 0, "mUpdateTimer" )
   , autoopen_timer( 0, "autoopen_timer" )
 {
@@ -712,7 +712,7 @@ void KMFolderTree::slotUpdateOneCount()
 
 //-----------------------------------------------------------------------------
 // Recursively add a directory of folders to the tree of folders
-void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
+void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent )
 {
   for ( KMFolderNode * node = fdir->first() ; node ; node = fdir->next() ) {
     if ( node->isDir() )
@@ -720,7 +720,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
 
     KMFolder * folder = static_cast<KMFolder*>(node);
     KMFolderTreeItem * fti = 0;
-    if (!parent)
+    if (!tqparent)
     {
       // create new root-item, but only if this is not the root of a
       // "groupware folders only" account
@@ -742,8 +742,8 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
       }
 
       // create new child
-      fti = new KMFolderTreeItem( parent, folder->label(), folder );
-      // set folders explicitely to exandable when they have children
+      fti = new KMFolderTreeItem( tqparent, folder->label(), folder );
+      // set folders explicitely to exandable when they have tqchildren
       // this way we can do a listing for IMAP folders when the user expands them
       // even when the child folders are not created yet
       if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) {
@@ -757,7 +757,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
         addDirectory( folder->child(), fti );
       }
 
-      // Check if this is an IMAP resource folder or a no-content parent only
+      // Check if this is an IMAP resource folder or a no-content tqparent only
       // containing groupware folders
       if ( (kmkernel->iCalIface().hideResourceFolder( folder ) || folder->noContent())
             && fti->childCount() == 0 ) {
@@ -858,8 +858,8 @@ void KMFolderTree::slotFolderRemoved(KMFolder *aFolder)
 // Methods for navigating folders with the keyboard
 void KMFolderTree::prepareItem( KMFolderTreeItem* fti )
 {
-  for ( TQListViewItem * parent = fti->parent() ; parent ; parent = parent->parent() )
-    parent->setOpen( true );
+  for ( TQListViewItem * tqparent = fti->tqparent() ; tqparent ; tqparent = tqparent->tqparent() )
+    tqparent->setOpen( true );
   ensureItemVisible( fti );
 }
 
@@ -1086,7 +1086,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
 
   /* Treat the special case of the root and account folders */
   if ((!fti->folder() || (fti->folder()->noContent()
-    && !fti->parent())))
+    && !fti->tqparent())))
   {
     TQString createChild = i18n("&New Subfolder...");
     if (!fti->folder()) createChild = i18n("&New Folder...");
@@ -1184,7 +1184,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
     mMainWidget->action("post_message")->plug(folderMenu);
   }
 
-  if (fti->folder() && fti->parent() && !multiFolder)
+  if (fti->folder() && fti->tqparent() && !multiFolder)
   {
     folderMenu->insertItem(SmallIconSet("configure_shortcuts"),
         i18n("&Assign Shortcut..."),
@@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me)
   }
 
   // react on middle-button only
-  if (btn != Qt::MidButton) {
+  if (btn != TQt::MidButton) {
     KFolderTree::contentsMouseReleaseEvent(me);
     return;
   }
@@ -1264,7 +1264,7 @@ static bool folderHasCreateRights( const KMFolder *folder )
 //-----------------------------------------------------------------------------
 // Create a subfolder.
 // Requires creating the appropriate subdirectory and show a dialog
-void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
+void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent )
 {
   KMFolder *aFolder = folder;
   if ( !aFolder ) {
@@ -1286,8 +1286,8 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
     }
   }
 
-  if ( parent )
-    ( new KMail::NewFolderDialog( parent, aFolder ) )->exec();
+  if ( tqparent )
+    ( new KMail::NewFolderDialog( tqparent, aFolder ) )->exec();
   else
     ( new KMail::NewFolderDialog( this, aFolder ) )->show();
   return;
@@ -1392,7 +1392,7 @@ void KMFolderTree::cleanupConfigFile()
   {
     if ((*grpIt).left(7) != "Folder-") continue;
     name = (*grpIt).mid(7);
-    if (folderMap.find(name) == folderMap.end())
+    if (folderMap.tqfind(name) == folderMap.end())
     {
       KMFolder* folder = kmkernel->findFolderById( name );
       if ( folder ) {
@@ -1522,8 +1522,8 @@ void KMFolderTree::contentsDropEvent( TQDropEvent *e )
     if (fti && mCopySourceFolders.count() == 1)
     {
       KMFolder *source = mCopySourceFolders.first();
-      // if we are dragging to ourselves or to our parent, set fti to 0 so nothing is done
-      if (source == fti->folder() || source->parent()->owner() == fti->folder()) fti = 0;
+      // if we are dragging to ourselves or to our tqparent, set fti to 0 so nothing is done
+      if (source == fti->folder() || source->tqparent()->owner() == fti->folder()) fti = 0;
     }
     if (fti && acceptDrag(e) && ( fti != oldSelected || e->source() != mMainWidget->headers()->viewport() ) )
     {
@@ -1583,22 +1583,22 @@ void KMFolderTree::slotFolderExpanded( TQListViewItem * item )
     KMFolderImap *folder = static_cast<KMFolderImap*>( fti->folder()->storage() );
     // if we should list all folders we limit this to the root folder
     if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() &&
-         fti->parent() ) )
+         fti->tqparent() ) )
       return;
     if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation )
     {
-      // check if all parents are expanded
-      TQListViewItem *parent = item->parent();
-      while ( parent )
+      // check if all tqparents are expanded
+      TQListViewItem *tqparent = item->tqparent();
+      while ( tqparent )
       {
-        if ( !parent->isOpen() )
+        if ( !tqparent->isOpen() )
           return;
-        parent = parent->parent();
+        tqparent = tqparent->tqparent();
       }
       // the tree will be reloaded after that
       bool success = folder->listDirectory();
       if (!success) fti->setOpen( false );
-      if ( fti->childCount() == 0 && fti->parent() )
+      if ( fti->childCount() == 0 && fti->tqparent() )
         fti->setExpandable( false );
     }
   }
@@ -1970,9 +1970,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
   // Disable drag during copy operation since it prevents from many crashes
   setDragEnabled( false );
 
-  KMFolderDir* parent = &(kmkernel->folderMgr()->dir());
+  KMFolderDir* tqparent = &(kmkernel->folderMgr()->dir());
   if ( destination )
-    parent = destination->createChildFolder();
+    tqparent = destination->createChildFolder();
 
   TQStringList sourceFolderNames;
 
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     if ( source )
       sourceFolderName = source->label();
 
-    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
+    if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
           .arg( sourceFolderName ) );
       setDragEnabled( true );
@@ -2002,19 +2002,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
         setDragEnabled( true );
         return;
       }
-      if ( f->parent() )
-        f = f->parent()->owner();
+      if ( f->tqparent() )
+        f = f->tqparent()->owner();
     }
 
     TQString message =
       i18n( "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>" ).
           arg( sourceFolderName );
-    KMFolderDir* folderDir = parent;
+    KMFolderDir* folderDir = tqparent;
     // check that the folder can be moved
     if ( source && source->child() )
     {
       while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
-          ( folderDir != source->parent() ) )
+          ( folderDir != source->tqparent() ) )
       {
         if ( folderDir->findRef( source ) != -1 )
         {
@@ -2022,19 +2022,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
           setDragEnabled( true );
           return;
         }
-        folderDir = folderDir->parent();
+        folderDir = folderDir->tqparent();
       }
     }
 
-    if( source && source->child() && parent &&
-        ( parent->path().find( source->child()->path() + "/" ) == 0 ) ) {
+    if( source && source->child() && tqparent &&
+        ( tqparent->path().tqfind( source->child()->path() + "/" ) == 0 ) ) {
       KMessageBox::error( this, message );
       setDragEnabled( true );
       return;
     }
 
     if( source && source->child()
-        && ( parent == source->child() ) ) {
+        && ( tqparent == source->child() ) ) {
       KMessageBox::error( this, message );
       setDragEnabled( true );
       return;
@@ -2043,20 +2043,20 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
 
   // check if the source folders are independent of each other
   for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it = sources.constBegin(); move && it != sources.constEnd(); ++it ) {
-    KMFolderDir *parentDir = (*it)->child();
-    if ( !parentDir )
+    KMFolderDir *tqparentDir = (*it)->child();
+    if ( !tqparentDir )
       continue;
     for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) {
       if ( *it == *it2 )
         continue;
-      KMFolderDir *childDir = (*it2)->parent();
+      KMFolderDir *childDir = (*it2)->tqparent();
       do {
-        if ( parentDir == childDir || parentDir->findRef( childDir->owner() ) != -1 ) {
+        if ( tqparentDir == childDir || tqparentDir->findRef( childDir->owner() ) != -1 ) {
           KMessageBox::error( this, i18n("Moving the selected folders is not possible") );
           setDragEnabled( true );
           return;
         }
-        childDir = childDir->parent();
+        childDir = childDir->tqparent();
       }
       while ( childDir && childDir != &kmkernel->folderMgr()->dir() );
     }
@@ -2074,9 +2074,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     if ( move ) {
       kdDebug(5006) << "move folder " << (source ? source->label(): "Unknown") << " to "
         << ( destination ? destination->label() : "Local Folders" ) << endl;
-      kmkernel->folderMgr()->moveFolder( source, parent );
+      kmkernel->folderMgr()->moveFolder( source, tqparent );
     } else {
-      kmkernel->folderMgr()->copyFolder( source, parent );
+      kmkernel->folderMgr()->copyFolder( source, tqparent );
     }
   }
 }
@@ -2085,7 +2085,7 @@ TQDragObject * KMFolderTree::dragObject()
 {
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>
       (itemAt(viewport()->mapFromGlobal(TQCursor::pos())));
-  if ( !item || !item->parent() || !item->folder() ) // top-level items or something invalid
+  if ( !item || !item->tqparent() || !item->folder() ) // top-level items or something invalid
     return 0;
   mCopySourceFolders = selectedFolders();
 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 640da950..73704df4 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -45,17 +45,18 @@ template <typename T> class TQGuardedPtr;
 class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Construct a root item _without_ folder */
-  KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+  KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                     KFolderTreeItem::Protocol protocol=KFolderTreeItem::NONE );
 
   /** Construct a root item _with_ folder */
-  KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+  KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                     KMFolder* folder );
 
   /** Construct a child item */
-  KMFolderTreeItem( KFolderTreeItem* parent, const TQString & name,
+  KMFolderTreeItem( KFolderTreeItem* tqparent, const TQString & name,
                     KMFolder* folder );
   virtual ~KMFolderTreeItem();
 
@@ -67,7 +68,7 @@ public:
 
   /** associated folder */
   KMFolder* folder() const { return mFolder; }
-  TQListViewItem* parent() const { return KFolderTreeItem::parent(); }
+  TQListViewItem* tqparent() const { return KFolderTreeItem::tqparent(); }
 
   /** Adjust the unread count from the folder and update the
    * pixmaps accordingly. */
@@ -108,16 +109,17 @@ private:
 class KMFolderTree : public KMail::FolderTreeBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0,
+  KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent=0,
 		const char *name=0 );
 
   /** Save config options */
   void writeConfig();
 
   /** Recusively add folders in a folder directory to a listview item. */
-  virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent );
+  virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent );
 
   /** create a folderlist */
   void createFolderList( TQStringList *str,
@@ -165,7 +167,7 @@ public:
     MoveFolder
   };
 
-  /** Generate a popup menu that tqcontains all folders that can have content */
+  /** Generate a popup menu that contains all folders that can have content */
   void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *,
       TQPopupMenu *menu, TQListViewItem *start = 0 );
 
@@ -224,7 +226,7 @@ public slots:
   void slotResetFolderList( TQListViewItem* item = 0, bool startList = true );
 
   /** Create a child folder */
-  void addChildFolder( KMFolder *folder = 0, TQWidget * parent = 0 );
+  void addChildFolder( KMFolder *folder = 0, TQWidget * tqparent = 0 );
 
   /** Copies the currently selected folder. */
   void copyFolder();
diff --git a/kmail/kmgroupware.cpp b/kmail/kmgroupware.cpp
index 47bcf33b..92c3a01f 100644
--- a/kmail/kmgroupware.cpp
+++ b/kmail/kmgroupware.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/kmgroupware.h b/kmail/kmgroupware.h
index 0c815b4c..27fa3a35 100644
--- a/kmail/kmgroupware.h
+++ b/kmail/kmgroupware.h
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 5afc9d81..f20ceb99 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -22,7 +22,7 @@ using KMail::ActionScheduler;
 #include "messagecopyhelper.h"
 using KMail::MessageCopyHelper;
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 using KPIM::ProgressItem;
@@ -92,9 +92,9 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0;
 
 
 //-----------------------------------------------------------------------------
-KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
+KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent,
                      const char *name) :
-  KListView( parent, name ),
+  KListView( tqparent, name ),
   mIgnoreSortOrderChanges( false )
 {
   static bool pixmapsLoaded = false;
@@ -129,7 +129,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
   mPopup = new KPopupMenu(this);
   mPopup->insertTitle(i18n("View Columns"));
   mPopup->setCheckable(true);
-  mPopup->insertItem(i18n("Status"),          KPaintInfo::COL_STATUS);
+  mPopup->insertItem(i18n("tqStatus"),          KPaintInfo::COL_STATUS);
   mPopup->insertItem(i18n("Important"),       KPaintInfo::COL_IMPORTANT);
   mPopup->insertItem(i18n("Action Item"),     KPaintInfo::COL_TODO);
   mPopup->insertItem(i18n("Attachment"),      KPaintInfo::COL_ATTACHMENT);
@@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode)
     }
     case KPaintInfo::COL_STATUS:
     {
-      show  = &mPaintInfo.showStatus;
+      show  = &mPaintInfo.showtqStatus;
       col   = &mPaintInfo.statusCol;
       width = pixNew->width() + 8;
       if ( *col == header()->mapToIndex( *col ) )
@@ -622,7 +622,7 @@ void KMHeaders::readFolderConfig (void)
   mCurrentItemSerNum = config->readNumEntry("CurrentSerialNum", 0);
 
   mPaintInfo.orderOfArrival = config->readBoolEntry( "OrderOfArrival", false );
-  mPaintInfo.status = config->readBoolEntry( "Status", false );
+  mPaintInfo.status = config->readBoolEntry( "tqStatus", false );
 
   { //area for config group "Geometry"
     KConfigGroupSaver saver(config, "Geometry");
@@ -653,7 +653,7 @@ void KMHeaders::writeFolderConfig (void)
   config->writeEntry("CurrentSerialNum", sernum);
 
   config->writeEntry("OrderOfArrival", mPaintInfo.orderOfArrival);
-  config->writeEntry("Status", mPaintInfo.status);
+  config->writeEntry("tqStatus", mPaintInfo.status);
 }
 
 //-----------------------------------------------------------------------------
@@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void)
   config->writeEntry("showTodoColumn"          , mPaintInfo.showTodo);
   config->writeEntry("showSpamHamColumn"       , mPaintInfo.showSpamHam);
   config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored);
-  config->writeEntry("showStatusColumn"        , mPaintInfo.showStatus);
+  config->writeEntry("showStatusColumn"        , mPaintInfo.showtqStatus);
   config->writeEntry("showSignedColumn"        , mPaintInfo.showSigned);
   config->writeEntry("showCryptoColumn"        , mPaintInfo.showCrypto);
   config->writeEntry("showReceiverColumn"      , mPaintInfo.showReceiver);
@@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       highlightMessage(0, false);
 
       disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-          this, TQT_SLOT(setFolderInfoStatus()));
+          this, TQT_SLOT(setFolderInfotqStatus()));
 
       mFolder->markNewAsUnread();
       writeFolderConfig();
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                  BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,9 +752,9 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+              BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-          this, TQT_SLOT(setFolderInfoStatus()));
+          this, TQT_SLOT(setFolderInfotqStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
 
       // Not very nice, but if we go from nested to non-nested
@@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
     END_TIMER(updateMsg);
     SHOW_TIMER(updateMsg);
     makeHeaderVisible();
-    setFolderInfoStatus();
+    setFolderInfotqStatus();
 
     TQString colText = i18n( "Sender" );
     if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver)
@@ -803,7 +803,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
 
     colText = i18n( "Subject" );
     if (mPaintInfo.status)
-      colText = colText + i18n( " (Status)" );
+      colText = colText + i18n( " (tqStatus)" );
     setColumnText( mPaintInfo.subCol, colText);
   }
 
@@ -920,26 +920,26 @@ void KMHeaders::msgAdded(int id)
       msgId = "";
     TQString replyToId = mFolder->getMsgBase(id)->replyToIdMD5();
 
-    SortCacheItem *parent = findParent( sci );
-    if (!parent && mSubjThreading) {
-      parent = findParentBySubject( sci );
-      if (parent && sci->isImperfectlyThreaded()) {
-        // The parent we found could be by subject, in which case it is
+    SortCacheItem *tqparent = findParent( sci );
+    if (!tqparent && mSubjThreading) {
+      tqparent = findParentBySubject( sci );
+      if (tqparent && sci->isImperfectlyThreaded()) {
+        // The tqparent we found could be by subject, in which case it is
         // possible, that it would be preferrable to thread it below us,
         // not the other way around. Check that. This is not only
         // cosmetic, as getting this wrong leads to circular threading.
-        if (msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToIdMD5()
-         || msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToAuxIdMD5())
-          parent = NULL;
+        if (msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToIdMD5()
+         || msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToAuxIdMD5())
+          tqparent = NULL;
       }
     }
 
-    if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
-    else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
-    if (parent)
-      hi = new HeaderItem( parent->item(), id );
+    if (tqparent && mFolder->getMsgBase(tqparent->id())->isWatched())
+      mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched );
+    else if (tqparent && mFolder->getMsgBase(tqparent->id())->isIgnored())
+      mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored );
+    if (tqparent)
+      hi = new HeaderItem( tqparent->item(), id );
     else
       hi = new HeaderItem( this, id );
 
@@ -953,16 +953,16 @@ void KMHeaders::msgAdded(int id)
 
     if ( !msgId.isEmpty() )
       mSortCacheItems.tqreplace(msgId, sci);
-    /* Add to the list of potential parents for subject threading. But only if
+    /* Add to the list of potential tqparents for subject threading. But only if
      * we are top level. */
-    if (mSubjThreading && parent) {
+    if (mSubjThreading && tqparent) {
       TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5();
       if (subjMD5.isEmpty()) {
         mFolder->getMsgBase(id)->initStrippedSubjectMD5();
         subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5();
       }
       if( !subjMD5.isEmpty()) {
-        if ( !mSubjectLists.find(subjMD5) )
+        if ( !mSubjectLists.tqfind(subjMD5) )
           mSubjectLists.insert(subjMD5, new TQPtrList<SortCacheItem>());
         // insertion sort by date. See buildThreadTrees for details.
         int p=0;
@@ -977,7 +977,7 @@ void KMHeaders::msgAdded(int id)
         sci->setSubjectThreadingList( mSubjectLists[subjMD5] );
       }
     }
-    // The message we just added might be a better parent for one of the as of
+    // The message we just added might be a better tqparent for one of the as of
     // yet imperfectly threaded messages. Let's find out.
 
     /* In case the current item is taken during reparenting, prevent qlistview
@@ -1006,7 +1006,7 @@ void KMHeaders::msgAdded(int id)
           if (msgId != otherMsg->replyToAuxIdMD5())
             continue;
           else {
-            if (!otherId.isEmpty() && mSortCacheItems.find(otherId))
+            if (!otherId.isEmpty() && mSortCacheItems.tqfind(otherId))
               continue;
             else
               // Thread below us by aux id, but keep on the list of
@@ -1017,8 +1017,8 @@ void KMHeaders::msgAdded(int id)
         TQListViewItem *newParent = mItems[id];
         TQListViewItem *msg = mItems[tryMe];
 
-        if (msg->parent())
-          msg->parent()->takeItem(msg);
+        if (msg->tqparent())
+          msg->tqparent()->takeItem(msg);
         else
           takeItem(msg);
         newParent->insertItem(msg);
@@ -1029,7 +1029,7 @@ void KMHeaders::msgAdded(int id)
 
         if (perfectParent) {
           mImperfectlyThreadedList.removeRef (mItems[tryMe]);
-          // The item was imperfectly thread before, now it's parent
+          // The item was imperfectly thread before, now it's tqparent
           // is there. Update the .sorted file accordingly.
           TQString sortFile = KMAIL_SORT_FILE(mFolder);
           FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+");
@@ -1110,17 +1110,17 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       if (mSortCacheItems[msgId] == removedItem->sortCacheItem())
         mSortCacheItems.remove(msgId);
     }
-    // Remove the message from the list of potential parents for threading by
+    // Remove the message from the list of potential tqparents for threading by
     // subject.
     if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() )
       removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() );
 
-    // Reparent children of item.
+    // Retqparent tqchildren of item.
     TQListViewItem *myParent = removedItem;
     TQListViewItem *myChild = myParent->firstChild();
     TQListViewItem *threadRoot = myParent;
-    while (threadRoot->parent())
-      threadRoot = threadRoot->parent();
+    while (threadRoot->tqparent())
+      threadRoot = threadRoot->tqparent();
     TQString key = static_cast<HeaderItem*>(threadRoot)->key(mSortCol, !mSortDescending);
 
     TQPtrList<TQListViewItem> childList;
@@ -1148,26 +1148,26 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       TQListViewItem *lvi = *it;
       HeaderItem *item = static_cast<HeaderItem*>(lvi);
       SortCacheItem *sci = item->sortCacheItem();
-      SortCacheItem *parent = findParent( sci );
-      if ( !parent && mSubjThreading )
-        parent = findParentBySubject( sci );
+      SortCacheItem *tqparent = findParent( sci );
+      if ( !tqparent && mSubjThreading )
+        tqparent = findParentBySubject( sci );
 
-      Q_ASSERT( !parent || parent->item() != removedItem );
+      Q_ASSERT( !tqparent || tqparent->item() != removedItem );
       myParent->takeItem(lvi);
-      if ( parent && parent->item() != item && parent->item() != removedItem ) {
-        parent->item()->insertItem(lvi);
-        parent->addSortedChild( sci );
+      if ( tqparent && tqparent->item() != item && tqparent->item() != removedItem ) {
+        tqparent->item()->insertItem(lvi);
+        tqparent->addSortedChild( sci );
       } else {
         insertItem(lvi);
         mRoot->addSortedChild( sci );
       }
 
-      if ((!parent || sci->isImperfectlyThreaded())
-                      && !mImperfectlyThreadedList.tqcontainsRef(item))
+      if ((!tqparent || sci->isImperfectlyThreaded())
+                      && !mImperfectlyThreadedList.containsRef(item))
         mImperfectlyThreadedList.append(item);
 
-      if (parent && !sci->isImperfectlyThreaded()
-          && mImperfectlyThreadedList.tqcontainsRef(item))
+      if (tqparent && !sci->isImperfectlyThreaded()
+          && mImperfectlyThreadedList.containsRef(item))
         mImperfectlyThreadedList.removeRef(item);
     }
   }
@@ -1220,7 +1220,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
 
 
 //-----------------------------------------------------------------------------
-void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle)
+void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle)
 {
   //  kdDebug() << k_funcinfo << endl;
   SerNumList serNums = selectedVisibleSernums();
@@ -1242,8 +1242,8 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const
 
   // ...find the top-level item:
   TQListViewItem *topOfThread = curItem;
-  while ( topOfThread->parent() )
-    topOfThread = topOfThread->parent();
+  while ( topOfThread->tqparent() )
+    topOfThread = topOfThread->tqparent();
 
   // collect the items in this thread:
   TQPtrList<TQListViewItem> list;
@@ -1254,7 +1254,7 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const
   return list;
 }
 
-void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
+void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle)
 {
   TQPtrList<TQListViewItem> curThread;
 
@@ -1266,8 +1266,8 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
       if (item->isSelected() ) {
         // ...find the top-level item:
         TQListViewItem *top = item;
-        while ( top->parent() )
-          top = top->parent();
+        while ( top->tqparent() )
+          top = top->tqparent();
         if (!topOfThreads.tqcontains(top)) {
           topOfThreads.append(top);
         }
@@ -1313,11 +1313,11 @@ int KMHeaders::slotFilterMsg(KMMessage *msg)
     kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
     return 2;
   }
-  if (msg->parent()) { // unGet this msg
+  if (msg->tqparent()) { // unGet this msg
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
-    assert( p == msg->parent() ); assert( idx >= 0 );
+    assert( p == msg->tqparent() ); assert( idx >= 0 );
     p->unGetMsg( idx );
   }
 
@@ -1328,13 +1328,13 @@ int KMHeaders::slotFilterMsg(KMMessage *msg)
 void KMHeaders::slotExpandOrCollapseThread( bool expand )
 {
   if ( !isThreaded() ) return;
-  // find top-level parent of currentItem().
+  // find top-level tqparent of currentItem().
   TQListViewItem *item = currentItem();
   if ( !item ) return;
   clearSelection();
   item->setSelected( true );
-  while ( item->parent() )
-    item = item->parent();
+  while ( item->tqparent() )
+    item = item->tqparent();
   HeaderItem * hdrItem = static_cast<HeaderItem*>(item);
   hdrItem->setOpenRecursive( expand );
   if ( !expand ) // collapse can hide the current item:
@@ -1358,8 +1358,8 @@ void KMHeaders::slotExpandOrCollapseAllThreads( bool expand )
   if ( !expand ) { // collapse can hide the current item:
     TQListViewItem * item = currentItem();
     if( item ) {
-      while ( item->parent() )
-        item = item->parent();
+      while ( item->tqparent() )
+        item = item->tqparent();
       setCurrentMsg( static_cast<HeaderItem*>(item)->msgId() );
     }
   }
@@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle )
 }
 
 //-----------------------------------------------------------------------------
-void KMHeaders::setFolderInfoStatus ()
+void KMHeaders::setFolderInfotqStatus ()
 {
   if ( !mFolder ) return;
   TQString str;
@@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfoStatus ()
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
     str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
-  BroadcasStatus::instance()->seStatusMsg(str);
+  BroadcastqStatus::instance()->seStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-        KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
+        KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcasStatus::instance()->seStatusMsg("");
+  BroadcastqStatus::instance()->seStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,7 +1620,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcasStatus::instance()->seStatusMsg(
+    BroadcastqStatus::instance()->seStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcasStatus::instance()->seStatusMsg(
+      BroadcastqStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcasStatus::instance()->seStatusMsg(
+      BroadcastqStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur)
     setSelectionAnchor( currentItem() );
   }
   makeHeaderVisible();
-  setFolderInfoStatus();
+  setFolderInfotqStatus();
 }
 
 //-----------------------------------------------------------------------------
@@ -1713,8 +1713,8 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected )
   if ( item->isVisible() )
     KListView::setSelected( item, selected );
 
-  // If the item is the parent of a closed thread recursively select
-  // children .
+  // If the item is the tqparent of a closed thread recursively select
+  // tqchildren .
   if ( isThreaded() && !item->isOpen() && item->firstChild() ) {
       TQListViewItem *nextRoot = item->itemBelow();
       TQListViewItemIterator it( item->firstChild() );
@@ -1826,14 +1826,14 @@ void KMHeaders::selectNextMessage()
     if (lvi && below ) {
       while (temp) {
         temp->firstChild();
-        temp = temp->parent();
+        temp = temp->tqparent();
       }
       lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
       makeHeaderVisible();
-      setFolderInfoStatus();
+      setFolderInfotqStatus();
     }
   }
 }
@@ -1864,14 +1864,14 @@ void KMHeaders::selectPrevMessage()
     if (lvi && above) {
       while (temp) {
         temp->firstChild();
-        temp = temp->parent();
+        temp = temp->tqparent();
       }
       lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
       makeHeaderVisible();
-      setFolderInfoStatus();
+      setFolderInfotqStatus();
     }
   }
 }
@@ -1997,11 +1997,11 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept
   // first unread item.
   //
   // Find the ancestor of the unread item closest to the
-  // root and recursively sort all of that ancestors children.
+  // root and recursively sort all of that ancestors tqchildren.
   if (item) {
     TQListViewItem *next = item;
-    while (next->parent())
-      next = next->parent();
+    while (next->tqparent())
+      next = next->tqparent();
     next = static_cast<HeaderItem*>(next)->firstChildNonConst();
     while (next && (next != item))
       if (static_cast<HeaderItem*>(next)->firstChildNonConst())
@@ -2010,7 +2010,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept
         next = next->nextSibling();
       else {
         while (next && (next != item)) {
-          next = next->parent();
+          next = next->tqparent();
           if (next == item)
             break;
           if (next && next->nextSibling()) {
@@ -2135,12 +2135,12 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcasStatus::instance()->seStatusMsg("");
+  BroadcastqStatus::instance()->seStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
   mItems[idx]->tqrepaint();
   emit selected( msg );
-  setFolderInfoStatus();
+  setFolderInfotqStatus();
 }
 
 void KMHeaders::highlightCurrentThread()
@@ -2288,9 +2288,9 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
         && (  mPressPos.x() >= header()->cellPos(  header()->mapToActual(  0 ) ) );
 
      if ( rootDecoClicked ) {
-        // Check if our item is the parent of a closed thread and if so, if the root
+        // Check if our item is the tqparent of a closed thread and if so, if the root
         // decoration of the item was clicked (i.e. the +/- sign) which would expand
-        // the thread. In that case, deselect all children, so opening the thread
+        // the thread. In that case, deselect all tqchildren, so opening the thread
         // doesn't cause a flicker.
         if ( !lvi->isOpen() && lvi->firstChild() ) {
            TQListViewItem *nextRoot = lvi->itemBelow();
@@ -2303,7 +2303,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
 
   // let klistview do it's thing, expanding/collapsing, selection/deselection
   KListView::contentsMousePressEvent(e);
-  /* QListView's shift-select selects also invisible items. Until that is
+  /* TQListView's shift-select selects also invisible items. Until that is
      fixed, we have to deselect hidden items here manually, so the quick
      search doesn't mess things up. */
   if ( e->state() & ShiftButton ) {
@@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
   }
 
   if ( rootDecoClicked ) {
-      // select the thread's children after closing if the parent is selected
+      // select the thread's tqchildren after closing if the tqparent is selected
      if ( lvi && !lvi->isOpen() && lvi->isSelected() )
         setSelected( lvi, true );
   }
@@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     if ( lvi != currentItem() )
       highlightMessage( lvi );
     /* Explicitely set selection state. This is necessary because we want to
-     * also select all children of closed threads when the parent is selected. */
+     * also select all tqchildren of closed threads when the tqparent is selected. */
 
     // unless ctrl tqmask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
@@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     HeaderItem *item = static_cast<HeaderItem*>( lvi );
     KMMsgBase *msg = mFolder->getMsgBase(item->msgId());
     if ( section == mPaintInfo.flagCol && flagsToggleable ) {
-      setMsgStatus( KMMsgStatusFlag, true );
+      setMsgtqStatus( KMMsgStatusFlag, true );
     } else if ( section == mPaintInfo.importantCol && flagsToggleable ) {
-      setMsgStatus( KMMsgStatusFlag, true );
+      setMsgtqStatus( KMMsgStatusFlag, true );
     } else if ( section == mPaintInfo.todoCol && flagsToggleable ) {
-      setMsgStatus( KMMsgStatusTodo, true );
+      setMsgtqStatus( KMMsgStatusTodo, true );
     } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) {
       if ( msg->isWatched() || msg->isIgnored() )
-        setMsgStatus( KMMsgStatusIgnored, true );
+        setMsgtqStatus( KMMsgStatusIgnored, true );
       else
-        setMsgStatus( KMMsgStatusWatched, true );
+        setMsgtqStatus( KMMsgStatusWatched, true );
     } else if ( section == mPaintInfo.statusCol ) {
       if ( msg->isUnread() || msg->isNew() )
-        setMsgStatus( KMMsgStatusRead );
+        setMsgtqStatus( KMMsgStatusRead );
       else
-        setMsgStatus( KMMsgStatusUnread );
+        setMsgtqStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -2645,7 +2645,7 @@ void KMHeaders::setSorting( int column, bool ascending )
 
     colText = i18n( "Subject" );
     if (mPaintInfo.status)
-      colText = colText + i18n( " (Status)" );
+      colText = colText + i18n( " (tqStatus)" );
     setColumnText( mPaintInfo.subCol, colText);
   }
   KListView::setSorting( column, ascending );
@@ -2660,23 +2660,23 @@ void KMHeaders::setSorting( int column, bool ascending )
 
 //Flatten the list and write it to disk
 static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid,
-                              int parent_id, TQString key,
+                              int tqparent_id, TQString key,
                               bool update_discover=true)
 {
   unsigned long msgSerNum;
-  unsigned long parentSerNum;
+  unsigned long tqparentSerNum;
   msgSerNum = KMMsgDict::instance()->getMsgSerNum( folder, msgid );
-  if (parent_id >= 0)
-    parentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, parent_id ) + KMAIL_RESERVED;
+  if (tqparent_id >= 0)
+    tqparentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, tqparent_id ) + KMAIL_RESERVED;
   else
-    parentSerNum = (unsigned long)(parent_id + KMAIL_RESERVED);
+    tqparentSerNum = (unsigned long)(tqparent_id + KMAIL_RESERVED);
 
   fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream);
-  fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream);
+  fwrite(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream);
   TQ_INT32 len = key.length() * sizeof(TQChar);
   fwrite(&len, sizeof(len), 1, sortStream);
   if (len)
-    fwrite(key.tqunicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
+    fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
 
   if (update_discover) {
     //update the discovered change count
@@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder()
 
     KMMsgBase *kmb;
     while(HeaderItem *i = items.pop()) {
-      int parent_id = -1; //no parent, top level
+      int tqparent_id = -1; //no tqparent, top level
       if (threaded) {
         kmb = mFolder->getMsgBase( i->msgId() );
         assert(kmb); // I have seen 0L come out of this, called from
@@ -2781,8 +2781,8 @@ bool KMHeaders::writeSortOrder()
           p = mSortCacheItems[replymd5];
 
         if (p)
-          parent_id = p->id();
-        // We now have either found a parent, or set it to -1, which means that
+          tqparent_id = p->id();
+        // We now have either found a tqparent, or set it to -1, which means that
         // it will be reevaluated when a message is added, for example. If there
         // is no replyToId and no replyToAuxId and the message is not prefixed,
         // this message is top level, and will always be, so no need to
@@ -2790,12 +2790,12 @@ bool KMHeaders::writeSortOrder()
         if (replymd5.isEmpty()
             && replyToAuxId.isEmpty()
             && !kmb->subjectIsPrefixed() )
-          parent_id = -2;
+          tqparent_id = -2;
         // FIXME also mark messages with -1 as -2 a certain amount of time after
-        // their arrival, since it becomes very unlikely that a new parent for
+        // their arrival, since it becomes very unlikely that a new tqparent for
         // them will show up. (Ingo suggests a month.) -till
       }
-      internalWriteItem(sortStream, mFolder, i->msgId(), parent_id,
+      internalWriteItem(sortStream, mFolder, i->msgId(), tqparent_id,
                         i->key(mSortCol, !mSortDescending), false);
       //double check for magic headers
       sorted_count++;
@@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder()
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile ));
     }
     fclose(sortStream);
     ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile));
@@ -2828,20 +2828,20 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
 {
   TQString sortFile = KMAIL_SORT_FILE(mFolder);
   if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) {
-    int parent_id = -1; //no parent, top level
+    int tqparent_id = -1; //no tqparent, top level
 
     if (isThreaded()) {
       SortCacheItem *sci = khi->sortCacheItem();
       KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() );
-      if(sci->parent() && !sci->isImperfectlyThreaded())
-        parent_id = sci->parent()->id();
+      if(sci->tqparent() && !sci->isImperfectlyThreaded())
+        tqparent_id = sci->tqparent()->id();
       else if(kmb->replyToIdMD5().isEmpty()
            && kmb->replyToAuxIdMD5().isEmpty()
            && !kmb->subjectIsPrefixed())
-        parent_id = -2;
+        tqparent_id = -2;
     }
 
-    internalWriteItem(sortStream, mFolder, khi->msgId(), parent_id,
+    internalWriteItem(sortStream, mFolder, khi->msgId(), tqparent_id,
                       khi->key(mSortCol, !mSortDescending), false);
 
     //update the appended flag FIXME obsolete?
@@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile ));
     }
     fclose(sortStream);
   } else {
@@ -2872,7 +2872,7 @@ void KMHeaders::dirtySortOrder(int column)
 
 // -----------------
 void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder,
-                                      bool waiting_for_parent, bool update_discover)
+                                      bool waiting_for_tqparent, bool update_discover)
 {
     if(mSortOffset == -1) {
         fseek(sortStream, 0, SEEK_END);
@@ -2881,12 +2881,12 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder,
         fseek(sortStream, mSortOffset, SEEK_SET);
     }
 
-    int parent_id = -1;
-    if(!waiting_for_parent) {
+    int tqparent_id = -1;
+    if(!waiting_for_tqparent) {
         if(mParent && !isImperfectlyThreaded())
-            parent_id = mParent->id();
+            tqparent_id = mParent->id();
     }
-    internalWriteItem(sortStream, folder, mId, parent_id, mKey, update_discover);
+    internalWriteItem(sortStream, folder, mId, tqparent_id, mKey, update_discover);
 }
 
 static bool compare_ascending = false;
@@ -2931,9 +2931,9 @@ void KMHeaders::printThreadingTree()
     }
     for (int i = 0; i < (int)mItems.size(); ++i) {
       HeaderItem *item = mItems[i];
-      int parentCacheId = item->sortCacheItem()->parent()?item->sortCacheItem()->parent()->id():0;
-      kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " parent: " << parentCacheId << endl;
-      kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " parent: " << item->sortCacheItem()->parent() << endl;
+      int tqparentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0;
+      kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << tqparentCacheId << endl;
+      kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " tqparent: " << item->sortCacheItem()->tqparent() << endl;
     }
     kdDebug(5006) << endl;
 }
@@ -2962,8 +2962,8 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache
 
     for(int x = 0; x < mFolder->count(); x++) {
         // Only a lot items that are now toplevel
-        if ( sortCache[x]->parent()
-          && sortCache[x]->parent()->id() != -666 ) continue;
+        if ( sortCache[x]->tqparent()
+          && sortCache[x]->tqparent()->id() != -666 ) continue;
         KMMsgBase *mi = mFolder->getMsgBase(x);
         TQString subjMD5 = mi->strippedSubjectMD5();
         if (subjMD5.isEmpty()) {
@@ -2974,7 +2974,7 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache
 
         /* For each subject, keep a list of items with that subject
          * (stripped of prefixes) sorted by date. */
-        if (!mSubjectLists.find(subjMD5))
+        if (!mSubjectLists.tqfind(subjMD5))
             mSubjectLists.insert(subjMD5, new TQPtrList<SortCacheItem>());
         /* Insertion sort by date. These lists are expected to be very small.
          * Also, since the messages are roughly ordered by date in the store,
@@ -2996,36 +2996,36 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache
 
 SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
 {
-    SortCacheItem *parent = NULL;
-    if (!item) return parent;
+    SortCacheItem *tqparent = NULL;
+    if (!item) return tqparent;
     KMMsgBase *msg =  mFolder->getMsgBase(item->id());
     TQString replyToIdMD5 = msg->replyToIdMD5();
     item->setImperfectlyThreaded(true);
     /* First, try if the message our Reply-To header points to
      * is available to thread below. */
     if(!replyToIdMD5.isEmpty()) {
-        parent = mSortCacheItems[replyToIdMD5];
-        if (parent)
+        tqparent = mSortCacheItems[replyToIdMD5];
+        if (tqparent)
             item->setImperfectlyThreaded(false);
     }
-    if (!parent) {
+    if (!tqparent) {
         // If we dont have a replyToId, or if we have one and the
         // corresponding message is not in this folder, as happens
         // if you keep your outgoing messages in an OUTBOX, for
         // example, try the list of references, because the second
         // to last will likely be in this folder. replyToAuxIdMD5
-        // tqcontains the second to last one.
+        // contains the second to last one.
         TQString  ref = msg->replyToAuxIdMD5();
         if (!ref.isEmpty())
-            parent = mSortCacheItems[ref];
+            tqparent = mSortCacheItems[ref];
     }
-    return parent;
+    return tqparent;
 }
 
 SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
 {
-    SortCacheItem *parent = NULL;
-    if (!item) return parent;
+    SortCacheItem *tqparent = NULL;
+    if (!item) return tqparent;
 
     KMMsgBase *msg =  mFolder->getMsgBase(item->id());
 
@@ -3033,31 +3033,31 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
     // This is necessary to make for example cvs commit mailing lists
     // work as expected without having to turn threading off alltogether.
     if (!msg->subjectIsPrefixed())
-        return parent;
+        return tqparent;
 
     TQString replyToIdMD5 = msg->replyToIdMD5();
     TQString subjMD5 = msg->strippedSubjectMD5();
     if (!subjMD5.isEmpty() && mSubjectLists[subjMD5]) {
-        /* Iterate over the list of potential parents with the same
+        /* Iterate over the list of potential tqparents with the same
          * subject, and take the closest one by date. */
         for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]);
                 it2.current(); ++it2) {
             KMMsgBase *mb = mFolder->getMsgBase((*it2)->id());
-            if ( !mb ) return parent;
+            if ( !mb ) return tqparent;
             // make sure it's not ourselves
             if ( item == (*it2) ) continue;
             int delta = msg->date() - mb->date();
             // delta == 0 is not allowed, to avoid circular threading
             // with duplicates.
             if (delta > 0 ) {
-                // Don't use parents more than 6 weeks older than us.
+                // Don't use tqparents more than 6 weeks older than us.
                 if (delta < 3628899)
-                    parent = (*it2);
+                    tqparent = (*it2);
                 break;
             }
         }
     }
-    return parent;
+    return tqparent;
 }
 
 bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
@@ -3077,7 +3077,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
     bool error = false;
 
     //threaded cases
-    TQPtrList<SortCacheItem> unparented;
+    TQPtrList<SortCacheItem> untqparented;
     mImperfectlyThreadedList.clear();
 
     //cleanup
@@ -3117,8 +3117,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             mSortInfo.ascending = (compare_ascending = ascending);
 
             SortCacheItem *item;
-            unsigned long serNum, parentSerNum;
-            int id, len, parent, x;
+            unsigned long serNum, tqparentSerNum;
+            int id, len, tqparent, x;
             TQChar *tmp_qchar = 0;
             int tmp_qchar_len = 0;
             const int mFolderCount = mFolder->count();
@@ -3131,7 +3131,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 KMFolder *folder;
                 //parse
                 if(!fread(&serNum, sizeof(serNum), 1, sortStream) || //short read means to end
-                   !fread(&parentSerNum, sizeof(parentSerNum), 1, sortStream) ||
+                   !fread(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream) ||
                    !fread(&len, sizeof(len), 1, sortStream)) {
                     break;
                 }
@@ -3157,15 +3157,15 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                     ++deleted_count;
                     continue;
                 }
-                if (parentSerNum < KMAIL_RESERVED) {
-                    parent = (int)parentSerNum - KMAIL_RESERVED;
+                if (tqparentSerNum < KMAIL_RESERVED) {
+                    tqparent = (int)tqparentSerNum - KMAIL_RESERVED;
                 } else {
-                    KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &parent);
+                    KMMsgDict::instance()->getLocation(tqparentSerNum - KMAIL_RESERVED, &folder, &tqparent);
                     if (folder != mFolder)
-                        parent = -1;
+                        tqparent = -1;
                 }
                 if ((id < 0) || (id >= mFolderCount) ||
-                    (parent < -2) || (parent >= mFolderCount)) { // sanity checking
+                    (tqparent < -2) || (tqparent >= mFolderCount)) { // sanity checking
                     kdDebug(5006) << "Whoa.1! " << __FILE__ << ":" << __LINE__ << endl;
                     error = true;
                     continue;
@@ -3183,15 +3183,15 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 } else {
                     item = sortCache[id] = new SortCacheItem(id, key, offset);
                 }
-                if (threaded && parent != -2) {
-                    if(parent == -1) {
-                        unparented.append(item);
+                if (threaded && tqparent != -2) {
+                    if(tqparent == -1) {
+                        untqparented.append(item);
                         mRoot->addUnsortedChild(item);
                     } else {
-                        if( ! sortCache[parent] ) {
-                            sortCache[parent] = new SortCacheItem;
+                        if( ! sortCache[tqparent] ) {
+                            sortCache[tqparent] = new SortCacheItem;
                         }
-                        sortCache[parent]->addUnsortedChild(item);
+                        sortCache[tqparent]->addUnsortedChild(item);
                     }
                 } else {
                     if(x < sorted_count )
@@ -3245,7 +3245,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 sortCache[x] = new SortCacheItem(
                     x, HeaderItem::generate_key( this, msg, &mPaintInfo, sortOrder ));
                 if(threaded)
-                    unparented.append(sortCache[x]);
+                    untqparented.append(sortCache[x]);
                 else
                     mRoot->addUnsortedChild(sortCache[x]);
                 if(sortStream)
@@ -3258,21 +3258,21 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         SHOW_TIMER(holes);
     }
 
-    // Make sure we've placed everything in parent/child relationship. All
-    // messages with a parent id of -1 in the sort file are reevaluated here.
+    // Make sure we've placed everything in tqparent/child relationship. All
+    // messages with a tqparent id of -1 in the sort file are reevaluated here.
     if (threaded) buildThreadingTree( sortCache );
     TQPtrList<SortCacheItem> toBeSubjThreaded;
 
-    if (threaded && !unparented.isEmpty()) {
+    if (threaded && !untqparented.isEmpty()) {
         CREATE_TIMER(reparent);
         START_TIMER(reparent);
 
-        for(TQPtrListIterator<SortCacheItem> it(unparented); it.current(); ++it) {
+        for(TQPtrListIterator<SortCacheItem> it(untqparented); it.current(); ++it) {
             SortCacheItem *item = (*it);
-            SortCacheItem *parent = findParent( item );
-            // If we have a parent, make sure it's not ourselves
-            if ( parent && (parent != (*it)) ) {
-                parent->addUnsortedChild((*it));
+            SortCacheItem *tqparent = findParent( item );
+            // If we have a tqparent, make sure it's not ourselves
+            if ( tqparent && (tqparent != (*it)) ) {
+                tqparent->addUnsortedChild((*it));
                 if(sortStream)
                     (*it)->updateSortFile(sortStream, mFolder);
             } else {
@@ -3289,10 +3289,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             buildSubjectThreadingTree( sortCache );
             for(TQPtrListIterator<SortCacheItem> it(toBeSubjThreaded); it.current(); ++it) {
                 SortCacheItem *item = (*it);
-                SortCacheItem *parent = findParentBySubject( item );
+                SortCacheItem *tqparent = findParentBySubject( item );
 
-                if ( parent ) {
-                    parent->addUnsortedChild((*it));
+                if ( tqparent ) {
+                    tqparent->addUnsortedChild((*it));
                     if(sortStream)
                       (*it)->updateSortFile(sortStream, mFolder);
                 } else {
@@ -3321,8 +3321,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now tqcontains all sorted children of this item, while
-         * the (aptly named) unsorted array tqcontains all as of yet unsorted
+        /* The sorted list now contains all sorted tqchildren of this item, while
+         * the (aptly named) unsorted array contains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
         for(TQPtrListIterator<SortCacheItem> it(*sorted);
@@ -3348,16 +3348,16 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 /* Otherwise use the next item of the unsorted list */
                 new_kci = unsorted[unsorted_off++];
             }
-            if(new_kci->item() || new_kci->parent() != i) //could happen if you reparent
+            if(new_kci->item() || new_kci->tqparent() != i) //could happen if you reparent
                 continue;
 
             if(threaded && i->item()) {
-                // If the parent is watched or ignored, propagate that to it's
-                // children
+                // If the tqparent is watched or ignored, propagate that to it's
+                // tqchildren
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
@@ -3406,7 +3406,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             sortCache[x]->setItem(mItems[sortCache[x]->id()] = khi);
         }
         // Add all imperfectly threaded items to a list, so they can be
-        // reevaluated when a new message arrives which might be a better parent.
+        // reevaluated when a new message arrives which might be a better tqparent.
         // Important for messages arriving out of order.
         if (threaded && sortCache[x]->isImperfectlyThreaded()) {
             mImperfectlyThreadedList.append(sortCache[x]->item());
@@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if ( sortStream )
             fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
 
         return true;
@@ -3620,12 +3620,12 @@ TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums()
   TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible);
   while( it.current() ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
-      if ( it.current()->parent() && ( !it.current()->parent()->isOpen() ) ) {
-        // the item's parent is closed, don't traverse any more of this subtree
-        TQListViewItem * lastAncestorWithSiblings = it.current()->parent();
+      if ( it.current()->tqparent() && ( !it.current()->tqparent()->isOpen() ) ) {
+        // the item's tqparent is closed, don't traverse any more of this subtree
+        TQListViewItem * lastAncestorWithSiblings = it.current()->tqparent();
         // travel towards the root until we find an ancestor with siblings
         while ( ( lastAncestorWithSiblings->depth() > 0 ) && !lastAncestorWithSiblings->nextSibling() )
-          lastAncestorWithSiblings = lastAncestorWithSiblings->parent();
+          lastAncestorWithSiblings = lastAncestorWithSiblings->tqparent();
         // move the iterator to that ancestor's next sibling
         it = TQListViewItemIterator( lastAncestorWithSiblings->nextSibling() );
         continue;
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 4eddbdf4..e6bbe422 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -10,7 +10,7 @@ using KMail::HeaderItem;
 
 #include <klistview.h>
 #include <kfoldertree.h> // for KPaintInfo
-#include <kmmsgbase.h>   // for KMMsgStatus
+#include <kmmsgbase.h>   // for KMMsgtqStatus
 
 #include <tqwidget.h>
 #include <tqstrlist.h>
@@ -48,11 +48,12 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 class KMHeaders : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class ::KMail::HeaderItem; // For easy access to the pixmaps
 
 public:
-  KMHeaders(KMMainWidget *owner, TQWidget *parent=0, const char *name=0);
+  KMHeaders(KMMainWidget *owner, TQWidget *tqparent=0, const char *name=0);
   virtual ~KMHeaders();
 
   /** A new folder has been selected update the list of headers shown
@@ -76,13 +77,13 @@ public:
 
   /** Set all messages in the current thread to status @p status
       or toggle it, if specified. */
-  virtual void setThreadStatus(KMMsgStatus status, bool toggle=false);
+  virtual void setThreadtqStatus(KMMsgtqStatus status, bool toggle=false);
 
   /* Set message status to read if it is new, or unread */
   virtual void setMsgRead(int msgId);
 
   /** The following methods processes all selected messages. */
-  virtual void setMsgStatus(KMMsgStatus status, bool toggle=false);
+  virtual void setMsgtqStatus(KMMsgtqStatus status, bool toggle=false);
   virtual void deleteMsg();
   virtual void applyFiltersOnMsg();
   virtual void undo();
@@ -113,7 +114,7 @@ public:
   /** Returns the sernums of all selected items. */
   TQValueList<TQ_UINT32> selectedSernums();
 
-  /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by
+  /** Returns the sernums of all visible (ie. items with expanded tqparent, not hidden by
       eg. the quick search) selected items.
   */
   TQValueList<TQ_UINT32> selectedVisibleSernums();
@@ -284,13 +285,13 @@ public slots:
 
   virtual void ensureCurrentItemVisible();
 
-  /** Select an item and if it is the parent of a closed thread, also
-    recursively select its children. */
+  /** Select an item and if it is the tqparent of a closed thread, also
+    recursively select its tqchildren. */
   virtual void setSelected(TQListViewItem *item, bool selected);
 
   /** Select several items by message index
-   * and if they are the parent of a closed thread, also
-   * recursively select their children. */
+   * and if they are the tqparent of a closed thread, also
+   * recursively select their tqchildren. */
   void setSelectedByIndex(TQValueList<int> items, bool selected);
 
   /** switch a column with the given id (see KPaintInfo enum)
@@ -298,7 +299,7 @@ public slots:
   void slotToggleColumn(int id, int mode = -1);
 
   /** Provide information about number of messages in a folder */
-  void setFolderInfoStatus();
+  void setFolderInfotqStatus();
 
 protected:
   static TQPixmap *pixNew, *pixUns, *pixDel, *pixRead, *pixRep, *pixSent,
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index b464913b..0eb1a116 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -11,7 +11,7 @@
 
 #include "globalsettings.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmstartup.h"
 #include "index.h"
 #include "kmmainwin.h"
@@ -98,8 +98,8 @@ static bool s_askingToGoOnline = false;
 /********************************************************************/
 /*                     Constructor and destructor                   */
 /********************************************************************/
-KMKernel::KMKernel (TQObject *parent, const char *name) :
-  DCOPObject("KMailIface"), TQObject(parent, name),
+KMKernel::KMKernel (TQObject *tqparent, const char *name) :
+  DCOPObject("KMailIface"), TQObject(tqparent, name),
   mIdentityManager(0), mConfigureDialog(0),
   mContextMenuShown( false ), mWallet( 0 )
 {
@@ -146,11 +146,11 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
 
   new Kpgp::Module();
 
-  // register our own (libkdenetwork) utf-7 codec as long as Qt
+  // register our own (libkdenetwork) utf-7 codec as long as TQt
   // doesn't have it's own:
   if ( !TQTextCodec::codecForName("utf-7") ) {
-    kdDebug(5006) << "No Qt-native utf-7 codec found; registering QUtf7Codec from libkdenetwork" << endl;
-    (void) new QUtf7Codec();
+    kdDebug(5006) << "No TQt-native utf-7 codec found; registering TQUtf7Codec from libkdenetwork" << endl;
+    (void) new TQUtf7Codec();
   }
 
   // In the case of Japan. Japanese locale name is "eucjp" but
@@ -214,11 +214,11 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
      // that the user wants to send a message with subject "ession" but
      // (most likely) that the user clicked on KMail's system tray applet
      // which results in KMKernel::raise() calling "kmail kmail newInstance"
-     // via dcop which apparently executes the application with the original
+     // via dcop which aptqparently executes the application with the original
      // command line arguments and those include "-session ..." if
      // kmail/kontact was restored by session management
      if ( subj == "ession" ) {
-       subj = TQString::null;
+       subj = TQString();
        calledWithSession = true;
      }
      else
@@ -375,7 +375,7 @@ void KMKernel::openReader( bool onlyCheck )
   if ( activate ) {
     // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
     KStartupInfo::setNewStartupId( mWin, kapp->startupId() );
 #endif
   }
@@ -425,7 +425,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     for ( QCStringList::ConstIterator it = customHeaders.begin() ; it != customHeaders.end() ; ++it )
       if ( !(*it).isEmpty() )
       {
-        const int pos = (*it).find( ':' );
+        const int pos = (*it).tqfind( ':' );
         if ( pos > 0 )
         {
           TQCString header, value;
@@ -445,7 +445,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     cWin->show();
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
     KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   }
@@ -592,7 +592,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     cWin->show();
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
     KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   } else {
@@ -606,7 +606,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
 void KMKernel::setDefaultTransport( const TQString & transport )
 {
   TQStringList availTransports = KMail::TransportManager::transportNames();
-  TQStringList::const_iterator it = availTransports.find( transport );
+  TQStringList::const_iterator it = availTransports.tqfind( transport );
   if ( it == availTransports.end() ) {
     kdWarning() << "The transport you entered is not available" << endl;
     return;
@@ -638,7 +638,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc,
     cWin->show();
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
     KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   }
@@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData )
   return 1;
 }
 
-KMMsgStatus KMKernel::strToStatus(const TQString &flags)
+KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags)
 {
-    KMMsgStatus status = 0;
+    KMMsgtqStatus status = 0;
     if (!flags.isEmpty()) {
         for (uint n = 0; n < flags.length() ; n++) {
             switch (flags[n]) {
@@ -938,7 +938,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
       }
 
       int k = mAddMessageMsgIds.findIndex( msgId );
-      //fprintf(stderr,"find %s = %d\n",(const char *) msgId,k);
+      //fprintf(stderr,"tqfind %s = %d\n",(const char *) msgId,k);
 
       if ( k == -1 ) {
         if ( !msgId.isEmpty() ) {
@@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
         }
 
         if ( !MsgStatusFlags.isEmpty() ) {
-          KMMsgStatus status = strToStatus(MsgStatusFlags);
-          if (status) msg->seStatus(status);
+          KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
+          if (status) msg->setqStatus(status);
         }
 
         int index;
@@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
       int index;
 
       if( !MsgStatusFlags.isEmpty() ) {
-        KMMsgStatus status = strToStatus(MsgStatusFlags);
-        if (status) msg->seStatus(status);
+        KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
+        if (status) msg->setqStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1156,7 +1156,7 @@ bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 
     KMReaderMainWin *win = new KMReaderMainWin( false, false );
     KMMessage *newMessage = new KMMessage( *msg );
-    newMessage->setParent( msg->parent() );
+    newMessage->setParent( msg->tqparent() );
     newMessage->setMsgSerNum( msg->getMsgSerNum() );
     newMessage->setReadyToShow( true );
     win->showMsg( GlobalSettings::self()->overrideCharacterEncoding(), newMessage );
@@ -1176,11 +1176,11 @@ TQString KMKernel::getFrom( TQ_UINT32 serialNumber )
   KMFolder *folder = 0;
   KMMsgDict::instance()->getLocation(serialNumber, &folder, &idx);
   if (!folder || (idx == -1))
-    return TQString::null;
+    return TQString();
   KMFolderOpener openFolder(folder, "getFrom");
   KMMsgBase *msgBase = folder->getMsgBase(idx);
   if (!msgBase)
-    return TQString::null;
+    return TQString();
   bool unGet = !msgBase->isMessage();
   KMMessage *msg = folder->getMsg(idx);
   TQString result = msg->from();
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
@@ -1431,7 +1431,7 @@ void KMKernel::initFolders(KConfig* cfg)
 
   the_inboxFolder->setSystemFolder(true);
   if ( the_inboxFolder->userWhoField().isEmpty() )
-    the_inboxFolder->setUserWhoField( TQString::null );
+    the_inboxFolder->setUserWhoField( TQString() );
   // inboxFolder->open();
 
   the_outboxFolder = the_folderMgr->findOrCreate(cfg->readEntry("outboxFolder", I18N_NOOP("outbox")));
@@ -1442,7 +1442,7 @@ void KMKernel::initFolders(KConfig* cfg)
 
   the_outboxFolder->setSystemFolder(true);
   if ( the_outboxFolder->userWhoField().isEmpty() )
-    the_outboxFolder->setUserWhoField( TQString::null );
+    the_outboxFolder->setUserWhoField( TQString() );
   /* Nuke the oubox's index file, to make sure that no ghost messages are in
    * it from a previous crash. Ghost messages happen in the outbox because it
    * the only folder where messages enter and leave within 5 seconds, which is
@@ -1459,7 +1459,7 @@ void KMKernel::initFolders(KConfig* cfg)
   }
   the_sentFolder->setSystemFolder(true);
   if ( the_sentFolder->userWhoField().isEmpty() )
-    the_sentFolder->setUserWhoField( TQString::null );
+    the_sentFolder->setUserWhoField( TQString() );
   // the_sentFolder->open();
 
   the_trashFolder  = the_folderMgr->findOrCreate(cfg->readEntry("trashFolder", I18N_NOOP("trash")));
@@ -1468,7 +1468,7 @@ void KMKernel::initFolders(KConfig* cfg)
   }
   the_trashFolder->setSystemFolder( true );
   if ( the_trashFolder->userWhoField().isEmpty() )
-    the_trashFolder->setUserWhoField( TQString::null );
+    the_trashFolder->setUserWhoField( TQString() );
   // the_trashFolder->open();
 
   the_draftsFolder = the_folderMgr->findOrCreate(cfg->readEntry("draftsFolder", I18N_NOOP("drafts")));
@@ -1477,7 +1477,7 @@ void KMKernel::initFolders(KConfig* cfg)
   }
   the_draftsFolder->setSystemFolder( true );
   if ( the_draftsFolder->userWhoField().isEmpty() )
-    the_draftsFolder->setUserWhoField( TQString::null );
+    the_draftsFolder->setUserWhoField( TQString() );
   the_draftsFolder->open("kmkernel");
 
   the_templatesFolder =
@@ -1488,7 +1488,7 @@ void KMKernel::initFolders(KConfig* cfg)
   }
   the_templatesFolder->setSystemFolder( true );
   if ( the_templatesFolder->userWhoField().isEmpty() )
-    the_templatesFolder->setUserWhoField( TQString::null );
+    the_templatesFolder->setUserWhoField( TQString() );
   the_templatesFolder->open("kmkernel");
 }
 
@@ -1528,7 +1528,7 @@ void KMKernel::init()
   recreateCorruptIndexFiles();
 
   the_searchFolderMgr = new KMFolderMgr(locateLocal("data","kmail/search"), KMSearchDir);
-  KMFolder *lsf = the_searchFolderMgr->find( i18n("Last Search") );
+  KMFolder *lsf = the_searchFolderMgr->tqfind( i18n("Last Search") );
   if (lsf)
     the_searchFolderMgr->remove( lsf );
 
@@ -1613,7 +1613,7 @@ void KMKernel::cleanupImapFolders()
   KMFolderNode *node = the_imapFolderMgr->dir().first();
   while (node)
   {
-    if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
+    if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id()))
 			  && ( acct->type() == "imap" )) )
     {
       node = the_imapFolderMgr->dir().next();
@@ -1629,7 +1629,7 @@ void KMKernel::cleanupImapFolders()
   node = the_dimapFolderMgr->dir().first();
   while (node)
   {
-    if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
+    if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id()))
 			  && ( acct->type() == "cachedimap" )) )
     {
       node = the_dimapFolderMgr->dir().next();
@@ -1665,7 +1665,7 @@ void KMKernel::cleanupImapFolders()
 
     if (acct->type() != "cachedimap" ) continue;
 
-    KMFolder* fld = the_dimapFolderMgr->find(TQString::number(acct->id()));
+    KMFolder* fld = the_dimapFolderMgr->tqfind(TQString::number(acct->id()));
     if( fld )
       cfld = static_cast<KMFolderCachedImap*>( fld->storage() );
     if (cfld == 0) {
@@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles()
     if ( !folder || folder->isDir() || folder->isOpened() )
       continue;
     KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() );
-    if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) {
+    if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) {
       foldersWithBrokenIndex.append( index );
     }
   }
@@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "%1 now uses the <i>%5</i> folder for "
                 "its messages.<p>"
                 "%2 can move the contents of <i>%6<i> into this folder for "
-                "you, though this may tqreplace any existing files with "
+                "you, though this may replace any existing files with "
                 "the same name in <i>%7</i>.<p>"
                 "<strong>Would you like %3 to move the mail "
                 "files now?</strong></qt>" )
@@ -1933,7 +1933,7 @@ void KMKernel::ungrabPtrKb(void)
 
 
 // Message handler
-void KMKernel::kmailMsgHandler(QtMsgType aType, const char* aMsg)
+void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg)
 {
   static int recurse=-1;
 
@@ -2016,7 +2016,7 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
 {
   // send the data in 64 KB chunks
   const int MAX_CHUNK_SIZE = 64*1024;
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job);
   assert(it != mPutJobs.end());
   int remainingBytes = (*it).data.size() - (*it).offset;
   if( remainingBytes > MAX_CHUNK_SIZE )
@@ -2039,14 +2039,14 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
 
 void KMKernel::slotResult(KIO::Job *job)
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job);
   assert(it != mPutJobs.end());
   if (job->error())
   {
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to tqreplace it?")
+        i18n("File %1 exists.\nDo you want to replace it?")
         .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, true);
@@ -2119,7 +2119,7 @@ bool KMKernel::registerSystemTrayApplet( const KSystemTray* applet )
 bool KMKernel::unregisterSystemTrayApplet( const KSystemTray* applet )
 {
   TQValueList<const KSystemTray*>::iterator it =
-    systemTrayApplets.find( applet );
+    systemTrayApplets.tqfind( applet );
   if ( it != systemTrayApplets.end() ) {
     systemTrayApplets.remove( it );
     return true;
@@ -2464,7 +2464,7 @@ Wallet *KMKernel::wallet() {
   if ( !Wallet::isEnabled() || walletOpenFailed )
     return 0;
 
-  // find an appropriate parent window for the wallet dialog
+  // find an appropriate tqparent window for the wallet dialog
   WId window = 0;
   if ( tqApp->activeWindow() )
     window = tqApp->activeWindow()->winId();
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 3eb19f65..871582ac 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -28,7 +28,7 @@ namespace KWallet {
   class Wallet;
 }
 
-/** The KMail namespace tqcontains classes used for KMail.
+/** The KMail namespace contains classes used for KMail.
 * This is to keep them out of the way from all the other
 * un-namespaced classes in libs and the rest of PIM.
 */
@@ -83,9 +83,10 @@ class ConfigureDialog;
 class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMKernel (TQObject *parent=0, const char *name=0);
+  KMKernel (TQObject *tqparent=0, const char *name=0);
   ~KMKernel ();
 
   /** dcop callable stuff */
@@ -262,12 +263,12 @@ public:
   void quit();
   /**
    * Returns true if the transfer was successful, otherwise false. In any case
-   * destinationDir tqcontains the path to the current mail storage when the
+   * destinationDir contains the path to the current mail storage when the
    * method returns.
    */
   bool transferMail( TQString & destinationDir );
   void ungrabPtrKb(void);
-  void kmailMsgHandler(QtMsgType aType, const char* aMsg);
+  void kmailMsgHandler(TQtMsgType aType, const char* aMsg);
   bool doSessionManagement();
   bool firstInstance() { return the_firstInstance; }
   void setFirstInstance(bool value) { the_firstInstance = value; }
@@ -441,7 +442,7 @@ signals:
 
 private:
   void openReader( bool onlyCheck );
-  KMMsgStatus strToStatus(const TQString &flags);
+  KMMsgtqStatus strTotqStatus(const TQString &flags);
   KMFolder *currentFolder();
 
   KMFolder *the_inboxFolder;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 0cd5aec5..de50cd78 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -30,8 +30,8 @@
 
 
 KMLineEdit::KMLineEdit(bool useCompletion,
-                       TQWidget *parent, const char *name)
-    : KPIM::AddresseeLineEdit(parent,useCompletion,name)
+                       TQWidget *tqparent, const char *name)
+    : KPIM::AddresseeLineEdit(tqparent,useCompletion,name)
 {
    allowSemiColonAsSeparator( GlobalSettings::allowSemicolonAsAddressSeparator() );
 }
@@ -108,7 +108,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
     KABC::Addressee::List list;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
 
-      // First, let's deal with mailto Urls. The path() part tqcontains the
+      // First, let's deal with mailto Urls. The path() part contains the
       // email-address.
       if ( (*it).protocol() == "mailto" ) {
         KABC::Addressee addressee;
@@ -210,8 +210,8 @@ void KMLineEdit::loadContacts()
 
 
 KMLineEditSpell::KMLineEditSpell(bool useCompletion,
-                       TQWidget *parent, const char *name)
-    : KMLineEdit(useCompletion,parent,name)
+                       TQWidget *tqparent, const char *name)
+    : KMLineEdit(useCompletion,tqparent,name)
 {
 }
 
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 46d4d0db..70c8316f 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -12,8 +12,9 @@ class TQPopupMenu;
 class KMLineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMLineEdit(bool useCompletion, TQWidget *parent = 0,
+    KMLineEdit(bool useCompletion, TQWidget *tqparent = 0,
                const char *name = 0);
 
 signals:
@@ -21,7 +22,7 @@ signals:
     void focusDown();
 
 protected:
-    // Inherited. Always called by the parent when this widget is created.
+    // Inherited. Always called by the tqparent when this widget is created.
     virtual void loadContacts();
 
     virtual void keyPressEvent(TQKeyEvent*);
@@ -40,8 +41,9 @@ private:
 class KMLineEditSpell : public KMLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMLineEditSpell(bool useCompletion, TQWidget *parent = 0,
+    KMLineEditSpell(bool useCompletion, TQWidget *tqparent = 0,
                const char *name = 0);
     void highLightWord( unsigned int length, unsigned int pos );
     void spellCheckDone( const TQString &s );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index a3363e4f..e573af2a 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -46,7 +46,7 @@
 #include "globalsettings.h"
 #include "kcursorsaver.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmfoldermgr.h"
 #include "kmfolderdia.h"
 #include "accountmanager.h"
@@ -135,10 +135,10 @@ TQValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0;
 static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
 
 //-----------------------------------------------------------------------------
-KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
+KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name,
                            KXMLGUIClient *aGUIClient,
                            KActionCollection *actionCollection, KConfig* config ) :
-    TQWidget(parent, name),
+    TQWidget(tqparent, name),
     mFavoritesCheckMailAction( 0 ),
     mFavoriteFolderView( 0 ),
     mFolderView( 0 ),
@@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
           this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
 
   connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ),
-           this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) );
+           this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) );
 
   toggleSystemTray();
 
@@ -559,9 +559,9 @@ void KMMainWidget::createWidgets(void)
   if ( mLongFolderList ) {
     // superior splitter: folder tree vs. rest
     // inferior splitter: headers vs. message vs. mime tree
-    mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" );
+    mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" );
     mPanner1->setOpaqueResize( opaqueResize );
-    Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal;
+    Qt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal;
     mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" );
     mPanner2->setOpaqueResize( opaqueResize );
     mPanner2->setChildrenCollapsible( false );
@@ -570,10 +570,10 @@ void KMMainWidget::createWidgets(void)
   } else /* !mLongFolderList */ {
     // superior splitter: ( folder tree + headers ) vs. message vs. mime
     // inferior splitter: folder tree vs. headers
-    mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" );
+    mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" );
     mPanner1->setOpaqueResize( opaqueResize );
     mPanner1->setChildrenCollapsible( false );
-    mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" );
+    mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" );
     mPanner2->setOpaqueResize( opaqueResize );
     headerParent = mFolderViewParent = mPanner2;
     mimeParent = messageParent = mPanner1;
@@ -637,7 +637,7 @@ void KMMainWidget::createWidgets(void)
       mMsgActions->setMessageView( mMsgView );
     }
 
-    connect(mMsgView, TQT_SIGNAL(tqreplaceMsgByUnencryptedVersion()),
+    connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()),
         this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion()));
     connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
         this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -677,7 +677,7 @@ void KMMainWidget::createWidgets(void)
   action->plugAccel( actionCollection()->kaccel() );
 
   // create list of folders
-  mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent );
+  mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent );
   mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter );
   if ( mFavoritesCheckMailAction )
@@ -939,7 +939,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
   for ( TQStringList::const_iterator it = keys.begin();
         it != keys.end();
         ++it ) {
-    kdDebug(5006) << newInFolder.find( *it ).data() << " new message(s) in "
+    kdDebug(5006) << newInFolder.tqfind( *it ).data() << " new message(s) in "
                   << *it << endl;
 
     KMFolder *folder = kmkernel->findFolderById( *it );
@@ -949,7 +949,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
       if ( GlobalSettings::self()->verboseNewMailNotification() ) {
         summary += "<br>" + i18n( "1 new message in %1",
                                   "%n new messages in %1",
-                                  newInFolder.find( *it ).data() )
+                                  newInFolder.tqfind( *it ).data() )
                             .arg( folder->prettyURL() );
       }
     }
@@ -1096,7 +1096,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
 {
   KMFolder* folder = folderItem->folder();
   KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
-  KMFolderDialog props( folder, folder->parent(), folderTree,
+  KMFolderDialog props( folder, folder->tqparent(), folderTree,
                         i18n("Properties of Folder %1").arg( folder->label() ) );
   props.exec();
   updateFolderMenu();
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcasStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcastqStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
     KCursorSaver busy(KBusyPtr::busy());
     mFolder->compact( KMFolder::CompactNow );
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
-    TQString statusMsg = BroadcasStatus::instance()->statusMsg();
+    TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcasStatus::instance()->seStatusMsg( statusMsg );
+    BroadcastqStatus::instance()->seStatusMsg( statusMsg );
   }
 }
 
@@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
-  updateVactionScripStatus( false );
+  updateVactionScriptqStatus( false );
   if ( !kmkernel->askToGoOnline() )
     return;
 
   Vacation *vac = new Vacation( this, true /* check only */ );
-  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
+  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
 }
 
 void KMMainWidget::slotEditVacation()
@@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation()
     return;
 
   mVacation = new Vacation( this );
-  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
+  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
   if ( mVacation->isUsable() ) {
     connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
   } else {
@@ -1763,7 +1763,7 @@ void KMMainWidget::slotDebugSieve()
 void KMMainWidget::slotStartCertManager()
 {
   KProcess certManagerProc; // save to create on the heap, since
-  // there is no parent
+  // there is no tqparent
   certManagerProc << "kleopatra";
 
   if( !certManagerProc.start( KProcess::DontCare ) )
@@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments()
   saveCommand->start();
 }
 
-void KMMainWidget::slotOnlineStatus()
+void KMMainWidget::slotOnlinetqStatus()
 {
   // KMKernel will emit a signal when we toggle the network state that is caught by
-  // KMMainWidget::slotUpdateOnlineStatus to update our GUI
+  // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI
   if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) {
     // if online; then toggle and set it offline.
     kmkernel->stopNetworkJobs();
@@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlineStatus()
   }
 }
 
-void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type )
+void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type )
 {
   if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online )
     actionCollection()->action( "online_status" )->setText( i18n("Work Offline") );
@@ -2120,7 +2120,7 @@ void KMMainWidget::showOfflinePage()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotMsgSelected(KMMessage *msg)
 {
-  if ( msg && msg->parent() && !msg->isComplete() )
+  if ( msg && msg->tqparent() && !msg->isComplete() )
   {
     if ( msg->transferInProgress() )
       return;
@@ -2131,7 +2131,7 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg)
        disconnect( mJob, 0, mMsgView, 0 );
        delete mJob;
     }
-    mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0,
+    mJob = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0,
           "STRUCTURE", mMsgView->attachmentStrategy() );
     connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)),
             mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*)));
@@ -2165,7 +2165,7 @@ void KMMainWidget::slotSelectFolder(KMFolder* folder)
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSelectMessage(KMMessage* msg)
 {
-  int idx = mFolder->find(msg);
+  int idx = mFolder->tqfind(msg);
   if (idx != -1) {
     mHeaders->setCurrentMsg(idx);
     if (mMsgView)
@@ -2189,7 +2189,7 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
       {
         TQString msgId( oldMsg->msgId() );
         TQString prefix("DecryptedMsg.");
-        int oldIdx = msgId.find(prefix, 0, false);
+        int oldIdx = msgId.tqfind(prefix, 0, false);
         if( -1 == oldIdx ) {
           int leftAngle = msgId.findRev( '<' );
           msgId = msgId.insert( (-1 == leftAngle) ? 0 : ++leftAngle, prefix );
@@ -2210,12 +2210,12 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
       kdDebug(5006) << "KMMainWidget  -  adding unencrypted message to folder" << endl;
       mFolder->addMsg( newMsg );
       /* Figure out its index in the folder for selecting. This must be count()-1,
-       * since we append. Be safe and do find, though, just in case. */
-      int newMsgIdx = mFolder->find( newMsg );
+       * since we append. Be safe and do tqfind, though, just in case. */
+      int newMsgIdx = mFolder->tqfind( newMsg );
       Q_ASSERT( newMsgIdx != -1 );
       /* we need this unget, to have the message displayed correctly initially */
       mFolder->unGetMsg( newMsgIdx );
-      int idx = mFolder->find( oldMsg );
+      int idx = mFolder->tqfind( oldMsg );
       Q_ASSERT( idx != -1 );
       /* only select here, so the old one is not un-Gotten before, which would
        * render the pointer we hold invalid so that find would fail */
@@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusNew()
 {
-  mHeaders->setThreadStatus(KMMsgStatusNew);
+  mHeaders->setThreadtqStatus(KMMsgStatusNew);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusUnread()
 {
-  mHeaders->setThreadStatus(KMMsgStatusUnread);
+  mHeaders->setThreadtqStatus(KMMsgStatusUnread);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusFlag()
 {
-  mHeaders->setThreadStatus(KMMsgStatusFlag, true);
+  mHeaders->setThreadtqStatus(KMMsgStatusFlag, true);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusRead()
 {
-  mHeaders->setThreadStatus(KMMsgStatusRead);
+  mHeaders->setThreadtqStatus(KMMsgStatusRead);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusTodo()
 {
-  mHeaders->setThreadStatus(KMMsgStatusTodo, true);
+  mHeaders->setThreadtqStatus(KMMsgStatusTodo, true);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusWatched()
 {
-  mHeaders->setThreadStatus(KMMsgStatusWatched, true);
+  mHeaders->setThreadtqStatus(KMMsgStatusWatched, true);
   if (mWatchThreadAction->isChecked()) {
     mIgnoreThreadAction->setChecked(false);
   }
@@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusIgnored()
 {
-  mHeaders->setThreadStatus(KMMsgStatusIgnored, true);
+  mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true);
   if (mIgnoreThreadAction->isChecked()) {
     mWatchThreadAction->setChecked(false);
   }
@@ -2316,8 +2316,8 @@ void KMMainWidget::slotDisplayCurrentMessage()
 void KMMainWidget::slotMsgActivated(KMMessage *msg)
 {
   if ( !msg ) return;
-  if ( msg->parent() && !msg->isComplete() ) {
-    FolderJob *job = msg->parent()->createJob( msg );
+  if ( msg->tqparent() && !msg->isComplete() ) {
+    FolderJob *job = msg->tqparent()->createJob( msg );
     connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
              TQT_SLOT( slotMsgActivated( KMMessage* ) ) );
     job->start();
@@ -2340,7 +2340,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
                                : reader.readBoolEntry( "useFixedFont", false );
   win->setUseFixedFont( useFixedFont );
   KMMessage *newMessage = new KMMessage(*msg);
-  newMessage->setParent( msg->parent() );
+  newMessage->setParent( msg->tqparent() );
   newMessage->setMsgSerNum( msg->getMsgSerNum() );
   newMessage->setReadyToShow( true );
   win->showMsg( overrideEncoding(), newMessage );
@@ -2689,8 +2689,8 @@ void KMMainWidget::setupActions()
   (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, this,
 		     TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
-  (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, this,
-                     TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
+  (void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, this,
+                     TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status");
 
   KActionMenu *sendActionMenu = new
     KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(),
@@ -2703,7 +2703,7 @@ void KMMainWidget::setupActions()
 
   KAction *act;
   //----- Tools menu
-  if (parent()->inherits("KMMainWin")) {
+  if (tqparent()->inherits("KMMainWin")) {
     act =  new KAction( i18n("&Address Book..."), "contents", 0, this,
 			TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
     if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
@@ -2767,10 +2767,10 @@ void KMMainWidget::setupActions()
                               TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
 
 
-  (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, this,
+  (void) new KAction( i18n("&Find Messages..."), "mail_tqfind", Key_S, this,
 		      TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
 
-  mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), this,
+  mFindInMessageAction = new KAction( i18n("&Find in Message..."), "tqfind", KStdAccel::shortcut(KStdAccel::Find), this,
 		      TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
 
   (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), this,
@@ -3029,25 +3029,25 @@ void KMMainWidget::setupActions()
   mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
                                       "total size of messages in folders.") );
 
-  (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString::null,
+  (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
 			       i18n("Expand the current thread") ),
 		     Key_Period, this,
 		     TQT_SLOT(slotExpandThread()),
 		     actionCollection(), "expand_thread" );
 
-  (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString::null,
+  (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
 			       i18n("Collapse the current thread") ),
 		     Key_Comma, this,
 		     TQT_SLOT(slotCollapseThread()),
 		     actionCollection(), "collapse_thread" );
 
-  (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString::null,
+  (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
 			       i18n("Expand all threads in the current folder") ),
 		     CTRL+Key_Period, this,
 		     TQT_SLOT(slotExpandAllThreads()),
 		     actionCollection(), "expand_all_threads" );
 
-  (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString::null,
+  (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
 			       i18n("Collapse all threads in the current folder") ),
 		     CTRL+Key_Comma, this,
 		     TQT_SLOT(slotCollapseAllThreads()),
@@ -3063,7 +3063,7 @@ void KMMainWidget::setupActions()
   dukeOfMonmoth->plugAccel( actionCollection()->kaccel() );
 
   //----- Go Menu
-  new KAction( KGuiItem( i18n("&Next Message"), TQString::null,
+  new KAction( KGuiItem( i18n("&Next Message"), TQString(),
                          i18n("Go to the next message") ),
                          "N;Right", this, TQT_SLOT(slotNextMessage()),
                          actionCollection(), "go_next_message" );
@@ -3075,13 +3075,13 @@ void KMMainWidget::setupActions()
                          actionCollection(), "go_next_unread_message" );
 
   /* ### needs better support from folders:
-  new KAction( KGuiItem( i18n("Next &Important Message"), TQString::null,
+  new KAction( KGuiItem( i18n("Next &Important Message"), TQString(),
                          i18n("Go to the next important message") ),
                          0, this, TQT_SLOT(slotNextImportantMessage()),
                          actionCollection(), "go_next_important_message" );
   */
 
-  new KAction( KGuiItem( i18n("&Previous Message"), TQString::null,
+  new KAction( KGuiItem( i18n("&Previous Message"), TQString(),
                          i18n("Go to the previous message") ),
                          "P;Left", this, TQT_SLOT(slotPrevMessage()),
                          actionCollection(), "go_prev_message" );
@@ -3093,14 +3093,14 @@ void KMMainWidget::setupActions()
                          actionCollection(), "go_prev_unread_message" );
 
   /* needs better support from folders:
-  new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString::null,
+  new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
                          i18n("Go to the previous important message") ),
                          0, this, TQT_SLOT(slotPrevImportantMessage()),
                          actionCollection(), "go_prev_important_message" );
   */
 
   KAction *action =
-    new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString::null,
+    new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
                            i18n("Go to the next folder with unread messages") ),
                            ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()),
                            actionCollection(), "go_next_unread_folder" );
@@ -3109,7 +3109,7 @@ void KMMainWidget::setupActions()
   action->setShortcut( shortcut );
 
   action =
-    new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString::null,
+    new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
                            i18n("Go to the previous folder with unread messages") ),
                            ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()),
                            actionCollection(), "go_prev_unread_folder" );
@@ -3117,7 +3117,7 @@ void KMMainWidget::setupActions()
   shortcut.append( KKey( CTRL+Key_Minus ) );
   action->setShortcut( shortcut );
 
-  new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString::null,
+  new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(),
                          i18n("Go to the next unread text"),
                          i18n("Scroll down current message. "
                               "If at end of current message, "
@@ -3126,7 +3126,7 @@ void KMMainWidget::setupActions()
                          actionCollection(), "go_next_unread_text" );
 
   //----- Settings Menu
-  mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString::null,
+  mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString(),
                                        0, this, TQT_SLOT(slotToggleShowQuickSearch()),
                                        actionCollection(), "show_quick_search");
   mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
@@ -3328,7 +3328,7 @@ void KMMainWidget::updateMessageActions()
       for ( TQPtrListIterator<TQListViewItem> it( selectedItems ) ;
             it.current() ; ++ it ) {
         TQListViewItem * item = *it;
-        if ( item->parent()==0 && item->childCount()==0 ) {
+        if ( item->tqparent()==0 && item->childCount()==0 ) {
           allSelectedInCommonThread = false;
           break;
         }
@@ -3339,8 +3339,8 @@ void KMMainWidget::updateMessageActions()
     }
 
     TQListViewItem *curItemParent = mHeaders->currentItem();
-    bool parent_thread = 0;
-    if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1;
+    bool tqparent_thread = 0;
+    if ( curItemParent && curItemParent->firstChild() != 0 ) tqparent_thread = 1;
 
     bool mass_actions = count >= 1;
     bool thread_actions = mass_actions && allSelectedInCommonThread &&
@@ -3376,7 +3376,7 @@ void KMMainWidget::updateMessageActions()
     mFindInMessageAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) );
     mForwardInlineAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ));
     mForwardAttachedAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) );
-    mForwardDigestAction->setEnabled( ( count > 1 || parent_thread ) && !kmkernel->folderIsTemplates( mFolder ) );
+    mForwardDigestAction->setEnabled( ( count > 1 || tqparent_thread ) && !kmkernel->folderIsTemplates( mFolder ) );
 
     forwardMenu()->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ));
 
@@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions()
     actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread );
     actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
     actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
-    slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) );
+    slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) );
     if (action( "edit_undo" ))
       action( "edit_undo" )->setEnabled( mHeaders->canUndo() );
 
@@ -3578,7 +3578,7 @@ void KMMainWidget::slotShowStartupFolder()
 
 void KMMainWidget::slotShowTip()
 {
-  KTipDialog::showTip( this, TQString::null, true );
+  KTipDialog::showTip( this, TQString(), true );
 }
 
 //-----------------------------------------------------------------------------
@@ -3587,7 +3587,7 @@ void KMMainWidget::slotChangeCaption(TQListViewItem * i)
   if ( !i ) return;
   // set the caption to the current full path
   TQStringList names;
-  for ( TQListViewItem * item = i ; item ; item = item->parent() )
+  for ( TQListViewItem * item = i ; item ; item = item->tqparent() )
     names.prepend( item->text(0) );
   emit captionChangeRequest( names.join( "/" ) );
 }
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcasStatus::instance()->seStatusMsg( msg );
+  BroadcastqStatus::instance()->seStatusMsg( msg );
 }
 
 
@@ -3993,20 +3993,20 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
     assert( mSearchWin );
     KMSearchPattern pattern;
     pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) );
-    int status = mQuickSearchLine->currenStatus();
+    int status = mQuickSearchLine->currentqStatus();
     if ( status != 0 ) {
-        pattern.append( new KMSearchRuleStatus( status ) );
+        pattern.append( new KMSearchRuletqStatus( status ) );
     }
     mSearchWin->setSearchPattern( pattern );
 }
 
-void KMMainWidget::updateVactionScripStatus(bool active)
+void KMMainWidget::updateVactionScriptqStatus(bool active)
 {
   mVacationIndicatorActive = active;
   if ( active ) {
     mVacationScriptIndicator->setText( i18n("Out of office reply active") );
-    mVacationScriptIndicator->setPaletteBackgroundColor( Qt::yellow );
-    mVacationScriptIndicator->setCursor( TQCursor( Qt::PointingHandCursor ) );
+    mVacationScriptIndicator->setPaletteBackgroundColor( TQt::yellow );
+    mVacationScriptIndicator->setCursor( TQCursor( TQt::PointingHandCursor ) );
     mVacationScriptIndicator->show();
   } else {
     mVacationScriptIndicator->hide();
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 824f2aaa..1bb3ee06 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -79,12 +79,13 @@ namespace KMail {
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
 
 
-class KDE_EXPORT KMMainWidget : public QWidget
+class KDE_EXPORT KMMainWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMainWidget(TQWidget *parent, const char *name,
+  KMMainWidget(TQWidget *tqparent, const char *name,
                KXMLGUIClient *aGUIClient,
                KActionCollection *actionCollection,
          KConfig*config = KMKernel::config() );
@@ -178,7 +179,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
+  void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -261,7 +262,7 @@ protected:
 
   KActionCollection * actionCollection() const { return mActionCollection; }
 
-  /** @return the correct config dialog depending on whether the parent of the mainWidget
+  /** @return the correct config dialog depending on whether the tqparent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
    */
   KConfig * config();
@@ -338,8 +339,8 @@ protected slots:
   void slotToggleSizeColumn();
   void slotSendQueued();
   void slotSendQueuedVia( int item );
-  void slotOnlineStatus();
-  void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type );
+  void slotOnlinetqStatus();
+  void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type );
   void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&);
   void slotMarkAll();
   void slotMemInfo();
@@ -446,7 +447,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScripStatus( bool active );
+  void updateVactionScriptqStatus( bool active );
 
 private:
   // Message actions
@@ -516,9 +517,9 @@ private:
   int		mMessageStatusId;
   TQValueList<int> mPanner1Sep, mPanner2Sep;
   KURL          mUrlCurrent;
-  QPopupMenu	*mActMenu;
+  TQPopupMenu	*mActMenu;
   TQPopupMenu    *mSendMenu;
-  QPopupMenu	*mFileMenu;
+  TQPopupMenu	*mFileMenu;
 
   bool mLongFolderList;
 
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 503c9a06..21879c55 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
 
   connect(kmkernel, TQT_SIGNAL(configChanged()),
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index 201c3824..006020e8 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -35,11 +35,12 @@ using KPIM::ProgressDialog;
 class KMMainWin : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   // the main window needs to have a name since else restoring the window
   // settings by kwin doesn't work
-  KMMainWin(TQWidget *parent = 0);
+  KMMainWin(TQWidget *tqparent = 0);
   virtual ~KMMainWin();
   KMMainWidget *mainKMWidget() const { return mKMMainWidget; };
   StatusbarProgressWidget* progressWidget() const { return mLittleProgress; }
diff --git a/kmail/kmmainwin.rc b/kmail/kmmainwin.rc
index 955dabad..899d03c5 100644
--- a/kmail/kmmainwin.rc
+++ b/kmail/kmmainwin.rc
@@ -25,7 +25,7 @@
    <Action name="file_print" />
    <Separator/>
    <Action name="expire_all_folders" />
-   <Action name="file_invalidate_imap_cache"/>
+   <Action name="file_tqinvalidate_imap_cache"/>
    <Action name="empty_trash"/>
    <Separator/>
    <Action name="online_status" />
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 3af9a252..6501c9e5 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -97,7 +97,7 @@ KMMessage::KMMessage(DwMessage* aMsg)
 }
 
 //-----------------------------------------------------------------------------
-KMMessage::KMMessage(KMFolder* parent): KMMsgBase(parent)
+KMMessage::KMMessage(KMFolder* tqparent): KMMsgBase(tqparent)
 {
   init();
 }
@@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase()
   // now overwrite a few from the msgInfo
   mMsgSize = msgInfo.msgSize();
   mFolderOffset = msgInfo.folderOffset();
-  mStatus = msgInfo.status();
+  mtqStatus = msgInfo.status();
   mEncryptionState = msgInfo.encryptionState();
   mSignatureState = msgInfo.signatureState();
   mMDNSentState = msgInfo.mdnSentState();
@@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg )
   mMsgSize = 0;
   mMsgLength = 0;
   mFolderOffset = 0;
-  mStatus  = KMMsgStatusNew;
+  mtqStatus  = KMMsgStatusNew;
   mEncryptionState = KMMsgEncryptionStateUnknown;
   mSignatureState = KMMsgSignatureStateUnknown;
   mMDNSentState = KMMsgMDNStateUnknown;
@@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other )
   mMsgSize = other.mMsgSize;
   mMsgLength = other.mMsgLength;
   mFolderOffset = other.mFolderOffset;
-  mStatus  = other.mStatus;
+  mtqStatus  = other.mtqStatus;
   mEncryptionState = other.mEncryptionState;
   mSignatureState = other.mSignatureState;
   mMDNSentState = other.mMDNSentState;
@@ -248,10 +248,10 @@ void KMMessage::setTransferInProgress(bool value, bool force)
   MessageProperty::setTransferInProgress( getMsgSerNum(), value, force );
   if ( !transferInProgress() && sPendingDeletes.tqcontains( this ) ) {
     sPendingDeletes.remove( this );
-    if ( parent() ) {
-      int idx = parent()->find( this );
+    if ( tqparent() ) {
+      int idx = tqparent()->tqfind( this );
       if ( idx > 0 ) {
-        parent()->removeMsg( idx );
+        tqparent()->removeMsg( idx );
       }
     }
   }
@@ -336,8 +336,8 @@ TQCString KMMessage::headerAsSendableString() const
 }
 
 void KMMessage::removePrivateHeaderFields() {
-  removeHeaderField("Status");
-  removeHeaderField("X-Status");
+  removeHeaderField("tqStatus");
+  removeHeaderField("X-tqStatus");
   removeHeaderField("X-KMail-EncryptionState");
   removeHeaderField("X-KMail-SignatureState");
   removeHeaderField("X-KMail-MDN-Sent");
@@ -355,8 +355,8 @@ void KMMessage::seStatusFields()
 {
   char str[2] = { 0, 0 };
 
-  setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO");
-  setHeaderField("X-Status", statusToStr(status()));
+  setHeaderField("tqStatus", status() & KMMsgStatusNew ? "R" : "RO");
+  setHeaderField("X-tqStatus", statusToStr(status()));
 
   str[0] = (char)encryptionState();
   setHeaderField("X-KMail-EncryptionState", str);
@@ -383,7 +383,7 @@ TQString KMMessage::headerAsString() const
   DwHeaders& header = mMsg->Headers();
   header.Assemble();
   if ( header.AsString().empty() )
-    return TQString::null;
+    return TQString();
   return TQString::tqfromLatin1( header.AsString().c_str() );
 }
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), setqStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
+void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSetqStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSeStatus) {
-    seStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+  if (aSetqStatus) {
+    setqStatus(headerField("tqStatus").latin1(), headerField("X-tqStatus").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
     setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) );
@@ -541,7 +541,7 @@ static TQString splitLine( TQString &line)
     if ( i == l )
     {
        TQString result = line.left(j);
-       line = TQString::null;
+       line = TQString();
        return result;
     }
 
@@ -583,7 +583,7 @@ static TQString flowText(TQString &text, const TQString& indent, int maxLength)
       if (i < (int) text.length())
          text = text.mid(i);
       else
-         text = TQString::null;
+         text = TQString();
 
       result += indent + line + '\n';
 
@@ -667,7 +667,7 @@ TQString KMMessage::smartQuote( const TQString & msg, int maxLineLength )
      if ( line.isEmpty())
      {
         if (!firstPart)
-           part.append(TQString::null);
+           part.append(TQString());
         continue;
      };
 
@@ -750,14 +750,14 @@ TQString KMMessage::asPlainTextFromObjectTree( partNode *root, bool aStripSignat
   bool isHTML = false;
   const TQTextCodec * codec = 0;
 
-  if ( !root ) return TQString::null;
+  if ( !root ) return TQString();
   parseTextStringFromDwPart( root, parsedString, codec, isHTML );
 
   if ( mOverrideCodec || !codec )
     codec = this->codec();
 
   if ( parsedString.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   bool clearSigned = false;
   TQString result;
@@ -826,7 +826,7 @@ TQString KMMessage::asPlainText( bool aStripSignature, bool allowDecryption ) co
 {
   partNode *root = partNode::fromMessage( this );
   if ( !root )
-    return TQString::null;
+    return TQString();
 
   ObjectTreeParser otp;
   otp.parseObjectTree( root );
@@ -837,7 +837,7 @@ TQString KMMessage::asPlainText( bool aStripSignature, bool allowDecryption ) co
 
 TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
 				   const TQString& aIndentStr,
-				   const TQString& selection /* = TQString::null */,
+				   const TQString& selection /* = TQString() */,
 				   bool aStripSignature /* = true */,
 				   bool allowDecryption /* = true */) const
 {
@@ -845,7 +845,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
     asPlainText( aStripSignature, allowDecryption ) : selection ;
 
   // Remove blank lines at the beginning:
-  const int firstNonWS = content.find( TQRegExp( "\\S" ) );
+  const int firstNonWS = content.tqfind( TQRegExp( "\\S" ) );
   const int lineStart = content.findRev( '\n', firstNonWS );
   if ( lineStart >= 0 )
     content.remove( 0, static_cast<unsigned int>( lineStart ) );
@@ -864,10 +864,10 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
 
 //-----------------------------------------------------------------------------
 KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
-                                   TQString selection /* = TQString::null */,
+                                   TQString selection /* = TQString() */,
                                    bool noQuote /* = false */,
                                    bool allowDecryption /* = true */,
-                                   const TQString &tmpl /* = TQString::null */ )
+                                   const TQString &tmpl /* = TQString() */ )
 {
   KMMessage* msg = new KMMessage;
   TQString mailingListStr, replyToStr, toStr;
@@ -883,11 +883,11 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
   msg->setCharset("utf-8");
 
   // determine the mailing list posting address
-  if ( parent() && parent()->isMailingListEnabled() &&
-       !parent()->mailingListPostAddress().isEmpty() ) {
-    mailingListAddresses << parent()->mailingListPostAddress();
+  if ( tqparent() && tqparent()->isMailingListEnabled() &&
+       !tqparent()->mailingListPostAddress().isEmpty() ) {
+    mailingListAddresses << tqparent()->mailingListPostAddress();
   }
-  if ( headerField("List-Post").find( "mailto:", 0, false ) != -1 ) {
+  if ( headerField("List-Post").tqfind( "mailto:", 0, false ) != -1 ) {
     TQString listPost = headerField("List-Post");
     TQRegExp rx( "<mailto:([^@>]+)@([^>]+)>", false );
     if ( rx.search( listPost, 0 ) != -1 ) // matched
@@ -916,7 +916,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
     // strip all my addresses from the list of recipients
     TQStringList recipients = KPIM::splitEmailAddrList( toStr );
     toStr = stripMyAddressesFromAddressList( recipients ).join(", ");
-    // ... unless the list tqcontains only my addresses (reply to self)
+    // ... unless the list contains only my addresses (reply to self)
     if ( toStr.isEmpty() && !recipients.isEmpty() )
       toStr = recipients[0];
 
@@ -1081,11 +1081,11 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // seStatus(KMMsgStatusReplied);
+  // setqStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
-  if ( parent() && parent()->putRepliesInSameFolder() )
-    msg->setFcc( parent()->idString() );
+  if ( tqparent() && tqparent()->putRepliesInSameFolder() )
+    msg->setFcc( tqparent()->idString() );
 
   // replies to an encrypted message should be encrypted as well
   if ( encryptionState() == KMMsgPartiallyEncrypted ||
@@ -1108,8 +1108,8 @@ TQCString KMMessage::getRefStr() const
   if (refStr.isEmpty())
     return headerField("Message-Id").latin1();
 
-  i = refStr.find('<');
-  j = refStr.find('>');
+  i = refStr.tqfind('<');
+  j = refStr.tqfind('>');
   firstRef = refStr.mid(i, j-i+1);
   if (!firstRef.isEmpty())
     retRefStr = firstRef + ' ';
@@ -1185,7 +1185,7 @@ TQCString KMMessage::createForwardBody()
   if (sHeaderStrategy == HeaderStrategy::all()) {
     s = "\n\n----------  " + sForwardStr + "  ----------\n\n";
     s += headerAsString();
-    str = asQuotedString(s, "", TQString::null, false, false).utf8();
+    str = asQuotedString(s, "", TQString(), false, false).utf8();
     str += "\n-------------------------------------------------------\n";
   } else {
     s = "\n\n----------  " + sForwardStr + "  ----------\n\n";
@@ -1198,7 +1198,7 @@ TQCString KMMessage::createForwardBody()
     s += "To: " + to() + "\n";
     if (!cc().isEmpty()) s += "Cc: " + cc() + "\n";
     s += "\n";
-    str = asQuotedString(s, "", TQString::null, false, false).utf8();
+    str = asQuotedString(s, "", TQString(), false, false).utf8();
     str += "\n-------------------------------------------------------\n";
   }
 
@@ -1215,7 +1215,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
    while (field)
    {
      nextField = field->Next();
-     if ( field->FieldNameStr().find( "ontent" ) == DwString::npos
+     if ( field->FieldNameStr().tqfind( "ontent" ) == DwString::npos
              && !whiteList.tqcontains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
@@ -1224,7 +1224,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
 }
 
 //-----------------------------------------------------------------------------
-KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */ )
+KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString() */ )
 {
   KMMessage* msg = new KMMessage();
 
@@ -1245,7 +1245,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */
     TQStringList blacklist = GlobalSettings::self()->mimetypesToStripWhenInlineForwarding();
     for ( TQStringList::Iterator it = blacklist.begin(); it != blacklist.end(); ++it ) {
       TQString entry = (*it);
-      int sep = entry.find( '/' );
+      int sep = entry.tqfind( '/' );
       TQCString type = entry.left( sep ).latin1();
       TQCString subtype = entry.mid( sep+1 ).latin1();
       kdDebug( 5006 ) << "Looking for blacklisted type: " << type << "/" << subtype << endl;
@@ -1276,7 +1276,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */
     msg->initFromMessage( this );
     msg->removeHeaderField("Content-Type");
     msg->removeHeaderField("Content-Transfer-Encoding");
-    // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
+    // Modify the ContentType directly (replaces setAutomaticFields(true))
     DwHeaders & header = msg->mMsg->Headers();
     header.MimeVersion().FromString("1.0");
     DwMediaType & contentType = msg->dwContentType();
@@ -1328,32 +1328,32 @@ static const struct {
   const char * text;
 } mdnMessageBoxes[] = {
   { "mdnNormalAsk", true,
-    I18N_NOOP("This message tqcontains a request to return a notification "
+    I18N_NOOP("This message contains a request to return a notification "
 	      "about your reception of the message.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnUnknownOption", false,
-    I18N_NOOP("This message tqcontains a request to send a notification "
+    I18N_NOOP("This message contains a request to send a notification "
 	      "about your reception of the message.\n"
-	      "It tqcontains a processing instruction that is marked as "
+	      "It contains a processing instruction that is marked as "
 	      "\"required\", but which is unknown to KMail.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"failed\" response.") },
   { "mdnMultipleAddressesInReceiptTo", true,
-    I18N_NOOP("This message tqcontains a request to send a notification "
+    I18N_NOOP("This message contains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but it is requested to send the notification to more "
 	      "than one address.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathEmpty", true,
-    I18N_NOOP("This message tqcontains a request to send a notification "
+    I18N_NOOP("This message contains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but there is no return-path set.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathNotInReceiptTo", true,
-    I18N_NOOP("This message tqcontains a request to send a notification "
+    I18N_NOOP("This message contains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but the return-path address differs from the address "
 	      "the notification was requested to be sent to.\n"
@@ -1473,7 +1473,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   // SHOULD be obtained (or no MDN sent) if there is no Return-Path
   // header in the message [...]
   AddrSpecList returnPathList = extractAddrSpecs("Return-Path");
-  TQString returnPath = returnPathList.isEmpty() ? TQString::null
+  TQString returnPath = returnPathList.isEmpty() ? TQString()
     : returnPathList.front().localPart + '@' + returnPathList.front().domain ;
   kdDebug(5006) << "clean return path: " << returnPath << endl;
   if ( returnPath.isEmpty() || !receiptTo.tqcontains( returnPath, false ) ) {
@@ -1523,7 +1523,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->initFromMessage( this );
   receipt->removeHeaderField("Content-Type");
   receipt->removeHeaderField("Content-Transfer-Encoding");
-  // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
+  // Modify the ContentType directly (replaces setAutomaticFields(true))
   DwHeaders & header = receipt->mMsg->Headers();
   header.MimeVersion().FromString("1.0");
   DwMediaType & contentType = receipt->dwContentType();
@@ -1533,7 +1533,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->mNeedsAssembly = true;
   receipt->setContentTypeParam( "report-type", "disposition-notification" );
 
-  TQString description = tqreplaceHeadersInString( MDN::descriptionFor( d, m ) );
+  TQString description = replaceHeadersInString( MDN::descriptionFor( d, m ) );
 
   // text/plain part:
   KMMessagePart firstMsgPart;
@@ -1605,7 +1605,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   return receipt;
 }
 
-TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const {
+TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
   TQString result = s;
   TQRegExp rx( "\\$\\{([a-z0-9-]+)\\}", false );
   Q_ASSERT( rx.isValid() );
@@ -1623,9 +1623,9 @@ TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const {
 
   idx = 0;
   while ( ( idx = rx.search( result, idx ) ) != -1 ) {
-    TQString tqreplacement = headerField( rx.cap(1).latin1() );
-    result.tqreplace( idx, rx.matchedLength(), tqreplacement );
-    idx += tqreplacement.length();
+    TQString replacement = headerField( rx.cap(1).latin1() );
+    result.tqreplace( idx, rx.matchedLength(), replacement );
+    idx += replacement.length();
   }
   return result;
 }
@@ -1693,17 +1693,17 @@ void KMMessage::applyIdentity( uint id )
     setHeaderField( "X-KMail-Transport", ident.transport() );
 
   if ( ident.fcc().isEmpty() )
-    setFcc( TQString::null );
+    setFcc( TQString() );
   else
     setFcc( ident.fcc() );
 
   if ( ident.drafts().isEmpty() )
-    setDrafts( TQString::null );
+    setDrafts( TQString() );
   else
     setDrafts( ident.drafts() );
 
   if ( ident.templates().isEmpty() )
-    setTemplates( TQString::null );
+    setTemplates( TQString() );
   else
     setTemplates( ident.templates() );
 
@@ -1729,8 +1729,8 @@ uint KMMessage::identityUoid() const {
 
   if ( !ok || id == 0 )
     id = kmkernel->identityManager()->identityForAddress( to() + ", " + cc() ).uoid();
-  if ( id == 0 && parent() )
-    id = parent()->identity();
+  if ( id == 0 && tqparent() )
+    id = tqparent()->identity();
 
   return id;
 }
@@ -2039,7 +2039,7 @@ TQString KMMessage::sender() const {
   if ( asl.empty() )
     asl = extractAddrSpecs( "From" );
   if ( asl.empty() )
-    return TQString::null;
+    return TQString();
   return asl.front().asString();
 }
 
@@ -2081,7 +2081,7 @@ TQString KMMessage::replyToId() const
 
   replyTo = headerField("In-Reply-To");
   // search the end of the (first) message id in the In-Reply-To header
-  rightAngle = replyTo.find( '>' );
+  rightAngle = replyTo.tqfind( '>' );
   if (rightAngle != -1)
     replyTo.truncate( rightAngle + 1 );
   // now search the start of the message id
@@ -2094,14 +2094,14 @@ TQString KMMessage::replyToId() const
   // misconfigured Mutt. They look like this <"from foo"@bar.baz>, i.e.
   // they contain double quotes and spaces. We only check for '"'.
   if (!replyTo.isEmpty() && (replyTo[0] == '<') &&
-      ( -1 == replyTo.find( '"' ) ) )
+      ( -1 == replyTo.tqfind( '"' ) ) )
     return replyTo;
 
   references = headerField("References");
   leftAngle = references.findRev( '<' );
   if (leftAngle != -1)
     references = references.mid( leftAngle );
-  rightAngle = references.find( '>' );
+  rightAngle = references.tqfind( '>' );
   if (rightAngle != -1)
     references.truncate( rightAngle + 1 );
 
@@ -2137,16 +2137,16 @@ TQString KMMessage::references() const
   if( !references.isEmpty() && references[0] == '<' )
     return references;
   else
-    return TQString::null;
+    return TQString();
 }
 
 //-----------------------------------------------------------------------------
 TQString KMMessage::replyToAuxIdMD5() const
 {
   TQString result = references();
-  // references tqcontains two items, use the first one
+  // references contains two items, use the first one
   // (the second to last reference)
-  const int rightAngle = result.find( '>' );
+  const int rightAngle = result.tqfind( '>' );
   if( rightAngle != -1 )
     result.truncate( rightAngle + 1 );
 
@@ -2182,7 +2182,7 @@ TQString KMMessage::msgId() const
   TQString msgId = headerField("Message-Id");
 
   // search the end of the message id
-  const int rightAngle = msgId.find( '>' );
+  const int rightAngle = msgId.tqfind( '>' );
   if (rightAngle != -1)
     msgId.truncate( rightAngle + 1 );
   // now search the start of the message id
@@ -2287,10 +2287,10 @@ TQValueList<TQCString> KMMessage::rawHeaderFields( const TQCString& field ) cons
 TQString KMMessage::headerField(const TQCString& aName) const
 {
   if ( aName.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   if ( !mMsg->Headers().FindField( aName ) )
-    return TQString::null;
+    return TQString();
 
   return decodeRFC2047String( mMsg->Headers().FieldBody( aName.data() ).AsString().c_str(),
                               charset() );
@@ -2666,7 +2666,7 @@ TQValueList<int> KMMessage::determineAllowedCtes( const CharFreq& cf,
   }
 
   // In the following cases only QP and Base64 are allowed:
-  // - the buffer will be OpenPGP/MIME signed and it tqcontains trailing
+  // - the buffer will be OpenPGP/MIME signed and it contains trailing
   //   whitespace (cf. RFC 3156)
   // - a line starts with "From "
   if ( ( willBeSigned && cf.hasTrailingWhitespace() ) ||
@@ -2819,7 +2819,7 @@ int KMMessage::numBodyParts() const
       parts.append( part );
       part = part->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart tqcontains a leaf message part
+    // this is where currPart->msgPart contains a leaf message part
     count++;
     // go up in the tree until reaching a node with next
     // (or the last top-level node)
@@ -2871,7 +2871,7 @@ int KMMessage::partNumber( DwBodyPart * aDwBodyPart ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart tqcontains a leaf message part
+    // this is where currPart->msgPart contains a leaf message part
     if (curpart == aDwBodyPart)
       idx = curIdx;
     curIdx++;
@@ -2911,7 +2911,7 @@ DwBodyPart * KMMessage::dwBodyPart( int aIdx ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart tqcontains a leaf message part
+    // this is where currPart->msgPart contains a leaf message part
     if (curIdx==aIdx)
         part = curpart;
     curIdx++;
@@ -2949,7 +2949,7 @@ DwBodyPart * KMMessage::findDwBodyPart( int type, int subtype ) const
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart tqcontains a leaf message part
+    // this is where curPart->msgPart contains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -2998,7 +2998,7 @@ DwBodyPart * KMMessage::findDwBodyPart( const TQCString& type, const TQCString&
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart tqcontains a leaf message part
+    // this is where curPart->msgPart contains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -3183,10 +3183,10 @@ bool KMMessage::deleteBodyPart( int partIndex )
   if ( !part.isComplete() )
      return false;
 
-  DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
-  if ( !parentNode )
+  DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
+  if ( !tqparentNode )
     return false;
-  parentNode->RemoveBodyPart( dwpart );
+  tqparentNode->RemoveBodyPart( dwpart );
 
   // add dummy part to show that a attachment has been deleted
   KMMessagePart dummyPart;
@@ -3197,14 +3197,14 @@ bool KMMessage::deleteBodyPart( int partIndex )
   dummyPart.setContentDescription( comment );
   dummyPart.setBodyEncodedBinary( TQByteArray() );
   TQCString cd = dummyPart.contentDisposition();
-  if ( cd.find( "inline", 0, false ) == 0 ) {
+  if ( cd.tqfind( "inline", 0, false ) == 0 ) {
     cd.tqreplace( 0, 10, "attachment" );
     dummyPart.setContentDisposition( cd );
   } else if ( cd.isEmpty() ) {
     dummyPart.setContentDisposition( "attachment" );
   }
   DwBodyPart* newDwPart = createDWBodyPart( &dummyPart );
-  parentNode->AddBodyPart( newDwPart );
+  tqparentNode->AddBodyPart( newDwPart );
   getTopLevelPart()->Assemble();
   return true;
 }
@@ -3251,14 +3251,14 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
     int iL, i1, i2, iM;
     iL = additionalParam.length();
     i1 = 0;
-    i2 = additionalParam.find(';', i1, false);
+    i2 = additionalParam.tqfind(';', i1, false);
     while ( i1 < iL )
     {
       if( -1 == i2 )
 	i2 = iL;
       if( i1+1 < i2 ) {
 	parAV = additionalParam.mid( i1, (i2-i1) );
-	iM = parAV.find('=');
+	iM = parAV.tqfind('=');
 	if( -1 < iM )
         {
 	  parA = parAV.left( iM );
@@ -3281,7 +3281,7 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
 	ct.AddParameter( param );
       }
       i1 = i2+1;
-      i2 = additionalParam.find(';', i1, false);
+      i2 = additionalParam.tqfind(';', i1, false);
     }
   }
 
@@ -3639,7 +3639,7 @@ TQString KMMessage::stripEmailAddr( const TQString& aStr )
   //kdDebug(5006) << "KMMessage::stripEmailAddr( " << aStr << " )" << endl;
 
   if ( aStr.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   TQString result;
 
@@ -3710,9 +3710,9 @@ TQString KMMessage::stripEmailAddr( const TQString& aStr )
                    else if ( !angleAddress.isEmpty() ) {
                      result += angleAddress;
                    }
-                   name = TQString::null;
-                   comment = TQString::null;
-                   angleAddress = TQString::null;
+                   name = TQString();
+                   comment = TQString();
+                   angleAddress = TQString();
                  }
                  else
                    name += ch;
@@ -3975,7 +3975,7 @@ TQString KMMessage::expandAliases( const TQString& recipients )
 
     // check whether the address is missing the domain part
     // FIXME: looking for '@' might be wrong
-    if ( receiver.find('@') == -1 ) {
+    if ( receiver.tqfind('@') == -1 ) {
       KConfigGroup general( KMKernel::config(), "General" );
       TQString defaultdomain = general.readEntry( "Default domain" );
       if( !defaultdomain.isEmpty() ) {
@@ -4014,7 +4014,7 @@ TQString KMMessage::guessEmailAddressFromLoginName( const TQString& loginName )
   const KUser user( loginName );
   if ( user.isValid() ) {
     TQString fullName = user.fullName();
-    if ( fullName.find( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 )
+    if ( fullName.tqfind( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 )
       address = '"' + fullName.tqreplace( '\\', "\\" ).tqreplace( '"', "\\" )
 	      + "\" <" + address + '>';
     else
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 {
-  if (mStatus == aStatus)
+  if (mtqStatus == atqStatus)
     return;
-  KMMsgBase::seStatus(aStatus, idx);
+  KMMsgBase::setqStatus(atqStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
+void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
 {
-  Q_ASSERT( aStatus == KMMsgStatusReplied
-      || aStatus == KMMsgStatusForwarded
-      || aStatus == KMMsgStatusDeleted );
+  Q_ASSERT( atqStatus == KMMsgStatusReplied
+      || atqStatus == KMMsgStatusForwarded
+      || atqStatus == KMMsgStatusDeleted );
 
   TQString message = headerField( "X-KMail-Link-Message" );
   if ( !message.isEmpty() )
@@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
     type += ',';
 
   message += TQString::number( aMsg->getMsgSerNum() );
-  if ( aStatus == KMMsgStatusReplied )
+  if ( atqStatus == KMMsgStatusReplied )
     type += "reply";
-  else if ( aStatus == KMMsgStatusForwarded )
+  else if ( atqStatus == KMMsgStatusForwarded )
     type += "forward";
-  else if ( aStatus == KMMsgStatusDeleted )
+  else if ( atqStatus == KMMsgStatusDeleted )
     type += "deleted";
 
   setHeaderField( "X-KMail-Link-Message", message );
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const
 {
   *retMsgSerNum = 0;
-  *reStatus = KMMsgStatusUnknown;
+  *retqStatus = KMMsgStatusUnknown;
 
   TQString message = headerField("X-KMail-Link-Message");
   TQString type = headerField("X-KMail-Link-Type");
@@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *reStatus = KMMsgStatusReplied;
+      *retqStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *reStatus = KMMsgStatusForwarded;
+      *retqStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *reStatus = KMMsgStatusDeleted;
+      *retqStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4275,7 +4275,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray &
     TQString specifier = partSpecifier;
     if ( partSpecifier.endsWith(".HEADER") ||
          partSpecifier.endsWith(".MIME") ) {
-      // get the parent bodypart
+      // get the tqparent bodypart
       specifier = partSpecifier.section( '.', 0, -2 );
     }
 
@@ -4292,7 +4292,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray &
     {
       // update headers
       // get rid of EOL
-      content.resize( QMAX( content.length(), 2 ) - 2 );
+      content.resize( TQMAX( content.length(), 2 ) - 2 );
       // we have to delete the fields first as they might have been created by
       // an earlier call to DwHeaders::FieldBody
       mLastUpdated->Headers().DeleteAllFields();
@@ -4306,19 +4306,19 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray &
     } else {
       // update body
       mLastUpdated->Body().FromString( content );
-      TQString parentSpec = partSpecifier.section( '.', 0, -2 );
-      if ( !parentSpec.isEmpty() )
+      TQString tqparentSpec = partSpecifier.section( '.', 0, -2 );
+      if ( !tqparentSpec.isEmpty() )
       {
-        DwBodyPart* parent = findDwBodyPart( getFirstDwBodyPart(), parentSpec );
-        if ( parent && parent->hasHeaders() && parent->Headers().HasContentType() )
+        DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), tqparentSpec );
+        if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() )
         {
-          const DwMediaType& contentType = parent->Headers().ContentType();
+          const DwMediaType& contentType = tqparent->Headers().ContentType();
           if ( contentType.Type() == DwMime::kTypeMessage &&
                contentType.Subtype() == DwMime::kSubtypeRfc822 )
           {
             // an embedded message that is not multipart
             // update this directly
-            parent->Body().Message()->Body().FromString( content );
+            tqparent->Body().Message()->Body().FromString( content );
           }
         }
       }
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      seStatus( KMMsgStatusHasInvitation );
+      setqStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  seStatus( KMMsgStatusHasNoInvitation );
+  setqStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    seStatus( KMMsgStatusHasNoAttach );
+    setqStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      seStatus( KMMsgStatusHasAttach );
+      setqStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    seStatus( KMMsgStatusHasNoAttach );
+    setqStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index a063ca1a..32e79e2a 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -71,7 +71,7 @@ class KMMessage: public KMMsgBase, public KMail::ISubject
 
 public:
   // promote some of KMMsgBase's methods to public:
-  using KMMsgBase::parent;
+  using KMMsgBase::tqparent;
   using KMMsgBase::setParent;
   using KMMsgBase::enableUndo; // KMFolder
   using KMMsgBase::setEnableUndo; // dto.
@@ -85,7 +85,7 @@ public:
   using KMMsgBase::setSignatureStateChar; // dto.
 
   /** Straight forward initialization. */
-  KMMessage(KMFolder* parent=0);
+  KMMessage(KMFolder* tqparent=0);
 
   /** Constructor from a DwMessage. KMMessage takes possession of the
       DwMessage, so don't dare to delete it.
@@ -131,7 +131,7 @@ public:
   */
   void setUnencryptedMsg( KMMessage* unencrypted );
 
-  /** Returns TRUE if the message tqcontains an unencrypted copy of itself. */
+  /** Returns TRUE if the message contains an unencrypted copy of itself. */
   bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; }
 
   /** Returns an unencrypted copy of this message or 0 if none exists. */
@@ -150,21 +150,21 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { seStatus(KMMsgStatusDeleted); }
+  void del() { setqStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { seStatus(KMMsgStatusOld); }
+  void undel() { setqStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { seStatus(KMMsgStatusOld); }
+  void touch() { setqStatus(KMMsgStatusOld); }
 
   /** Create a new message that is a reply to this message, filling all
       required header fields with the proper values. The returned message
       is not stored in any folder. Marks this message as replied. */
   KMMessage* createReply( KMail::ReplyStrategy replyStrategy = KMail::ReplySmart,
-                          TQString selection=TQString::null, bool noQuote = false,
+                          TQString selection=TQString(), bool noQuote = false,
                           bool allowDecryption = true,
-                          const TQString &tmpl = TQString::null );
+                          const TQString &tmpl = TQString() );
 
   /** Create a new message that is a redirect to this message, filling all
     required header fields with the proper values. The returned message
@@ -181,7 +181,7 @@ public:
   /** Create a new message that is a forward of this message, filling all
     required header fields with the proper values. The returned message
     is not stored in any folder. Marks this message as forwarded. */
-  KMMessage* createForward( const TQString &tmpl = TQString::null );
+  KMMessage* createForward( const TQString &tmpl = TQString() );
 
   /** Create a new message that is a delivery receipt of this message,
       filling required header fileds with the proper values. The
@@ -210,9 +210,9 @@ public:
   void sanitizeHeaders( const TQStringList& whiteList = TQStringList() );
 
   /** Parse the string and create this message from it. */
-  void fromDwString(const DwString& str, bool seStatus=false);
-  void fromString(const TQCString& str, bool seStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool seStatus=false);
+  void fromDwString(const DwString& str, bool setqStatus=false);
+  void fromString(const TQCString& str, bool setqStatus=false);
+  void fromByteArray(const TQByteArray & ba, bool setqStatus=false);
 
   /** Return the entire message contents in the DwString. This function
       is *fast* even for large message since it does *not* involve a
@@ -243,7 +243,7 @@ public:
   TQCString headerAsSendableString() const;
 
   /**
-   * Remove all private header fields: *Status: and X-KMail-*
+   * Remove all private header fields: *tqStatus: and X-KMail-*
    **/
   void removePrivateHeaderFields();
 
@@ -274,7 +274,7 @@ public:
   /** @return the UOID of the identity for this message.
       Searches the "x-kmail-identity" header and if that fails,
       searches with KPIM::IdentityManager::identityForAddress()
-      and if that fails queries the KMMsgBase::parent() folder for a default.
+      and if that fails queries the KMMsgBase::tqparent() folder for a default.
    **/
   uint identityUoid() const;
 
@@ -663,11 +663,11 @@ public:
 
   /**
    * Delete a body part with the specified part index.
-   * A dummy body part with the text "the attachment foo was deleted" will tqreplace the old part.
+   * A dummy body part with the text "the attachment foo was deleted" will replace the old part.
    */
   bool deleteBodyPart( int partIndex );
 
-  /** Set "Status" and "X-Status" fields of the message from the
+  /** Set "tqStatus" and "X-tqStatus" fields of the message from the
    * internal message status. */
   void seStatusFields();
 
@@ -679,7 +679,7 @@ public:
 
   /** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
     * prevent their interpretation by KHTML.
-    * Does *not* use the Qt tqreplace function but runs a very fast C code
+    * Does *not* use the TQt replace function but runs a very fast C code
     * the same way as lf2crlf() does.
    */
   static TQCString html2source( const TQCString & src );
@@ -717,7 +717,7 @@ public:
    * only the name part and not the given emailAddr.
    */
   static TQString emailAddrAsAnchor(const TQString& emailAddr,
-          bool stripped=true, const TQString& cssStyle = TQString::null, bool link = true);
+          bool stripped=true, const TQString& cssStyle = TQString(), bool link = true);
 
   /** Strips an address from an address list. This is for example used
       when replying to all.
@@ -760,7 +760,7 @@ public:
   static const TQStringList &preferredCharsets();
 
   /** Replaces every occurrence of "${foo}" in @p s with headerField("foo") */
-  TQString tqreplaceHeadersInString( const TQString & s ) const;
+  TQString replaceHeadersInString( const TQString & s ) const;
 
   /** Get the message charset.*/
   TQCString charset() const;
@@ -822,11 +822,11 @@ public:
   ulong UID() const;
   void setUID(ulong uid);
 
-  /** Status of the message. */
-  KMMsgStatus status() const { return mStatus; }
+  /** tqStatus of the message. */
+  KMMsgtqStatus status() const { return mtqStatus; }
   /** Set status and mark dirty. */
-  void seStatus(const KMMsgStatus status, int idx = -1);
-  void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
+  void setqStatus(const KMMsgtqStatus status, int idx = -1);
+  void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); }
 
   /** Set encryption status of the message. */
   void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
@@ -844,11 +844,11 @@ public:
 
   KMMsgMDNSentState mdnSentState() const { return mMDNSentState; }
 
-  /** Links this message to @p aMsg, setting link type to @p aStatus. */
-  void link(const KMMessage *aMsg, KMMsgStatus aStatus);
+  /** Links this message to @p aMsg, setting link type to @p atqStatus. */
+  void link(const KMMessage *aMsg, KMMsgtqStatus atqStatus);
   /** Returns the information for the Nth link into @p retMsg
-   * and @p reStatus. */
-  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const;
+   * and @p retqStatus. */
+  void getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const;
 
   /** Convert wildcards into normal string */
   TQString formatString(const TQString&) const;
@@ -886,7 +886,7 @@ public:
   /** Returns message body with quoting header and indented by the
     given indentation string. This is suitable for including the message
     in another message of for replies, forwards. The header string is
-    a template where the following fields are tqreplaced with the
+    a template where the following fields are replaced with the
     corresponding values:
     <pre>
         %D: date of this message
@@ -900,7 +900,7 @@ public:
     get converted to plain text when allowDecryption is true. */
   TQString asQuotedString( const TQString & headerStr,
           const TQString & indentStr,
-          const TQString & selection=TQString::null,
+          const TQString & selection=TQString(),
           bool aStripSignature=true,
           bool allowDecryption=true) const;
 
@@ -969,7 +969,7 @@ private:
   KMMessage* mUnencryptedMsg;
   DwBodyPart* mLastUpdated;
   int mCursorPos;
-  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage tqreplaced in the KMMsgList
+  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage replaced in the KMMsgList
   static TQValueList<KMMessage*> sPendingDeletes;
 };
 
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 6e73051f..c0b79189 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -55,9 +55,9 @@
 
 
 KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin,
-                                TQWidget* parent,
+                                TQWidget* tqparent,
                                 const char* name )
-    : KListView(  parent, name ),
+    : KListView(  tqparent, name ),
       mReaderWin( readerWin ), mSizeColumn(0)
 {
     setStyleDependantFrameWidth();
@@ -65,7 +65,7 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin,
     addColumn( i18n("Type") );
     addColumn( i18n("Encoding") );
     mSizeColumn = addColumn( i18n("Size") );
-    setColumnAlignment( 3, Qt::AlignRight );
+    setColumnAlignment( 3, TQt::AlignRight );
 
     restoreLayoutIfPresent();
     connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ),
@@ -245,8 +245,8 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
   }
   if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() )
     item->setText( mSizeColumn, KIO::convertSize(totalSize) );
-  if ( item->parent() )
-    correctSize( item->parent() );
+  if ( item->tqparent() )
+    correctSize( item->tqparent() );
 }
 
 void KMMimePartTree::slotDelete()
@@ -309,18 +309,18 @@ void KMMimePartTree::slotCopy()
   if ( !url.isValid() ) return;
   urls.append( url );
   KURLDrag* drag = new KURLDrag( urls, this );
-  TQApplication::clipboard()->setData( drag, QClipboard::Clipboard );
+  TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
 }
 
 //=============================================================================
-KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent,
+KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent,
                                         partNode* node,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
                                         KIO::filesize_t size )
-  : TQListViewItem( parent, description,
-		   TQString::null, // set by setIconAndTextForType()
+  : TQListViewItem( tqparent, description,
+		   TQString(), // set by setIconAndTextForType()
 		   encoding,
 		   KIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
@@ -328,19 +328,19 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent,
   if( node )
     node->setMimePartTreeItem( this );
   setIconAndTextForType( mimetype );
-  if ( parent )
-    parent->correctSize(this);
+  if ( tqparent )
+    tqparent->correctSize(this);
 }
 
-KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent,
+KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * tqparent,
                                         partNode* node,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
                                         KIO::filesize_t size,
                                         bool revertOrder )
-  : TQListViewItem( parent, description,
-		   TQString::null, // set by setIconAndTextForType()
+  : TQListViewItem( tqparent, description,
+		   TQString(), // set by setIconAndTextForType()
 		   encoding,
 		   KIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index a2e4370a..f520a795 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,11 +47,12 @@ class KMMimePartTreeItem;
 class KMMimePartTree : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMReaderWin;
 
 public:
   KMMimePartTree( KMReaderWin* readerWin,
-                  TQWidget* parent,
+                  TQWidget* tqparent,
                   const char* name = 0 );
   virtual ~KMMimePartTree();
 
@@ -94,20 +95,20 @@ protected:
   int mSizeColumn;
 };
 
-class KMMimePartTreeItem :public QListViewItem
+class KMMimePartTreeItem :public TQListViewItem
 {
 public:
-  KMMimePartTreeItem( KMMimePartTree * parent,
+  KMMimePartTreeItem( KMMimePartTree * tqparent,
                       partNode* node,
                       const TQString & labelDescr,
-                      const TQString & labelCntType  = TQString::null,
-                      const TQString & labelEncoding = TQString::null,
+                      const TQString & labelCntType  = TQString(),
+                      const TQString & labelEncoding = TQString(),
                       KIO::filesize_t size=0 );
-  KMMimePartTreeItem( KMMimePartTreeItem * parent,
+  KMMimePartTreeItem( KMMimePartTreeItem * tqparent,
                       partNode* node,
                       const TQString & labelDescr,
-                      const TQString & labelCntType  = TQString::null,
-                      const TQString & labelEncoding = TQString::null,
+                      const TQString & labelCntType  = TQString(),
+                      const TQString & labelEncoding = TQString(),
                       KIO::filesize_t size=0,
                       bool revertOrder = false );
   partNode* node() const { return mPartNode; }
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index 71a1731c..aed32458 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -72,7 +72,7 @@ using KMail::MessageProperty;
 //-----------------------------------------------------------------------------
 KMMsgBase::KMMsgBase(KMFolder* aParentFolder)
   : mParent( aParentFolder ), mIndexOffset( 0 ),
-    mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mStatus( KMMsgStatusUnknown )
+    mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mtqStatus( KMMsgStatusUnknown )
 {
 }
 
@@ -121,145 +121,145 @@ bool KMMsgBase::isMessage(void) const
   return false;
 }
 //-----------------------------------------------------------------------------
-void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx)
 {
   mDirty = true;
-  KMMsgStatus oldStatus = status();
-  if ( status() & aStatus ) {
-    mStatus &= ~aStatus;
+  KMMsgtqStatus oldtqStatus = status();
+  if ( status() & atqStatus ) {
+    mtqStatus &= ~atqStatus;
   } else {
-    mStatus |= aStatus;
+    mtqStatus |= atqStatus;
     // Ignored and Watched are toggleable, yet mutually exclusive.
     // That is an arbitrary restriction on my part. HAR HAR HAR :) -till
-    if (aStatus == KMMsgStatusWatched)
-      mStatus &= ~KMMsgStatusIgnored;
-    if (aStatus == KMMsgStatusIgnored)
-      mStatus &= ~KMMsgStatusWatched;
-    if (aStatus == KMMsgStatusSpam)
-      mStatus &= ~KMMsgStatusHam;
-    if (aStatus == KMMsgStatusHam)
-      mStatus &= ~KMMsgStatusSpam;
+    if (atqStatus == KMMsgStatusWatched)
+      mtqStatus &= ~KMMsgStatusIgnored;
+    if (atqStatus == KMMsgStatusIgnored)
+      mtqStatus &= ~KMMsgStatusWatched;
+    if (atqStatus == KMMsgStatusSpam)
+      mtqStatus &= ~KMMsgStatusHam;
+    if (atqStatus == KMMsgStatusHam)
+      mtqStatus &= ~KMMsgStatusSpam;
   }
   if (storage()) {
      if (idx < 0)
-       idx = storage()->find( this );
-     storage()->msgStatusChanged( oldStatus, status(), idx );
+       idx = storage()->tqfind( this );
+     storage()->msgStatusChanged( oldtqStatus, status(), idx );
      storage()->headerOfMsgChanged(this, idx);
   }
 
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 {
   mDirty = true;
-  KMMsgStatus oldStatus = status();
-  switch (aStatus) {
+  KMMsgtqStatus oldtqStatus = status();
+  switch (atqStatus) {
     case KMMsgStatusRead:
       // Unset unread and new, set read
-      mStatus &= ~KMMsgStatusUnread;
-      mStatus &= ~KMMsgStatusNew;
-      mStatus |= KMMsgStatusRead;
+      mtqStatus &= ~KMMsgStatusUnread;
+      mtqStatus &= ~KMMsgStatusNew;
+      mtqStatus |= KMMsgStatusRead;
       break;
 
     case KMMsgStatusUnread:
       // unread overrides read
-      mStatus &= ~KMMsgStatusOld;
-      mStatus &= ~KMMsgStatusRead;
-      mStatus &= ~KMMsgStatusNew;
-      mStatus |= KMMsgStatusUnread;
+      mtqStatus &= ~KMMsgStatusOld;
+      mtqStatus &= ~KMMsgStatusRead;
+      mtqStatus &= ~KMMsgStatusNew;
+      mtqStatus |= KMMsgStatusUnread;
       break;
 
     case KMMsgStatusOld:
       // old can't be new or unread
-      mStatus &= ~KMMsgStatusNew;
-      mStatus &= ~KMMsgStatusUnread;
-      mStatus |= KMMsgStatusOld;
+      mtqStatus &= ~KMMsgStatusNew;
+      mtqStatus &= ~KMMsgStatusUnread;
+      mtqStatus |= KMMsgStatusOld;
       break;
 
     case KMMsgStatusNew:
       // new overrides old and read
-      mStatus &= ~KMMsgStatusOld;
-      mStatus &= ~KMMsgStatusRead;
-      mStatus &= ~KMMsgStatusUnread;
-      mStatus |= KMMsgStatusNew;
+      mtqStatus &= ~KMMsgStatusOld;
+      mtqStatus &= ~KMMsgStatusRead;
+      mtqStatus &= ~KMMsgStatusUnread;
+      mtqStatus |= KMMsgStatusNew;
       break;
 
     case KMMsgStatusDeleted:
-      mStatus |= KMMsgStatusDeleted;
+      mtqStatus |= KMMsgStatusDeleted;
       break;
 
     case KMMsgStatusReplied:
-      mStatus |= KMMsgStatusReplied;
+      mtqStatus |= KMMsgStatusReplied;
       break;
 
     case KMMsgStatusForwarded:
-      mStatus |= KMMsgStatusForwarded;
+      mtqStatus |= KMMsgStatusForwarded;
       break;
 
     case KMMsgStatusQueued:
-      mStatus |= KMMsgStatusQueued;
+      mtqStatus |= KMMsgStatusQueued;
       break;
 
     case KMMsgStatusTodo:
-      mStatus |= KMMsgStatusTodo;
+      mtqStatus |= KMMsgStatusTodo;
       break;
 
     case KMMsgStatusSent:
-      mStatus &= ~KMMsgStatusQueued;
-      mStatus &= ~KMMsgStatusUnread;
-      mStatus &= ~KMMsgStatusNew;
-      mStatus |= KMMsgStatusSent;
+      mtqStatus &= ~KMMsgStatusQueued;
+      mtqStatus &= ~KMMsgStatusUnread;
+      mtqStatus &= ~KMMsgStatusNew;
+      mtqStatus |= KMMsgStatusSent;
       break;
 
     case KMMsgStatusFlag:
-      mStatus |= KMMsgStatusFlag;
+      mtqStatus |= KMMsgStatusFlag;
       break;
 
     // Watched and ignored are mutually exclusive
     case KMMsgStatusWatched:
-      mStatus &= ~KMMsgStatusIgnored;
-      mStatus |= KMMsgStatusWatched;
+      mtqStatus &= ~KMMsgStatusIgnored;
+      mtqStatus |= KMMsgStatusWatched;
       break;
 
     case KMMsgStatusIgnored:
-      mStatus &= ~KMMsgStatusWatched;
-      mStatus |= KMMsgStatusIgnored;
+      mtqStatus &= ~KMMsgStatusWatched;
+      mtqStatus |= KMMsgStatusIgnored;
       break;
     // as are ham and spam
     case KMMsgStatusSpam:
-      mStatus &= ~KMMsgStatusHam;
-      mStatus |= KMMsgStatusSpam;
+      mtqStatus &= ~KMMsgStatusHam;
+      mtqStatus |= KMMsgStatusSpam;
       break;
     case KMMsgStatusHam:
-      mStatus &= ~KMMsgStatusSpam;
-      mStatus |= KMMsgStatusHam;
+      mtqStatus &= ~KMMsgStatusSpam;
+      mtqStatus |= KMMsgStatusHam;
       break;
     case KMMsgStatusHasAttach:
-      mStatus &= ~KMMsgStatusHasNoAttach;
-      mStatus |= KMMsgStatusHasAttach;
+      mtqStatus &= ~KMMsgStatusHasNoAttach;
+      mtqStatus |= KMMsgStatusHasAttach;
       break;
     case KMMsgStatusHasNoAttach:
-      mStatus &= ~KMMsgStatusHasAttach;
-      mStatus |= KMMsgStatusHasNoAttach;
+      mtqStatus &= ~KMMsgStatusHasAttach;
+      mtqStatus |= KMMsgStatusHasNoAttach;
       break;
     case KMMsgStatusHasInvitation:
-      mStatus &= ~KMMsgStatusHasNoInvitation;
-      mStatus |= KMMsgStatusHasInvitation;
+      mtqStatus &= ~KMMsgStatusHasNoInvitation;
+      mtqStatus |= KMMsgStatusHasInvitation;
       break;
     case KMMsgStatusHasNoInvitation:
-      mStatus &= ~KMMsgStatusHasInvitation;
-      mStatus |= KMMsgStatusHasNoInvitation;
+      mtqStatus &= ~KMMsgStatusHasInvitation;
+      mtqStatus |= KMMsgStatusHasNoInvitation;
       break;
     default:
-      mStatus = aStatus;
+      mtqStatus = atqStatus;
       break;
   }
 
-  if ( oldStatus != mStatus && storage() ) {
+  if ( oldtqStatus != mtqStatus && storage() ) {
     if (idx < 0)
-      idx = storage()->find( this );
-    storage()->msgStatusChanged( oldStatus, status(), idx );
+      idx = storage()->tqfind( this );
+    storage()->msgStatusChanged( oldtqStatus, status(), idx );
     storage()->headerOfMsgChanged( this, idx );
   }
 }
@@ -267,40 +267,40 @@ void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr)
+void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr)
 {
-  // first try to find status from "X-Status" field if given
+  // first try to find status from "X-tqStatus" field if given
   if (aXStatusStr) {
-    if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach);
+    if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew);
+    if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread);
+    if (strchr(aXStatusStr, 'O')) setqStatus(KMMsgStatusOld);
+    if (strchr(aXStatusStr, 'R')) setqStatus(KMMsgStatusRead);
+    if (strchr(aXStatusStr, 'D')) setqStatus(KMMsgStatusDeleted);
+    if (strchr(aXStatusStr, 'A')) setqStatus(KMMsgStatusReplied);
+    if (strchr(aXStatusStr, 'F')) setqStatus(KMMsgStatusForwarded);
+    if (strchr(aXStatusStr, 'Q')) setqStatus(KMMsgStatusQueued);
+    if (strchr(aXStatusStr, 'K')) setqStatus(KMMsgStatusTodo);
+    if (strchr(aXStatusStr, 'S')) setqStatus(KMMsgStatusSent);
+    if (strchr(aXStatusStr, 'G')) setqStatus(KMMsgStatusFlag);
+    if (strchr(aXStatusStr, 'P')) setqStatus(KMMsgStatusSpam);
+    if (strchr(aXStatusStr, 'H')) setqStatus(KMMsgStatusHam);
+    if (strchr(aXStatusStr, 'T')) setqStatus(KMMsgStatusHasAttach);
+    if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach);
   }
 
-  // Merge the contents of the "Status" field
+  // Merge the contents of the "tqStatus" field
   if (aStatusStr) {
     if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
         (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
-      seStatus( KMMsgStatusOld );
-      seStatus( KMMsgStatusRead );
+      setqStatus( KMMsgStatusOld );
+      setqStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      seStatus(KMMsgStatusRead);
+      setqStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      seStatus(KMMsgStatusDeleted);
+      setqStatus(KMMsgStatusDeleted);
     else
-      seStatus(KMMsgStatusNew);
+      setqStatus(KMMsgStatusNew);
   }
 }
 
@@ -363,117 +363,117 @@ void KMMsgBase::setSignatureStateChar( TQChar status, int idx )
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isUnread(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusUnread && !(st & KMMsgStatusIgnored));
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isNew(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusNew && !(st & KMMsgStatusIgnored));
 }
 
 //-----------------------------------------------------------------------------
-bool KMMsgBase::isOfUnknownStatus(void) const
+bool KMMsgBase::isOfUnknowntqStatus(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st == KMMsgStatusUnknown);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isOld(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusOld);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isRead(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusRead || st & KMMsgStatusIgnored);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isDeleted(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusDeleted);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isReplied(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusReplied);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isForwarded(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusForwarded);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isQueued(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusQueued);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isTodo(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusTodo);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isSent(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusSent);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isImportant(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusFlag);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isWatched(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusWatched);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isIgnored(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusIgnored);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isSpam(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusSpam);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isHam(void) const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   return (st & KMMsgStatusHam);
 }
 
 //-----------------------------------------------------------------------------
-TQCString KMMsgBase::statusToStr(const KMMsgStatus status)
+TQCString KMMsgBase::statusToStr(const KMMsgtqStatus status)
 {
   TQCString sstr;
   if (status & KMMsgStatusNew) sstr += 'N';
@@ -608,7 +608,7 @@ TQStringList KMMsgBase::supportedEncodings(bool usAscii)
   {
     TQTextCodec *codec = KGlobal::charsets()->codecForName(*it);
     TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it);
-    if (mimeNames.find(mimeName) == mimeNames.end())
+    if (mimeNames.tqfind(mimeName) == mimeNames.end())
     {
       encodings.append(KGlobal::charsets()->languageForEncoding(*it)
         + " ( " + mimeName + " )");
@@ -658,14 +658,14 @@ namespace {
 TQString KMMsgBase::decodeRFC2047String(const TQCString& aStr, TQCString prefCharset)
 {
   if ( aStr.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const TQCString str = unfold( aStr );
 
   if ( str.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  if ( str.find( "=?" ) < 0 ) {
+  if ( str.tqfind( "=?" ) < 0 ) {
     if ( !prefCharset.isEmpty() &&
          kmkernel->isCodecAsciiCompatible( KMMsgBase::codecForName( prefCharset ) ) ) {
       if ( prefCharset == "us-ascii" ) {
@@ -813,7 +813,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     start = pos; p = pos;
     while (p < strLength)
     {
-      if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1))
+      if (!breakLine && (_str.at(p) == ' ' || dontQuote.tqfind(_str.at(p)) != -1))
         start = p + 1;
       if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
         break;
@@ -821,9 +821,9 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     }
     if (breakLine || p < strLength)
     {
-      while (dontQuote.find(_str.at(start)) != -1) start++;
+      while (dontQuote.tqfind(_str.at(start)) != -1) start++;
       stop = start;
-      while (stop < strLength && dontQuote.find(_str.at(stop)) == -1)
+      while (stop < strLength && dontQuote.tqfind(_str.at(stop)) == -1)
         stop++;
       result += _str.mid(pos, start - pos).latin1();
       encLength = encodeRFC2047Quoted(codec->fromUnicode(_str.
@@ -946,7 +946,7 @@ TQCString KMMsgBase::encodeRFC2231StringAutoDetectCharset( const TQString &str,
 //-----------------------------------------------------------------------------
 TQString KMMsgBase::decodeRFC2231String(const TQCString& _str)
 {
-  int p = _str.find('\'');
+  int p = _str.tqfind('\'');
   if (p < 0) return kmkernel->networkCodec()->toUnicode(_str);
 
   TQCString charset = _str.left(p);
@@ -996,10 +996,10 @@ TQCString KMMsgBase::extractRFC2231HeaderField( const TQCString &aStr, const TQC
       // Quoted values end at the ending quote
       if ( aStr[startPart] == '"' ) {
         startPart++; // the double quote isn't part of the filename
-        endPart = aStr.find('"', startPart) - 1;
+        endPart = aStr.tqfind('"', startPart) - 1;
       }
       else {
-        endPart = aStr.find(';', startPart) - 1;
+        endPart = aStr.tqfind(';', startPart) - 1;
       }
       if (endPart < 0)
         endPart = 32767;
@@ -1081,7 +1081,7 @@ unsigned long KMMsgBase::getMsgSerNum() const
   if (msn)
     return msn;
   if (mParent) {
-    int index = mParent->find((KMMsgBase*)this);
+    int index = mParent->tqfind((KMMsgBase*)this);
     msn = KMMsgDict::instance()->getMsgSerNum(mParent, index);
     if (msn)
       MessageProperty::setSerialCache( this, msn );
@@ -1093,7 +1093,7 @@ unsigned long KMMsgBase::getMsgSerNum() const
 //-----------------------------------------------------------------------------
 KMMsgAttachmentState KMMsgBase::attachmentState() const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   if (st & KMMsgStatusHasAttach)
     return KMMsgHasAttachment;
   else if (st & KMMsgStatusHasNoAttach)
@@ -1105,7 +1105,7 @@ KMMsgAttachmentState KMMsgBase::attachmentState() const
 
 KMMsgInvitationState KMMsgBase::invitationState() const
 {
-  KMMsgStatus st = status();
+  KMMsgtqStatus st = status();
   if (st & KMMsgStatusHasInvitation)
     return KMMsgHasInvitation;
   else if (st & KMMsgStatusHasNoInvitation)
@@ -1204,9 +1204,9 @@ retry:
       g_chunk_length = 0;
       g_chunk = 0;
   }
-  // Normally we need to swap the byte order because the QStrings are written
-  // in the style of Qt2 (MSB -> network ordered).
-  // QStrings in Qt3 expect host ordering.
+  // Normally we need to swap the byte order because the TQStrings are written
+  // in the style of TQt2 (MSB -> network ordered).
+  // TQStrings in TQt3 expect host ordering.
   // On e.g. Intel host ordering is LSB, on e.g. Sparc it is MSB.
 
 #ifndef WORDS_BIGENDIAN
@@ -1372,7 +1372,7 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   //these is at the beginning because it is queried quite often
   tmp_str = msgIdMD5().stripWhiteSpace();
   STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
-  tmp = mLegacyStatus;
+  tmp = mLegacytqStatus;
   STORE_DATA(MsgLegacyStatusPart, tmp);
 
   //these are completely arbitrary order
@@ -1461,13 +1461,13 @@ void KMMsgBase::readConfig()
 // static
 TQString KMMsgBase::stripOffPrefixes( const TQString& str )
 {
-  return tqreplacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
-                          true, TQString::null ).stripWhiteSpace();
+  return replacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
+                          true, TQString() ).stripWhiteSpace();
 }
 
 //-----------------------------------------------------------------------------
 // static
-TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
+TQString KMMsgBase::replacePrefixes( const TQString& str,
                                     const TQStringList& prefixRegExps,
                                     bool tqreplace,
                                     const TQString& newPrefix )
@@ -1480,7 +1480,7 @@ TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
                       .arg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
-    kdWarning(5006) << "KMMessage::tqreplacePrefixes(): bigRegExp = \""
+    kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
                     << bigRegExp << "\"\n"
                     << "prefix regexp is invalid!" << endl;
     // try good ole Re/Fwd:
@@ -1503,7 +1503,7 @@ TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
 TQString KMMsgBase::cleanSubject() const
 {
   return cleanSubject( sReplySubjPrefixes + sForwardSubjPrefixes,
-		       true, TQString::null ).stripWhiteSpace();
+		       true, TQString() ).stripWhiteSpace();
 }
 
 //-----------------------------------------------------------------------------
@@ -1511,7 +1511,7 @@ TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps,
                                  bool tqreplace,
                                  const TQString & newPrefix ) const
 {
-  return KMMsgBase::tqreplacePrefixes( subject(), prefixRegExps, tqreplace,
+  return KMMsgBase::replacePrefixes( subject(), prefixRegExps, tqreplace,
                                      newPrefix );
 }
 
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index d5b7107f..e3bf0029 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -38,7 +38,7 @@ class KMFolderIndex;
     to Unread or New. This is done in KMMsgBase::isRead()
     and related getters. So we can preserve the state
     when switching a thread to Ignored and back. */
-enum MsgStatus
+enum MsgtqStatus
 {
     KMMsgStatusUnknown =           0x00000000,
     KMMsgStatusNew =               0x00000001,
@@ -62,7 +62,7 @@ enum MsgStatus
     KMMsgStatusHasNoInvitation =   0x00040000
 };
 
-typedef uint KMMsgStatus;
+typedef uint KMMsgtqStatus;
 
 /** The old status format, only one at a time possible. Needed
     for upgrade path purposes. */
@@ -80,7 +80,7 @@ typedef enum
     KMLegacyMsgStatusQueued='Q',
     KMLegacyMsgStatusSent='S',
     KMLegacyMsgStatusFlag='G'
-} KMLegacyMsgStatus;
+} KMLegacyMsgtqStatus;
 
 
 
@@ -152,13 +152,13 @@ public:
   KMFolderIndex* storage() const;
 
   /** Return owning folder. */
-  KMFolder* parent() const { return mParent; }
+  KMFolder* tqparent() const { return mParent; }
 
   /** Set owning folder. */
   void setParent(KMFolder* p) { mParent = p; }
 
   /** Convert the given message status to a string. */
-  static TQCString statusToStr(const KMMsgStatus status);
+  static TQCString statusToStr(const KMMsgtqStatus status);
 
   /** Convert the given message status to a string. */
   TQString statusToSortRank();
@@ -173,7 +173,7 @@ public:
   virtual bool isNew(void) const;
 
   /** Returns TRUE if status is unknown. */
-  virtual bool isOfUnknownStatus(void) const;
+  virtual bool isOfUnknowntqStatus(void) const;
 
   /** Returns TRUE if status is old. */
   virtual bool isOld(void) const;
@@ -215,14 +215,14 @@ public:
   virtual bool isHam(void) const;
 
 
-  /** Status of the message. */
-  virtual KMMsgStatus status(void) const = 0;
+  /** tqStatus of the message. */
+  virtual KMMsgtqStatus status(void) const = 0;
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
-   * specify the index of this message within the parent folder. */
-  virtual void seStatus(const KMMsgStatus status, int idx = -1);
-  virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
-  virtual void seStatus(const char* statusField, const char* xstatusField=0);
+   * specify the index of this message within the tqparent folder. */
+  virtual void setqStatus(const KMMsgtqStatus status, int idx = -1);
+  virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1);
+  virtual void setqStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -238,22 +238,22 @@ public:
 
   /** Set encryption status of the message and mark dirty. Optional
    * optimization: @p idx may specify the index of this message within
-   * the parent folder. */
+   * the tqparent folder. */
   virtual void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
 
   /** Set signature status of the message and mark dirty. Optional
    * optimization: @p idx may specify the index of this message within
-   * the parent folder. */
+   * the tqparent folder. */
   virtual void setSignatureState(const KMMsgSignatureState, int idx = -1);
 
   /** Set encryption status of the message and mark dirty. Optional
    * optimization: @p idx may specify the index of this message within
-   * the parent folder. */
+   * the tqparent folder. */
   virtual void setEncryptionStateChar( TQChar status, int idx = -1 );
 
   /** Set signature status of the message and mark dirty. Optional
    * optimization: @p idx may specify the index of this message within
-   * the parent folder. */
+   * the tqparent folder. */
   virtual void setSignatureStateChar( TQChar status, int idx = -1 );
 
   /** Important header fields of the message that are also kept in the index. */
@@ -403,16 +403,16 @@ public:
   /** Return if the message has at least one attachment */
   virtual KMMsgAttachmentState attachmentState() const;
 
-  /** Return if the message tqcontains an invitation */
+  /** Return if the message contains an invitation */
   virtual KMMsgInvitationState invitationState() const;
 
   /** Check for prefixes @p prefixRegExps in @p str. If none
       is found, @p newPrefix + ' ' is prepended to @p str and the
-      resulting string is returned. If @p tqreplace is true, any
+      resulting string is returned. If @p replace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      @p str is tqreplaced by @p newPrefix.
+      @p str is replaced by @p newPrefix.
   **/
-  static TQString tqreplacePrefixes( const TQString& str,
+  static TQString replacePrefixes( const TQString& str,
                                   const TQStringList& prefixRegExps,
                                   bool tqreplace,
                                   const TQString& newPrefix );
@@ -423,9 +423,9 @@ public:
 
   /** Check for prefixes @p prefixRegExps in #subject(). If none
       is found, @p newPrefix + ' ' is prepended to the subject and the
-      resulting string is returned. If @p tqreplace is true, any
+      resulting string is returned. If @p replace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      #subject() is tqreplaced by @p newPrefix
+      #subject() is replaced by @p newPrefix
   **/
   TQString cleanSubject(const TQStringList& prefixRegExps, bool tqreplace,
 		       const TQString& newPrefix) const;
@@ -450,10 +450,10 @@ protected:
   short mIndexLength;
   bool mDirty;
   bool mEnableUndo;
-  mutable KMMsgStatus mStatus;
+  mutable KMMsgtqStatus mtqStatus;
   // This is kept to provide an upgrade path from the the old single status
   // to the new multiple status scheme.
-  mutable KMLegacyMsgStatus mLegacyStatus;
+  mutable KMLegacyMsgtqStatus mLegacytqStatus;
 
 public:
   enum MsgPartType
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index 07f5797d..223a8adf 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -92,7 +92,7 @@ public:
     if (index >= 0) {
       int size = array.size();
       if (index >= size) {
-        int newsize = QMAX(size + 25, index + 1);
+        int newsize = TQMAX(size + 25, index + 1);
         array.resize(newsize);
         for (int j = size; j < newsize; j++)
           array.at(j) = 0;
@@ -215,10 +215,10 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum,
   }
 
   if (index == -1)
-    index = folder->find(msg);
+    index = folder->tqfind(msg);
 
   // Should not happen, indicates id file corruption
-  while (dict->find((long)msn)) {
+  while (dict->tqfind((long)msn)) {
     msn = getNextMsgSerNum();
     folder->setDirty( true ); // rewrite id file
   }
@@ -251,7 +251,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum,
 {
   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
   if ( !folder ) {
-    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial "
+    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot replace the message serial "
       << "number, null pointer to storage. Requested serial: " << msgSerNum
       << endl;
     kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
@@ -260,7 +260,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum,
   }
 
   if ( index == -1 )
-    index = folder->find( msg );
+    index = folder->tqfind( msg );
 
   remove( msgSerNum );
   KMMsgDictEntry *entry = new KMMsgDictEntry( folder->folder(), index );
@@ -279,7 +279,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum,
 void KMMsgDict::remove(unsigned long msgSerNum)
 {
   long key = (long)msgSerNum;
-  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find(key);
+  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind(key);
   if (!entry)
     return;
 
@@ -303,7 +303,7 @@ unsigned long KMMsgDict::remove(const KMMsgBase *msg)
 
 void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex)
 {
-  KMMsgDictREntry *rentry = msg->parent()->storage()->rDict();
+  KMMsgDictREntry *rentry = msg->tqparent()->storage()->rDict();
   if (rentry) {
     KMMsgDictEntry *entry = rentry->get(index);
     if (entry) {
@@ -319,7 +319,7 @@ void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex)
 void KMMsgDict::getLocation(unsigned long key,
                             KMFolder **retFolder, int *retIndex) const
 {
-  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find((long)key);
+  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind((long)key);
   if (entry) {
     *retFolder = (KMFolder *)entry->folder;
     *retIndex = entry->index;
@@ -448,7 +448,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
     if (swapByteOrder)
        msn = kmail_swap_32(msn);
 
-    if (!readOk || dict->find(msn)) {
+    if (!readOk || dict->tqfind(msn)) {
       for (unsigned int i = 0; i < index; i++) {
         msn = rentry->getMsn(i);
         dict->remove((long)msn);
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index 9a7b1ed8..2d678bf1 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other)
         delete kd;
         kd = 0;
     }
-    mStatus = other.status();
+    mtqStatus = other.status();
     return *this;
 }
 #endif
@@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
     kd->strippedSubjectMD5 = msg.strippedSubjectMD5();
     kd->msgIdMD5 = msg.msgIdMD5();
     kd->xmark = msg.xmark();
-    mStatus = msg.status();
+    mtqStatus = msg.status();
     kd->folderOffset = msg.folderOffset();
     kd->msgSize = msg.msgSize();
     kd->date = msg.date();
@@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
 //-----------------------------------------------------------------------------
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgStatus aStatus, const TQCString& aXMark,
+                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      KMMsgEncryptionState encryptionState,
@@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
     kd->msgIdMD5 = base64EncodedMD5( msgId );
     kd->xmark = aXMark;
     kd->folderOffset = aFolderOffset;
-    mStatus    = aStatus;
+    mtqStatus    = atqStatus;
     kd->msgSize = aMsgSize;
     kd->date = aDate;
     kd->file = "";
@@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
 
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgStatus aStatus, const TQCString& aXMark,
+                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      const TQCString& aFileName,
@@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
              size_t aMsgSizeServer, ulong aUID)
 {
   // use the "normal" init for most stuff
-  init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId,
+  init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId,
         msgId, encryptionState, signatureState, mdnSentState, prefCharset,
         (unsigned long)0, aMsgSize, aMsgSizeServer, aUID );
   kd->file = aFileName;
@@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx )
 }
 
 //-----------------------------------------------------------------------------
-KMMsgStatus KMMsgInfo::status(void) const
+KMMsgtqStatus KMMsgInfo::status(void) const
 {
-    if (mStatus == KMMsgStatusUnknown) {
-        KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart);
+    if (mtqStatus == KMMsgStatusUnknown) {
+        KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart);
         if (!st) {
             // We are opening an old index for the first time, get the legacy
             // status and merge it in.
-            mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart);
+            mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart);
             st = KMMsgStatusRead;
-            switch (mLegacyStatus) {
+            switch (mLegacytqStatus) {
                 case KMLegacyMsgStatusUnknown:
                     st = KMMsgStatusUnknown;
                     break;
@@ -525,9 +525,9 @@ KMMsgStatus KMMsgInfo::status(void) const
             }
 
         }
-        mStatus = st;
+        mtqStatus = st;
     }
-    return mStatus;
+    return mtqStatus;
 }
 
 
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 {
-    if(aStatus == status())
+    if(atqStatus == status())
         return;
-    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
@@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8)
     kd->folderOffset = str.mid(2,9).toULong();
     kd->msgSize = str.mid(12,9).toULong();
     kd->date = (time_t)str.mid(22,10).toULong();
-    mStatus = (KMMsgStatus)str.at(0);
+    mtqStatus = (KMMsgtqStatus)str.at(0);
     if (toUtf8) {
         kd->subject = str.mid(37, 100).stripWhiteSpace();
         kd->fromStrip = str.mid(138, 50).stripWhiteSpace();
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index ce15e312..56735448 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -29,7 +29,7 @@ class KMMessage;
 class KMMsgInfo: public KMMsgBase
 {
 public:
-  KMMsgInfo(KMFolder* parent, off_t off=0, short len=0);
+  KMMsgInfo(KMFolder* tqparent, off_t off=0, short len=0);
   virtual ~KMMsgInfo();
 
   /** left for old style index files */
@@ -39,7 +39,7 @@ public:
   /** Initialize with given values and set dirty flag to FALSE. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
-		    KMMsgStatus status, const TQCString& xmark,
+		    KMMsgtqStatus status, const TQCString& xmark,
                     const TQCString& replyToId,
                     const TQCString& replyToAuxId,
                     const TQCString& msgId,
@@ -53,7 +53,7 @@ public:
   /** Initialize with given values and set dirty flag to FALSE. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
-		    KMMsgStatus status, const TQCString& xmark,
+		    KMMsgtqStatus status, const TQCString& xmark,
                     const TQCString& replyToId,
                     const TQCString& replyToAuxId,
                     const TQCString& msgId,
@@ -78,7 +78,7 @@ public:
   virtual bool subjectIsPrefixed() const;
   virtual TQString msgIdMD5(void) const;
   virtual TQString fileName(void) const;
-  virtual KMMsgStatus status(void) const;
+  virtual KMMsgtqStatus status(void) const;
   virtual KMMsgEncryptionState encryptionState() const;
   virtual KMMsgSignatureState signatureState() const;
   virtual KMMsgMDNSentState mdnSentState() const;
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void seStatus(const KMMsgStatus status, int idx = -1);
+  virtual void setqStatus(const KMMsgtqStatus status, int idx = -1);
   virtual void setDate(time_t aUnixTime);
   virtual void setSubject(const TQString&);
   virtual void setXMark(const TQString&);
@@ -107,7 +107,7 @@ public:
   virtual void setTo( const TQString &to );
 
   /** Grr.. c++! */
-  virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
+  virtual void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); }
   virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); }
 
   virtual bool dirty(void) const;
diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index a96d6aae..9e71f285 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -45,7 +45,7 @@ KMMessagePart::KMMessagePart( TQDataStream & stream )
   KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() );
 
   // set the type
-  int sep = mOriginalContentTypeStr.find('/');
+  int sep = mOriginalContentTypeStr.tqfind('/');
   mType = mOriginalContentTypeStr.left(sep);
   mSubtype = mOriginalContentTypeStr.mid(sep+1);
 
@@ -70,11 +70,11 @@ void KMMessagePart::clear()
   mContentDisposition = TQCString();
   mBody.truncate( 0 );
   mAdditionalCTypeParamStr = TQCString();
-  mName = TQString::null;
+  mName = TQString();
   mParameterAttribute = TQCString();
-  mParameterValue = TQString::null;
+  mParameterValue = TQString();
   mCharset = TQCString();
-  mPartSpecifier = TQString::null;
+  mPartSpecifier = TQString();
   mBodyDecodedSize = 0;
   mParent = 0;
   mLoadHeaders = false;
@@ -87,7 +87,7 @@ void KMMessagePart::duplicate( const KMMessagePart & msgPart )
 {
   // copy the data of msgPart
   *this = msgPart;
-  // detach the explicitely shared QByteArray
+  // detach the explicitely shared TQByteArray
   mBody.detach();
 }
 
@@ -103,7 +103,7 @@ int KMMessagePart::decodedSize(void) const
 //-----------------------------------------------------------------------------
 void KMMessagePart::setBody(const TQCString &aStr)
 {
-  KMail::Util::setFromQCString( mBody, aStr );
+  KMail::Util::setFromTQCString( mBody, aStr );
 
   int enc = cte();
   if (enc == DwMime::kCte7bit || enc == DwMime::kCte8bit || enc == DwMime::kCteBinary)
@@ -422,10 +422,10 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
   KMimeMagic::self()->setFollowLinks( true ); // is it necessary ?
 
   const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ;
-  KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body );
+  KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body );
 
   TQString mimetype = result->mimeType();
-  const int sep = mimetype.find('/');
+  const int sep = mimetype.tqfind('/');
   mType = mimetype.left(sep).latin1();
   mSubtype = mimetype.mid(sep+1).latin1();
 }
@@ -438,14 +438,14 @@ TQString KMMessagePart::iconName( int size ) const
   KPIM::kAsciiToLower( mimeType.data() );
 
   TQString fileName =
-    KMimeType::mimeType( mimeType )->icon( TQString::null, false );
+    KMimeType::mimeType( mimeType )->icon( TQString(), false );
   if ( fileName.isEmpty() )
   {
     fileName = this->fileName();
     if ( fileName.isEmpty() ) fileName = this->name();
     if ( !fileName.isEmpty() )
     {
-      fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
+      fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString(), true );
     }
   }
 
@@ -568,19 +568,19 @@ TQString KMMessagePart::fileName(void) const
 
     // Standard RFC 2047-encoded
     // search the start of the filename
-    int startOfFilename = mContentDisposition.find("filename=", 0, false);
+    int startOfFilename = mContentDisposition.tqfind("filename=", 0, false);
     if (startOfFilename < 0)
-      return TQString::null;
+      return TQString();
     startOfFilename += 9;
 
     // search the end of the filename
     int endOfFilename;
     if ( '"' == mContentDisposition[startOfFilename] ) {
       startOfFilename++; // the double quote isn't part of the filename
-      endOfFilename = mContentDisposition.find('"', startOfFilename) - 1;
+      endOfFilename = mContentDisposition.tqfind('"', startOfFilename) - 1;
     }
     else {
-      endOfFilename = mContentDisposition.find(';', startOfFilename) - 1;
+      endOfFilename = mContentDisposition.tqfind(';', startOfFilename) - 1;
     }
     if (endOfFilename < 0)
       endOfFilename = 32767;
@@ -591,7 +591,7 @@ TQString KMMessagePart::fileName(void) const
     return KMMsgBase::decodeRFC2047String(str);
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 TQCString KMMessagePart::body() const
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 85906af5..8ab55358 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -63,12 +63,12 @@ public:
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-    tqcontains the correct encoding. This routine is meant for binary data.
+    contains the correct encoding. This routine is meant for binary data.
     No trailing 0 is appended. */
   TQByteArray bodyDecodedBinary(void) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-      tqcontains the correct encoding. This routine is meant for text strings! */
+      contains the correct encoding. This routine is meant for text strings! */
   TQCString bodyDecoded(void) const;
 
   /** Sets body, encoded in the best fitting
@@ -100,8 +100,8 @@ public:
       This one is for text strings, the trailing 0 is not used.
 
       For speed reasons, prefer setBodyEncodedBinary.
-      When possible (the TQCString isn't used afterwards), change setBodyEncoded(myQCString) into:
-       setBodyEncodedBinary(byteArrayFromQCStringNoDetach(myQCString));
+      When possible (the TQCString isn't used afterwards), change setBodyEncoded(myTQCString) into:
+       setBodyEncodedBinary(byteArrayFromTQCStringNoDetach(myTQCString));
   */
  void setBodyEncoded(const TQCString& aStr);
 
@@ -209,13 +209,13 @@ public:
   /** Sets the part number */
   void setPartSpecifier( const TQString & part ) { mPartSpecifier = part; }
 
-  /** If this part is complete (tqcontains a body) */
+  /** If this part is complete (contains a body) */
   bool isComplete() { return (!mBody.isNull()); }
 
-  /** Returns the parent part */
-  KMMessagePart* parent() { return mParent; }
+  /** Returns the tqparent part */
+  KMMessagePart* tqparent() { return mParent; }
 
-  /** Set the parent of this part */
+  /** Set the tqparent of this part */
   void setParent( KMMessagePart* part ) { mParent = part; }
 
   /** Returns true if the headers should be loaded */
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index e87fbd8a..386f4af6 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 
-// other Qt includes:
+// other TQt includes:
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
@@ -44,10 +44,10 @@ static const int numEncodingTypes =
   sizeof encodingTypes / sizeof *encodingTypes;
 
 KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
-				  TQWidget * parent, const char * name )
+				  TQWidget * tqparent, const char * name )
   : KDialogBase( Plain,
 		 caption.isEmpty() ? i18n("Message Part Properties") : caption,
-		 Ok|Cancel|Help, Ok, parent, name, true, true)
+		 Ok|Cancel|Help, Ok, tqparent, name, true, true)
 {
   // tmp vars:
   TQGridLayout * glay;
@@ -331,8 +331,8 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) {
 
 
 
-KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * parent, const char *, bool readOnly)
-  : KMMsgPartDialog(TQString::null, parent ), mMsgPart( 0 )
+KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * tqparent, const char *, bool readOnly)
+  : KMMsgPartDialog(TQString(), tqparent ), mMsgPart( 0 )
 {
   setShownEncodings( SevenBit|EightBit|QuotedPrintable|Base64 );
   if (readOnly)
@@ -370,7 +370,7 @@ void KMMsgPartDialogCompat::setMsgPart( KMMessagePart * aMsgPart )
   setMimeType( mMsgPart->typeStr(), mMsgPart->subtypeStr() );
   setSize( mMsgPart->decodedSize() );
   setInline( mMsgPart->contentDisposition()
-	     .find( TQRegExp("^\\s*inline", false) ) >= 0 );
+	     .tqfind( TQRegExp("^\\s*inline", false) ) >= 0 );
 }
 
 
@@ -408,7 +408,7 @@ void KMMsgPartDialogCompat::applyChanges()
   // apply Content-Type:
   TQCString type = mimeType().latin1();
   TQCString subtype;
-  int idx = type.find('/');
+  int idx = type.tqfind('/');
   if ( idx < 0 )
     subtype = "";
   else {
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index d53b7d56..eb69c0be 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -39,10 +39,11 @@ class TQLineEdit;
 class KMMsgPartDialog: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMsgPartDialog( const TQString & caption=TQString::null,
-		   TQWidget * parent=0, const char * name=0 );
+  KMMsgPartDialog( const TQString & caption=TQString(),
+		   TQWidget * tqparent=0, const char * name=0 );
   virtual ~KMMsgPartDialog();
 
   /** Get the currently selected mimetype */
@@ -139,8 +140,9 @@ protected:
 */
 class KMMsgPartDialogCompat : public KMMsgPartDialog {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
+  KMMsgPartDialogCompat( TQWidget * tqparent=0, const char * caption=0, bool=FALSE );
   virtual ~KMMsgPartDialogCompat();
 
   /** Display information about this message part. */
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 3139aa32..0936df8a 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -30,11 +30,11 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial
       : KListView(aParent)
 {
   mDialog=aDialog;
-  int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString::null, 24);
+  int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString(), 24);
   assert( mDownIndex == Down ); //This code relies on the fact that radiobuttons are the first three columns for easier Column-Action mapping
 			        //it does not necessarily be true - you could redefine mapToColumn and mapToAction to eg. shift those numbers by 1
-  addColumn(TQIconSet(TQPixmap(mLater)), TQString::null, 24);
-  addColumn(TQIconSet(TQPixmap(mDel)), TQString::null, 24);
+  addColumn(TQIconSet(TQPixmap(mLater)), TQString(), 24);
+  addColumn(TQIconSet(TQPixmap(mDel)), TQString(), 24);
 
   /*int subjCol =*/ addColumn(i18n("Subject"), 180);
   /*int sendCol =*/ addColumn(i18n("Sender"), 150);
@@ -44,10 +44,10 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial
 
   setAllColumnsShowFocus(true);
 
-  setColumnAlignment(Down, Qt::AlignHCenter);
-  setColumnAlignment(Later, Qt::AlignHCenter);
-  setColumnAlignment(Delete, Qt::AlignHCenter);
-  setColumnAlignment(sizeCol, Qt::AlignRight);
+  setColumnAlignment(Down, TQt::AlignHCenter);
+  setColumnAlignment(Later, TQt::AlignHCenter);
+  setColumnAlignment(Delete, TQt::AlignHCenter);
+  setColumnAlignment(sizeCol, TQt::AlignRight);
 
   setSorting(dateCol, false);
   setShowSortIndicator(true);
diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h
index 76744d7c..8055faea 100644
--- a/kmail/kmpopfiltercnfrmdlg.h
+++ b/kmail/kmpopfiltercnfrmdlg.h
@@ -36,6 +36,7 @@ class KMPopFilterCnfrmDlg;
 class KMPopHeadersView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMPopHeadersView(TQWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0);
@@ -78,6 +79,7 @@ class KMPopFilterCnfrmDlg : public KDialogBase
 {
 	friend class ::KMPopHeadersView;
   Q_OBJECT
+  TQ_OBJECT
 protected:
   KMPopFilterCnfrmDlg() { };
   TQMap<TQListViewItem*, KMPopHeaders*> mItemMap;
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 375234c0..84060817 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -156,15 +156,15 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg,
   menuBar()->show();
   toolBar( "mainToolBar" )->show();
 
-  connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) );
+  connect ( msg->tqparent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) );
 
 }
 
 void KMReaderMainWin::slotFolderRemoved( TQObject* folderPtr )
 {
   assert(mMsg);
-  assert(folderPtr == mMsg->parent());
-  if( mMsg && folderPtr == mMsg->parent() )
+  assert(folderPtr == mMsg->tqparent());
+  if( mMsg && folderPtr == mMsg->tqparent() )
     mMsg->setParent( 0 );
 }
 
@@ -181,18 +181,18 @@ void KMReaderMainWin::slotTrashMsg()
   if ( !mMsg )
     return;
   // find the real msg by its sernum
-  KMFolder* parent;
+  KMFolder* tqparent;
   int index;
-  KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &parent, &index );
-  if ( parent && !parent->isTrash() ) {
+  KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &tqparent, &index );
+  if ( tqparent && !tqparent->isTrash() ) {
     // open the folder (ref counted)
-    parent->open("trashmsg");
-    KMMessage *msg = parent->getMsg( index );
+    tqparent->open("trashmsg");
+    KMMessage *msg = tqparent->getMsg( index );
     if (msg) {
-      KMDeleteMsgCommand *command = new KMDeleteMsgCommand( parent, msg );
+      KMDeleteMsgCommand *command = new KMDeleteMsgCommand( tqparent, msg );
       command->start();
     }
-    parent->close("trashmsg");
+    tqparent->close("trashmsg");
   }
   close();
 }
@@ -235,9 +235,9 @@ void KMReaderMainWin::slotPrintMsg()
 void KMReaderMainWin::slotForwardInlineMsg()
 {
    KMCommand *command = 0;
-   if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
+   if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) {
     command = new KMForwardInlineCommand( this, mReaderWin->message(),
-        mReaderWin->message()->parent()->identity() );
+        mReaderWin->message()->tqparent()->identity() );
    } else {
     command = new KMForwardInlineCommand( this, mReaderWin->message() );
    }
@@ -250,9 +250,9 @@ void KMReaderMainWin::slotForwardInlineMsg()
 void KMReaderMainWin::slotForwardAttachedMsg()
 {
    KMCommand *command = 0;
-   if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
+   if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) {
      command = new KMForwardAttachedCommand( this, mReaderWin->message(),
-        mReaderWin->message()->parent()->identity() );
+        mReaderWin->message()->tqparent()->identity() );
    } else {
      command = new KMForwardAttachedCommand( this, mReaderWin->message() );
    }
@@ -265,9 +265,9 @@ void KMReaderMainWin::slotForwardAttachedMsg()
 void KMReaderMainWin::slotForwardDigestMsg()
 {
    KMCommand *command = 0;
-   if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
+   if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) {
      command = new KMForwardDigestCommand( this, mReaderWin->message(),
-        mReaderWin->message()->parent()->identity() );
+        mReaderWin->message()->tqparent()->identity() );
    } else {
      command = new KMForwardDigestCommand( this, mReaderWin->message() );
    }
@@ -362,8 +362,8 @@ void KMReaderMainWin::setupAccel()
   //----- Edit Menu
   KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
   KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
-  KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() );
-  KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
+  KStdAction::tqfind( this, TQT_SLOT(slotFind()), actionCollection() );
+  KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
   mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
@@ -487,9 +487,9 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
       return;
     }
 
-    if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() ||
-                                aMsg.parent()->isDrafts() ||
-                                aMsg.parent()->isTemplates() ) ) ) {
+    if ( ! ( aMsg.tqparent() && ( aMsg.tqparent()->isSent() ||
+                                aMsg.tqparent()->isDrafts() ||
+                                aMsg.tqparent()->isTemplates() ) ) ) {
       // add the reply and forward actions only if we are not in a sent-mail,
       // templates or drafts folder
       //
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index a4d8e972..83d87267 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -25,6 +25,7 @@ class MessageActions;
 class KMReaderMainWin : public KMail::SecondaryWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 );
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 0fce722d..a6b3c1d5 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -136,7 +136,7 @@ using KMail::TeeHtmlWriter;
 #include <paths.h>
 #endif
 
-class NewByteArray : public QByteArray
+class NewByteArray : public TQByteArray
 {
 public:
     NewByteArray &appendNULL();
@@ -274,21 +274,21 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
     DwHeaders * headers(
         (part && part->hasHeaders())
         ? &part->Headers()
-        : (  (weAreReplacingTheRootNode || !dataNode->parentNode())
+        : (  (weAreReplacingTheRootNode || !dataNode->tqparentNode())
             ? &rootHeaders
             : 0 ) );
     if( dataNode == curNode ) {
 kdDebug(5006) << "dataNode == curNode:  Save curNode without replacing it." << endl;
 
       // A) Store the headers of this part IF curNode is not the root node
-      //    AND we are not replacing a node that already *has* tqreplaced
+      //    AND we are not replacing a node that already *has* replaced
       //    the root node in previous recursion steps of this function...
       if( headers ) {
-        if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
+        if( dataNode->tqparentNode() && !weAreReplacingTheRootNode ) {
 kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
           resultingData += headers->AsString().c_str();
         } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
-kdDebug(5006) << "dataNode tqreplace the root node:  Do NOT store the headers but change" << endl;
+kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
 kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
 kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
 kdDebug(5006) << "              new Content-Type = " << headers->ContentType(   ).AsString().c_str() << endl;
@@ -309,10 +309,10 @@ kdDebug(5006) << "              new Content-Type = " << headers->ContentType(
 
       // B) Store the body of this part.
       if( headers && bIsMultipart && dataNode->firstChild() )  {
-kdDebug(5006) << "is valid Multipart, processing children:" << endl;
+kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl;
         TQCString boundary = headers->ContentType().Boundary().c_str();
         curNode = dataNode->firstChild();
-        // store children of multipart
+        // store tqchildren of multipart
         while( curNode ) {
 kdDebug(5006) << "--boundary" << endl;
           if( resultingData.size() &&
@@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl;
           resultingData += boundary;
           resultingData += "\n";
           // note: We are processing a harmless multipart that is *not*
-          //       to be tqreplaced by one of it's children, therefor
+          //       to be replaced by one of it's tqchildren, therefor
           //       we set their doStoreHeaders to true.
           objectTreeToDecryptedMsg( curNode,
                                     resultingData,
@@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl;
         resultingData += "\n--";
         resultingData += boundary;
         resultingData += "--\n\n";
-kdDebug(5006) << "Multipart processing children - DONE" << endl;
+kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl;
       } else if( part ){
         // store simple part
 kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl;
@@ -345,13 +345,13 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE
       }
     } else {
 kdDebug(5006) << "dataNode != curNode:  Replace curNode by dataNode." << endl;
-      bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();
+      bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->tqparentNode();
       if( rootNodeReplaceFlag ) {
-kdDebug(5006) << "                      Root node will be tqreplaced." << endl;
+kdDebug(5006) << "                      Root node will be replaced." << endl;
       } else {
-kdDebug(5006) << "                      Root node will NOT be tqreplaced." << endl;
+kdDebug(5006) << "                      Root node will NOT be replaced." << endl;
       }
-      // store special data to tqreplace the current part
+      // store special data to replace the current part
       // (e.g. decrypted data or embedded RfC 822 data)
       objectTreeToDecryptedMsg( dataNode,
                                 resultingData,
@@ -386,7 +386,7 @@ kdDebug(5006) << "                      Root node will NOT be tqreplaced." << en
 
 void KMReaderWin::createWidgets() {
   TQVBoxLayout * vlay = new TQVBoxLayout( this );
-  mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" );
+  mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" );
   vlay->addWidget( mSplitter );
   mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" );
   mBox = new TQHBox( mSplitter, "mBox" );
@@ -406,7 +406,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
 			 KActionCollection* actionCollection,
                          const char *aName,
                          int aFlags )
-  : TQWidget(aParent, aName, aFlags | Qt::WDestructiveClose),
+  : TQWidget(aParent, aName, aFlags | TQt::WDestructiveClose),
     mSerNumOfOriginalMessage( 0 ),
     mNodeIdOffset( -1 ),
     mAttachmentStrategy( 0 ),
@@ -1002,7 +1002,7 @@ void KMReaderWin::initHtmlWidget(void)
 
   if ( !htmlWriter() )
 #ifdef KMAIL_READER_HTML_DEBUG
-    mHtmlWriter = new TeeHtmlWriter( new FileHtmlWriter( TQString::null ),
+    mHtmlWriter = new TeeHtmlWriter( new FileHtmlWriter( TQString() ),
 				     new KHtmlPartHtmlWriter( mViewer, 0 ) );
 #else
     mHtmlWriter = new KHtmlPartHtmlWriter( mViewer, 0 );
@@ -1033,7 +1033,7 @@ void KMReaderWin::contacStatusChanged( const TQString &uid)
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
-    if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString::null )
+    if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
       newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
@@ -1088,7 +1088,7 @@ void KMReaderWin::setOverrideEncoding( const TQString & encoding )
         kdWarning(5006) << "Unknown override character encoding \"" << encoding
                         << "\". Using Auto instead." << endl;
         mSelectEncodingAction->setCurrentItem( 0 );
-        mOverrideEncoding = TQString::null;
+        mOverrideEncoding = TQString();
       }
     }
   }
@@ -1364,7 +1364,7 @@ void KMReaderWin::displayAboutPage()
 			  "an incoming as well as outgoing mail account."
 			  "</p>\n") );
   } else {
-    info = info.arg( TQString::null );
+    info = info.arg( TQString() );
   }
 
   if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) {
@@ -1465,7 +1465,7 @@ void KMReaderWin::displayMessage() {
   htmlWriter()->begin( mCSSHelper->cssDefinitions( isFixedFont() ) );
   htmlWriter()->queue( mCSSHelper->htmlHead( isFixedFont() ) );
 
-  if (!parent())
+  if (!tqparent())
     setCaption(msg->subject());
 
   removeTempFiles();
@@ -1592,7 +1592,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
 
 kdDebug(5006) << "\n\n\nKMReaderWin::parseMsg()  -  special post-encryption handling:\n1." << endl;
 kdDebug(5006) << "(aMsg == msg) = "                               << (aMsg == message()) << endl;
-kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl;
+kdDebug(5006) << "aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() = " << (aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder()) << endl;
 kdDebug(5006) << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ) << endl;
 kdDebug(5006) << "this->decryptMessage() = " << decryptMessage() << endl;
 kdDebug(5006) << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs() << endl;
@@ -1602,7 +1602,7 @@ kdDebug(5006) << "|| (KMMsgPartiallyEncrypted == encryptionState) = " << (KMMsgP
          // double click on the message (==not running in a separate window)
   if(    (aMsg == message())
          // don't remove encryption in the outbox folder :)
-      && ( aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() )
+      && ( aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() )
          // only proceed if this message was not saved encryptedly before
       && !message_was_saved_decrypted_before( aMsg )
          // only proceed if the message has actually been decrypted
@@ -1653,7 +1653,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 
   if( emitReplaceMsgByUnencryptedVersion ) {
     kdDebug(5006) << "KMReaderWin  -  invoce saving in decrypted form:" << endl;
-    emit tqreplaceMsgByUnencryptedVersion();
+    emit replaceMsgByUnencryptedVersion();
   } else {
     kdDebug(5006) << "KMReaderWin  -  finished parsing and displaying of message." << endl;
     showHideMimeTree( rootNodeCntType == DwMime::kTypeText &&
@@ -1708,7 +1708,7 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart,
     size = KMail::Util::crlf2lf( data.data(), size );
   }
   if( !KPIM::kBytesToFile( data.data(), size, fname, false, false, false ) )
-    return TQString::null;
+    return TQString();
 
   mTempFiles.append( fname );
   // make file read-only so that nobody gets the impression that he might
@@ -1720,7 +1720,7 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart,
 
 TQString KMReaderWin::createTempDir( const TQString &param )
 {
-  KTempFile *tempFile = new KTempFile( TQString::null, "." + param );
+  KTempFile *tempFile = new KTempFile( TQString(), "." + param );
   tempFile->setAutoDelete( true );
   TQString fname = tempFile->name();
   delete tempFile;
@@ -1729,7 +1729,7 @@ TQString KMReaderWin::createTempDir( const TQString &param )
     // Not there or not writable
     if( ::mkdir( TQFile::encodeName( fname ), 0 ) != 0
         || ::chmod( TQFile::encodeName( fname ), S_IRWXU ) != 0 )
-      return TQString::null; //failed create
+      return TQString(); //failed create
 
   assert( !fname.isNull() );
 
@@ -1814,7 +1814,7 @@ void KMReaderWin::slotTouchMessage()
        message()->encryptionState() != KMMsgEncryptionStateUnknown )
     return;
 
-  KMFolder *folder = message()->parent();
+  KMFolder *folder = message()->tqparent();
   if (folder &&
      (folder->isOutbox() || folder->isSent() || folder->isTrash() ||
       folder->isDrafts() || folder->isTemplates() ) )
@@ -1845,15 +1845,15 @@ bool foundSMIMEData( const TQString aUrl,
   displayName = "";
   libName = "";
   keyId = "";
-  int i1 = aUrl.find( showCertMan );
+  int i1 = aUrl.tqfind( showCertMan );
   if( -1 < i1 ) {
     i1 += showCertMan.length();
-    int i2 = aUrl.find(" ### ", i1);
+    int i2 = aUrl.tqfind(" ### ", i1);
     if( i1 < i2 )
     {
       displayName = aUrl.mid( i1, i2-i1 );
       i1 = i2+5;
-      i2 = aUrl.find(" ### ", i1);
+      i2 = aUrl.tqfind(" ### ", i1);
       if( i1 < i2 )
       {
         libName = aUrl.mid( i1, i2-i1 );
@@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   }
 
   if ( aUrl.stripWhiteSpace().isEmpty() ) {
-    KPIM::BroadcasStatus::instance()->reset();
+    KPIM::BroadcastqStatus::instance()->reset();
     mHoveredUrl = KURL();
     mLastClickImagePath = TQString();
     return;
@@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
 
   kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
-  KPIM::BroadcasStatus::instance()->setTransienStatusMsg( msg );
+  KPIM::BroadcastqStatus::instance()->setTransienStatusMsg( msg );
 }
 
 
@@ -1916,7 +1916,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &)
     return;
 
   kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl;
-  emit urlClicked( aUrl, Qt::LeftButton );
+  emit urlClicked( aUrl, TQt::LeftButton );
 }
 
 //-----------------------------------------------------------------------------
@@ -1940,7 +1940,7 @@ void KMReaderWin::slotUrlPopup(const TQString &aUrl, const TQPoint& aPos)
   }
 }
 
-// Checks if the given node has a parent node that is a DIV which has an ID attribute
+// Checks if the given node has a tqparent node that is a DIV which has an ID attribute
 // with the value specified here
 static bool hasParentDivWithId( const DOM::Node &start, const TQString &id )
 {
@@ -1955,8 +1955,8 @@ static bool hasParentDivWithId( const DOM::Node &start, const TQString &id )
     }
   }
 
-  if ( !start.parentNode().isNull() )
-    return hasParentDivWithId( start.parentNode(), id );
+  if ( !start.tqparentNode().isNull() )
+    return hasParentDivWithId( start.tqparentNode(), id );
   else return false;
 }
 
@@ -1971,7 +1971,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
   menu->insertItem(i18n("to view something", "View"), 3);
   menu->insertItem(SmallIcon("filesaveas"),i18n("Save As..."), 4);
   menu->insertItem(SmallIcon("editcopy"), i18n("Copy"), 9 );
-  const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false;
+  const bool canChange = message()->tqparent() ? !message()->tqparent()->isReadOnly() : false;
   if ( GlobalSettings::self()->allowAttachmentEditing() && canChange )
     menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
   if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
@@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice )
     if (!url.isValid() ) return;
     urls.append( url );
     KURLDrag* drag = new KURLDrag( urls, this );
-    TQApplication::clipboard()->setData( drag, QClipboard::Clipboard );
+    TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
   } else if ( choice == 10 ) { // Scroll To
     scrollToAttachment( node );
   }
@@ -2050,13 +2050,13 @@ void KMReaderWin::slotHandleAttachment( int choice )
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFind()
 {
-  mViewer->tqfindText();
+  mViewer->findText();
 }
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFindNext()
 {
-  mViewer->tqfindTextNext();
+  mViewer->findTextNext();
 }
 
 //-----------------------------------------------------------------------------
@@ -2084,7 +2084,7 @@ void KMReaderWin::atmViewMsg( KMMessagePart* aMsgPart, int nodeId )
   assert(msg != 0);
   msg->setMsgSerNum( 0 ); // because lookups will fail
   // some information that is needed for imap messages with LOD
-  msg->setParent( message()->parent() );
+  msg->setParent( message()->tqparent() );
   msg->setUID(message()->UID());
   msg->setReadyToShow(true);
   KMReaderMainWin *win = new KMReaderMainWin();
@@ -2138,7 +2138,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
         ObjectTreeParser otp( this );
         otp.writeBodyStr( str,
                           overrideCodec() ? overrideCodec() : aMsgPart->codec(),
-                          message() ? message()->from() : TQString::null );
+                          message() ? message()->from() : TQString() );
       }
       htmlWriter()->queue("</body></html>");
       htmlWriter()->flush();
@@ -2190,8 +2190,8 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
     // A TQString cannot handle binary data. So if it's shorter than the
     // attachment, we assume the attachment is binary:
     if( str.length() < (unsigned) aMsgPart->decodedSize() ) {
-      str.prepend( i18n("[KMail: Attachment tqcontains binary data. Trying to show first character.]",
-          "[KMail: Attachment tqcontains binary data. Trying to show first %n characters.]",
+      str.prepend( i18n("[KMail: Attachment contains binary data. Trying to show first character.]",
+          "[KMail: Attachment contains binary data. Trying to show first %n characters.]",
           str.length()) + TQChar('\n') );
     }
     htmlWriter()->queue( TQStyleSheet::escape( str ) );
@@ -2270,13 +2270,13 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::tqfindByPath( name, 0, true /* no disk access */ );
+    mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::tqfindByFileContent( name );
+    mimetype = KMimeType::findByFileContent( name );
   }
 
   KService::Ptr offer =
@@ -2476,8 +2476,8 @@ void KMReaderWin::slotUrlClicked()
 {
   KMMainWidget *mainWidget = dynamic_cast<KMMainWidget*>(mMainWindow);
   uint identity = 0;
-  if ( message() && message()->parent() ) {
-    identity = message()->parent()->identity();
+  if ( message() && message()->tqparent() ) {
+    identity = message()->tqparent()->identity();
   }
 
   KMCommand *command = new KMUrlClickedCommand( mClickedUrl, identity, this,
@@ -2636,8 +2636,8 @@ static TQString linkForNode( const DOM::Node &node )
         return href.nodeValue().string();
       }
     }
-    if ( !node.parentNode().isNull() ) {
-      return linkForNode( node.parentNode() );
+    if ( !node.tqparentNode().isNull() ) {
+      return linkForNode( node.tqparentNode() );
     } else {
       return TQString();
     }
@@ -2905,7 +2905,7 @@ static TQColor nextColor( const TQColor & c )
 {
   int h, s, v;
   c.hsv( &h, &s, &v );
-  return TQColor( (h + 50) % 360, QMAX(s, 64), v, TQColor::Hsv );
+  return TQColor( (h + 50) % 360, TQMAX(s, 64), v, TQColor::Hsv );
 }
 
 TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor )
@@ -3000,7 +3000,7 @@ void KMReaderWin::setBodyPartMemento( const partNode * node, const TQCString & w
 BodyPartMemento * KMReaderWin::bodyPartMemento( const partNode * node, const TQCString & which ) const
 {
   const TQCString index = node->path() + ':' + which.lower();
-  const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( index );
+  const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( index );
   if ( it == mBodyPartMementoMap.end() ) {
     return 0;
   }
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 27bc33b0..4db8f05d 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -75,6 +75,7 @@ namespace KParts {
 
 class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
   Q_OBJECT
+  TQ_OBJECT
 
   friend void KMMimePartTree::itemClicked( TQListViewItem* item );
   friend void KMMimePartTree::itemRightClicked( TQListViewItem* item, const TQPoint & );
@@ -85,7 +86,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
   friend class KMail::KHtmlPartHtmlWriter;
 
 public:
-  KMReaderWin( TQWidget *parent,
+  KMReaderWin( TQWidget *tqparent,
 	       TQWidget *mainWindow,
 	       KActionCollection *actionCollection,
                const char *name=0,
@@ -323,7 +324,7 @@ public:
   /* show or hide the list that points to the attachments */
   void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; }
 
-  // This controls whether a Toltec invitation is shown in its raw form or as a tqreplacement text.
+  // This controls whether a Toltec invitation is shown in its raw form or as a replacement text.
   // This can be toggled with the "kmail:showRawToltecMail" link.
   bool showRawToltecMail() const { return mShowRawToltecMail; }
   void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
@@ -331,9 +332,9 @@ public:
   /* retrieve BodyPartMemento of id \a which for partNode \a node */
   KMail::Interface::BodyPartMemento * bodyPartMemento( const partNode * node, const TQCString & which ) const;
 
-  /* set/tqreplace BodyPartMemento \a memento of id \a which for
+  /* set/replace BodyPartMemento \a memento of id \a which for
      partNode \a node. If there was a BodyPartMemento registered
-     already, tqreplaces (deletes) that one. */
+     already, replaces (deletes) that one. */
   void setBodyPartMemento( const partNode * node, const TQCString & which, KMail::Interface::BodyPartMemento * memento );
 
   /// Scrolls to the given attachment and marks it with a yellow border
@@ -347,7 +348,7 @@ private:
 signals:
   /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */
-  void tqreplaceMsgByUnencryptedVersion();
+  void replaceMsgByUnencryptedVersion();
 
   /** The user presses the right mouse button. 'url' may be 0. */
   void popupMenu(KMMessage &msg, const KURL &url, const TQPoint& mousePos);
@@ -493,7 +494,7 @@ protected:
   TQString writeMsgHeader(KMMessage* aMsg, partNode *vCardNode = 0, bool topLevel=false );
 
   /** Writes the given message part to a temporary file and returns the
-      name of this file or TQString::null if writing failed.
+      name of this file or TQString() if writing failed.
   */
   TQString writeMessagePartToTempFile( KMMessagePart* msgPart, int partNumber );
 
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index dc2cc4a1..4af3d68a 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -41,7 +41,7 @@ static const int numFuncConfigNames = sizeof funcConfigNames / sizeof *funcConfi
 
 struct _statusNames {
   const char* name;
-  KMMsgStatus status;
+  KMMsgtqStatus status;
 };
 
 static struct _statusNames statusNames[] = {
@@ -104,7 +104,7 @@ KMSearchRule * KMSearchRule::createInstance( const TQCString & field,
 {
   KMSearchRule *ret = 0;
   if (field == "<status>")
-    ret = new KMSearchRuleStatus( field, func, contents );
+    ret = new KMSearchRuletqStatus( field, func, contents );
   else if ( field == "<age in days>" || field == "<size>" )
     ret = new KMSearchRuleNumerical( field, func, contents );
   else
@@ -281,10 +281,10 @@ bool KMSearchRuleString::matches( const DwString & aStr, KMMessage & msg,
       rc = ( ( function() & 1 ) == 1 );
     else {
       start += headerLen;
-      size_t stop = aStr.find( '\n', start );
+      size_t stop = aStr.tqfind( '\n', start );
       char ch = '\0';
       while ( stop != DwString::npos && ( ( ch = aStr.at( stop + 1 ) ) == ' ' || ch == '\t' ) )
-        stop = aStr.find( '\n', stop + 1 );
+        stop = aStr.tqfind( '\n', stop + 1 );
       const int len = stop == DwString::npos ? aStr.length() - start : stop - start ;
       const TQCString codedValue( aStr.data() + start, len + 1 );
       const TQString msgContents = KMMsgBase::decodeRFC2047String( codedValue ).stripWhiteSpace(); // FIXME: This needs to be changed for IDN support.
@@ -357,7 +357,7 @@ bool KMSearchRuleString::matches( const KMMessage * msg ) const
     msgContents = msg->headerAsString();
     logContents = false;
   } else if ( field() == "<recipients>" ) {
-    // (mmutz 2001-11-05) hack to fix "<recipients> !tqcontains foo" to
+    // (mmutz 2001-11-05) hack to fix "<recipients> !contains foo" to
     // meet user's expectations. See FAQ entry in KDE 2.2.2's KMail
     // handbook
     if ( function() == FuncEquals || function() == FuncNotEqual )
@@ -419,10 +419,10 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
       return ( TQString::compare( msgContents.lower(), contents().lower() ) != 0 );
 
   case KMSearchRule::FuncContains:
-    return ( msgContents.find( contents(), 0, false ) >= 0 );
+    return ( msgContents.tqfind( contents(), 0, false ) >= 0 );
 
   case KMSearchRule::FuncContainsNot:
-    return ( msgContents.find( contents(), 0, false ) < 0 );
+    return ( msgContents.tqfind( contents(), 0, false ) < 0 );
 
   case KMSearchRule::FuncRegExp:
     {
@@ -455,7 +455,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( !stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( !stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -468,7 +468,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -481,7 +481,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
     for( TQStringList::ConstIterator it = addressList.begin();
       it != addressList.end(); ++it ) {
-        KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
+        KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
 
           for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
               if ( (*itAd).hasCategory(category) )
@@ -498,7 +498,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
       for( TQStringList::ConstIterator it = addressList.begin();
         it != addressList.end(); ++it ) {
-          KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
+          KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
 
             for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
                 if ( (*itAd).hasCategory(category) )
@@ -576,10 +576,10 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue,
       return ( numericalValue != numericalMsgContents );
 
   case KMSearchRule::FuncContains:
-    return ( msgContents.find( contents(), 0, false ) >= 0 );
+    return ( msgContents.tqfind( contents(), 0, false ) >= 0 );
 
   case KMSearchRule::FuncContainsNot:
-    return ( msgContents.find( contents(), 0, false ) < 0 );
+    return ( msgContents.tqfind( contents(), 0, false ) < 0 );
 
   case KMSearchRule::FuncRegExp:
     {
@@ -622,35 +622,35 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue,
 
 //==================================================
 //
-// class KMSearchRuleStatus
+// class KMSearchRuletqStatus
 //
 //==================================================
-TQString englishNameForStatus( const KMMsgStatus& status )
+TQString englishNameFortqStatus( const KMMsgtqStatus& status )
 {
   for ( int i=0; i< numStatusNames; i++ ) {
     if ( statusNames[i].status == status ) {
       return statusNames[i].name;
     }
   }
-  return TQString::null;
+  return TQString();
 }
 
-KMSearchRuleStatus::KMSearchRuleStatus( const TQCString & field,
+KMSearchRuletqStatus::KMSearchRuletqStatus( const TQCString & field,
                                         Function func, const TQString & aContents )
           : KMSearchRule(field, func, aContents)
 {
   // the values are always in english, both from the conf file as well as
   // the patternedit gui
-  mStatus = statusFromEnglishName( aContents );
+  mtqStatus = statusFromEnglishName( aContents );
 }
 
-KMSearchRuleStatus::KMSearchRuleStatus( int status, Function func )
-: KMSearchRule( "<status>", func, englishNameForStatus( status ) )
+KMSearchRuletqStatus::KMSearchRuletqStatus( int status, Function func )
+: KMSearchRule( "<status>", func, englishNameFortqStatus( status ) )
 {
-    mStatus = status;
+    mtqStatus = status;
 }
 
-KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusString )
+KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aStatusString )
 {
   for ( int i=0; i< numStatusNames; i++ ) {
     if ( !aStatusString.compare( statusNames[i].name ) ) {
@@ -660,33 +660,33 @@ KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusS
   return KMMsgStatusUnknown;
 }
 
-bool KMSearchRuleStatus::isEmpty() const
+bool KMSearchRuletqStatus::isEmpty() const
 {
   return field().stripWhiteSpace().isEmpty() || contents().isEmpty();
 }
 
-bool KMSearchRuleStatus::matches( const DwString &, KMMessage &,
+bool KMSearchRuletqStatus::matches( const DwString &, KMMessage &,
 				  const DwBoyerMoore *, int ) const
 {
   assert( 0 );
   return false; // don't warn
 }
 
-bool KMSearchRuleStatus::matches( const KMMessage * msg ) const
+bool KMSearchRuletqStatus::matches( const KMMessage * msg ) const
 {
 
-  KMMsgStatus msgStatus = msg->status();
+  KMMsgtqStatus msgtqStatus = msg->status();
   bool rc = false;
 
   switch ( function() ) {
     case FuncEquals: // fallthrough. So that "<status> 'is' 'read'" works
     case FuncContains:
-      if (msgStatus & mStatus)
+      if (msgtqStatus & mtqStatus)
         rc = true;
       break;
     case FuncNotEqual: // fallthrough. So that "<status> 'is not' 'read'" works
     case FuncContainsNot:
-      if (! (msgStatus & mStatus) )
+      if (! (msgtqStatus & mtqStatus) )
         rc = true;
       break;
     // FIXME what about the remaining funcs, how can they make sense for
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index a79b6122..4c2cb75d 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -10,7 +10,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqcstring.h>
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
 
 class KMMessage;
 class KConfig;
@@ -48,7 +48,7 @@ public:
                   FuncIsInCategory, FuncIsNotInCategory,
 		  FuncHasAttachment, FuncHasNoAttachment};
   KMSearchRule ( const TQCString & field=0, Function=FuncContains,
-                 const TQString &contents=TQString::null );
+                 const TQString &contents=TQString() );
   KMSearchRule ( const KMSearchRule &other );
 
   const KMSearchRule & operator=( const KMSearchRule & other );
@@ -57,7 +57,7 @@ public:
       priate subclass depending on the @p field. */
   static KMSearchRule* createInstance( const TQCString & field=0,
                                       Function function=FuncContains,
-		                      const TQString & contents=TQString::null );
+		                      const TQString & contents=TQString() );
 
   static KMSearchRule* createInstance( const TQCString & field,
                                        const char * function,
@@ -160,7 +160,7 @@ class KMSearchRuleString : public KMSearchRule
 {
 public:
   KMSearchRuleString( const TQCString & field=0, Function function=FuncContains,
-		const TQString & contents=TQString::null );
+		const TQString & contents=TQString() );
   KMSearchRuleString( const KMSearchRuleString & other );
   const KMSearchRuleString & operator=( const KMSearchRuleString & other );
 
@@ -195,7 +195,7 @@ class KMSearchRuleNumerical : public KMSearchRule
 {
 public:
   KMSearchRuleNumerical( const TQCString & field=0, Function function=FuncContains,
-		         const TQString & contents=TQString::null );
+		         const TQString & contents=TQString() );
   virtual bool isEmpty() const ;
 
   virtual bool matches( const KMMessage * msg ) const;
@@ -208,13 +208,13 @@ public:
 
 namespace KMail {
 // The below are used in several places and here so they are accessible.
-  struct MessageStatus {
+  struct MessagetqStatus {
     const char * const text;
     const char * const icon;
   };
 
   // If you change the ordering here; also do it in the enum below
-  static const MessageStatus StatusValues[] = {
+  static const MessagetqStatus StatusValues[] = {
     { I18N_NOOP( "Important" ),        "kmmsgflag"   },
     { I18N_NOOP( "New" ),              "kmmsgnew"   },
     { I18N_NOOP( "Unread" ),           "kmmsgunseen"   },
@@ -255,7 +255,7 @@ namespace KMail {
   };
 
   static const int StatusValueCount =
-    sizeof( StatusValues ) / sizeof( MessageStatus );
+    sizeof( StatusValues ) / sizeof( MessagetqStatus );
   // we want to show all status entries in the quick search bar, but only the
   // ones up to attachment in the search/filter dialog, because there the
   // attachment case is handled separately.
@@ -267,12 +267,12 @@ namespace KMail {
     @short This class represents a search pattern rule operating on message
     status.
 */
-class KMSearchRuleStatus : public KMSearchRule
+class KMSearchRuletqStatus : public KMSearchRule
 {
 public:
-   KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains,
-		       const TQString & contents=TQString::null );
-   KMSearchRuleStatus( int status, Function function=FuncContains );
+   KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains,
+		       const TQString & contents=TQString() );
+   KMSearchRuletqStatus( int status, Function function=FuncContains );
 
   virtual bool isEmpty() const ;
   virtual bool matches( const KMMessage * msg ) const;
@@ -280,9 +280,9 @@ public:
   virtual bool matches( const DwString &, KMMessage &,
                         const DwBoyerMoore *,
 			int ) const;
-  static KMMsgStatus statusFromEnglishName(const TQString&);
+  static KMMsgtqStatus statusFromEnglishName(const TQString&);
   private:
-  KMMsgStatus mStatus;
+  KMMsgtqStatus mtqStatus;
 };
 
 // ------------------------------------------------------------------------
@@ -365,7 +365,7 @@ public:
   */
   void readConfig( const KConfig * config );
   /** Writes itself into @p config. The group has to be preset. Tries
-      to delete old-style keys by overwriting them with TQString::null.
+      to delete old-style keys by overwriting them with TQString().
 
       Derived classes reimplementing writeConfig() should also call this
       method, or else the rules will not be stored.
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 5f7c96cb..84005f2b 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -37,7 +37,7 @@ static const struct {
   { "<recipients>",  I18N_NOOP( "All Recipients" )    },
   { "<size>",        I18N_NOOP( "Size in Bytes" ) },
   { "<age in days>", I18N_NOOP( "Age in Days" )   },
-  { "<status>",      I18N_NOOP( "Message Status" )        },
+  { "<status>",      I18N_NOOP( "Message tqStatus" )        },
   { "Subject",       I18N_NOOP( "Subject" )  },
   { "From",          I18N_NOOP( "From" )  },
   { "To",            I18N_NOOP( "To" )  },
@@ -54,10 +54,10 @@ static const int SpecialRuleFieldsCount =
 //
 //=============================================================================
 
-KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *parent, KMSearchRule *aRule,
+KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *tqparent, KMSearchRule *aRule,
                                         const char *name, bool headersOnly,
                                         bool absoluteDates )
-  : TQWidget( parent, name ),
+  : TQWidget( tqparent, name ),
     mRuleField( 0 ),
     mFunctionStack( 0 ),
     mValueStack( 0 ),
@@ -88,7 +88,7 @@ void KMSearchRuleWidget::setHeadersOnly( bool headersOnly )
       ( currentText != "<body>"))
     mRuleField->changeItem( TQString::fromAscii( currentText ), 0 );
   else
-    mRuleField->changeItem( TQString::null, 0 );
+    mRuleField->changeItem( TQString(), 0 );
 }
 
 void KMSearchRuleWidget::initWidget()
@@ -146,7 +146,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule )
     mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 );
     i = 0;
   } else { // found in the list of predefined fields
-    mRuleField->changeItem( TQString::null, 0 );
+    mRuleField->changeItem( TQString(), 0 );
   }
 
   mRuleField->setCurrentItem( i );
@@ -282,8 +282,8 @@ void KMSearchRuleWidget::slotRuleFieldChanged( const TQString & field )
 //
 //=============================================================================
 
-KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *parent, const char* name, bool headersOnly, bool absoluteDates )
-  : KWidgetLister( 2, FILTER_MAX_RULES, parent, name )
+KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *tqparent, const char* name, bool headersOnly, bool absoluteDates )
+  : KWidgetLister( 2, FILTER_MAX_RULES, tqparent, name )
 {
   mRuleList = 0;
   mHeadersOnly = headersOnly;
@@ -321,10 +321,10 @@ void KMSearchRuleWidgetLister::setRuleList( TQPtrList<KMSearchRule> *aList )
       mRuleList->removeLast();
   }
 
-  // HACK to workaround regression in Qt 3.1.3 and Qt 3.2.0 (fixes bug #63537)
-  setNumberOfShownWidgetsTo( QMAX((int)mRuleList->count(),mMinWidgets)+1 );
+  // HACK to workaround regression in TQt 3.1.3 and TQt 3.2.0 (fixes bug #63537)
+  setNumberOfShownWidgetsTo( TQMAX((int)mRuleList->count(),mMinWidgets)+1 );
   // set the right number of widgets
-  setNumberOfShownWidgetsTo( QMAX((int)mRuleList->count(),mMinWidgets) );
+  setNumberOfShownWidgetsTo( TQMAX((int)mRuleList->count(),mMinWidgets) );
 
   // load the actions into the widgets
   TQPtrListIterator<KMSearchRule> rIt( *mRuleList );
@@ -357,9 +357,9 @@ void KMSearchRuleWidgetLister::reset()
   slotClear();
 }
 
-TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *parent )
+TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *tqparent )
 {
-  return new KMSearchRuleWidget(parent, 0, 0, mHeadersOnly, mAbsoluteDates);
+  return new KMSearchRuleWidget(tqparent, 0, 0, mHeadersOnly, mAbsoluteDates);
 }
 
 void KMSearchRuleWidgetLister::clearWidget( TQWidget *aWidget )
@@ -391,15 +391,15 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets()
 //
 //=============================================================================
 
-KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates )
-  : TQGroupBox( 1/*columns*/, Horizontal, parent, name )
+KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates )
+  : TQGroupBox( 1/*columns*/, Horizontal, tqparent, name )
 {
   setTitle( i18n("Search Criteria") );
   initLayout( headersOnly, absoluteDates );
 }
 
-KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates)
-  : TQGroupBox( 1/*column*/, Horizontal, title, parent, name )
+KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates)
+  : TQGroupBox( 1/*column*/, Horizontal, title, tqparent, name )
 {
   initLayout( headersOnly, absoluteDates );
 }
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 3fee81e1..307a7ae2 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -37,15 +37,16 @@ class KMSearchPatternEdit;
     @author Marc Mutz <Marc@Mutz.com>
 */
 
-class KMSearchRuleWidget : public QWidget
+class KMSearchRuleWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Constructor. You can give a KMSearchRule as parameter, which will
       be used to initialize the widget. */
-  KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
+  KMSearchRuleWidget( TQWidget* tqparent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
 
-  enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, Status,
+  enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus,
          Subject, From, To, CC, ReplyTo, Organization };
 
   /** Set whether only header fields can be searched. If @p is true only
@@ -105,11 +106,12 @@ private:
 class KMSearchRuleWidgetLister : public KWidgetLister
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class ::KMSearchPatternEdit;
 
 public:
-  KMSearchRuleWidgetLister( TQWidget *parent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
+  KMSearchRuleWidgetLister( TQWidget *tqparent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
 
   virtual ~KMSearchRuleWidgetLister();
 
@@ -121,7 +123,7 @@ public slots:
 
 protected:
   virtual void clearWidget( TQWidget *aWidget );
-  virtual TQWidget* createWidget( TQWidget *parent );
+  virtual TQWidget* createWidget( TQWidget *tqparent );
 
 private:
   void regenerateRuleListFromWidgets();
@@ -165,13 +167,14 @@ private:
 
 class KMSearchPatternEdit : public TQGroupBox  {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  /** Constructor. The parent and name parameters are passed to the underlying
+  /** Constructor. The tqparent and name parameters are passed to the underlying
       TQGroupBox, as usual. */
-  KMSearchPatternEdit(TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
+  KMSearchPatternEdit(TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
   /** Constructor. This one allows you to set a title different from
       i18n("Search Criteria"). */
-  KMSearchPatternEdit(const TQString & title, TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
+  KMSearchPatternEdit(const TQString & title, TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
   ~KMSearchPatternEdit();
 
   /** Set the search pattern. Rules are inserted regardless of the
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 208bf574..1d267d88 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -80,7 +80,7 @@ KMSender::~KMSender()
 void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->seStatus(msg);
+    mProgressItem->setqStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->seStatus(KMMsgStatusQueued);
+  aMsg->setqStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
    * though, so we need to make sure to keep it around and restore it
-   * afterwards. The real fix would be to tqreplace the unGet with
+   * afterwards. The real fix would be to replace the unGet with
    * whatever parsing is triggered by it, but I'm too chicken to do that,
    * in this branch.
    * Note that the unencrypted mail will be lost if the mail remains in
@@ -293,7 +293,7 @@ void KMSender::doSendMsg()
   {
     mCurrentMsg->setTransferInProgress( false );
     if( mCurrentMsg->hasUnencryptedMsg() ) {
-      kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl;
+      kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl;
       // delete all current body parts
       mCurrentMsg->deleteBodyParts();
       // copy Content-[..] headers from unencrypted message to current one
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->seStatus(KMMsgStatusSent);
-    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->setqStatus(KMMsgStatusSent);
+    mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -363,9 +363,9 @@ void KMSender::doSendMsg()
     // Disable the emitting of msgAdded signal, because the message is taken out of the
     // current folder (outbox) and re-added, to make filter actions changing the message
     // work. We don't want that to screw up message counts.
-    if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( true );
+    if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( true );
     const int processResult = kmkernel->filterMgr()->process(mCurrentMsg,KMFilterMgr::Outbound);
-    if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( false );
+    if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( false );
 
     // 0==processed ok, 1==no filter matched, 2==critical error, abort!
     switch (processResult) {
@@ -401,13 +401,13 @@ void KMSender::doSendMsg()
       break;
     }
     seStatusByLink( mCurrentMsg );
-    if (mCurrentMsg->parent() && !imapSentFolder) {
+    if (mCurrentMsg->tqparent() && !imapSentFolder) {
       // for speed optimization, this code assumes that mCurrentMsg is the
-      // last one in it's parent folder; make sure that's really the case:
-      assert( mCurrentMsg->parent()->find( mCurrentMsg )
-              == mCurrentMsg->parent()->count() - 1 );
+      // last one in it's tqparent folder; make sure that's really the case:
+      assert( mCurrentMsg->tqparent()->tqfind( mCurrentMsg )
+              == mCurrentMsg->tqparent()->count() - 1 );
        // unGet this message:
-      mCurrentMsg->parent()->unGetMsg( mCurrentMsg->parent()->count() -1 );
+      mCurrentMsg->tqparent()->unGetMsg( mCurrentMsg->tqparent()->count() -1 );
     }
 
     mCurrentMsg = 0;
@@ -710,7 +710,7 @@ void KMSender::slotIdle()
       mFailedMessages++;
       // reset cached password
       TQMapIterator <TQString,TQString> pc;
-      if ( (pc = mPasswdCache.find( mMethodStr )) != mPasswdCache.end() ) {
+      if ( (pc = mPasswdCache.tqfind( mMethodStr )) != mPasswdCache.end() ) {
         mPasswdCache.erase(pc);
       }
       // Sending of message failed.
@@ -788,7 +788,7 @@ void KMSender::setSendQuotedPrintable(bool aSendQuotedPrintable)
 //-----------------------------------------------------------------------------
 KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
 {
-  mTransportInfo->type = TQString::null;
+  mTransportInfo->type = TQString();
   int nr = KMTransportInfo::findTransport(transport);
   if (nr)
   {
@@ -800,7 +800,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
       mTransportInfo->auth = false;
       mTransportInfo->encryption = "NONE";
       TQString serverport = transport.mid(7);
-      int colon = serverport.find(':');
+      int colon = serverport.tqfind(':');
       if (colon != -1) {
         mTransportInfo->host = serverport.left(colon);
         mTransportInfo->port = serverport.mid(colon + 1);
@@ -815,7 +815,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
       mTransportInfo->auth = false;
       mTransportInfo->encryption = "ssl";
       TQString serverport = transport.mid(7);
-      int colon = serverport.find(':');
+      int colon = serverport.tqfind(':');
       if (colon != -1) {
         mTransportInfo->host = serverport.left(colon);
         mTransportInfo->port = serverport.mid(colon + 1);
@@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
   int n = 0;
   while (1) {
     ulong msn;
-    KMMsgStatus status;
+    KMMsgtqStatus status;
     aMsg->getLink(n, &msn, &status);
     if (!msn || !status)
       break;
@@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->seStatus(index, status);
+        folder->setqStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -891,7 +891,7 @@ void KMSendProc::reset()
 {
   mSending = false;
   mSendOk = false;
-  mLastErrorMessage = TQString::null;
+  mLastErrorMessage = TQString();
 }
 
 //-----------------------------------------------------------------------------
@@ -1082,8 +1082,8 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
 
   if (ti->auth)
   {
-    TQMapIterator<TQString,TQString> tpc = mSender->mPasswdCache.find( ti->name );
-    TQString tpwd = ( tpc != mSender->mPasswdCache.end() )?(*tpc):TQString::null;
+    TQMapIterator<TQString,TQString> tpc = mSender->mPasswdCache.tqfind( ti->name );
+    TQString tpwd = ( tpc != mSender->mPasswdCache.end() )?(*tpc):TQString();
 
     if ( ti->passwd().isEmpty() )
       ti->setPasswd( tpwd );
@@ -1098,7 +1098,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
       TQString passwd = ti->passwd();
       result = KIO::PasswordDialog::getNameAndPassword(ti->user, passwd,
 	&b, i18n("You need to supply a username and a password to use this "
-	     "SMTP server."), false, TQString::null, ti->name, TQString::null);
+	     "SMTP server."), false, TQString(), ti->name, TQString());
 
       if ( result != TQDialog::Accepted )
       {
@@ -1188,7 +1188,7 @@ void KMSendSMTP::doFinish() {
 void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array)
 {
   // Send it by 32K chuncks
-  const int chunkSize = QMIN( mMessageLength - mMessageOffset, 32*1024 );
+  const int chunkSize = TQMIN( mMessageLength - mMessageOffset, 32*1024 );
   if ( chunkSize > 0 ) {
     array.duplicate(mMessage.data() + mMessageOffset, chunkSize);
     mMessageOffset += chunkSize;
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 600737fe..3c7c6c0e 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -53,6 +53,7 @@ namespace KPIM {
 class KMSender: public TQObject, public KMail::MessageSender
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMSendProc;
   friend class ::KMSendSendmail;
   friend class ::KMSendSMTP;
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index a842027a..a541e153 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -20,9 +20,10 @@ namespace KIO {
   class Slave;
 }
 
-class KMSendProc: public QObject
+class KMSendProc: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMSendProc(KMSender*);
@@ -86,6 +87,7 @@ protected:
 class KMSendSendmail: public KMSendProc
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   KMSendSendmail(KMSender*);
   ~KMSendSendmail();
@@ -116,6 +118,7 @@ private:
 class KMSendSMTP : public KMSendProc
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   KMSendSMTP(KMSender *sender);
   ~KMSendSMTP();
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index c184e6df..b99e1cc9 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -112,17 +112,17 @@ void KMServerTest::slotData(KIO::Job *, const TQString &data)
 
 
 void KMServerTest::slotMetaData( const KIO::MetaData & md ) {
-  KIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" );
+  KIO::MetaData::const_iterator it = md.tqfind( "PLAIN AUTH METHODS" );
   if ( it != md.end() ) {
     mAuthNone = it.data();
     kdDebug(5006) << "mAuthNone: " << mAuthNone << endl;
   }
-  it = md.find( "TLS AUTH METHODS" );
+  it = md.tqfind( "TLS AUTH METHODS" );
   if ( it != md.end() ) {
     mAuthTLS = it.data();
     kdDebug(5006) << "mAuthTLS: " << mAuthTLS << endl;
   }
-  it = md.find( "SSL AUTH METHODS" );
+  it = md.tqfind( "SSL AUTH METHODS" );
   if ( it != md.end() ) {
     mAuthSSL = it.data();
     kdDebug(5006) << "mAuthSSL: " << mAuthSSL << endl;
@@ -142,7 +142,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
   if (aSlave != mSlave) return;
   if ( mSSL && error == 0 ) {
     // add a dummy entry to the list of SSL capabilities so that the receiver
-    // of the capabilities signal can use mListSSL.isEmpty() in order to find
+    // of the capabilities signal can use mListSSL.isEmpty() in order to tqfind
     // out whether SSL is supported
     mListSSL.append("SSL");
   }
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index 6c19da1c..ca2392a7 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,9 +44,10 @@ namespace KIO {
   class MetaData;
 }
 
-class KMServerTest : public QObject
+class KMServerTest : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMServerTest( const TQString & protocol, const TQString & host, int port );
@@ -65,7 +66,7 @@ protected slots:
   void slotResult(KIO::Job *job);
   void slotMetaData( const KIO::MetaData & );
   void slotSlaveResult(KIO::Slave *aSlave, int error,
-    const TQString &errorText = TQString::null);
+    const TQString &errorText = TQString());
 
 protected:
   KIO::MetaData slaveConfig() const;
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 9007fe1a..943a3a2d 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 
-#undef Status // stupid X headers
+#undef tqStatus // stupid X headers
 
 extern "C" {
 
@@ -160,7 +160,7 @@ void lockOrDie() {
       first_instance = true;
   else if (hostName == oldHostName && oldPid != getpid()) {
       // check if the lock file is stale
-#ifdef Q_OS_LINUX
+#ifdef TQ_OS_LINUX
       if ( ::access("/proc", X_OK ) == 0 ) {
           // On linux with /proc we can even check that it's really kmail and not something else
           char path_buffer[MAXPATHLEN + 1];
@@ -200,8 +200,8 @@ void lockOrDie() {
                    "can cause the loss of mail. You should not start %1 "
                    "unless you are sure that it is not already running.")
               .arg( programName, programName );
-              // TQString::arg( st ) only tqreplaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
+              // TQString::arg( st ) only replaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) replacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
       else
@@ -228,7 +228,7 @@ void lockOrDie() {
 
     KCursorSaver idle( KBusyPtr::idle() );
     if ( KMessageBox::No ==
-         KMessageBox::warningYesNo( 0, msg, TQString::null,
+         KMessageBox::warningYesNo( 0, msg, TQString(),
                                     i18n("Start %1").arg( programName ),
                                     i18n("Exit") ) ) {
       exit(1);
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index f10faabe..3a5840a8 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -57,8 +57,8 @@ using KMail::AccountManager;
  * with its count of unread messages, allowing the user to jump
  * to the first unread message in each folder.
  */
-KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
-  : KSystemTray( parent, name ),
+KMSystemTray::KMSystemTray(TQWidget *tqparent, const char *name)
+  : KSystemTray( tqparent, name ),
     mParentVisible( true ),
     mPosOfMainWin( 0, 0 ),
     mDesktopOfMainWin( 0 ),
@@ -211,7 +211,7 @@ void KMSystemTray::updateCount()
     // and which has a transparent background.
     // Unfortunately this required the following twisted code because for some
     // reason text that is drawn on a transparent pixmap is invisible
-    // (apparently the alpha channel isn't changed when the text is drawn).
+    // (aptqparently the alpha channel isn't changed when the text is drawn).
     // Therefore I have to draw the text on a solid background and then remove
     // the background by making it transparent with TQPixmap::setMask. This
     // involves the slow createHeuristicMask() function (from the API docs:
@@ -225,11 +225,11 @@ void KMSystemTray::updateCount()
     // unread messages, but every other approach I tried failed miserably.
     //                                                           IK, 2003-09-22
     TQPixmap numberPixmap( oldPixmapWidth, oldPixmapHeight );
-    numberPixmap.fill( Qt::white );
+    numberPixmap.fill( TQt::white );
     TQPainter p( &numberPixmap );
     p.setFont( countFont );
-    p.setPen( Qt::blue );
-    p.drawText( numberPixmap.rect(), Qt::AlignCenter, countString );
+    p.setPen( TQt::blue );
+    p.drawText( numberPixmap.rect(), TQt::AlignCenter, countString );
     numberPixmap.setMask( numberPixmap.createHeuristicMask() );
     TQImage numberImage = numberPixmap.convertToImage();
 
@@ -483,7 +483,7 @@ void KMSystemTray::updateNewMessages()
   int unread = fldr->countUnread();
 
   TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it =
-      mFoldersWithUnread.find(fldr);
+      mFoldersWithUnread.tqfind(fldr);
   bool unmapped = (it == mFoldersWithUnread.end());
 
   /** If the folder is not mapped yet, increment count by numUnread
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index 62707464..1fa144b6 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -41,9 +41,10 @@ class TQPoint;
 class KMSystemTray : public KSystemTray
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** construtor */
-  KMSystemTray(TQWidget* parent=0, const char *name=0);
+  KMSystemTray(TQWidget* tqparent=0, const char *name=0);
   /** destructor */
   ~KMSystemTray();
 
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index dce1ccf0..335025b7 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -243,9 +243,9 @@ void KMTransportInfo::readPassword() const
 }
 
 
-KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name,
+KMTransportSelDlg::KMTransportSelDlg( TQWidget *tqparent, const char *name,
   bool modal )
-  : KDialogBase( parent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok )
+  : KDialogBase( tqparent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok )
 {
   TQFrame *page = makeMainWidget();
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
@@ -282,9 +282,9 @@ int KMTransportSelDlg::selected( void ) const
 
 KMTransportDialog::KMTransportDialog( const TQString & caption,
 				      KMTransportInfo *transportInfo,
-				      TQWidget *parent, const char *name,
+				      TQWidget *tqparent, const char *name,
 				      bool modal )
-  : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
+  : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
     mServerTest( 0 ),
     mTransportInfo( transportInfo ),
     mAuthNone( AllAuth ), mAuthSSL( AllAuth ), mAuthTLS( AllAuth )
@@ -498,7 +498,7 @@ void KMTransportDialog::makeSmtpPage()
   TQWidget *page2 = new TQWidget( tabWidget );
   tabWidget->addTab( page2, i18n("S&ecurity") );
   TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() );
-  mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Encryption"), page2 );
   mSmtp.encryptionNone =
     new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup );
@@ -510,7 +510,7 @@ void KMTransportDialog::makeSmtpPage()
     TQT_SLOT(slotSmtpEncryptionChanged(int)));
   vlay->addWidget( mSmtp.encryptionGroup );
 
-  mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+  mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
     i18n("Authentication Method"), page2 );
   mSmtp.authLogin = new TQRadioButton( i18n("Please translate this "
     "authentication method only if you have a good reason", "&LOGIN"),
@@ -615,7 +615,7 @@ void KMTransportDialog::saveSettings()
 
 void KMTransportDialog::slotSendmailChooser()
 {
-  KFileDialog dialog("/", TQString::null, this, 0, true );
+  KFileDialog dialog("/", TQString(), this, 0, true );
   dialog.setCaption(i18n("Choose sendmail Location") );
 
   if( dialog.exec() == TQDialog::Accepted )
@@ -735,7 +735,7 @@ void KMTransportDialog::checkHighest(TQButtonGroup *btnGroup)
 {
   for ( int i = btnGroup->count() - 1; i >= 0 ; --i )
   {
-    TQButton * btn = btnGroup->find(i);
+    TQButton * btn = btnGroup->tqfind(i);
     if (btn && btn->isEnabled())
     {
       btn->animateClick();
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index bbddedf5..901401e3 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -29,7 +29,7 @@ class TQRadioButton;
 class KMServerTest;
 class TQButtonGroup;
 
-class KMTransportInfo : public QObject
+class KMTransportInfo : public TQObject
 {
 public:
   KMTransportInfo();
@@ -64,9 +64,10 @@ public:
 class KMTransportSelDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE );
+  KMTransportSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=TRUE );
   int selected() const;
 
 private slots:
@@ -79,10 +80,11 @@ private:
 class KMTransportDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo,
-		     TQWidget *parent=0, const char *name=0, bool modal=TRUE );
+		     TQWidget *tqparent=0, const char *name=0, bool modal=TRUE );
   virtual ~KMTransportDialog();
 
 private slots:
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index adec1399..4c17f234 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -29,18 +29,18 @@ void KMail::KorgHelper::ensureRunning()
 {
   TQString error;
   TQCString dcopService;
-  int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+  int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString(), TQString(), &error, &dcopService );
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
     // [that's not the case when kontact was already running, but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
         kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-        Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+        Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else
         kdWarning() << "Error loading " << dcopService << endl;
     }
diff --git a/kmail/kwindowpositioner.h b/kmail/kwindowpositioner.h
index d85f5cee..efb65390 100644
--- a/kmail/kwindowpositioner.h
+++ b/kmail/kwindowpositioner.h
@@ -23,11 +23,12 @@
 
 #include <tqobject.h>
 
-class QWindow;
+class TQWindow;
 
-class KWindowPositioner : public QObject
+class KWindowPositioner : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum Mode { Right, Bottom };
 
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 07d118b2..3c1e1304 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -101,7 +101,7 @@ void ListJob::execute()
   ImapAccountBase::jobData jd;
   jd.total = 1; jd.done = 0;
   jd.cancellable = true;
-  jd.parent = mDestFolder;
+  jd.tqparent = mDestFolder;
   jd.onlySubscribed = ( mType == ImapAccountBase::ListSubscribed ||
                         mType == ImapAccountBase::ListSubscribedNoCheck ||
                         mType == ImapAccountBase::ListFolderOnlySubscribed );
@@ -109,16 +109,16 @@ void ListJob::execute()
   jd.curNamespace = mNamespace;
   if ( mParentProgressItem )
   {
-    TQString escapedStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() )
-                                        : TQString::null;
+    TQString escapedtqStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() )
+                                        : TQString();
     jd.progressItem = ProgressManager::createProgressItem(
         mParentProgressItem,
         "ListDir" + ProgressManager::getUniqueID(),
-        escapedStatus,
+        escapedtqStatus,
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->seStatus( escapedStatus );
+    mParentProgressItem->setqStatus( escapedtqStatus );
   }
 
   // make the URL
@@ -203,8 +203,8 @@ void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
   for ( KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
         udsIt != uds.end(); udsIt++ )
   {
-    mimeType = TQString::null;
-    attributes = TQString::null;
+    mimeType = TQString();
+    attributes = TQString();
     for ( KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
           eIt != (*udsIt).end(); eIt++ )
     {
diff --git a/kmail/listjob.h b/kmail/listjob.h
index f1adcba6..d12da6bb 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -54,19 +54,20 @@ namespace KMail {
 class ListJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a new job
-   * @param storage the parent folder, either provide this or a path
+   * @param storage the tqparent folder, either provide this or a path
    * @param account the ImapAccountBase
    * @param type Type of subscription
    * @param complete list all folders or only next level
    * @param path the listing path;
    *             if empty the path of the folder will be taken
-   * @param item a parent ProgressItem
+   * @param item a tqparent ProgressItem
    */
   ListJob( ImapAccountBase* account, ImapAccountBase::ListType type,
-           FolderStorage* storage = 0, const TQString& path = TQString::null,
+           FolderStorage* storage = 0, const TQString& path = TQString(),
            bool complete = false, KPIM::ProgressItem* item = 0 );
 
   virtual ~ListJob();
@@ -96,7 +97,7 @@ public:
   /** Set this to true for a complete listing */
   void setComplete( bool complete ) { mComplete = complete; }
 
-  /** Set parent progress item */
+  /** Set tqparent progress item */
   void setParentProgressItem( KPIM::ProgressItem* it ) {
     mParentProgressItem = it; }
 
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index a020fa57..f3ef1f1e 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,9 +46,9 @@
 
 namespace KMail {
 
-LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,
+LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption,
     ImapAccountBase *acct, TQString startPath )
-  : SubscriptionDialog( parent, caption, acct, startPath ),
+  : SubscriptionDialog( tqparent, caption, acct, startPath ),
     mAccount( acct )
 {
 }
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index 2061ab27..685bc515 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -40,11 +40,12 @@ namespace KMail {
   class LocalSubscriptionDialog: public SubscriptionDialog
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-      LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,
+      LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption,
                                ImapAccountBase* acct,
-                               TQString startPath = TQString::null );
+                               TQString startPath = TQString() );
       virtual ~LocalSubscriptionDialog();
 
     protected:
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index 5833cfe4..9bf4d74d 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -64,9 +64,9 @@ MaildirJob::~MaildirJob()
 }
 
 //-----------------------------------------------------------------------------
-void MaildirJob::setParentFolder( const KMFolderMaildir* parent )
+void MaildirJob::setParentFolder( const KMFolderMaildir* tqparent )
 {
-  mParentFolder = const_cast<KMFolderMaildir*>( parent );
+  mParentFolder = const_cast<KMFolderMaildir*>( tqparent );
 }
 
 
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index a2209f08..0ab12222 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,13 +41,14 @@ namespace KMail {
 class MaildirJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
   MaildirJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
               JobType jt = tGetMessage, KMFolder *folder = 0 );
   virtual ~MaildirJob();
 
-  void setParentFolder( const KMFolderMaildir* parent );
+  void setParentFolder( const KMFolderMaildir* tqparent );
 protected:
   void execute();
 protected slots:
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 4483323d..3c9efd14 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -25,18 +25,18 @@ static TQString check_sender(const KMMessage  *message,
   TQString header = message->headerField( "Sender" );
 
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   if ( header.left( 6 ) == "owner-" )
   {
     header_name = "Sender";
     header_value = header;
-    header = header.mid( 6, header.find( '@' ) - 6 );
+    header = header.mid( 6, header.tqfind( '@' ) - 6 );
 
   } else {
-    int index = header.find( "-owner@ " );
+    int index = header.tqfind( "-owner@ " );
     if ( index == -1 )
-      return TQString::null;
+      return TQString();
 
     header.truncate( index );
     header_name = "Sender";
@@ -52,12 +52,12 @@ static TQString check_x_beenthere(const KMMessage  *message,
                                  TQString &header_value )
 {
   TQString header = message->headerField( "X-BeenThere" );
-  if ( header.isNull() || header.find( '@' ) == -1 )
-    return TQString::null;
+  if ( header.isNull() || header.tqfind( '@' ) == -1 )
+    return TQString();
 
   header_name = "X-BeenThere";
   header_value = header;
-  header.truncate( header.find( '@' ) );
+  header.truncate( header.tqfind( '@' ) );
   return header;
 }
 
@@ -68,13 +68,13 @@ static TQString check_delivered_to(const KMMessage  *message,
 {
   TQString header = message->headerField( "Delivered-To" );
   if ( header.isNull() || header.left(13 ) != "mailing list"
-       || header.find( '@' ) == -1 )
-    return TQString::null;
+       || header.tqfind( '@' ) == -1 )
+    return TQString();
 
   header_name = "Delivered-To";
   header_value = header;
 
-  return header.mid( 13, header.find( '@' ) - 13 );
+  return header.mid( 13, header.tqfind( '@' ) - 13 );
 }
 
 /* X-Mailing-List: <?([^@]+) */
@@ -84,17 +84,17 @@ static TQString check_x_mailing_list(const KMMessage  *message,
 {
   TQString header = message->headerField( "X-Mailing-List");
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  if ( header.find( '@' ) < 1 )
-    return TQString::null;
+  if ( header.tqfind( '@' ) < 1 )
+    return TQString();
 
   header_name = "X-Mailing-List";
   header_value = header;
   if ( header[0] == '<' )
-    header = header.mid(1,  header.find( '@' ) - 1);
+    header = header.mid(1,  header.tqfind( '@' ) - 1);
   else
-    header.truncate( header.find( '@' ) );
+    header.truncate( header.tqfind( '@' ) );
   return header;
 }
 
@@ -106,15 +106,15 @@ static TQString check_list_id(const KMMessage  *message,
   int lAnglePos, firstDotPos;
   TQString header = message->headerField( "List-Id" );
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  lAnglePos = header.find( '<' );
+  lAnglePos = header.tqfind( '<' );
   if ( lAnglePos < 0 )
-    return TQString::null;
+    return TQString();
 
-  firstDotPos = header.find( '.', lAnglePos );
+  firstDotPos = header.tqfind( '.', lAnglePos );
   if ( firstDotPos < 0 )
-    return TQString::null;
+    return TQString();
 
   header_name = "List-Id";
   header_value = header.mid( lAnglePos );
@@ -130,16 +130,16 @@ static TQString check_list_post(const KMMessage  *message,
 {
   TQString header = message->headerField( "List-Post" );
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  int lAnglePos = header.find( "<mailto:" );
+  int lAnglePos = header.tqfind( "<mailto:" );
   if ( lAnglePos < 0 )
-    return TQString::null;
+    return TQString();
 
   header_name = "List-Post";
   header_value = header;
   header = header.mid( lAnglePos + 8, header.length());
-  header.truncate( header.find('@') );
+  header.truncate( header.tqfind('@') );
   return header;
 }
 
@@ -150,14 +150,14 @@ static TQString check_mailing_list(const KMMessage  *message,
 {
   TQString header = message->headerField( "Mailing-List");
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  if (header.left( 5 ) != "list " || header.find( '@' ) < 5 )
-    return TQString::null;
+  if (header.left( 5 ) != "list " || header.tqfind( '@' ) < 5 )
+    return TQString();
 
   header_name = "Mailing-List";
   header_value = header;
-  header = header.mid(5,  header.find( '@' ) - 5);
+  header = header.mid(5,  header.tqfind( '@' ) - 5);
   return header;
 }
 
@@ -168,14 +168,14 @@ static TQString check_x_loop(const KMMessage  *message,
                             TQString &header_value ){
   TQString header = message->headerField( "X-Loop");
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  if (header.find( '@' ) < 2 )
-    return TQString::null;
+  if (header.tqfind( '@' ) < 2 )
+    return TQString();
 
   header_name = "X-Loop";
   header_value = header;
-  header.truncate(header.find( '@' ));
+  header.truncate(header.tqfind( '@' ));
   return header;
 }
 
@@ -185,11 +185,11 @@ static TQString check_x_ml_name(const KMMessage  *message,
                                TQString &header_value ){
   TQString header = message->headerField( "X-ML-Name");
   if ( header.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   header_name = "X-ML-Name";
   header_value = header;
-  header.truncate(header.find( '@' ));
+  header.truncate(header.tqfind( '@' ));
   return header;
 }
 
@@ -208,7 +208,7 @@ MagicDetectorFunc magic_detector[] =
 
 static const int num_detectors = sizeof (magic_detector) / sizeof (magic_detector[0]);
 
-static QStringList
+static TQStringList
 headerToAddress( const TQString& header )
 {
   TQStringList addr;
@@ -218,8 +218,8 @@ headerToAddress( const TQString& header )
   if ( header.isEmpty() )
     return addr;
 
-  while ( (start = header.find( "<", start )) != -1 ) {
-    if ( (end = header.find( ">", ++start ) ) == -1 ) {
+  while ( (start = header.tqfind( "<", start )) != -1 ) {
+    if ( (end = header.tqfind( ">", ++start ) ) == -1 ) {
       kdDebug(5006)<<k_funcinfo<<"Serious mailing list header parsing error !"<<endl;
       return addr;
     }
@@ -249,16 +249,16 @@ MailingList::detect( const KMMessage *message )
   return mlist;
 }
 
-QString
+TQString
 MailingList::name( const KMMessage  *message, TQCString &header_name,
                    TQString &header_value )
 {
   TQString mlist;
   header_name = TQCString();
-  header_value = TQString::null;
+  header_value = TQString();
 
   if ( !message )
-    return TQString::null;
+    return TQString();
 
   for (int i = 0; i < num_detectors; i++) {
     mlist = magic_detector[i] (message, header_name, header_value);
@@ -266,7 +266,7 @@ MailingList::name( const KMMessage  *message, TQCString &header_name,
       return mlist;
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 MailingList::MailingList()
@@ -379,7 +379,7 @@ MailingList::setId( const TQString& str )
 
   mId = str;
 }
-QString
+TQString
 MailingList::id() const
 {
   return mId;
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 525faf3d..d05d6413 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -45,8 +45,8 @@
 
 using namespace KMail;
 
-MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* parent, KMFolder *folder )
-    : KDialogBase( parent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), 
+MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* tqparent, KMFolder *folder )
+    : KDialogBase( tqparent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), 
                    KDialogBase::Ok|KDialogBase::Cancel, 
                    KDialogBase::Ok, true ),
       mFolder( folder )
@@ -59,7 +59,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
                                             "topLayout" );
 
   TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
-  mlGroup->setColumnLayout( 0,  Qt::Vertical );
+  mlGroup->setColumnLayout( 0,  TQt::Vertical );
   TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() );
   topLayout->addWidget( mlGroup );
   setMainWidget( mlGroup );
@@ -87,7 +87,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
   groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 );
   mMLId->setEnabled( false );
 
-  //FIXME: add QWhatsThis
+  //FIXME: add TQWhatsThis
   label = new TQLabel( i18n("Preferred handler:"), mlGroup );
   label->setEnabled(false);
   TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
@@ -199,7 +199,7 @@ void MailingListFolderPropertiesDialog::slotDetectMailingList()
 
   /* FIXME Till - make work without the folder tree
   // first try the currently selected message
-  KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->parent() );
+  KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->tqparent() );
   int curMsgIdx = folderTree->mainWidget()->headers()->currentItemIndex();
   if ( curMsgIdx > 0 ) {
     KMMessage *mes = mFolder->getMsg( curMsgIdx );
@@ -257,7 +257,7 @@ void MailingListFolderPropertiesDialog::fillMLFromWidgets()
   for ( TQStringList::ConstIterator it = oldList.begin();
         it != oldList.end(); ++it ) {
     if ( !(*it).startsWith("http:") && !(*it).startsWith("https:") &&
-         !(*it).startsWith("mailto:") && ( (*it).find('@') != -1 ) ) {
+         !(*it).startsWith("mailto:") && ( (*it).tqfind('@') != -1 ) ) {
       changed = true;
       newList << "mailto:" + *it;
     }
diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h
index 2a09dab7..f3aa13fa 100644
--- a/kmail/mailinglistpropertiesdialog.h
+++ b/kmail/mailinglistpropertiesdialog.h
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -45,8 +45,9 @@ namespace KMail
 class MailingListFolderPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder );
+  MailingListFolderPropertiesDialog( TQWidget *tqparent, KMFolder *folder );
   ~MailingListFolderPropertiesDialog() {};
 protected:
   void load();
diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp
index e7337e81..f5b810a3 100644
--- a/kmail/mailserviceimpl.cpp
+++ b/kmail/mailserviceimpl.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -86,7 +86,7 @@ bool MailServiceImpl::sendMessage( const TQString& to,
 {
   kdDebug(5006) << "DCOP call MailTransportServiceIface bool sendMessage(TQString to,TQString cc,TQString bcc,TQString subject,TQString body,KURL::List attachments)" << endl;
   kdDebug(5006) << "This DCOP call is deprecated. Use the corresponding DCOP call with the additional parameter TQString from instead." << endl;
-  return sendMessage( TQString::null, to, cc, bcc, subject, body, attachments );
+  return sendMessage( TQString(), to, cc, bcc, subject, body, attachments );
 }
 
 
@@ -128,7 +128,7 @@ bool MailServiceImpl::sendMessage( const TQString& to,
 {
   kdDebug(5006) << "DCOP call MailTransportServiceIface bool sendMessage(TQString to,TQString cc,TQString bcc,TQString subject,TQString body,TQByteArray attachment)" << endl;
   kdDebug(5006) << "This DCOP call is deprecated. Use the corresponding DCOP call with the additional parameter TQString from instead." << endl;
-  return sendMessage( TQString::null, to, cc, bcc, subject, body, attachment );
+  return sendMessage( TQString(), to, cc, bcc, subject, body, attachment );
 }
 
 }//end namespace KMail
diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h
index 093d0f83..0fbb415a 100644
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index 0cfa11bb..6d5c4e38 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -53,13 +53,13 @@ int MailSourceHighlighter::highlightParagraph( const TQString& text, int ) {
   return 0;
 }
 
-MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name )
-  : KTextBrowser( parent, name ), mSourceHighLighter( 0 )
+MailSourceViewer::MailSourceViewer( TQWidget *tqparent, const char *name )
+  : KTextBrowser( tqparent, name ), mSourceHighLighter( 0 )
 {
   setWFlags( WDestructiveClose );
   TQAccel *accel = new TQAccel( this, "browser close-accel" );
-  accel->connectItem( accel->insertItem( Qt::Key_Escape ), this , TQT_SLOT( close() ));
-  accel->connectItem( accel->insertItem( Qt::Key_W+CTRL ), this , TQT_SLOT( close() ));
+  accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() ));
+  accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() ));
   setWordWrap( KTextBrowser::NoWrap );
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 }
@@ -73,9 +73,9 @@ void MailSourceViewer::setText( const TQString& text )
 {
   delete mSourceHighLighter; mSourceHighLighter = 0;
   if ( text.length() > 500000 ) {
-    setTextFormat( Qt::LogText );
+    setTextFormat( TQt::LogText );
   } else {
-    setTextFormat( Qt::PlainText );
+    setTextFormat( TQt::PlainText );
     mSourceHighLighter = new MailSourceHighlighter( this );
   }
   KTextBrowser::setText( text );
diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h
index 10d24258..d4e60253 100644
--- a/kmail/mailsourceviewer.h
+++ b/kmail/mailsourceviewer.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -46,7 +46,7 @@
  */
 namespace KMail {
 
-class MailSourceHighlighter : public QSyntaxHighlighter
+class MailSourceHighlighter : public TQSyntaxHighlighter
 {
 public:
   MailSourceHighlighter( TQTextEdit* edit )
@@ -59,7 +59,7 @@ public:
 class MailSourceViewer : public KTextBrowser
 {
 public:
-  MailSourceViewer( TQWidget *parent = 0, const char *name = 0 );
+  MailSourceViewer( TQWidget *tqparent = 0, const char *name = 0 );
   ~MailSourceViewer();
   void setText( const TQString& text );
 private:
diff --git a/kmail/main.cpp b/kmail/main.cpp
index b06bf8a4..0cca3cb2 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 
-#undef Status // stupid X headers
+#undef tqStatus // stupid X headers
 
 #include "aboutdata.h"
 
@@ -41,11 +41,11 @@ class KMailApplication : public KUniqueApplication
 public:
   KMailApplication() : KUniqueApplication() { };
   virtual int newInstance();
-  void commitData(QSessionManager& sm);
+  void commitData(TQSessionManager& sm);
 
 };
 
-void KMailApplication::commitData(QSessionManager& sm) {
+void KMailApplication::commitData(TQSessionManager& sm) {
   kmkernel->dumpDeadLetters();
   kmkernel->setShuttingDown( true ); // Prevent further dumpDeadLetters calls
   KApplication::commitData( sm );
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index dc8e42f4..b3018fea 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -29,9 +29,9 @@ inline const TQCheckListItem * qcli_cast( const TQListViewItem * lvi ) {
   return lvi && lvi->rtti() == 1 ? static_cast<const TQCheckListItem*>( lvi ) : 0 ;
 }
 
-KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, const char * name )
+KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * tqparent, const char * name )
   : KDialogBase( Plain, i18n( "Manage Sieve Scripts" ), Close, Close,
-    parent, name, false ),
+    tqparent, name, false ),
     mSieveEditor( 0 ),
     mContextMenuItem( 0 ),
     mWasActive( false )
@@ -126,29 +126,29 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() {
 }
 
 void KMail::ManageSieveScriptsDialog::slotResult( KMail::SieveJob * job, bool success, const TQString &, bool ) {
-  TQCheckListItem * parent = mJobs[job];
-  if ( !parent )
+  TQCheckListItem * tqparent = mJobs[job];
+  if ( !tqparent )
     return;
 
   mJobs.remove( job );
 
-  parent->setOpen( true );
+  tqparent->setOpen( true );
 
   if ( success )
     return;
 
-  TQListViewItem * item = new TQListViewItem( parent, i18n( "Failed to fetch the list of scripts" ) );
+  TQListViewItem * item = new TQListViewItem( tqparent, i18n( "Failed to fetch the list of scripts" ) );
   item->setEnabled( false );
 }
 
 void KMail::ManageSieveScriptsDialog::slotItem( KMail::SieveJob * job, const TQString & filename, bool isActive ) {
-  TQCheckListItem * parent = mJobs[job];
-  if ( !parent )
+  TQCheckListItem * tqparent = mJobs[job];
+  if ( !tqparent )
     return;
-  TQCheckListItem * item = new TQCheckListItem( parent, filename, TQCheckListItem::RadioButton );
+  TQCheckListItem * item = new TQCheckListItem( tqparent, filename, TQCheckListItem::RadioButton );
   if ( isActive ) {
     item->setOn( true );
-    mSelectedItems[parent] = item;
+    mSelectedItems[tqparent] = item;
   }
 }
 
@@ -178,12 +178,12 @@ void KMail::ManageSieveScriptsDialog::slotDeactivateScript() {
   if ( !mContextMenuItem )
     return;
 
-  TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
-  if ( !parent )
+  TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
+  if ( !tqparent )
     return;
   if ( mContextMenuItem->isOn()) {
-    mSelectedItems[parent] = mContextMenuItem;
-    changeActiveScript( parent,false );
+    mSelectedItems[tqparent] = mContextMenuItem;
+    changeActiveScript( tqparent,false );
   }
 }
 
@@ -191,12 +191,12 @@ void KMail::ManageSieveScriptsDialog::slotSelectionChanged( TQListViewItem * i )
   TQCheckListItem * item = qcli_cast( i );
   if ( !item )
     return;
-  TQCheckListItem * parent = qcli_cast( item->parent() );
-  if ( !parent )
+  TQCheckListItem * tqparent = qcli_cast( item->tqparent() );
+  if ( !tqparent )
     return;
-  if ( item->isOn() && mSelectedItems[parent] != item ) {
-    mSelectedItems[parent] = item;
-    changeActiveScript( parent,true );
+  if ( item->isOn() && mSelectedItems[tqparent] != item ) {
+    mSelectedItems[tqparent] = item;
+    changeActiveScript( tqparent,true );
   }
 }
 
@@ -240,14 +240,14 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
   if ( !mContextMenuItem->depth() )
     return;
 
-  TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
-  if ( !parent )
+  TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
+  if ( !tqparent )
     return;
 
-  if ( !mUrls.count( parent ) )
+  if ( !mUrls.count( tqparent ) )
     return;
 
-  KURL u = mUrls[parent];
+  KURL u = mUrls[tqparent];
   if ( u.isEmpty() )
     return;
 
@@ -268,10 +268,10 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() {
     return;
   if ( !mContextMenuItem->depth() )
     return;
-  TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
-  if ( !mUrls.count( parent ) )
+  TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
+  if ( !mUrls.count( tqparent ) )
     return;
-  KURL url = mUrls[parent];
+  KURL url = mUrls[tqparent];
   if ( url.isEmpty() )
     return;
   url.setFileName( mContextMenuItem->text( 0 ) );
@@ -285,7 +285,7 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() {
   if ( !mContextMenuItem )
     return;
   if ( mContextMenuItem->depth() )
-    mContextMenuItem = qcli_cast( mContextMenuItem->parent() );
+    mContextMenuItem = qcli_cast( mContextMenuItem->tqparent() );
   if ( !mContextMenuItem )
     return;
 
@@ -308,11 +308,11 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() {
   (void) new TQCheckListItem( mContextMenuItem, name, TQCheckListItem::RadioButton );
 
   mCurrentURL = u;
-  slotGetResult( 0, true, TQString::null, false );
+  slotGetResult( 0, true, TQString(), false );
 }
 
-KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
-  : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, parent, name )
+KMail::SieveEditor::SieveEditor( TQWidget * tqparent, const char * name )
+  : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, tqparent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, spacingHint() );
   mTextEdit = new TQTextEdit( plainPage() );
diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h
index 70c4f697..73de8465 100644
--- a/kmail/managesievescriptsdialog.h
+++ b/kmail/managesievescriptsdialog.h
@@ -15,8 +15,9 @@ class SieveEditor;
 
 class ManageSieveScriptsDialog : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 );
+  ManageSieveScriptsDialog( TQWidget * tqparent=0, const char * name=0 );
   ~ManageSieveScriptsDialog();
 
 private slots:
diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h
index 2ae12ff5..c756ebe3 100644
--- a/kmail/managesievescriptsdialog_p.h
+++ b/kmail/managesievescriptsdialog_p.h
@@ -9,9 +9,10 @@ namespace KMail {
 
 class SieveEditor : public KDialogBase {
   Q_OBJECT
-  Q_PROPERTY( TQString script READ script WRITE setScript )
+  TQ_OBJECT
+  TQ_PROPERTY( TQString script READ script WRITE setScript )
 public:
-  SieveEditor( TQWidget * parent=0, const char * name=0 );
+  SieveEditor( TQWidget * tqparent=0, const char * name=0 );
   ~SieveEditor();
 
   TQString script() const { return mTextEdit->text(); }
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 1b6b3223..93f94d43 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -72,9 +72,9 @@ MboxJob::execute()
 
 //-----------------------------------------------------------------------------
 void
-MboxJob::setParent( const KMFolderMbox *parent )
+MboxJob::setParent( const KMFolderMbox *tqparent )
 {
-  mParent = const_cast<KMFolderMbox*>( parent );
+  mParent = const_cast<KMFolderMbox*>( tqparent );
 }
 
 //-----------------------------------------------------------------------------
@@ -82,14 +82,14 @@ void
 MboxJob::startJob()
 {
   KMMessage *msg = mMsgList.first();
-  assert( (msg && ( mParent || msg->parent() )) );
+  assert( (msg && ( mParent || msg->tqparent() )) );
   switch( mType ) {
   case tGetMessage:
     {
       kdDebug(5006)<<msg<<endl;
       kdDebug(5006)<<this<<endl;
       kdDebug(5006)<<"Done"<<endl;
-      //KMMessage* msg = mParent->getMsg( mParent->find( mMsgList.first() ) );
+      //KMMessage* msg = mParent->getMsg( mParent->tqfind( mMsgList.first() ) );
       msg->setComplete( true );
       emit messageRetrieved( msg );
     }
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index 406edef7..df9609ae 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,6 +41,7 @@ namespace KMail {
 class MboxJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::KMFolderMbox;
 public:
   MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
@@ -49,7 +50,7 @@ public:
   virtual ~MboxJob();
 protected:
   void execute();
-  void setParent( const KMFolderMbox *parent );
+  void setParent( const KMFolderMbox *tqparent );
 protected slots:
   void startJob();
 private:
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index c1f56992..d899972c 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -32,9 +32,9 @@
 
 using namespace KMail;
 
-MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) :
-    TQObject( parent ),
-    mParent( parent ),
+MessageActions::MessageActions( KActionCollection *ac, TQWidget * tqparent ) :
+    TQObject( tqparent ),
+    mParent( tqparent ),
     mActionCollection( ac ),
     mCurrentMessage( 0 ),
     mMessageView( 0 )
@@ -139,13 +139,13 @@ void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > &
 void MessageActions::updateActions()
 {
   bool singleMsg = (mCurrentMessage != 0);
-  if ( mCurrentMessage && mCurrentMessage->parent() ) {
-    if ( mCurrentMessage->parent()->isTemplates() )
+  if ( mCurrentMessage && mCurrentMessage->tqparent() ) {
+    if ( mCurrentMessage->tqparent()->isTemplates() )
       singleMsg = false;
   }
   const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage;
   const bool flagsAvailable = GlobalSettings::self()->allowLocalFlags() ||
-      !((mCurrentMessage && mCurrentMessage->parent()) ? mCurrentMessage->parent()->isReadOnly() : true);
+      !((mCurrentMessage && mCurrentMessage->tqparent()) ? mCurrentMessage->tqparent()->isReadOnly() : true);
 
   mCreateTodoAction->setEnabled( singleMsg );
   mReplyActionMenu->setEnabled( singleMsg );
@@ -223,30 +223,30 @@ void MessageActions::slotNoQuoteReplyToMsg()
 
 void MessageActions::slotSetMsgStatusNew()
 {
-  setMessageStatus( KMMsgStatusNew );
+  setMessagetqStatus( KMMsgStatusNew );
 }
 
 void MessageActions::slotSetMsgStatusUnread()
 {
-  setMessageStatus( KMMsgStatusUnread );
+  setMessagetqStatus( KMMsgStatusUnread );
 }
 
 void MessageActions::slotSetMsgStatusRead()
 {
-  setMessageStatus( KMMsgStatusRead );
+  setMessagetqStatus( KMMsgStatusRead );
 }
 
 void MessageActions::slotSetMsgStatusFlag()
 {
-  setMessageStatus( KMMsgStatusFlag, true );
+  setMessagetqStatus( KMMsgStatusFlag, true );
 }
 
 void MessageActions::slotSetMsgStatusTodo()
 {
-  setMessageStatus( KMMsgStatusTodo, true );
+  setMessagetqStatus( KMMsgStatusTodo, true );
 }
 
-void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle )
+void MessageActions::setMessagetqStatus( KMMsgtqStatus status, bool toggle )
 {
   TQValueList<TQ_UINT32> serNums = mVisibleSernums;
   if ( serNums.isEmpty() && mCurrentMessage )
@@ -262,7 +262,7 @@ void MessageActions::editCurrentMessage()
   if ( !mCurrentMessage )
     return;
   KMCommand *command = 0;
-  KMFolder *folder = mCurrentMessage->parent();
+  KMFolder *folder = mCurrentMessage->tqparent();
   // edit, unlike send again, removes the message from the folder
   // we only want that for templates and drafts folders
   if ( folder && ( kmkernel->folderIsDraftOrOutbox( folder ) ||
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index fe040c2c..0cf06256 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -36,11 +36,12 @@ namespace KMail {
 /**
   Manages common actions that can be performed on one or more messages.
 */
-class MessageActions : public QObject
+class MessageActions : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    MessageActions( KActionCollection* ac, TQWidget *parent );
+    MessageActions( KActionCollection* ac, TQWidget *tqparent );
     void setMessageView( KMReaderWin *msgView );
 
     void setCurrentMessage( KMMessage *msg );
@@ -69,7 +70,7 @@ class MessageActions : public QObject
   private:
     void updateActions();
     template<typename T> void replyCommand();
-    void setMessageStatus( KMMsgStatus status, bool toggle = false );
+    void setMessagetqStatus( KMMsgtqStatus status, bool toggle = false );
 
   private slots:
     void slotReplyToMsg();
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 2ff7cd6a..897b03e6 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -521,7 +521,7 @@ void MessageComposer::readFromComposeWin()
 
   mEncryptWithChiasmus = mComposeWin->mEncryptWithChiasmus;
 
-  mIsRichText = mComposeWin->mEditor->textFormat() == Qt::RichText;
+  mIsRichText = mComposeWin->mEditor->textFormat() == TQt::RichText;
   mIdentityUid = mComposeWin->identityUid();
   mText = breakLinesAndApplyCodec();
   assert( mText.isEmpty() || mText[mText.size()-1] == '\n' );
@@ -1000,7 +1000,7 @@ void MessageComposer::composeMessage()
 }
 
 //
-// These are tqreplacements for StructuringInfo(Wrapper):
+// These are replacements for StructuringInfo(Wrapper):
 //
 
 // check whether to use multipart/{signed,encrypted}
@@ -1137,7 +1137,7 @@ static inline GpgME::Context::SignatureMode signingMode( Kleo::CryptoMessageForm
 }
 
 //
-// END tqreplacements for StructuringInfo(Wrapper)
+// END replacements for StructuringInfo(Wrapper)
 //
 
 class EncryptMessageJob : public MessageComposerJob {
@@ -1475,7 +1475,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
     newbody += "--";
     newbody +=     boundaryCStr;
     newbody +=                 "--\n";
-    bodyData = KMail::Util::byteArrayFromQCStringNoDetach( newbody );
+    bodyData = KMail::Util::byteArrayFromTQCStringNoDetach( newbody );
     mOldBodyPart.setBodyEncodedBinary( bodyData );
 
     mSaveBoundary = tmpCT.Boundary();
@@ -1527,7 +1527,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
     innerDwPart->Assemble();
     TQByteArray tmpbody = KMail::Util::ByteArray( innerDwPart->AsString() );
     if ( mIsRichText ) { // and add our mp/a boundary
-        int boundPos = tmpbody.find( '\n' );
+        int boundPos = tmpbody.tqfind( '\n' );
         if( -1 < boundPos ) {
           TQCString bStr( ";\n  boundary=\"" );
           bStr += mSaveBoundary.c_str();
@@ -1590,7 +1590,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
 
     // manually add a boundary definition to the Content-Type header
     if( !mMultipartMixedBoundary.isEmpty() ) {
-      int boundPos = mEncodedBody.find( '\n' );
+      int boundPos = mEncodedBody.tqfind( '\n' );
       if( -1 < boundPos ) {
         // insert new "boundary" parameter
         TQCString bStr( ";\n  boundary=\"" );
@@ -1600,7 +1600,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
       }
     }
 
-    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     mEncodedBody = KMail::Util::lf2crlf( mEncodedBody );
@@ -1616,7 +1616,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
       mRc = false;
       return;
     }
-    mRc = processStructuringInfo( TQString::null,
+    mRc = processStructuringInfo( TQString(),
 				  mOldBodyPart.contentDescription(),
 				  mOldBodyPart.typeStr(),
 				  mOldBodyPart.subtypeStr(),
@@ -1700,7 +1700,7 @@ void MessageComposer::encryptMessage( KMMessage* msg,
     }
 
     // now do the encrypting:
-    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     innerContent = KMail::Util::lf2crlf( innerContent );
@@ -1792,7 +1792,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
       delete innerDwPart;
       innerDwPart = 0;
 
-      // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
+      // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
       // according to RfC 2633, 3.1.1 Canonicalization
       //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
       encodedAttachment = KMail::Util::lf2crlf( encodedAttachment );
@@ -1992,7 +1992,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
       }
       if ( binaryHint( format ) ) {
 	codeCStr += "Content-Transfer-Encoding: base64\n\n";
-	codeCStr += KMime::Codec::codecForName( "base64" )->encodeToQCString( ciphertext );
+	codeCStr += KMime::Codec::codecForName( "base64" )->encodeToTQCString( ciphertext );
       } else
 	codeCStr += '\n' + TQCString( ciphertext.data(), ciphertext.size() + 1 );
 
@@ -2051,7 +2051,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
 TQCString MessageComposer::plainTextFromMarkup( const TQString& markupText )
 {
   TQTextEdit *hackConspiratorTextEdit = new TQTextEdit( markupText );
-  hackConspiratorTextEdit->setTextFormat(Qt::PlainText);
+  hackConspiratorTextEdit->setTextFormat(TQt::PlainText);
   if ( !mDisableBreaking ) {
     hackConspiratorTextEdit->setWordWrap( TQTextEdit::FixedColumnWidth );
     hackConspiratorTextEdit->setWrapColumnOrWidth( mLineBreakColumn );
@@ -2133,7 +2133,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec()
     kdDebug(5006) << "Added an <LF> on the last line" << endl;
     cText += "\n";
   }
-  return KMail::Util::byteArrayFromQCStringNoDetach( cText );
+  return KMail::Util::byteArrayFromTQCStringNoDetach( cText );
 }
 
 
diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h
index 2284b04a..f6392b83 100644
--- a/kmail/messagecomposer.h
+++ b/kmail/messagecomposer.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -64,6 +64,7 @@ namespace KPIM {
 
 class MessageComposer : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
   friend class ::MessageComposerJob;
   friend class ::EncryptMessageJob;
   friend class ::SetLastMessageAsUnencryptedVersionOfLastButOne;
diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index 4d998330..84618ea8 100644
--- a/kmail/messagecopyhelper.cpp
+++ b/kmail/messagecopyhelper.cpp
@@ -27,8 +27,8 @@ using namespace KMail;
 using namespace KPIM;
 
 MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs,
-                                      KMFolder * dest, bool move, TQObject * parent ) :
-    TQObject( parent )
+                                      KMFolder * dest, bool move, TQObject * tqparent ) :
+    TQObject( tqparent )
 {
   if ( msgs.isEmpty() || !dest )
     return;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 419382cf..1c24d890 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -36,9 +36,10 @@ namespace KMail {
   Helper class to copy/move a set of messages defined by their serial
   numbers from arbitrary folders into a common destination folder.
 */
-class MessageCopyHelper : public QObject
+class MessageCopyHelper : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -47,10 +48,10 @@ class MessageCopyHelper : public QObject
       @param msgs List of serial numbers.
       @param dest Destination folder.
       @param move If set to true, messages will be moved instead of copied
-      @param parent The parent object.
+      @param tqparent The tqparent object.
     */
     MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest,
-                       bool move, TQObject *parent = 0 );
+                       bool move, TQObject *tqparent = 0 );
 
     /**
       Converts a MailList into a serial number list.
diff --git a/kmail/messageproperty.cpp b/kmail/messageproperty.cpp
index e9897cd6..91261540 100644
--- a/kmail/messageproperty.cpp
+++ b/kmail/messageproperty.cpp
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,7 +66,7 @@ void MessageProperty::setFiltering( const KMMsgBase *msgBase, bool filter )
 
 KMFolder* MessageProperty::filterFolder( TQ_UINT32 serNum )
 {
-  TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.tqfind( serNum );
   return it == sFolders.constEnd() ? 0 : (*it).operator->();
 }
 
@@ -87,7 +87,7 @@ void MessageProperty::setFilterFolder( const KMMsgBase *msgBase, KMFolder* folde
 
 ActionScheduler* MessageProperty::filterHandler( TQ_UINT32 serNum )
 {
-  TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.tqfind( serNum );
   return it == sHandlers.constEnd() ? 0 : (*it).operator->();
 }
 
@@ -111,14 +111,14 @@ void MessageProperty::setFilterHandler( const KMMsgBase *msgBase, ActionSchedule
 
 bool MessageProperty::transferInProgress( TQ_UINT32 serNum )
 {
-  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.tqfind( serNum );
   return it == sTransfers.constEnd() ? false : *it;
 }
 
 void MessageProperty::setTransferInProgress( TQ_UINT32 serNum, bool transfer, bool force )
 {
   int transferInProgress = 0;
-  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.tqfind( serNum );
   if (it != sTransfers.constEnd())
     transferInProgress = *it;
   if ( force && !transfer )
@@ -145,7 +145,7 @@ void MessageProperty::setTransferInProgress( const KMMsgBase *msgBase, bool tran
 
 TQ_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
 {
-  TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.find( msgBase );
+  TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.tqfind( msgBase );
   return it == sSerialCache.constEnd() ? 0 : *it;
 }
 
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index 0dd3f3b2..bd040ef5 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,9 +54,10 @@ class ActionScheduler;
    serialCache should only exist during the lifetime of a particular
    KMMsgBase based instance.
  */
-class MessageProperty : public QObject
+class MessageProperty : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /** If the message is being filtered  */
diff --git a/kmail/messagesender.h b/kmail/messagesender.h
index 0c45923b..eac7995a 100644
--- a/kmail/messagesender.h
+++ b/kmail/messagesender.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -74,7 +74,7 @@ public:
 
      @return true on success.
   */
-  bool sendQueued( const TQString & transport=TQString::null ) { return doSendQueued( transport ); }
+  bool sendQueued( const TQString & transport=TQString() ) { return doSendQueued( transport ); }
 
   virtual void readConfig() = 0;
   virtual void writeConfig( bool withSync = true ) = 0;
diff --git a/kmail/mh2kmailr b/kmail/mh2kmailr
index d88905aa..df76fec1 100755
--- a/kmail/mh2kmailr
+++ b/kmail/mh2kmailr
@@ -14,13 +14,13 @@ fi
 
 MH_DIR=$1
 
-for d in `/usr/bin/find $MH_DIR -type d -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
+for d in `/usr/bin/tqfind $MH_DIR -type d -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
 FOLDER=${d}.mbx
 
 # remove old kmail folder if any
 rm -f $FOLDER
 
-for f in `/usr/bin/find $d -type f -maxdepth 1 -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
+for f in `/usr/bin/tqfind $d -type f -maxdepth 1 -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
   echo "From ???@??? 00:00:00 1997 +0000" >> $FOLDER
   cat $f >> $FOLDER
 done
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 4721e1e1..b0d56a50 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -49,8 +49,8 @@ namespace KMail {
  // for restricting number of concurrent connections to the same server
   static TQMap<TQString, int> s_serverConnections;
 
-  NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id )
-    : KMAccount( parent, name, id ),
+  NetworkAccount::NetworkAccount( AccountManager * tqparent, const TQString & name, uint id )
+    : KMAccount( tqparent, name, id ),
       mSlave( 0 ),
       mAuth( "*" ),
       mPort( 0 ),
@@ -72,10 +72,10 @@ namespace KMail {
     KMAccount::init();
 
     mSieveConfig = SieveConfig();
-    mLogin = TQString::null;
-    mPasswd = TQString::null;
+    mLogin = TQString();
+    mPasswd = TQString();
     mAuth = "*";
-    mHost = TQString::null;
+    mHost = TQString();
     mPort = defaultPort();
     mStorePasswd = false;
     mUseSSL = false;
@@ -321,7 +321,7 @@ namespace KMail {
       if ( host().isEmpty() )
           return;
     if ( checking ) {
-        if ( s_serverConnections.find( host() ) != s_serverConnections.end() )
+        if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() )
             s_serverConnections[host()] += 1;
         else
             s_serverConnections[host()] = 1;
@@ -329,7 +329,7 @@ namespace KMail {
                 << host() << " now is "
                 << s_serverConnections[host()] << endl;
     } else {
-            if ( s_serverConnections.find( host() ) != s_serverConnections.end() &&
+            if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() &&
                 s_serverConnections[host()] > 0 ) {
                 s_serverConnections[host()] -= 1;
                 kdDebug(5006) << "connections to server " << host()
@@ -344,12 +344,12 @@ namespace KMail {
 
       kdDebug(5006) << "for host " << host()
               << " current connections="
-              << (s_serverConnections.find(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()])
+              << (s_serverConnections.tqfind(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()])
               << " and limit is " << GlobalSettings::self()->maxConnectionsPerHost()
               << endl;
       bool connectionLimitForHostReached = !host().isEmpty()
               && GlobalSettings::self()->maxConnectionsPerHost() > 0
-              && s_serverConnections.find( host() ) != s_serverConnections.end()
+              && s_serverConnections.tqfind( host() ) != s_serverConnections.end()
               && s_serverConnections[host()] >= GlobalSettings::self()->maxConnectionsPerHost();
       kdDebug(5006) << "connection limit reached: "
               << connectionLimitForHostReached << endl;
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 868e2055..891e1edc 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -45,8 +45,9 @@ namespace KMail {
 
   class NetworkAccount : public KMAccount {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    NetworkAccount( AccountManager * parent, const TQString & name, uint id );
+    NetworkAccount( AccountManager * tqparent, const TQString & name, uint id );
   public:
     virtual ~NetworkAccount();
 
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index acd5b332..6d1de7cd 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -55,8 +55,8 @@
 
 using namespace KMail;
 
-NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
-    : KDialogBase( parent, "new_folder_dialog", false, i18n( "New Folder" ),
+NewFolderDialog::NewFolderDialog( TQWidget* tqparent, KMFolder *folder )
+    : KDialogBase( tqparent, "new_folder_dialog", false, i18n( "New Folder" ),
                    KDialogBase::Ok|KDialogBase::Cancel,
                    KDialogBase::Ok, true ),
       mFormatComboBox( 0 ),
@@ -201,16 +201,16 @@ void NewFolderDialog::slotOk()
     return;
   }
 
-  // default parent is Top Level local folders
+  // default tqparent is Top Level local folders
   KMFolderDir * selectedFolderDir = &(kmkernel->folderMgr()->dir());
-  // we got a parent, let's use that
+  // we got a tqparent, let's use that
   if ( mFolder )
     selectedFolderDir = mFolder->createChildFolder();
 
   // check if the folder already exists
   if( selectedFolderDir->hasNamedFolder( fldName )
       && ( !( mFolder
-          && ( selectedFolderDir == mFolder->parent() )
+          && ( selectedFolderDir == mFolder->tqparent() )
           && ( mFolder->storage()->name() == fldName ) ) ) )
   {
     const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName);
diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h
index 4744db3e..e4a01f55 100644
--- a/kmail/newfolderdialog.h
+++ b/kmail/newfolderdialog.h
@@ -16,11 +16,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -47,9 +47,10 @@ namespace KMail {
 class NewFolderDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 );
+    NewFolderDialog( TQWidget* tqparent = 0, KMFolder *folder = 0 );
     ~NewFolderDialog() {};
 
     TQLabel* mNameLabel;
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 132dc058..80c182d9 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -97,7 +97,7 @@
 #include <kiconloader.h>
 #include <kmdcodec.h>
 
-// other Qt headers
+// other TQt headers
 #include <tqtextcodec.h>
 #include <tqdir.h>
 #include <tqfile.h>
@@ -208,24 +208,24 @@ namespace KMail {
       myBody->Headers().Parse();
     }
 
-    partNode* parentNode = &startNode;
+    partNode* tqparentNode = &startNode;
     partNode* newNode = new partNode(false, myBody);
 
-    // Build the object tree of the new node before setting the parent, as otherwise
-    // buildObjectTree() would erronously modify the parents as well
+    // Build the object tree of the new node before setting the tqparent, as otherwise
+    // buildObjectTree() would erronously modify the tqparents as well
     newNode->buildObjectTree( false );
 
-    if ( append && parentNode->firstChild() ) {
-      parentNode = parentNode->firstChild();
-      while( parentNode->nextSibling() )
-        parentNode = parentNode->nextSibling();
-      parentNode->setNext( newNode );
+    if ( append && tqparentNode->firstChild() ) {
+      tqparentNode = tqparentNode->firstChild();
+      while( tqparentNode->nextSibling() )
+        tqparentNode = tqparentNode->nextSibling();
+      tqparentNode->setNext( newNode );
     } else
-      parentNode->setFirstChild( newNode );
+      tqparentNode->setFirstChild( newNode );
 
     if ( startNode.mimePartTreeItem() ) {
       newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0,
-                                 TQString::null, TQString::null, TQString::null, 0,
+                                 TQString(), TQString(), TQString(), 0,
                                  append );
     } else {
     }
@@ -260,7 +260,7 @@ namespace KMail {
       node->setProcessed( false, false );
       if ( partNode * child = node->firstChild() )
         child->setProcessed( false, true );
-    } else if ( mReader && !node->parentNode() ) {
+    } else if ( mReader && !node->tqparentNode() ) {
       // ...this node and all it's siblings and descendants
       node->setProcessed( false, true );
     }
@@ -338,7 +338,7 @@ namespace KMail {
     const AttachmentStrategy * as = attachmentStrategy();
     if ( as && as->defaultDisplay( node ) == AttachmentStrategy::None &&
          !showOnlyOneMimePart() &&
-         node->parentNode() /* message is not an attachment */ ) {
+         node->tqparentNode() /* message is not an attachment */ ) {
       node->setDisplayedHidden( true );
       return;
     }
@@ -391,7 +391,7 @@ namespace KMail {
   //////////////////
   //////////////////
 
-  static int signatureToStatus( const GpgME::Signature &sig )
+  static int signatureTotqStatus( const GpgME::Signature &sig )
   {
     switch ( sig.status().code() ) {
       case GPG_ERR_NO_ERROR:
@@ -461,7 +461,7 @@ namespace KMail {
         dumpToFile( "dat_01_reader_signedtext_before_canonicalization",
                     cleartext.data(), cleartext.length() );
 
-        // tqreplace simple LFs by CRLSs
+        // replace simple LFs by CRLSs
         // according to RfC 2633, 3.1.1 Canonicalization
         //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
         cleartext = Util::lf2crlf( cleartext );
@@ -586,10 +586,10 @@ namespace KMail {
       //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl;
       GpgME::Signature signature = signatures[0];
 
-      messagePart.status_code = signatureToStatus( signature );
+      messagePart.status_code = signatureTotqStatus( signature );
       messagePart.status = TQString::fromUtf8( signature.status().asString() );
       for ( uint i = 1; i < signatures.size(); ++i ) {
-        if ( signatureToStatus( signatures[i] ) != messagePart.status_code ) {
+        if ( signatureTotqStatus( signatures[i] ) != messagePart.status_code ) {
           messagePart.status_code = GPGME_SIG_STAT_DIFF;
           messagePart.status = i18n("Different results for signatures");
         }
@@ -667,7 +667,7 @@ namespace KMail {
         txt.append( i18n( "The crypto engine returned no cleartext data." ) );
         txt.append( "</h2></b>" );
         txt.append( "<br>&nbsp;<br>" );
-        txt.append( i18n( "Status: " ) );
+        txt.append( i18n( "tqStatus: " ) );
         if ( !messagePart.status.isEmpty() ) {
           txt.append( "<i>" );
           txt.append( messagePart.status );
@@ -785,9 +785,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
 {
   passphraseError = false;
   decryptionStarted = false;
-  aErrorText = TQString::null;
+  aErrorText = TQString();
   auditLogError = GpgME::Error();
-  auditLog = TQString::null;
+  auditLog = TQString();
   bool bDecryptionOk = false;
   enum { NO_PLUGIN, NOT_INITIALIZED, CANT_DECRYPT }
     cryptPlugError = NO_PLUGIN;
@@ -804,9 +804,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     TQByteArray ciphertext( data.msgPart().bodyDecodedBinary() );
 #ifdef MARCS_DEBUG
     TQCString cipherStr( ciphertext.data(), ciphertext.size() + 1 );
-    bool cipherIsBinary = (-1 == cipherStr.find("BEGIN ENCRYPTED MESSAGE", 0, false) ) &&
-                          (-1 == cipherStr.find("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) &&
-                          (-1 == cipherStr.find("BEGIN PGP MESSAGE", 0, false) );
+    bool cipherIsBinary = (-1 == cipherStr.tqfind("BEGIN ENCRYPTED MESSAGE", 0, false) ) &&
+                          (-1 == cipherStr.tqfind("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) &&
+                          (-1 == cipherStr.tqfind("BEGIN PGP MESSAGE", 0, false) );
 
     dumpToFile( "dat_04_reader.encrypted", ciphertext.data(), ciphertext.size() );
 
@@ -829,7 +829,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     if ( mReader )
       emit mReader->noDrag(); // in case pineentry pops up, don't let kmheaders start a drag afterwards
 
-    // Check whether the memento tqcontains a result from last time:
+    // Check whether the memento contains a result from last time:
     const DecryptVerifyBodyPartMemento * m
       = dynamic_cast<DecryptVerifyBodyPartMemento*>( data.bodyPartMemento( "decryptverify" ) );
     if ( !m ) {
@@ -916,9 +916,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     // ### while pinentry-qt appears)
     TQByteArray ciphertext( data.msgPart().bodyDecodedBinary() );
     TQCString cipherStr( ciphertext.data(), ciphertext.size() + 1 );
-    bool cipherIsBinary = (-1 == cipherStr.find("BEGIN ENCRYPTED MESSAGE", 0, false) ) &&
-                          (-1 == cipherStr.find("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) &&
-                          (-1 == cipherStr.find("BEGIN PGP MESSAGE", 0, false) );
+    bool cipherIsBinary = (-1 == cipherStr.tqfind("BEGIN ENCRYPTED MESSAGE", 0, false) ) &&
+                          (-1 == cipherStr.tqfind("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) &&
+                          (-1 == cipherStr.tqfind("BEGIN PGP MESSAGE", 0, false) );
     if ( !cipherIsBinary ) {
       decryptedData = cipherStr;
     }
@@ -936,10 +936,10 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
 }
 
   //static
-  bool ObjectTreeParser::tqcontainsExternalReferences( const TQCString & str )
+  bool ObjectTreeParser::containsExternalReferences( const TQCString & str )
   {
     TQRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
-    int httpPos = str.find( httpRegExp, 0 );
+    int httpPos = str.tqfind( httpRegExp, 0 );
 
     while ( httpPos >= 0 ) {
       // look backwards for "href"
@@ -952,7 +952,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
           return true;
       }
       // find next occurrence of "http: or "https:
-      httpPos = str.find( httpRegExp, httpPos + 6 );
+      httpPos = str.tqfind( httpRegExp, httpPos + 6 );
     }
     return false;
   }
@@ -990,12 +990,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
         // ---Sven's strip </BODY> and </HTML> from end of attachment end-
         // Show the "external references" warning (with possibility to load
         // external references only if loading external references is disabled
-        // and the HTML code tqcontains obvious external references). For
+        // and the HTML code contains obvious external references). For
         // messages where the external references are obfuscated the user won't
         // have an easy way to load them but that shouldn't be a problem
-        // because only spam tqcontains obfuscated external references.
+        // because only spam contains obfuscated external references.
         if ( !mReader->htmlLoadExternal() &&
-             tqcontainsExternalReferences( cstr ) ) {
+             containsExternalReferences( cstr ) ) {
           htmlWriter()->queue( "<div class=\"htmlWarn\">\n" );
           htmlWriter()->queue( i18n("<b>Note:</b> This HTML message may contain external "
                                     "references to images etc. For security/privacy reasons "
@@ -1031,7 +1031,7 @@ static bool isMailmanMessage( partNode * curNode ) {
     return true;
   if ( headers.HasField("X-Mailer") &&
        0 == TQCString( headers.FieldBody("X-Mailer").AsString().c_str() )
-       .find("MAILMAN", 0, false) )
+       .tqfind("MAILMAN", 0, false) )
     return true;
   return false;
 }
@@ -1047,21 +1047,21 @@ namespace KMail {
     const TQCString delimZ2("--__--__--\n\n_____________");
     const TQCString delimZ1("--__--__--\r\n\r\n_____________");
     TQCString partStr, digestHeaderStr;
-    int thisDelim = cstr.find(delim1, 0, false);
+    int thisDelim = cstr.tqfind(delim1, 0, false);
     if ( thisDelim == -1 )
-      thisDelim = cstr.find(delim2, 0, false);
+      thisDelim = cstr.tqfind(delim2, 0, false);
     if ( thisDelim == -1 ) {
       kdDebug(5006) << "        Sorry: Old style Mailman message but no delimiter found." << endl;
       return false;
     }
 
-    int nextDelim = cstr.find(delim1, thisDelim+1, false);
+    int nextDelim = cstr.tqfind(delim1, thisDelim+1, false);
     if ( -1 == nextDelim )
-      nextDelim = cstr.find(delim2, thisDelim+1, false);
+      nextDelim = cstr.tqfind(delim2, thisDelim+1, false);
     if ( -1 == nextDelim )
-      nextDelim = cstr.find(delimZ1, thisDelim+1, false);
+      nextDelim = cstr.tqfind(delimZ1, thisDelim+1, false);
     if ( -1 == nextDelim )
-      nextDelim = cstr.find(delimZ2, thisDelim+1, false);
+      nextDelim = cstr.tqfind(delimZ2, thisDelim+1, false);
     if ( nextDelim < 0)
       return false;
 
@@ -1081,15 +1081,15 @@ namespace KMail {
     curNode->setType(    DwMime::kTypeMultipart );
     curNode->setSubType( DwMime::kSubtypeDigest );
     while( -1 < nextDelim ){
-      int thisEoL = cstr.find("\nMessage:", thisDelim, false);
+      int thisEoL = cstr.tqfind("\nMessage:", thisDelim, false);
       if ( -1 < thisEoL )
         thisDelim = thisEoL+1;
       else{
-        thisEoL = cstr.find("\n_____________", thisDelim, false);
+        thisEoL = cstr.tqfind("\n_____________", thisDelim, false);
         if ( -1 < thisEoL )
           thisDelim = thisEoL+1;
       }
-      thisEoL = cstr.find('\n', thisDelim);
+      thisEoL = cstr.tqfind('\n', thisDelim);
       if ( -1 < thisEoL )
         thisDelim = thisEoL+1;
       else
@@ -1101,10 +1101,10 @@ namespace KMail {
       partStr += cstr.mid( thisDelim, nextDelim-thisDelim );
       TQCString subject("embedded message");
       TQCString subSearch("\nSubject:");
-      int subPos = partStr.find(subSearch, 0, false);
+      int subPos = partStr.tqfind(subSearch, 0, false);
       if ( -1 < subPos ){
         subject = partStr.mid(subPos+subSearch.length());
-        thisEoL = subject.find('\n');
+        thisEoL = subject.tqfind('\n');
         if ( -1 < thisEoL )
           subject.truncate( thisEoL );
       }
@@ -1114,21 +1114,21 @@ namespace KMail {
                                   subject, true );
       //mReader->queueHtml("<br><hr><br>");
       thisDelim = nextDelim+1;
-      nextDelim = cstr.find(delim1, thisDelim, false);
+      nextDelim = cstr.tqfind(delim1, thisDelim, false);
       if ( -1 == nextDelim )
-        nextDelim = cstr.find(delim2, thisDelim, false);
+        nextDelim = cstr.tqfind(delim2, thisDelim, false);
       if ( -1 == nextDelim )
-        nextDelim = cstr.find(delimZ1, thisDelim, false);
+        nextDelim = cstr.tqfind(delimZ1, thisDelim, false);
       if ( -1 == nextDelim )
-        nextDelim = cstr.find(delimZ2, thisDelim, false);
+        nextDelim = cstr.tqfind(delimZ2, thisDelim, false);
     }
     // reset curent node's Content-Type
     curNode->setType(    DwMime::kTypeText );
     curNode->setSubType( DwMime::kSubtypePlain );
-    int thisEoL = cstr.find("_____________", thisDelim);
+    int thisEoL = cstr.tqfind("_____________", thisDelim);
     if ( -1 < thisEoL ){
       thisDelim = thisEoL;
-      thisEoL = cstr.find('\n', thisDelim);
+      thisEoL = cstr.tqfind('\n', thisDelim);
       if ( -1 < thisEoL )
         thisDelim = thisEoL+1;
     }
@@ -1357,7 +1357,7 @@ namespace KMail {
     const Kleo::CryptoBackend::Protocol * useThisCryptProto = 0;
 
     /*
-      ATTENTION: This code is to be tqreplaced by the new 'auto-detect' feature. --------------------------------------
+      ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
     */
     partNode * data = child->findType( DwMime::kTypeApplication,
                                        DwMime::kSubtypeOctetStream, false, true );
@@ -1544,9 +1544,9 @@ namespace KMail {
     }
 
     const Kleo::CryptoBackend::Protocol* oldUseThisCryptPlug = cryptoProtocol();
-    if (    node->parentNode()
-            && DwMime::kTypeMultipart    == node->parentNode()->type()
-            && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) {
+    if (    node->tqparentNode()
+            && DwMime::kTypeMultipart    == node->tqparentNode()->type()
+            && DwMime::kSubtypeEncrypted == node->tqparentNode()->subType() ) {
       //kdDebug(5006) << "\n----->  Initially processing encrypted data\n" << endl;
       node->setEncryptionState( KMMsgFullyEncrypted );
       if ( keepEncryptions() ) {
@@ -1559,7 +1559,7 @@ namespace KMail {
         writeDeferredDecryptionBlock();
       } else {
         /*
-          ATTENTION: This code is to be tqreplaced by the planned 'auto-detect' feature.
+          ATTENTION: This code is to be replaced by the planned 'auto-detect' feature.
         */
         PartMetaData messagePart;
         setCryptoProtocol( Kleo::CryptoBackendFactory::instance()->openpgp() );
@@ -1720,7 +1720,7 @@ namespace KMail {
     bool isSigned      = smimeType == "signed-data";
     bool isEncrypted   = smimeType == "enveloped-data";
 
-    // Analyze "signTestNode" node to find/verify a signature.
+    // Analyze "signTestNode" node to tqfind/verify a signature.
     // If zero this verification was successfully done after
     // decrypting via recursion by insertAndParseNewChildNode().
     partNode* signTestNode = isEncrypted ? 0 : node;
@@ -2050,7 +2050,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
 
     TQString comment = msgPart->contentDescription();
     comment = KMMessage::quoteHtmlChars( comment, true );
-    if ( label == comment ) comment = TQString::null;
+    if ( label == comment ) comment = TQString();
 
     TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum );
 
@@ -2252,7 +2252,7 @@ TQString ObjectTreeParser::sigStatusToString( const Kleo::CryptoBackend::Protoco
         }
         /*
         // add i18n support for 3rd party plug-ins here:
-        else if (0 <= cryptPlug->libName().find( "yetanotherpluginname", 0, false )) {
+        else if (0 <= cryptPlug->libName().tqfind( "yetanotherpluginname", 0, false )) {
 
         }
         */
@@ -2320,7 +2320,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString &
     return "<a href=\"" + url.htmlURL() + "\">" + i18n("The Audit Log is a detailed error log from the gnupg backend", "Show Audit Log") + "</a>";
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 static TQString endVerboseSigstatHeader( const PartMetaData & pmd )
@@ -2492,7 +2492,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                                 msgFrom +
                                 "<br />" +
                                 i18n("stored: ");
-                            // We cannot use Qt's join() function here but
+                            // We cannot use TQt's join() function here but
                             // have to join the addresses manually to
                             // extract the mail addresses (without '<''>')
                             // before including it into our string:
@@ -2591,7 +2591,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                 htmlStr += "<br />";
                 if( !statusStr.isEmpty() ) {
                     htmlStr += "&nbsp;<br />";
-                    htmlStr += i18n( "Status: " );
+                    htmlStr += i18n( "tqStatus: " );
                     htmlStr += statusStr;
                 }
             } else {
@@ -2634,7 +2634,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                                    "verified." );
                   if( !statusStr.isEmpty() ) {
                     htmlStr += "<br />";
-                    htmlStr += i18n( "Status: " );
+                    htmlStr += i18n( "tqStatus: " );
                     htmlStr += "<i>";
                     htmlStr += statusStr;
                     htmlStr += "</i>";
@@ -2795,7 +2795,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
   bool goodSignature = false;
   Kpgp::Module* pgp = Kpgp::Module::getKpgp();
   assert(pgp != 0);
-  bool isPgpMessage = false; // true if the message tqcontains at least one
+  bool isPgpMessage = false; // true if the message contains at least one
                              // PGP MESSAGE or one PGP SIGNED MESSAGE block
   TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
   TQString headerStr = TQString("<div dir=\"%1\">").arg(dir);
@@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
     TQString line;
 
     /* search next occurrence of '\n' */
-    pos = s.find('\n', beg, FALSE);
+    pos = s.tqfind('\n', beg, FALSE);
     if (pos == (unsigned int)(-1))
         pos = length;
 
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index 5cfe1d0e..2325b242 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -151,7 +151,7 @@ namespace KMail {
       mIncludeSignatures = include;
     }
 
-    // Controls whether Toltec invitations are displayed in their raw form or as a tqreplacement text,
+    // Controls whether Toltec invitations are displayed in their raw form or as a replacement text,
     // which is used in processToltecMail().
     void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
     bool showRawToltecMail() const { return mShowRawToltecMail; }
@@ -169,13 +169,13 @@ namespace KMail {
     KMail::CSSHelper * cssHelper() const { return mCSSHelper; }
 
     /** Parse beginning at a given node and recursively parsing
-        the children of that node and it's next sibling. */
+        the tqchildren of that node and it's next sibling. */
     //  Function is called internally by "parseMsg(KMMessage* msg)"
-    //  and it will be tqreplaced once KMime is alive.
+    //  and it will be replaced once KMime is alive.
     void parseObjectTree( partNode * node );
 
   private:
-    /** Standard children handling a.k.a. multipart/mixed (w/o
+    /** Standard tqchildren handling a.k.a. multipart/mixed (w/o
         kroupware hacks) */
     void stdChildHandling( partNode * child );
 
@@ -193,7 +193,7 @@ namespace KMail {
      *                            Setting this to false is useful for encapsulated messages, as we
      *                            do not want the text in those to appear in the editor
      */
-    //  Function will be tqreplaced once KMime is alive.
+    //  Function will be replaced once KMime is alive.
     void insertAndParseNewChildNode( partNode & node,
                                      const char * content,
                                      const char * cntDesc,
@@ -252,11 +252,11 @@ namespace KMail {
      */
     bool processToltecMail( partNode * node );
 
-    /** Checks whether @p str tqcontains external references. To be precise,
+    /** Checks whether @p str contains external references. To be precise,
         we only check whether @p str tqcontains 'xxx="http[s]:' where xxx is
         not href. Obfuscated external references are ignored on purpose.
     */
-    static bool tqcontainsExternalReferences( const TQCString & str );
+    static bool containsExternalReferences( const TQCString & str );
 
   public:// (during refactoring)
 
diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h
index d70cd8c7..5bac65f6 100644
--- a/kmail/objecttreeparser_p.h
+++ b/kmail/objecttreeparser_p.h
@@ -61,6 +61,7 @@ namespace KMail {
       public KMail::ISubject
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     CryptoBodyPartMemento();
     ~CryptoBodyPartMemento();
@@ -87,6 +88,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText );
     ~DecryptVerifyBodyPartMemento();
@@ -122,6 +124,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job,
                                    Kleo::KeyListJob * klj,
@@ -161,6 +164,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job,
                                  Kleo::KeyListJob * klj,
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index b75c54e4..96bb32c5 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,7 +50,7 @@
 
 
   ===========================================================================
-  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
+  N O T E :   The partNode structure will most likely be replaced by KMime.
   It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
   ===========================================================================
 */
@@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings )
                      && curNode->dwPart()->Next() ) ) {
             curNode = curNode->mRoot;
         }
-        // we might have to leave when all children have been processed
+        // we might have to leave when all tqchildren have been processed
         if( this == curNode && !processSiblings )
             return;
         // store next node
@@ -236,8 +236,8 @@ TQCString partNode::subTypeString() const {
 
 const partNode* partNode::topLevelParent() const {
   const partNode *ret = this;
-  while ( ret->parentNode() )
-    ret = ret->parentNode();
+  while ( ret->tqparentNode() )
+    ret = ret->tqparentNode();
   return ret;
 }
 
@@ -259,10 +259,10 @@ int partNode::totalChildCount() const {
 
 TQString partNode::contentTypeParameter( const char * name ) const {
   if ( !mDwPart || !mDwPart->hasHeaders() )
-    return TQString::null;
+    return TQString();
   DwHeaders & headers = mDwPart->Headers();
   if ( !headers.HasContentType() )
-    return TQString::null;
+    return TQString();
   DwString attr = name;
   attr.ConvertToLowerCase();
   for ( DwParameter * param = headers.ContentType().FirstParameter() ; param ; param = param->Next() ) {
@@ -272,14 +272,14 @@ TQString partNode::contentTypeParameter( const char * name ) const {
       return TQString::tqfromLatin1( param->Value().data(), param->Value().size() );
     // warning: misses rfc2231 handling!
   }
-  return TQString::null;
+  return TQString();
 }
 
 KMMsgEncryptionState partNode::overallEncryptionState() const
 {
     KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown;
     if( mEncryptionState == KMMsgNotEncrypted ) {
-        // NOTE: children are tested ONLY when parent is not encrypted
+        // NOTE: tqchildren are tested ONLY when tqparent is not encrypted
         if( mChild )
             myState = mChild->overallEncryptionState();
         else
@@ -320,7 +320,7 @@ KMMsgSignatureState  partNode::overallSignatureState() const
 {
     KMMsgSignatureState myState = KMMsgSignatureStateUnknown;
     if( mSignatureState == KMMsgNotSigned ) {
-        // children are tested ONLY when parent is not signed
+        // tqchildren are tested ONLY when tqparent is not signed
         if( mChild )
             myState = mChild->overallSignatureState();
         else
@@ -358,9 +358,9 @@ KMMsgSignatureState  partNode::overallSignatureState() const
 
 TQCString partNode::path() const
 {
-    if ( !parentNode() )
+    if ( !tqparentNode() )
         return ':';
-    const partNode * p = parentNode();
+    const partNode * p = tqparentNode();
 
     // count number of siblings with the same type as us:
     int nth = 0;
@@ -463,7 +463,7 @@ partNode* partNode::findTypeNot( int type, int subType, bool deep, bool wide )
     return 0;
 }
 
-void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
+void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem,
                                  KMMimePartTree*     mimePartTree,
                                  TQString labelDescr,
                                  TQString labelCntType,
@@ -471,11 +471,11 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
                                  KIO::filesize_t size,
                                  bool revertOrder )
 {
-  if( parentItem || mimePartTree ) {
+  if( tqparentItem || mimePartTree ) {
 
     if( mNext )
-        mNext->fillMimePartTree( parentItem, mimePartTree,
-                                 TQString::null, TQString::null, TQString::null, 0,
+        mNext->fillMimePartTree( tqparentItem, mimePartTree,
+                                 TQString(), TQString(), TQString(), 0,
                                  revertOrder );
 
     TQString cntDesc, cntType, cntEnc;
@@ -518,8 +518,8 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
     // remove linebreak+whitespace from folded Content-Description
     cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " );
 
-    if( parentItem )
-      mMimePartTreeItem = new KMMimePartTreeItem( parentItem,
+    if( tqparentItem )
+      mMimePartTreeItem = new KMMimePartTreeItem( tqparentItem,
                                                   this,
                                                   cntDesc,
                                                   cntType,
@@ -536,7 +536,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
     mMimePartTreeItem->setOpen( true );
     if( mChild )
         mChild->fillMimePartTree( mMimePartTreeItem, 0,
-                                  TQString::null, TQString::null, TQString::null, 0,
+                                  TQString(), TQString(), TQString(), 0,
                                   revertOrder );
 
   }
@@ -595,7 +595,7 @@ partNode * partNode::next( bool allowChildren ) const {
       return c;
   if ( partNode * s = nextSibling() )
     return s;
-  for ( partNode * p = parentNode() ; p ; p = p->parentNode() )
+  for ( partNode * p = tqparentNode() ; p ; p = p->tqparentNode() )
     if ( partNode * s = p->nextSibling() )
       return s;
   return 0;
@@ -607,7 +607,7 @@ bool partNode::isFirstTextPart() const {
   const partNode * root = this;
   // go up until we reach the root node of a message (of the actual message or
   // of an attached message)
-  while ( const partNode * p = root->parentNode() ) {
+  while ( const partNode * p = root->tqparentNode() ) {
     if ( p->type() == DwMime::kTypeMessage )
       break;
     else
@@ -652,11 +652,11 @@ bool partNode::isInEncapsulatedMessage() const
   const partNode * const topLevel = topLevelParent();
   const partNode *cur = this;
   while ( cur && cur != topLevel ) {
-    const bool parentIsMessage = cur->parentNode() &&
-                                 cur->parentNode()->msgPart().typeStr().lower() == "message";
-    if ( parentIsMessage && cur->parentNode() != topLevel )
+    const bool tqparentIsMessage = cur->tqparentNode() &&
+                                 cur->tqparentNode()->msgPart().typeStr().lower() == "message";
+    if ( tqparentIsMessage && cur->tqparentNode() != topLevel )
       return true;
-    cur = cur->parentNode();
+    cur = cur->tqparentNode();
   }
   return false;
 }
@@ -693,7 +693,7 @@ KMail::Interface::BodyPartMemento * partNode::internalBodyPartMemento( const TQC
 {
     assert( !reader() );
 
-    const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( which.lower() );
+    const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( which.lower() );
     return it != mBodyPartMementoMap.end() ? it->second : 0 ;
 }
 
@@ -768,8 +768,8 @@ partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const
   typeBlacklisted = typeBlacklisted || this == topLevelParent();
   bool firstTextChildOfEncapsulatedMsg = msgPart().typeStr().lower() == "text" &&
                                          msgPart().subtypeStr().lower() == "plain" &&
-                                         parentNode() &&
-                                         parentNode()->msgPart().typeStr().lower() == "message";
+                                         tqparentNode() &&
+                                         tqparentNode()->msgPart().typeStr().lower() == "message";
   typeBlacklisted = typeBlacklisted || firstTextChildOfEncapsulatedMsg;
   info.displayInHeader = !info.label.isEmpty() && !info.icon.isEmpty() && !typeBlacklisted;
   return info;
diff --git a/kmail/partNode.h b/kmail/partNode.h
index 6459a0a6..babd9a1b 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -60,7 +60,7 @@ class KMReaderWin;
 
 
  ===========================================================================
-  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
+  N O T E :   The partNode structure will most likely be replaced by KMime.
               It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
  ===========================================================================
 */
@@ -150,10 +150,10 @@ public:
         return mEncryptionState;
     }
 
-    // look at the encryption states of all children and return result
+    // look at the encryption states of all tqchildren and return result
     KMMsgEncryptionState overallEncryptionState() const ;
 
-    // look at the signature states of all children and return result
+    // look at the signature states of all tqchildren and return result
     KMMsgSignatureState  overallSignatureState() const ;
 
     void setSignatureState( KMMsgSignatureState state ) {
@@ -179,11 +179,11 @@ public:
 
     partNode* findNodeForDwPart( DwBodyPart* part );
 
-    void fillMimePartTree( KMMimePartTreeItem* parentItem,
+    void fillMimePartTree( KMMimePartTreeItem* tqparentItem,
                            KMMimePartTree*     mimePartTree,
-                           TQString labelDescr    = TQString::null,
-                           TQString labelCntType  = TQString::null,
-                           TQString labelEncoding = TQString::null,
+                           TQString labelDescr    = TQString(),
+                           TQString labelCntType  = TQString(),
+                           TQString labelEncoding = TQString(),
                            KIO::filesize_t size=0,
                            bool revertOrder = false );
 
@@ -248,7 +248,7 @@ public:
     const TQString& trueFromAddress() const;
 
     const partNode * topLevelParent() const;
-    partNode * parentNode() const { return mRoot; }
+    partNode * tqparentNode() const { return mRoot; }
     partNode * nextSibling() const { return mNext; }
     partNode * firstChild() const { return mChild; }
     partNode * next( bool allowChildren=true ) const;
diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp
index f9a56316..45ce2862 100644
--- a/kmail/partnodebodypart.cpp
+++ b/kmail/partnodebodypart.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -55,7 +55,7 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const {
 
 TQString KMail::PartNodeBodyPart::asText() const {
   if ( mPartNode.type() != DwMime::kTypeText )
-    return TQString::null;
+    return TQString();
   return mPartNode.msgPart().bodyToUnicode( mCodec );
 }
 
@@ -73,7 +73,7 @@ TQString KMail::PartNodeBodyPart::contentDescription() const {
 
 TQString KMail::PartNodeBodyPart::contentDispositionParameter( const char * ) const {
   kdWarning( 5006 ) << "Sorry, not yet implemented: PartNodeBodyPart::contentDispositionParameter()" << endl;
-  return TQString::null;
+  return TQString();
 }
 
 bool KMail::PartNodeBodyPart::hasCompleteBody() const {
diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h
index 919d43a2..3591286e 100644
--- a/kmail/partnodebodypart.h
+++ b/kmail/partnodebodypart.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 7bb830bc..b2f55528 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
 #include "popaccount.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "progressmanager.h"
 #include "kmfoldermgr.h"
 #include "kmfiltermgr.h"
@@ -152,7 +152,7 @@ void PopAccount::processNewMail(bool _interactive)
       bool b = storePasswd();
       if (KIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
         i18n("You need to supply a username and a password to access this "
-        "mailbox."), false, TQString::null, mName, i18n("Account:"))
+        "mailbox."), false, TQString(), mName, i18n("Account:"))
         != TQDialog::Accepted)
       {
         checkDone( false, CheckAborted );
@@ -673,7 +673,7 @@ void PopAccount::slotJobFinished() {
     kmkernel->folderMgr()->syncAllFolders();
 
     KURL url = getUrl();
-    TQMap< QPair<time_t, TQString>, int > idsToSave;
+    TQMap< TQPair<time_t, TQString>, int > idsToSave;
     idsToSave.clear();
     // Check if we want to keep any messages
     if ( mLeaveOnServer && !idsOfMsgsToDelete.isEmpty() ) {
@@ -692,7 +692,7 @@ void PopAccount::slotJobFinished() {
           if (msgTime >= timeLimit ||
                 !mTimeOfNextSeenMsgsMap[mUidForIdMap[*cur]]) {
             kdDebug() << "Saving msg id " << *cur << endl;
-            QPair<time_t, TQString> msg(msgTime, *cur);
+            TQPair<time_t, TQString> msg(msgTime, *cur);
             idsToSave.insert( msg, 1 );
           }
         }
@@ -702,7 +702,7 @@ void PopAccount::slotJobFinished() {
         int numToDelete = idsToSave.count() - mLeaveOnServerCount;
         kdDebug() << "numToDelete is " << numToDelete << endl;
         if ( numToDelete > 0 && (unsigned)numToDelete < idsToSave.count() ) {
-          TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
+          TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
           for ( int deleted = 0; deleted < numToDelete && cur != idsToSave.end()
                 ; deleted++, cur++ ) {
             kdDebug() << "deleting msg id " << cur.key().second << endl;
@@ -715,7 +715,7 @@ void PopAccount::slotJobFinished() {
       // Delete more old messages until we're under mLeaveOnServerSize MBs
       if ( mLeaveOnServerSize > 0 ) {
         double sizeOnServer = 0;
-        TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
+        TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin();
         for ( ; cur != idsToSave.end(); cur++ ) {
           sizeOnServer +=
             *mSizeOfNextSeenMsgsDict[ mUidForIdMap[ cur.key().second ] ];
@@ -730,7 +730,7 @@ void PopAccount::slotJobFinished() {
         }
       }
       // Save msgs from deletion
-      TQMap< QPair<time_t, TQString>, int >::Iterator it = idsToSave.begin();
+      TQMap< TQPair<time_t, TQString>, int >::Iterator it = idsToSave.begin();
       kdDebug() << "Going to save " << idsToSave.count() << endl;
       for ( ; it != idsToSave.end(); ++it ) {
         kdDebug() << "saving msg id " << it.key().second << endl;
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->seStatus(
+        mMailCheckProgressItem->setqStatus(
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
@@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() {
     } else {
       stage = Quit;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->seStatus(
+        mMailCheckProgressItem->setqStatus(
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
@@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() {
     }
     idsOfMsgsToDelete.clear();
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus(
+      mMailCheckProgressItem->setqStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
           .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
           .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
       }
-      mMailCheckProgressItem->seStatus( msg );
+      mMailCheckProgressItem->setqStatus( msg );
       mMailCheckProgressItem->setProgress(
         (numBytesToRead <= 100) ? 50  // We never know what the server tells us
         // This way of dividing is required for > 21MB of mail
@@ -930,11 +930,11 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
   // otherwise stage is List Or Uidl
   TQString qdata = data;
   qdata = qdata.simplifyWhiteSpace(); // Workaround for Maillennium POP3/UNIBOX
-  int spc = qdata.find( ' ' );
+  int spc = qdata.tqfind( ' ' );
   if ( stage == List ) {
     if ( spc > 0 ) {
       TQString length = qdata.mid(spc+1);
-      if (length.find(' ') != -1) length.truncate(length.find(' '));
+      if (length.tqfind(' ') != -1) length.truncate(length.tqfind(' '));
       int len = length.toInt();
       numBytes += len;
       TQString id = qdata.left(spc);
@@ -989,7 +989,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
     int *size = new int; //malloc(size_of(int));
     *size = mMsgsPendingDownload[id];
     mSizeOfNextSeenMsgsDict.insert( uid, size );
-    if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
+    if ( mUidsOfSeenMsgsDict.tqfind( uid ) != 0 ) {
       if ( mMsgsPendingDownload.tqcontains( id ) ) {
         mMsgsPendingDownload.remove( id );
       }
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 81fb153e..4c8dfdd5 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -27,6 +27,7 @@ namespace KMail {
  */
 class PopAccount: public NetworkAccount {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   virtual ~PopAccount();
diff --git a/kmail/protocols.h b/kmail/protocols.h
index b1815538..ab5aa38d 100644
--- a/kmail/protocols.h
+++ b/kmail/protocols.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp
index 334e87e5..3dd5aa49 100644
--- a/kmail/quotajobs.cpp
+++ b/kmail/quotajobs.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 31bd1ef5..e53a4f18 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -19,18 +19,18 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
  */
 
-#ifndef QUOTAJOBS_H
-#define QUOTAJOBS_H
+#ifndef TQUOTAJOBS_H
+#define TQUOTAJOBS_H
 
 #include <tqvariant.h>
 
@@ -48,7 +48,7 @@ namespace KMail {
 // the current value and the maximal value
 class QuotaInfo {
   public :
-  QuotaInfo() {} // for QValueVector
+  QuotaInfo() {} // for TQValueVector
   QuotaInfo( const TQString& _name, const TQString& _root, const TQVariant& _current, const TQVariant& _max )
     : mName( _name ), mRoot( _root ), mCurrent( _current ),mMax( _max )  {}
   bool operator==( const QuotaInfo & other ) const {
@@ -109,7 +109,7 @@ class QuotaInfo {
 typedef TQValueVector<QuotaInfo> QuotaInfoList;
 
 /**
- * This namespace tqcontains functions that return jobs for quota operations.
+ * This namespace contains functions that return jobs for quota operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
@@ -137,6 +137,7 @@ GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url );
 class GetQuotarootJob : public KIO::SimpleJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
 
@@ -163,6 +164,7 @@ protected slots:
 class GetStorageQuotaJob : public KIO::Job
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   GetStorageQuotaJob( KIO::Slave* slave, const KURL& url );
 
@@ -190,5 +192,5 @@ private:
 } // KMail namespace
 
 
-#endif /* QUOTAJOBS_H */
+#endif /* TQUOTAJOBS_H */
 
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 9f33a501..273ba923 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "recipientseditor.h"
@@ -119,8 +119,8 @@ TQStringList Recipient::allTypeLabels()
 }
 
 
-RecipientComboBox::RecipientComboBox( TQWidget *parent )
-  : TQComboBox( parent )
+RecipientComboBox::RecipientComboBox( TQWidget *tqparent )
+  : TQComboBox( tqparent )
 {
 }
 
@@ -145,8 +145,8 @@ void RecipientLineEdit::keyPressEvent( TQKeyEvent *ev )
   }
 }
 
-RecipientLine::RecipientLine( TQWidget *parent )
-  : TQWidget( parent ), mRecipientsCount( 0 ), mModified( false )
+RecipientLine::RecipientLine( TQWidget *tqparent )
+  : TQWidget( tqparent ), mRecipientsCount( 0 ), mModified( false )
 {
   TQBoxLayout *topLayout = new TQHBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = QMAX( w, mCombo->tqsizeHint().width() );
+  w = TQMAX( w, mCombo->tqsizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
   tqparentWidget()->updateGeometry();
@@ -320,8 +320,8 @@ void RecipientLine::setRemoveLineButtonEnabled( bool b )
 
 // ------------ RecipientsView ---------------------
 
-RecipientsView::RecipientsView( TQWidget *parent )
-  : TQScrollView( parent ), mCurDelLine( 0 ),
+RecipientsView::RecipientsView( TQWidget *tqparent )
+  : TQScrollView( tqparent ), mCurDelLine( 0 ),
     mLineHeight( 0 ), mFirstColumnWidth( 0 ),
     mModified( false )
 {
@@ -456,7 +456,7 @@ void RecipientsView::slotReturnPressed( RecipientLine *line )
 
 void RecipientsView::slotDownPressed( RecipientLine *line )
 {
-  int pos = mLines.find( line );
+  int pos = mLines.tqfind( line );
   if ( pos >= (int)mLines.count() - 1 ) {
     emit focusDown();
   } else if ( pos >= 0 ) {
@@ -466,7 +466,7 @@ void RecipientsView::slotDownPressed( RecipientLine *line )
 
 void RecipientsView::slotUpPressed( RecipientLine *line )
 {
-  int pos = mLines.find( line );
+  int pos = mLines.tqfind( line );
   if ( pos > 0 ) {
     activateLine( mLines.at( pos - 1 ) );
   } else {
@@ -492,7 +492,7 @@ void RecipientsView::slotDeleteLine()
     return;
 
   RecipientLine *line = mCurDelLine;
-  int pos = mLines.find( line );
+  int pos = mLines.tqfind( line );
 
   int newPos;
   if ( pos == 0 ) newPos = pos + 1;
@@ -698,8 +698,8 @@ void RecipientsView::moveCompletionPopup()
 
 }
 
-RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *parent )
-  : TQToolTip( parent ), mView( view )
+RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *tqparent )
+  : TQToolTip( tqparent ), mView( view )
 {
 }
 
@@ -748,8 +748,8 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 }
 
 
-SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
-  : TQWidget( parent ), mView( view ), mRecipientPicker( 0 )
+SideWidget::SideWidget( RecipientsView *view, TQWidget *tqparent )
+  : TQWidget( tqparent ), mView( view ), mRecipientPicker( 0 )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -837,8 +837,8 @@ void SideWidget::pickRecipient()
 }
 
 
-RecipientsEditor::RecipientsEditor( TQWidget *parent )
-  : TQWidget( parent ), mModified( false )
+RecipientsEditor::RecipientsEditor( TQWidget *tqparent )
+  : TQWidget( tqparent ), mModified( false )
 {
   TQBoxLayout *topLayout = new TQHBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index e6b7718b..4e2e9069 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef RECIPIENTSEDITOR_H
 #define RECIPIENTSEDITOR_H
@@ -48,7 +48,7 @@ class Recipient
 
     enum Type { To, Cc, Bcc, Undefined };
 
-    Recipient( const TQString &email = TQString::null, Type type = To );
+    Recipient( const TQString &email = TQString(), Type type = To );
 
     void setType( Type );
     Type type() const;
@@ -69,11 +69,12 @@ class Recipient
     Type mType;
 };
 
-class RecipientComboBox : public QComboBox
+class RecipientComboBox : public TQComboBox
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientComboBox( TQWidget *parent );
+    RecipientComboBox( TQWidget *tqparent );
 
   signals:
     void rightPressed();
@@ -85,9 +86,10 @@ class RecipientComboBox : public QComboBox
 class RecipientLineEdit : public KMLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientLineEdit( TQWidget * parent ) :
-      KMLineEdit( true, parent ) {}
+    RecipientLineEdit( TQWidget * tqparent ) :
+      KMLineEdit( true, tqparent ) {}
 
   signals:
     void deleteMe();
@@ -98,11 +100,12 @@ class RecipientLineEdit : public KMLineEdit
     void keyPressEvent( TQKeyEvent *ev );
 };
 
-class RecipientLine : public QWidget
+class RecipientLine : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientLine( TQWidget *parent );
+    RecipientLine( TQWidget *tqparent );
 
     void setRecipient( const Recipient & );
     Recipient recipient() const;
@@ -167,11 +170,12 @@ class RecipientLine : public QWidget
     bool mModified;
 };
 
-class RecipientsView : public QScrollView
+class RecipientsView : public TQScrollView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientsView( TQWidget *parent );
+    RecipientsView( TQWidget *tqparent );
 
     TQSize tqminimumSizeHint() const;
     TQSize tqsizeHint() const;
@@ -246,10 +250,10 @@ class RecipientsView : public QScrollView
     KGlobalSettings::Completion mCompletionMode;
 };
 
-class RecipientsToolTip : public QToolTip
+class RecipientsToolTip : public TQToolTip
 {
   public:
-    RecipientsToolTip( RecipientsView *, TQWidget *parent );
+    RecipientsToolTip( RecipientsView *, TQWidget *tqparent );
 
   protected:
     void maybeTip( const TQPoint & p );
@@ -260,11 +264,12 @@ class RecipientsToolTip : public QToolTip
     RecipientsView *mView;
 };
 
-class SideWidget : public QWidget
+class SideWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SideWidget( RecipientsView *view, TQWidget *parent );
+    SideWidget( RecipientsView *view, TQWidget *tqparent );
     ~SideWidget();
 
     RecipientsPicker* picker() const;
@@ -291,11 +296,12 @@ class SideWidget : public QWidget
     mutable KWindowPositioner *mPickerPositioner;
 };
 
-class RecipientsEditor : public QWidget
+class RecipientsEditor : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientsEditor( TQWidget *parent );
+    RecipientsEditor( TQWidget *tqparent );
     ~RecipientsEditor();
 
     void clear();
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index adbf4c4a..8ef12ed2 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "recipientseditortest.h"
@@ -39,8 +39,8 @@
 #include <tqlineedit.h>
 #include <tqtextedit.h>
 
-Composer::Composer( TQWidget *parent )
-  : TQWidget( parent )
+Composer::Composer( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *topLayout = new TQGridLayout( this );
   topLayout->setMargin( 4 );
diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h
index be468e83..ea2f1e9e 100644
--- a/kmail/recipientseditortest.h
+++ b/kmail/recipientseditortest.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef RECIPIENTSEDITORTEST_H
 #define RECIPIENTSEDITORTEST_H
@@ -28,11 +28,12 @@
 
 class RecipientsEditor;
 
-class Composer : public QWidget
+class Composer : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    Composer( TQWidget *parent );
+    Composer( TQWidget *tqparent );
 
   public slots:
     void slotClose();
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index a45a7683..38b00d14 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -227,9 +227,9 @@ RecipientItem *RecipientViewItem::recipientItem() const
 }
 
 
-RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent,
+RecipientsListToolTip::RecipientsListToolTip( TQWidget *tqparent,
   KListView *listView )
-  : TQToolTip( parent )
+  : TQToolTip( tqparent )
 {
   mListView = listView;
 }
@@ -294,13 +294,13 @@ RecipientItem::List RecipientsCollection::items() const
 
 bool RecipientsCollection::hasEquivalentItem( RecipientItem *item ) const
 {
-  return mKeyMap.find( item->key() ) != mKeyMap.end();
+  return mKeyMap.tqfind( item->key() ) != mKeyMap.end();
 }
 
 RecipientItem * RecipientsCollection::getEquivalentItem( RecipientItem *item) const
 {
   TQMap<TQString, RecipientItem *>::ConstIterator it;
-  it = mKeyMap.find( item->key() );
+  it = mKeyMap.tqfind( item->key() );
   if ( it == mKeyMap.end() )
     return 0;
   return (*it);
@@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const
   return mId;
 }
 
-SearchLine::SearchLine( TQWidget *parent, KListView *listView )
-  : KListViewSearchLine( parent, listView )
+SearchLine::SearchLine( TQWidget *tqparent, KListView *listView )
+  : KListViewSearchLine( tqparent, listView )
 {
 }
 
@@ -340,14 +340,14 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev )
 }
 
 
-RecipientsPicker::RecipientsPicker( TQWidget *parent )
-  : TQDialog( parent, "RecipientsPicker" )
+RecipientsPicker::RecipientsPicker( TQWidget *tqparent )
+  : TQDialog( tqparent, "RecipientsPicker" )
 #ifndef KDEPIM_NEW_DISTRLISTS
     , mDistributionListManager( 0 )
 #endif
     ,mLdapSearchDialog( 0 )
 {
-//  KWin::setType( winId(), NET::Dock );
+//  KWin::setType( winId(), NET::TQt::Dock );
 
   setCaption( i18n("Select Recipient") );
 
@@ -505,7 +505,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
       item->setAddressee( *it, *it3 );
 
       TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator collIt;
-      collIt = collectionMap.find( it->resource() );
+      collIt = collectionMap.tqfind( it->resource() );
       if ( collIt != collectionMap.end() ) {
         (*collIt)->addItem( item );
       }
@@ -514,7 +514,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
       TQStringList::ConstIterator catIt;
       for( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
         TQMap<TQString, RecipientsCollection *>::ConstIterator catMapIt;
-        catMapIt = categoryMap.find( *catIt );
+        catMapIt = categoryMap.tqfind( *catIt );
         RecipientsCollection *collection;
         if ( catMapIt == categoryMap.end() ) {
           collection = new RecipientsCollection( *catIt );
@@ -838,7 +838,7 @@ void RecipientsPicker::setFocusList()
 
 void RecipientsPicker::resetSearch()
 {
-  mSearchLine->setText( TQString::null );
+  mSearchLine->setText( TQString() );
 }
 
 void RecipientsPicker::slotSearchLDAP()
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 2d25a87b..9f989275 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -114,10 +114,10 @@ class RecipientViewItem : public KListViewItem
     RecipientItem *mRecipientItem;
 };
 
-class RecipientsListToolTip : public QToolTip
+class RecipientsListToolTip : public TQToolTip
 {
   public:
-    RecipientsListToolTip( TQWidget *parent, KListView * );
+    RecipientsListToolTip( TQWidget *tqparent, KListView * );
 
   protected:
     void maybeTip( const TQPoint &pos );
@@ -152,7 +152,7 @@ class RecipientsCollection
     TQString id() const;
 
   private:
-    // flag to indicate if this collection tqcontains just references
+    // flag to indicate if this collection contains just references
     // or should manage memory (de)allocation as well.
     bool mIsReferenceContainer;
     TQString mId;
@@ -163,8 +163,9 @@ class RecipientsCollection
 class SearchLine : public KListViewSearchLine
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SearchLine( TQWidget *parent, KListView *listView );
+    SearchLine( TQWidget *tqparent, KListView *listView );
 
   signals:
     void downPressed();
@@ -175,11 +176,12 @@ class SearchLine : public KListViewSearchLine
 
 using namespace KABC;
 
-class RecipientsPicker : public QDialog
+class RecipientsPicker : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecipientsPicker( TQWidget *parent );
+    RecipientsPicker( TQWidget *tqparent );
     ~RecipientsPicker();
 
     void setRecipients( const Recipient::List & );
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 275e623b..7a3507ef 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,9 +52,9 @@ using KRecentAddress::RecentAddresses;
 
 using namespace KMail;
 
-RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
+RedirectDialog::RedirectDialog( TQWidget *tqparent, const char *name,
                                 bool modal, bool immediate )
-  : KDialogBase( parent, name, modal, i18n( "Redirect Message" ),
+  : KDialogBase( tqparent, name, modal, i18n( "Redirect Message" ),
                  User1|User2|Cancel, ( immediate ? User1 : User2 ), false )
 {
   TQVBox *vbox = makeVBoxMainWidget();
@@ -66,7 +66,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
   mEditTo = new KMLineEdit( true, hbox, "toLine" );
   mEditTo->setMinimumWidth( 300 );
 
-  mBtnTo = new TQPushButton( TQString::null, hbox, "toBtn" );
+  mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" );
   mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
   mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") );
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index 9be9f272..d849b7a2 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -17,11 +17,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,16 +50,17 @@ namespace KMail {
   class RedirectDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /** Constructor
-        @param parent parent QWidget
+        @param tqparent tqparent TQWidget
         @param name dialog name
         @param modal dialog modal type
         @param immediate True, if the Send Now button should be default
                          or false if the Queue button should be default
       */
-      RedirectDialog( TQWidget *parent=0, const char *name=0,
+      RedirectDialog( TQWidget *tqparent=0, const char *name=0,
                       bool modal=false, bool immediate=true );
 
       /** Return the addresses for the redirection */
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 86e8df2d..97aef16f 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,8 +49,8 @@
 
 namespace KMail {
 
-  RegExpLineEdit::RegExpLineEdit( TQWidget *parent, const char *name )
-    : TQWidget( parent, name ),
+  RegExpLineEdit::RegExpLineEdit( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name ),
       mLineEdit( 0 ),
       mRegExpEditButton( 0 ),
       mRegExpEditDialog( 0 )
@@ -58,9 +58,9 @@ namespace KMail {
     initWidget();
   }
 
-  RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *parent,
+  RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *tqparent,
                                   const char *name )
-    : TQWidget( parent, name ),
+    : TQWidget( tqparent, name ),
       mLineEdit( 0 ),
       mRegExpEditButton( 0 ),
       mRegExpEditDialog( 0 )
@@ -120,7 +120,7 @@ namespace KMail {
   void RegExpLineEdit::slotEditRegExp()
   {
     if ( !mRegExpEditDialog )
-      mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
+      mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
 
     KRegExpEditorInterface *iface =
       static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->qt_cast( "KRegExpEditorInterface" ) );
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index c0314e8a..65a1b731 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,14 +44,15 @@ class TQDialog;
 
 namespace KMail {
 
-  class RegExpLineEdit : public QWidget
+  class RegExpLineEdit : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    RegExpLineEdit( const TQString &str, TQWidget *parent = 0,
+    RegExpLineEdit( const TQString &str, TQWidget *tqparent = 0,
                     const char *name = 0 );
-    RegExpLineEdit( TQWidget *parent = 0, const char *name = 0 );
+    RegExpLineEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
     TQString text() const;
 
@@ -67,7 +68,7 @@ namespace KMail {
     void slotEditRegExp();
 
   private:
-    void initWidget( const TQString & = TQString::null );
+    void initWidget( const TQString & = TQString() );
 
     KLineEdit * mLineEdit;
     TQPushButton * mRegExpEditButton;
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 0c220cf9..d4aa76f5 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -96,7 +96,7 @@ void RenameJob::execute()
 {
   if ( mNewParent )
   {
-    // move the folder to a different parent
+    // move the folder to a different tqparent
     KMFolderType type = mStorage->folderType();
     if ( ( type == KMFolderTypeMbox || type == KMFolderTypeMaildir ) &&
          mNewParent->type() == KMStandardDir &&
@@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success)
     config->writeEntry( it.key(), it.data() );
   }
   mNewFolder->readConfig( config );
-  // make sure the children state is correct
+  // make sure the tqchildren state is correct
   if ( mNewFolder->child() &&
         ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) )
     mNewFolder->storage()->updateChildrenState();
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 78102c3a..7e968ec3 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -51,12 +51,13 @@ class CopyFolderJob;
 class RenameJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a new job
    * @param storage the folder that should be renames
    * @param newName the new name of the folder
-   * @param newParent the new parent if the folder should be moved, else 0
+   * @param newParent the new tqparent if the folder should be moved, else 0
    */
   RenameJob( FolderStorage* storage, const TQString& newName,
       KMFolderDir* newParent = 0 );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 75940e4c..b3e211fa 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -228,12 +228,12 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler
 }
 
 namespace {
-  /** Returns the number of immediate children of parent with the given object
+  /** Returns the number of immediate tqchildren of tqparent with the given object
       name. Used by RuleWidgetHandlerManager::createWidgets().
   */
-  int childCount( const TQObject *parent, const char *objName )
+  int childCount( const TQObject *tqparent, const char *objName )
   {
-    TQObjectList *list = parent->queryList( 0, objName, false, false );
+    TQObjectList *list = tqparent->queryList( 0, objName, false, false );
     if ( !list )
       return 0;
     const int count = list->count();
@@ -302,7 +302,7 @@ TQString KMail::RuleWidgetHandlerManager::value( const TQCString& field,
     if ( !val.isEmpty() )
       return val;
   }
-  return TQString::null;
+  return TQString();
 }
 
 TQString KMail::RuleWidgetHandlerManager::prettyValue( const TQCString& field,
@@ -314,7 +314,7 @@ TQString KMail::RuleWidgetHandlerManager::prettyValue( const TQCString& field,
     if ( !val.isEmpty() )
       return val;
   }
-  return TQString::null;
+  return TQString();
 }
 
 void KMail::RuleWidgetHandlerManager::reset( TQWidgetStack *functionStack,
@@ -353,14 +353,14 @@ void KMail::RuleWidgetHandlerManager::update( const TQCString &field,
 //-----------------------------------------------------------------------------
 
 namespace {
-  // FIXME (Qt >= 4.0):
+  // FIXME (TQt >= 4.0):
   // This is a simplified and constified copy of TQObject::child(). According
-  // to a comment in tqobject.h TQObject::child() will be made const in Qt 4.0.
-  // So once we require Qt 4.0 this can be removed.
-  TQObject* QObject_child_const( const TQObject *parent,
+  // to a comment in tqobject.h TQObject::child() will be made const in TQt 4.0.
+  // So once we require TQt 4.0 this can be removed.
+  TQObject* TQObject_child_const( const TQObject *tqparent,
                                 const char *objName )
   {
-    const TQObjectList *list = parent->children();
+    const TQObjectList *list = tqparent->tqchildren();
     if ( !list )
       return 0;
 
@@ -472,9 +472,9 @@ namespace {
   KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
   {
     const TQComboBox *funcCombo =
-      dynamic_cast<TQComboBox*>( QObject_child_const( functionStack,
+      dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
                                                      "textRuleFuncCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo",
     //                                                  0, false ) );
     if ( funcCombo ) {
@@ -499,13 +499,13 @@ namespace {
   TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack,
                                                KMSearchRule::Function func ) const
   {
-    // here we gotta check the combobox which tqcontains the categories
+    // here we gotta check the combobox which contains the categories
     if ( func  == KMSearchRule::FuncIsInCategory ||
          func  == KMSearchRule::FuncIsNotInCategory ) {
       const TQComboBox *combo=
-        dynamic_cast<TQComboBox*>( QObject_child_const( valueStack,
+        dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
                                                        "categoryCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo",
     //                                               0, false ) );
       if ( combo ) {
@@ -514,15 +514,15 @@ namespace {
       else {
         kdDebug(5006) << "TextRuleWidgetHandler::currentValue: "
                          "categoryCombo not found." << endl;
-        return TQString::null;
+        return TQString();
       }
     }
 
     //in other cases of func it is a lineedit
     const RegExpLineEdit *lineEdit =
-      dynamic_cast<RegExpLineEdit*>( QObject_child_const( valueStack,
+      dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
                                                           "regExpLineEdit" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
     //                                                    0, false ) );
     if ( lineEdit ) {
@@ -533,7 +533,7 @@ namespace {
                        "regExpLineEdit not found." << endl;
 
     // or anything else, like addressbook
-    return TQString::null;
+    return TQString();
   }
 
   //---------------------------------------------------------------------------
@@ -794,9 +794,9 @@ namespace {
   KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
   {
     const TQComboBox *funcCombo =
-      dynamic_cast<TQComboBox*>( QObject_child_const( functionStack,
+      dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
                                                      "messageRuleFuncCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo",
     //                                                  0, false ) );
     if ( funcCombo ) {
@@ -825,9 +825,9 @@ namespace {
                                                   KMSearchRule::Function ) const
   {
     const RegExpLineEdit *lineEdit =
-      dynamic_cast<RegExpLineEdit*>( QObject_child_const( valueStack,
+      dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
                                                           "regExpLineEdit" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
     //                                                    0, false ) );
     if ( lineEdit ) {
@@ -837,7 +837,7 @@ namespace {
       kdDebug(5006) << "MessageRuleWidgetHandler::currentValue: "
                        "regExpLineEdit not found." << endl;
 
-    return TQString::null;
+    return TQString();
   }
 
   //---------------------------------------------------------------------------
@@ -847,7 +847,7 @@ namespace {
                                            const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     KMSearchRule::Function func = currentFunction( functionStack );
     if ( func == KMSearchRule::FuncHasAttachment )
@@ -865,7 +865,7 @@ namespace {
                                                  const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     KMSearchRule::Function func = currentFunction( functionStack );
     if ( func == KMSearchRule::FuncHasAttachment )
@@ -1068,9 +1068,9 @@ namespace {
   KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
   {
     const TQComboBox *funcCombo =
-      dynamic_cast<TQComboBox*>( QObject_child_const( functionStack,
+      dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
                                                      "statusRuleFuncCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo",
     //                                                  0, false ) );
     if ( funcCombo ) {
@@ -1098,9 +1098,9 @@ namespace {
   int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
   {
     const TQComboBox *statusCombo =
-      dynamic_cast<TQComboBox*>( QObject_child_const( valueStack,
+      dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
                                                      "statusRuleValueCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo",
     //                                               0, false ) );
     if ( statusCombo ) {
@@ -1119,13 +1119,13 @@ namespace {
                                           const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
     else
-      return TQString::null;
+      return TQString();
   }
 
   //---------------------------------------------------------------------------
@@ -1135,13 +1135,13 @@ namespace {
                                                 const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return i18n( KMail::StatusValues[ status ].text );
     else
-      return TQString::null;
+      return TQString();
   }
 
   //---------------------------------------------------------------------------
@@ -1323,9 +1323,9 @@ namespace {
   KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
   {
     const TQComboBox *funcCombo =
-      dynamic_cast<TQComboBox*>( QObject_child_const( functionStack,
+      dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
                                                      "numericRuleFuncCombo" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo",
     //                                                  0, false ) );
     if ( funcCombo ) {
@@ -1353,9 +1353,9 @@ namespace {
   TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const
   {
     const KIntNumInput *numInput =
-      dynamic_cast<KIntNumInput*>( QObject_child_const( valueStack,
+      dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack,
                                                         "KIntNumInput" ) );
-    // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const.
+    // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
     //  dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput",
     //                                                  0, false ) );
     if ( numInput ) {
@@ -1364,7 +1364,7 @@ namespace {
     else
       kdDebug(5006) << "NumericRuleWidgetHandler::currentValue: "
                        "KIntNumInput not found." << endl;
-    return TQString::null;
+    return TQString();
   }
 
   //---------------------------------------------------------------------------
@@ -1374,7 +1374,7 @@ namespace {
                                            const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     return currentValue( valueStack );
   }
@@ -1386,7 +1386,7 @@ namespace {
                                                  const TQWidgetStack *valueStack ) const
   {
     if ( !handlesField( field ) )
-      return TQString::null;
+      return TQString();
 
     return currentValue( valueStack );
   }
diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h
index 2e4043eb..431731e4 100644
--- a/kmail/rulewidgethandlermanager.h
+++ b/kmail/rulewidgethandlermanager.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/scalix.h b/kmail/scalix.h
index 66f78e79..ac07f504 100644
--- a/kmail/scalix.h
+++ b/kmail/scalix.h
@@ -19,9 +19,9 @@
  */
 
 /**
- * This file tqcontains helper classes for Scalix groupware support.
+ * This file contains helper classes for Scalix groupware support.
  * As the storage system of Scalix is quite similiar to Kolab we reuse some of
- * the exsiting code and tqreplace other code by our own.
+ * the exsiting code and replace other code by our own.
  *
  * Differences between Kolab and Scalix:
  *
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 50bf287d..cabae0fd 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -80,7 +80,7 @@ void SearchJob::searchCompleteFolder()
   TQString searchString = searchStringFromPattern( mSearchPattern );
 
   if ( searchString.isEmpty() ) // skip imap search and download the messages
-    return slotSearchData( 0, TQString::null );
+    return slotSearchData( 0, TQString() );
 
   // do the IMAP search  
   KURL url = mAccount->getUrl();
@@ -305,7 +305,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       // imap and local search have to match
       if ( mLocalSearchPattern->matches( msg ) &&
           ( mImapSearchHits.isEmpty() ||
-           mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
+           mImapSearchHits.tqfind( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
         TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
@@ -313,7 +313,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
     } else if ( mLocalSearchPattern->op() == KMSearchPattern::OpOr ) {
       // imap or local search have to match
       if ( mLocalSearchPattern->matches( msg ) ||
-          mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
+          mImapSearchHits.tqfind( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
         TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
@@ -368,7 +368,7 @@ void SearchJob::searchSingleMessage()
   if ( searchString.isEmpty() )
   {
     // no imap search
-    slotSearchDataSingleMessage( 0, TQString::null );
+    slotSearchDataSingleMessage( 0, TQString() );
   } else
   {
     // imap search
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index 0fe6bdf8..7e59fb7f 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -16,11 +16,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -53,6 +53,7 @@ class ImapAccountBase;
 class SearchJob : public FolderJob
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Creates a new job
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 2f4b3565..ee7e090b 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -71,8 +71,8 @@ const int SearchWindow::MSGID_COLUMN = 4;
 class MatchListView : public KListView
 {
   public:
-    MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) :
-      KListView( parent, name ),
+    MatchListView( TQWidget *tqparent, SearchWindow* sw, const char* name = 0 ) :
+      KListView( tqparent, name ),
       mSearchWindow( sw )
     {}
 
@@ -110,7 +110,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
                          KMFolder *curFolder, bool modal):
   KDialogBase(0, name, modal, i18n("Find Messages"),
               User1 | User2 | Close, User1, false,
-              KGuiItem( i18n("&Search"), "find" ),
+              KGuiItem( i18n("&Search"), "tqfind" ),
               KStdGuiItem::stop()),
   mStopped(false),
   mCloseRequested(false),
@@ -275,7 +275,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
   mStatusBar->changeItem(i18n("Ready."), 0);
   mStatusBar->setItemAlignment(0, AlignLeft | AlignVCenter);
-  mStatusBar->insertItem(TQString::null, 1, 1, true);
+  mStatusBar->insertItem(TQString(), 1, 1, true);
   mStatusBar->setItemAlignment(1, AlignLeft | AlignVCenter);
   vbl->addWidget(mStatusBar);
 
@@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
   mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
 
-  connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus()));
+  connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updtqStatus()));
   connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
           this, TQT_SLOT(folderInvalidated(KMFolder*)));
 
@@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool)
 }
 
 //-----------------------------------------------------------------------------
-void SearchWindow::updStatus(void)
+void SearchWindow::updtqStatus(void)
 {
     TQString genMsg, detailMsg, procMsg;
     int numMatches = 0, numProcessed = 0;
@@ -494,7 +494,7 @@ void SearchWindow::slotSearch()
       TQString fullName = baseName;
       int count = 0;
       KMFolder *folder;
-      while ((folder = mgr->find(fullName))) {
+      while ((folder = mgr->tqfind(fullName))) {
         if (folder->storage()->inherits("KMFolderSearch"))
           break;
         fullName = TQString("%1 %2").arg(baseName).arg(++count);
@@ -541,7 +541,7 @@ void SearchWindow::slotSearch()
 void SearchWindow::searchDone()
 {
     mTimer->stop();
-    updStatus();
+    updtqStatus();
 
     TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
     if(mLastFocus)
@@ -562,7 +562,7 @@ void SearchWindow::slotAddMsg(int idx)
     bool unget = !mFolder->isMessage(idx);
     KMMessage *msg = mFolder->getMsg(idx);
     TQString from, fName;
-    KMFolder *pFolder = msg->parent();
+    KMFolder *pFolder = msg->tqparent();
     if (!mFolders.tqcontains(pFolder)) {
         mFolders.append(pFolder);
         pFolder->open("searchwindow");
@@ -648,7 +648,7 @@ void SearchWindow::renameSearchFolder()
         int i = 1;
         TQString name =  mSearchFolderEdt->text();
         while (i < 100) {
-            if (!kmkernel->searchFolderMgr()->find( name )) {
+            if (!kmkernel->searchFolderMgr()->tqfind( name )) {
                 mFolder->rename( name );
                 kmkernel->searchFolderMgr()->contentsChanged();
                 break;
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index c3c8cf85..f8da35d7 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -68,17 +68,18 @@ namespace KMail {
 class SearchWindow: public KDialogBase, virtual public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
    * Creates a new search window.
-   * @param parent The parent widget.
+   * @param tqparent The tqparent widget.
    * @param name The (widget) name of the dialog.
    * @param curFolder The folder which will be pre-selected as the base folder
    * of search operations.
    * @param modal Whether the dialog is to be shown modal.
    */
-  SearchWindow( KMMainWidget* parent, const char* name=0,
+  SearchWindow( KMMainWidget* tqparent, const char* name=0,
                        KMFolder *curFolder=0, bool modal=false );
   virtual ~SearchWindow();
 
@@ -104,7 +105,7 @@ public:
 
 protected slots:
   /** Update status line widget. */
-  virtual void updStatus(void);
+  virtual void updtqStatus(void);
 
   virtual void slotClose();
   virtual void slotSearch();
@@ -161,7 +162,7 @@ protected:
   TQGuardedPtr<KMFolderSearch> mFolder;
   TQTimer *mTimer;
 
-  // GC'd by Qt
+  // GC'd by TQt
   TQRadioButton *mChkbxAllFolders;
   TQRadioButton *mChkbxSpecificFolders;
   KMail::FolderRequester *mCbxFolders;
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 272be70c..d2296f43 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index 0502f053..c17d604e 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -44,6 +44,7 @@ namespace KMail {
   class SecondaryWindow : public KMainWindow
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     SecondaryWindow( const char * name = 0 );
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index 2d320883..e9d1fe96 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -53,8 +53,8 @@ namespace KMail {
     config.writeEntry( "sieve-vacation-filename", mVacationFileName );
   }
 
-  SieveConfigEditor::SieveConfigEditor( TQWidget * parent, const char * name )
-    : TQWidget( parent, name )
+  SieveConfigEditor::SieveConfigEditor( TQWidget * tqparent, const char * name )
+    : TQWidget( tqparent, name )
   {
     // tmp. vars:
     int row = -1;
@@ -139,7 +139,7 @@ namespace KMail {
       return KURL();
 
     if ( url.hasPass() )
-      url.setPass( TQString::null );
+      url.setPass( TQString() );
 
     return url;
   }
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index 17380eb0..d426b998 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -30,7 +30,7 @@ namespace KMail {
   public:
     SieveConfig( bool managesieveSupported=false, bool reuseConfig=true,
 		 unsigned int port=2000, const KURL & alternateURL=KURL(),
-                 const TQString& vacationFileName = TQString::null )
+                 const TQString& vacationFileName = TQString() )
       : mManagesieveSupported( managesieveSupported ),
 	mReuseConfig( reuseConfig ),
 	mPort( port ),
@@ -87,8 +87,9 @@ namespace KMail {
 
   class SieveConfigEditor : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SieveConfigEditor( TQWidget * parent=0, const char * name=0 );
+    SieveConfigEditor( TQWidget * tqparent=0, const char * name=0 );
 
     bool managesieveSupported() const;
     virtual void setManagesieveSupported( bool enable );
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index bc5d2cca..d29b732d 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -186,8 +186,8 @@ private:
 namespace KMail
 {
 
-SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name )
-:   KDialogBase( parent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok,
+SieveDebugDialog::SieveDebugDialog( TQWidget *tqparent, const char *name )
+:   KDialogBase( tqparent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok,
     KDialogBase::Ok, true ),
     mSieveJob( 0 )
 {
diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h
index f8b0803b..6457280b 100644
--- a/kmail/sievedebugdialog.h
+++ b/kmail/sievedebugdialog.h
@@ -50,9 +50,10 @@ class SieveJob;
 class SieveDebugDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 );
+    SieveDebugDialog( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~SieveDebugDialog();
 
 protected:
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index fa32dea6..23517b53 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -34,8 +34,8 @@ namespace KMail {
 
   SieveJob::SieveJob( const KURL & url, const TQString & script,
 		      const TQValueStack<Command> & commands,
-		      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+		      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       mUrl( url ), mJob( 0 ), mDec( 0 ),
       mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
       mShowProgressInfo(true)
@@ -47,8 +47,8 @@ namespace KMail {
   SieveJob::SieveJob( const KURL & url, const TQString & script,
 		      const TQValueStack<Command> & commands,
                       bool showProgressInfo,
-		      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+		      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       mUrl( url ), mJob( 0 ), mDec( 0 ),
       mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
       mShowProgressInfo(showProgressInfo)
@@ -149,12 +149,12 @@ namespace KMail {
     // Convert mScript into UTF-8:
     data = mScript.utf8();
 
-    // "data" tqcontains a trailing NUL, remove:
+    // "data" contains a trailing NUL, remove:
     if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' )
       data.resize( data.size() - 1 );
 
     // mark mScript sent:
-    mScript = TQString::null;
+    mScript = TQString();
   }
 
   void SieveJob::slotEntries( Job *, const UDSEntryList & l ) {
@@ -224,7 +224,7 @@ namespace KMail {
     if ( !mCommands.empty() ) {
       // Don't fail get'ting a non-existant script:
       if ( mCommands.top() == Get && mFileExists == No ) {
-	mScript = TQString::null;
+	mScript = TQString();
 	mCommands.pop();
       }
     }
@@ -261,18 +261,18 @@ namespace KMail {
     TQValueStack<Command> commands;
     commands.push( Get );
     commands.push( SearchActive );
-    return new SieveJob( src, TQString::null, commands, showProgressInfo );
+    return new SieveJob( src, TQString(), commands, showProgressInfo );
   }
 
   SieveJob * SieveJob::list( const KURL & src ) {
     TQValueStack<Command> commands;
     commands.push( List );
-    return new SieveJob( src, TQString::null, commands );
+    return new SieveJob( src, TQString(), commands );
   }
   SieveJob * SieveJob::del( const KURL & url ) {
     TQValueStack<Command> commands;
     commands.push( Delete );
-    return new SieveJob( url, TQString::null, commands );
+    return new SieveJob( url, TQString(), commands );
   }
 
   SieveJob * SieveJob::desactivate( const KURL & url ) {
@@ -284,7 +284,7 @@ namespace KMail {
   SieveJob * SieveJob::activate( const KURL & url ) {
     TQValueStack<Command> commands;
     commands.push( Activate );
-    return new SieveJob( url, TQString::null, commands );
+    return new SieveJob( url, TQString(), commands );
   }
 
 } // namespace KMail
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index ed8fb5d8..b2ec73d0 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -33,15 +33,16 @@ namespace KMail {
 
   class SieveJob : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete };
     SieveJob( const KURL & url, const TQString & script,
 	      const TQValueStack<Command> & commands,
-	      TQObject * parent=0, const char * name=0 );
+	      TQObject * tqparent=0, const char * name=0 );
     SieveJob( const KURL & url, const TQString & script,
 	      const TQValueStack<Command> & commands,
 	      bool showProgressInfo,
-	      TQObject * parent=0, const char * name=0 );
+	      TQObject * tqparent=0, const char * name=0 );
     virtual ~SieveJob();
 
   public:
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index c566da00..7785b45f 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -42,8 +42,8 @@ using namespace KMail;
 
 namespace KMail {
 
-  SignatureConfigurator::SignatureConfigurator( TQWidget * parent, const char * name )
-    : TQWidget( parent, name )
+  SignatureConfigurator::SignatureConfigurator( TQWidget * tqparent, const char * name )
+    : TQWidget( tqparent, name )
   {
     // tmp. vars:
     TQLabel * label;
@@ -107,7 +107,7 @@ namespace KMail {
     widgetStack->addWidget( mTextEdit, pageno );
     mTextEdit->setFont( KGlobalSettings::fixedFont() );
     mTextEdit->setWordWrap( TQTextEdit::NoWrap );
-    mTextEdit->setTextFormat( Qt::PlainText );
+    mTextEdit->setTextFormat( TQt::PlainText );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
 
@@ -119,7 +119,7 @@ namespace KMail {
     hlay = new TQHBoxLayout( page_vlay ); // inherits spacing
     mFileRequester = new KURLRequester( page );
     TQWhatsThis::add(mFileRequester,
-        i18n("Use this requester to specify a text file that tqcontains your "
+        i18n("Use this requester to specify a text file that contains your "
              "signature. It will be read every time you create a new mail or "
              "append a new signature."));
     hlay->addWidget( new TQLabel( mFileRequester,
@@ -244,11 +244,11 @@ namespace KMail {
     if ( sig.type() == Signature::FromFile )
       setFileURL( sig.url() );
     else
-      setFileURL( TQString::null );
+      setFileURL( TQString() );
     if ( sig.type() == Signature::FromCommand )
       setCommandURL( sig.url() );
     else
-      setCommandURL( TQString::null );
+      setCommandURL( TQString() );
   }
 
   void SignatureConfigurator::slotEnableEditButton( const TQString & url ) {
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index afd33f76..e9f0fdf0 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -33,8 +33,9 @@ namespace KMail {
 
   class SignatureConfigurator : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SignatureConfigurator( TQWidget * parent=0, const char * name=0 );
+    SignatureConfigurator( TQWidget * tqparent=0, const char * name=0 );
     virtual ~SignatureConfigurator();
 
     bool isSignatureEnabled() const;
diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h
index 6bfc3eb3..92545c66 100644
--- a/kmail/simplefoldertree.h
+++ b/kmail/simplefoldertree.h
@@ -50,7 +50,7 @@ static int recurseFilter( TQListViewItem * item, const TQString& filter, int col
     }
 
     if ( filter.length() == 0 ||
-         item->text( column ).find( filter, 0, false ) >= 0 ) {
+         item->text( column ).tqfind( filter, 0, false ) >= 0 ) {
       item->setVisible( true );
       ++enabled;
     }
@@ -133,9 +133,9 @@ template <class T> class SimpleFolderTreeBase : public TreeBase
    public:
 
 
-    inline SimpleFolderTreeBase( TQWidget * parent, KMFolderTree *folderTree,
+    inline SimpleFolderTreeBase( TQWidget * tqparent, KMFolderTree *folderTree,
                       const TQString &preSelection, bool mustBeReadWrite )
-        : TreeBase( parent, folderTree, preSelection, mustBeReadWrite )
+        : TreeBase( tqparent, folderTree, preSelection, mustBeReadWrite )
     {
       assert( folderTree );
       setFolderColumn( addColumn( i18n( "Folder" ) ) );
@@ -148,24 +148,24 @@ template <class T> class SimpleFolderTreeBase : public TreeBase
 
     }
 
-    virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent )
+    virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent )
     {
-        return new SimpleFolderTreeItem<T>( parent );
+        return new SimpleFolderTreeItem<T>( tqparent );
     }
 
-    virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent, TQListViewItem* afterListViewItem  )
+    virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent, TQListViewItem* afterListViewItem  )
     {
-        return new SimpleFolderTreeItem<T>( parent, afterListViewItem );
+        return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem );
     }
 
-    virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent, TQListViewItem* afterListViewItem )
+    virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent, TQListViewItem* afterListViewItem )
     {
-        return new SimpleFolderTreeItem<T>( parent, afterListViewItem );
+        return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem );
     }
 
-    virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent )
+    virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent )
     {
-        return new SimpleFolderTreeItem<T>( parent );
+        return new SimpleFolderTreeItem<T>( tqparent );
     }
 
     inline void keyPressEvent( TQKeyEvent *e )
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 4d42f4d4..4ab24f69 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -56,14 +56,14 @@ static inline TQListBoxItem * findSelectedItem( TQListBox * lb ) {
   return item;
 }
 
-SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
+SimpleStringListEditor::SimpleStringListEditor( TQWidget * tqparent,
 						const char * name,
 						ButtonCode buttons,
 						const TQString & addLabel,
 						const TQString & removeLabel,
 						const TQString & modifyLabel,
 						const TQString & addDialogLabel )
-  : TQWidget( parent, name ),
+  : TQWidget( tqparent, name ),
     mAddButton(0), mRemoveButton(0), mModifyButton(0),
     mUpButton(0), mDownButton(0),
     mAddDialogLabel( addDialogLabel.isEmpty() ?
@@ -121,7 +121,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
     if ( !(buttons & Down) )
       kdDebug(5006) << "Are you sure you want to use an Up button "
 	"without a Down button??" << endl;
-    mUpButton = new KPushButton( TQString::null, this );
+    mUpButton = new KPushButton( TQString(), this );
     mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
     mUpButton->setAutoDefault( false );
     mUpButton->setEnabled( false ); // no selection yet
@@ -134,7 +134,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
     if ( !(buttons & Up) )
       kdDebug(5006) << "Are you sure you want to use a Down button "
 	"without an Up button??" << endl;
-    mDownButton = new KPushButton( TQString::null, this );
+    mDownButton = new KPushButton( TQString(), this );
     mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
     mDownButton->setAutoDefault( false );
     mDownButton->setEnabled( false ); // no selection yet
@@ -166,7 +166,7 @@ TQStringList SimpleStringListEditor::stringList() const {
   return result;
 }
 
-bool SimpleStringListEditor::tqcontainsString( const TQString & str ) {
+bool SimpleStringListEditor::containsString( const TQString & str ) {
   for ( TQListBoxItem * item = mListBox->firstItem() ;
 	item ; item = item->next() ) {
     if ( item->text() == str )
@@ -193,7 +193,7 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
   case Up:
   case Down:
     kdDebug(5006) << "SimpleStringListEditor: Cannot change text of "
-      "Up and Down buttons: they don't tqcontains text!" << endl;
+      "Up and Down buttons: they don't contains text!" << endl;
     return;
   default:
     if ( button & All )
@@ -212,11 +212,11 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
 void SimpleStringListEditor::slotAdd() {
   bool ok = false;
   TQString newEntry = KInputDialog::getText( i18n("New Value"),
-                                            mAddDialogLabel, TQString::null,
+                                            mAddDialogLabel, TQString(),
 					    &ok, this );
   // let the user verify the string before adding
   emit aboutToAdd( newEntry );
-  if ( ok && !newEntry.isEmpty() && !tqcontainsString( newEntry )) {
+  if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) {
       mListBox->insertItem( newEntry );
       emit changed();
   }
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index afa8593c..edcd2a7c 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,6 +47,7 @@ class TQPushButton;
 
 class SimpleStringListEditor : public TQWidget {
   Q_OBJECT
+  TQ_OBJECT
 public:
   enum ButtonCode {
     None = 0x00, Add = 0x01,
@@ -57,12 +58,12 @@ public:
   };
 
   /** Constructor. Populates the list with @p strings. */
-  SimpleStringListEditor( TQWidget * parent=0, const char * name=0,
+  SimpleStringListEditor( TQWidget * tqparent=0, const char * name=0,
 			  ButtonCode buttons=Unsorted,
-			  const TQString & addLabel=TQString::null,
-			  const TQString & removeLabel=TQString::null,
-			  const TQString & modifyLabel=TQString::null,
-			  const TQString & addDialogLabel=TQString::null );
+			  const TQString & addLabel=TQString(),
+			  const TQString & removeLabel=TQString(),
+			  const TQString & modifyLabel=TQString(),
+			  const TQString & addDialogLabel=TQString() );
 
   /** Sets the list of strings displayed to @p strings */
   void setStringList( const TQStringList & strings );
@@ -76,7 +77,7 @@ public:
 
 signals:
   /** Connected slots can alter the argument to be added or set the
-      argument to TQString::null to suppress adding.
+      argument to TQString() to suppress adding.
   */
   void aboutToAdd(TQString&);
   void changed(void);
@@ -91,7 +92,7 @@ protected slots:
   void slotSelectionChanged();
 
 protected:
-  bool tqcontainsString( const TQString & str );
+  bool containsString( const TQString & str );
   TQListBox      *mListBox;
   TQPushButton   *mAddButton;
   TQPushButton   *mRemoveButton;
diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui
index d82d06a3..4c32daba 100644
--- a/kmail/smimeconfiguration.ui
+++ b/kmail/smimeconfiguration.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SMimeConfiguration</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SMimeConfiguration</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QRadioButton">
+        <widget class="TQRadioButton">
             <property name="name">
                 <cstring>CRLRB</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <string>If this option is selected, S/MIME certificates are validated using Certificate Revocation Lists (CRLs).</string>
             </property>
         </widget>
-        <widget class="QRadioButton">
+        <widget class="TQRadioButton">
             <property name="name">
                 <cstring>OCSPRB</cstring>
             </property>
@@ -38,10 +38,10 @@
                 <string>Validate certificates online (OCSP)</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string>
+                <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates tqStatus Protocol (OCSP). Fill in the URL of the OCSP responder below.</string>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>OCSPGroupBox</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout4</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -68,7 +68,7 @@
                                 <string>OCSP responder URL:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>OCSPResponderURL</cstring>
                             </property>
@@ -78,7 +78,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout5</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -118,7 +118,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>ignoreServiceURLCB</cstring>
                     </property>
@@ -128,7 +128,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>doNotCheckCertPolicyCB</cstring>
             </property>
@@ -139,7 +139,7 @@
                 <string>By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate policy is allowed. If this option is selected, policies are not checked.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>neverConsultCB</cstring>
             </property>
@@ -150,7 +150,7 @@
                 <string>If this option is checked, Certificate Revocation Lists are never used to validate S/MIME certificates.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>fetchMissingCB</cstring>
             </property>
@@ -161,7 +161,7 @@
                 <string>If this option is checked, missing issuer certificates are fetched when necessary (this applies to both validation methods, CRLs and OCSP)</string>
             </property>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>HTTPGroupBox</cstring>
             </property>
@@ -172,7 +172,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>disableHTTPCB</cstring>
                     </property>
@@ -183,7 +183,7 @@
                         <string>Entirely disables the use of HTTP for S/MIME.</string>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frameHTTP</cstring>
                     </property>
@@ -200,7 +200,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+                        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>tqlayout5</cstring>
                             </property>
@@ -208,7 +208,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="0" column="1">
+                                <widget class="TQLabel" row="0" column="1">
                                     <property name="name">
                                         <cstring>systemHTTPProxy</cstring>
                                     </property>
@@ -216,7 +216,7 @@
                                         <string>no proxy</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton" row="1" column="0">
+                                <widget class="TQRadioButton" row="1" column="0">
                                     <property name="name">
                                         <cstring>useCustomHTTPProxyRB</cstring>
                                     </property>
@@ -224,7 +224,7 @@
                                         <string>Use this proxy for HTTP requests: </string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton" row="0" column="0">
+                                <widget class="TQRadioButton" row="0" column="0">
                                     <property name="name">
                                         <cstring>honorHTTPProxyRB</cstring>
                                     </property>
@@ -235,7 +235,7 @@
                                         <string>If this option is selected, the value of the HTTP proxy shown on the right (which comes from the environment variable http_proxy) will be used for any HTTP request.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="1" column="1">
+                                <widget class="TQLineEdit" row="1" column="1">
                                     <property name="name">
                                         <cstring>customHTTPProxy</cstring>
                                     </property>
@@ -245,7 +245,7 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>ignoreHTTPDPCB</cstring>
                             </property>
@@ -253,14 +253,14 @@
                                 <string>Ignore HTTP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
                     </grid>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>LDAPGroupBox</cstring>
             </property>
@@ -271,7 +271,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>disableLDAPCB</cstring>
                     </property>
@@ -282,7 +282,7 @@
                         <string>Entirely disables the use of LDAP for S/MIME.</string>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frameLDAP</cstring>
                     </property>
@@ -299,7 +299,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>ignoreLDAPDPCB</cstring>
                             </property>
@@ -307,10 +307,10 @@
                                 <string>Ignore LDAP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>tqlayout5</cstring>
                             </property>
@@ -318,7 +318,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>customLDAPLabel</cstring>
                                     </property>
@@ -326,7 +326,7 @@
                                         <string>Primary host for LDAP requests:</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>customLDAPProxy</cstring>
                                     </property>
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 5e26319f..2229a763 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -26,14 +26,14 @@
 #include "kmessagebox.h"
 
 /*
- *  Constructs a SnippetDlg as a child of 'parent', with the
+ *  Constructs a SnippetDlg as a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
-    : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac )
+SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+    : SnippetDlgBase( tqparent, name, modal, fl ), actionCollection( ac )
 {
     if ( !name )
 	setName( "SnippetDlg" );
@@ -66,7 +66,7 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
  */
 SnippetDlg::~SnippetDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index efd7bc53..e6ac0511 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -19,9 +19,10 @@ class KShortcut;
 class SnippetDlg : public SnippetDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    SnippetDlg( KActionCollection* ac, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SnippetDlg();
 
     void setShowShortcut( bool show );
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index 0df0e226..ec9454c9 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SnippetDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SnippetDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>tqlayout5</cstring>
             </property>
@@ -62,7 +62,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout3</cstring>
             </property>
@@ -92,7 +92,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -103,7 +103,7 @@
                         <cstring>snippetName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         <cstring>snippetText</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabelGroup</cstring>
                     </property>
diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp
index f9f3aa87..9d835d63 100644
--- a/kmail/snippetitem.cpp
+++ b/kmail/snippetitem.cpp
@@ -17,8 +17,8 @@
 
 #include <tqstring.h>
 
-SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text )
-			: TQListViewItem( parent, name ), action(0)
+SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text )
+			: TQListViewItem( tqparent, name ), action(0)
 {
   strName = name;
   strText = text;
@@ -26,12 +26,12 @@ SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text )
   setOpen( true );
 }
 
-SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text)
-			: TQListViewItem( parent, name ), action(0)
+SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text)
+			: TQListViewItem( tqparent, name ), action(0)
 {
   strName = name;
   strText = text;
-  iParent = ((SnippetGroup *)parent)->getId();
+  iParent = ((SnippetGroup *)tqparent)->getId();
   setOpen( true );
 }
 
@@ -81,7 +81,7 @@ void SnippetItem::setName(TQString name)
 
 void SnippetItem::resetParent()
 {
-  SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent());
+  SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent());
   if (group)
     iParent = group->getId();
 }
@@ -129,8 +129,8 @@ Deklaration for class SnippetGroup
 
 int SnippetGroup::iMaxId = 1;
 
-SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id)
- : SnippetItem(parent, name, i18n("GROUP"))
+SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id)
+ : SnippetItem(tqparent, name, i18n("GROUP"))
 {
     if (id > 0) {
       iId = id;
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index b61a553a..2ddc609f 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -33,13 +33,14 @@ class SnippetItem : public TQObject, public TQListViewItem {
 friend class SnippetGroup;
 
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SnippetItem(TQListViewItem * parent, TQString name, TQString text);
+    SnippetItem(TQListViewItem * tqparent, TQString name, TQString text);
 
     ~SnippetItem();
     TQString getName();
     TQString getText();
-    using TQListViewItem::parent;
+    using TQListViewItem::tqparent;
     int getParent() { return iParent; }
     void resetParent();
     void setText(TQString text);
@@ -54,7 +55,7 @@ public slots:
     void slotExecute();
     
 private:
-  SnippetItem(TQListView * parent, TQString name, TQString text);
+  SnippetItem(TQListView * tqparent, TQString name, TQString text);
   TQString strName;
   TQString strText;
   int iParent;
@@ -69,7 +70,7 @@ it in the main TQPtrList<SnippetItem>.
 */
 class SnippetGroup : public SnippetItem {
 public:
-    SnippetGroup(TQListView * parent, TQString name, int id);
+    SnippetGroup(TQListView * tqparent, TQString name, int id);
     ~SnippetGroup();
 
     int getId() { return iId; }
diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp
index e61ebf43..8dce0d31 100644
--- a/kmail/snippetsettings.cpp
+++ b/kmail/snippetsettings.cpp
@@ -20,14 +20,14 @@
 #include "snippetwidget.h"
 
 
-SnippetSettings::SnippetSettings(TQWidget *parent, const char *name)
- : SnippetSettingsBase(parent, name)
+SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name)
+ : SnippetSettingsBase(tqparent, name)
 {
   _widget = NULL;
 }
 
-SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name)
- : SnippetSettingsBase(parent, name)
+SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name)
+ : SnippetSettingsBase(tqparent, name)
 {
   _cfg = w->getSnippetConfig();
   _widget = w;
diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h
index f6362d96..05ce99a5 100644
--- a/kmail/snippetsettings.h
+++ b/kmail/snippetsettings.h
@@ -29,9 +29,10 @@ same named .ui file
 class SnippetSettings : public SnippetSettingsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SnippetSettings(TQWidget *parent = 0, const char *name = 0);
-    SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);
+    SnippetSettings(TQWidget *tqparent = 0, const char *name = 0);
+    SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0);
 
     ~SnippetSettings();
 
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index 62ca4a48..79667821 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SnippetSettingsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SnippetSettingsBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,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>cbToolTip</cstring>
                     </property>
@@ -63,7 +63,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -74,7 +74,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup" row="1" column="0">
+                <widget class="TQButtonGroup" row="1" column="0">
                     <property name="name">
                         <cstring>btnGroup</cstring>
                     </property>
@@ -85,7 +85,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton" row="0" column="0">
+                        <widget class="TQRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>rbSingle</cstring>
                             </property>
@@ -102,7 +102,7 @@
                                 <string>An input dialog will be displayed for every variable within a snippet</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>rbAll</cstring>
                             </property>
@@ -121,7 +121,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
                         <cstring>tqlayout1</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index ef0e0793..ac8d0ebf 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -44,11 +44,11 @@
 
 #include <cassert>
 
-SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent)
-		: KListView(parent, "snippet widget"), TQToolTip( viewport() ),
+SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent)
+		: KListView(tqparent, "snippet widget"), TQToolTip( viewport() ),
 		mEditor( editor ), mActionCollection( actionCollection )
 {
-    // init the QPtrList
+    // init the TQPtrList
     _list.setAutoDelete(TRUE);
 
     // init the KListView
@@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget()
   writeConfig();
   delete _cfg;
 
-  /* We need to delete the child items before the parent items
+  /* We need to delete the child items before the tqparent items
      otherwise KDevelop would crash on exiting */
   SnippetItem * item;
   while (_list.count() > 0) {
@@ -111,7 +111,7 @@ void SnippetWidget::slotAdd()
     which the selected item is a child of*/
   SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem());
   if ( !group && selectedItem() )
-    group = dynamic_cast<SnippetGroup*>(selectedItem()->parent());
+    group = dynamic_cast<SnippetGroup*>(selectedItem()->tqparent());
 
   /* still no group, let's make a default one */
   if (!group ) {
@@ -139,12 +139,12 @@ void SnippetWidget::slotAdd()
 }
 
 /*!
-    \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text )
+    \fn SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text )
     Helper factory method.
  */
-SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut )
+SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut )
 {
-    SnippetItem * item = new SnippetItem(parent, name, text);
+    SnippetItem * item = new SnippetItem(tqparent, name, text);
     const TQString actionName = i18n("Snippet %1").arg(name);
     const TQString normalizedName = TQString(actionName).tqreplace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8() ) ) {
@@ -194,7 +194,7 @@ void SnippetWidget::slotRemove()
 
   if (group) {
     if (group->childCount() > 0 &&
-        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString::null,KStdGuiItem::del())
+        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString(),KStdGuiItem::del())
         == KMessageBox::Cancel)
       return;
 
@@ -255,10 +255,10 @@ void SnippetWidget::slotEdit( TQListViewItem* item )
     pSnippet->setText( dlg.snippetText->text() );
     pSnippet->getAction()->setShortcut( dlg.keyButton->shortcut());
 
-    /* if the user changed the parent we need to move the snippet */
+    /* if the user changed the tqparent we need to move the snippet */
     if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) {
       SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
-      pSnippet->parent()->takeItem(pSnippet);
+      pSnippet->tqparent()->takeItem(pSnippet);
       newGroup->insertItem(pSnippet);
       pSnippet->resetParent();
     }
@@ -486,7 +486,7 @@ void SnippetWidget::initConfig()
 
   iCount = _cfg->readNumEntry("snippetSavedCount", 0);
 
-  for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in QMap
+  for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in TQMap
     strKeyName=TQString("snippetSavedName_%1").arg(i);
     strKeyText=TQString("snippetSavedVal_%1").arg(i);
 
@@ -562,7 +562,7 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int
 //  fn SnippetWidget::parseText(TQString text, TQString del)
 /*!
     This function is used to parse the given TQString for variables. If found the user will be prompted
-    for a tqreplacement value. It returns the string text with all tqreplacements made
+    for a replacement value. It returns the string text with all replacements made
  */
 TQString SnippetWidget::parseText(TQString text, TQString del)
 {
@@ -578,9 +578,9 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
   TQRect rMulti = _SnippetConfig.getMultiRect();
 
   do {
-    iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this QRegExp
+    iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this TQRegExp
     if (iFound >= 0) {
-      iEnd = text.find(del, iFound+1)+1;
+      iEnd = text.tqfind(del, iFound+1)+1;
       strName = text.mid(iFound, iEnd-iFound);
 
       if ( strName != del+del  ) {  //if not doubel-delimiter
@@ -597,7 +597,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
           strNew = ""; //for inputmode "multi" just reset new valaue
         }
       } else {
-        strNew = del; //if double-delimiter -> tqreplace by single character
+        strNew = del; //if double-delimiter -> replace by single character
       }
 
       if (iInMeth == 0) {  //if input-method "single" is selected
@@ -615,14 +615,14 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
     oh = rMulti.top();
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
       TQMap<TQString, TQString>::Iterator it;
-      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the tqreplacement
+      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
         str.tqreplace(it.key(), it.data());
       }
     } else {
       return "";
     }
 
-    rMulti.setWidth(w);   //this is a hack to save the dialog's dimensions in only one QRect
+    rMulti.setWidth(w);   //this is a hack to save the dialog's dimensions in only one TQRect
     rMulti.setHeight(bh);
     rMulti.setTop(oh);
     rMulti.setLeft(0);
@@ -637,7 +637,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
 
 //  fn SnippetWidget::showMultiVarDialog()
 /*!
-    This function constructs a dialog which tqcontains a label and a linedit for every
+    This function constructs a dialog which contains a label and a linedit for every
     variable that is stored in the given map except the double-delimiter entry
     It return true if everything was ok and false if the user hit cancel
  */
@@ -672,7 +672,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   labTop = new TQLabel( &dlg, "label" );
   labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
-  labTop->setText(i18n("Enter the tqreplacement values for these variables:"));
+  labTop->setText(i18n("Enter the replacement values for these variables:"));
   tqlayoutTop->addWidget(labTop, 0, 0);
   tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
@@ -685,10 +685,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    tqlayoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+    tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    tqlayoutVar->addWidget( te, i, 1, Qt::AlignTop );
+    tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -779,7 +779,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
 //  fn SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave)
 /*!
-    This function constructs a dialog which tqcontains a label and a linedit for the given variable
+    This function constructs a dialog which contains a label and a linedit for the given variable
     It return either the entered value or an empty string if the user hit cancel
  */
 TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize)
@@ -799,7 +799,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
   labTop = new TQLabel( &dlg, "label" );
   tqlayoutTop->addWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the tqreplacement values for %1:").arg( var ));
+  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
   tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
@@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  tqlayoutVar->addWidget( te, 0, 1, Qt::AlignTop);
-  tqlayoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop);
+  tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -909,7 +909,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
 
   SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2);
   if (!group)
-    group = dynamic_cast<SnippetGroup *>(item2->parent());
+    group = dynamic_cast<SnippetGroup *>(item2->tqparent());
 
   TQCString dropped;
   TQByteArray data = e->tqencodedData("text/plain");
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index cd7d09d3..bc45d6d4 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -39,15 +39,16 @@ class KActionCollection;
 /**
 This is the widget which gets added to the right TreeToolView.
 It inherits KListView and TQToolTip which is needed for showing the
-tooltips which tqcontains the text of the snippet
+tooltips which contains the text of the snippet
 @author Robert Gruber
 */
-class SnippetWidget : public KListView, public QToolTip
+class SnippetWidget : public KListView, public TQToolTip
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0);
+    SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent = 0);
     ~SnippetWidget();
     TQPtrList<SnippetItem> * getList() { return (&_list); }
     void writeConfig();
@@ -67,7 +68,7 @@ private:
     bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave,
                             int & iWidth, int & iBasicHeight, int & iOneHeight);
     TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize);
-    SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut );
+    SnippetItem* makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut );
 
     TQPtrList<SnippetItem> _list;
     TQMap<TQString, TQString> _mapSaved;
diff --git a/kmail/spamheaderanalyzer.cpp b/kmail/spamheaderanalyzer.cpp
index ad77605e..427aa4d1 100644
--- a/kmail/spamheaderanalyzer.cpp
+++ b/kmail/spamheaderanalyzer.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h
index 76ac50de..ddb9bf1b 100644
--- a/kmail/spamheaderanalyzer.h
+++ b/kmail/spamheaderanalyzer.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/stl_util.h b/kmail/stl_util.h
index 5e3e5ce6..4b549a35 100644
--- a/kmail/stl_util.h
+++ b/kmail/stl_util.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index bb9c5c6c..346cfa8c 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,9 +45,9 @@
 
 namespace KMail {
 
-SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString &caption,
+SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *tqparent, const TQString &caption,
     KAccount *acct, TQString startPath )
-  : KSubscription( parent, caption, acct, User1, TQString::null, false ),
+  : KSubscription( tqparent, caption, acct, User1, TQString(), false ),
     mStartPath( startPath ), mSubscribed( false ), mForceSubscriptionEnable( false)
 {
   // hide unneeded checkboxes
@@ -100,7 +100,7 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI
   {
     oldItem->takeItem(cur);
     item->insertItem(cur);
-    if ( cur->isSelected() ) // we have new parents so open them
+    if ( cur->isSelected() ) // we have new tqparents so open them
       folderTree()->ensureItemVisible( cur );
     ++it;
   }
@@ -111,19 +111,19 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI
 void SubscriptionDialogBase::createListViewItem( int i )
 {
   GroupItem *item = 0;
-  GroupItem *parent = 0;
+  GroupItem *tqparent = 0;
 
-  // get the parent
+  // get the tqparent
   GroupItem *oldItem = 0;
-  TQString parentPath;
-  findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &parent, &oldItem );
+  TQString tqparentPath;
+  findParentItem( mFolderNames[i], mFolderPaths[i], tqparentPath, &tqparent, &oldItem );
 
-  if (!parent && parentPath != "/")
+  if (!tqparent && tqparentPath != "/")
   {
-    // the parent is not available and it's no root-item
+    // the tqparent is not available and it's no root-item
     // this happens when the folders do not arrive in hierarchical order
-    // so we create each parent in advance
-    TQStringList folders = TQStringList::split(mDelimiter, parentPath);
+    // so we create each tqparent in advance
+    TQStringList folders = TQStringList::split(mDelimiter, tqparentPath);
     uint i = 0;
     for ( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it )
     {
@@ -154,17 +154,17 @@ void SubscriptionDialogBase::createListViewItem( int i )
       // as these items are "dummies" we create them non-checkable
       if (!item)
       {
-        if (parent)
-          item = new GroupItem(parent, info, this, false);
+        if (tqparent)
+          item = new GroupItem(tqparent, info, this, false);
         else
           item = new GroupItem(folderTree(), info, this, false);
         mItemDict.insert(info.path, item);
       }
 
-      parent = item;
+      tqparent = item;
       ++i;
     } // folders
-  } // parent
+  } // tqparent
 
   KGroupInfo info(mFolderNames[i]);
   if (mFolderNames[i].upper() == "INBOX" &&
@@ -175,8 +175,8 @@ void SubscriptionDialogBase::createListViewItem( int i )
   // only checkable when the folder is selectable
   bool checkable = ( mFolderMimeTypes[i] == "inode/directory" ) ? false : true;
   // create a new item
-  if (parent)
-    item = new GroupItem(parent, info, this, checkable);
+  if (tqparent)
+    item = new GroupItem(tqparent, info, this, checkable);
   else
     item = new GroupItem(folderTree(), info, this, checkable);
 
@@ -198,18 +198,18 @@ void SubscriptionDialogBase::createListViewItem( int i )
 
 
 //------------------------------------------------------------------------------
-void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath,
-    GroupItem **parent, GroupItem **oldItem )
+void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &tqparentPath,
+    GroupItem **tqparent, GroupItem **oldItem )
 {
-  // remove the name (and the separator) from the path to get the parent path
+  // remove the name (and the separator) from the path to get the tqparent path
   int start = path.length() - (name.length()+2);
   int length = name.length()+1;
   if (start < 0) start = 0;
-  parentPath = path;
-  parentPath.remove(start, length);
+  tqparentPath = path;
+  tqparentPath.remove(start, length);
 
-  // find the parent by it's path
-  *parent = mItemDict[parentPath];
+  // find the tqparent by it's path
+  *tqparent = mItemDict[tqparentPath];
 
   // check if the item already exists
   *oldItem = mItemDict[path];
@@ -303,9 +303,9 @@ void SubscriptionDialogBase::loadingComplete()
 // implementation for server side subscription
 //------------------------------------------------------------------------------
 
-SubscriptionDialog::SubscriptionDialog( TQWidget *parent, const TQString &caption,
+SubscriptionDialog::SubscriptionDialog( TQWidget *tqparent, const TQString &caption,
     KAccount *acct, TQString startPath )
-  : SubscriptionDialogBase( parent, caption, acct, startPath )
+  : SubscriptionDialogBase( tqparent, caption, acct, startPath )
 {
 }
 
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index 1d5a0148..4d3a01db 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,22 +47,23 @@ namespace KMail {
   class SubscriptionDialogBase : public KSubscription
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-      SubscriptionDialogBase( TQWidget *parent,
+      SubscriptionDialogBase( TQWidget *tqparent,
                               const TQString &caption,
                               KAccount* acct,
-                              TQString startPath = TQString::null );
+                              TQString startPath = TQString() );
       virtual ~SubscriptionDialogBase() {}
 
       void show();
 
     protected:
       /**
-       * Find the parent item
+       * Find the tqparent item
        */
       void findParentItem ( TQString &name, TQString &path, TQString &compare,
-                       GroupItem **parent, GroupItem **oldItem );
+                       GroupItem **tqparent, GroupItem **oldItem );
 
       /**
        * Process the next prefix in mPrefixList
@@ -127,12 +128,13 @@ namespace KMail {
   class SubscriptionDialog : public SubscriptionDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
-      SubscriptionDialog( TQWidget *parent,
+      SubscriptionDialog( TQWidget *tqparent,
                           const TQString &caption,
                           KAccount* acct,
-                          TQString startPath = TQString::null );
+                          TQString startPath = TQString() );
       virtual ~SubscriptionDialog();
      protected:
       /** reimpl */
diff --git a/kmail/teehtmlwriter.cpp b/kmail/teehtmlwriter.cpp
index 05d9969c..b162059e 100644
--- a/kmail/teehtmlwriter.cpp
+++ b/kmail/teehtmlwriter.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h
index 411c1a96..a55fd589 100644
--- a/kmail/teehtmlwriter.h
+++ b/kmail/teehtmlwriter.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 26355ac5..d497f184 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -126,7 +126,7 @@ TQString TemplateParser::getFName( const TQString &str )
   // last resort -- return 'name' from 'name@domain'
   int sep_pos;
   TQString res;
-  if ( ( sep_pos = str.find( '@' ) ) > 0 ) {
+  if ( ( sep_pos = str.tqfind( '@' ) ) > 0 ) {
     int i;
     for ( i = (sep_pos - 1); i >= 0; --i ) {
       TQChar c = str[i];
@@ -136,7 +136,7 @@ TQString TemplateParser::getFName( const TQString &str )
         break;
       }
     }
-  } else if ( ( sep_pos = str.find(',') ) > 0 ) {
+  } else if ( ( sep_pos = str.tqfind(',') ) > 0 ) {
     unsigned int i;
     bool begin = false;
     for ( i = sep_pos; i < str.length(); ++i ) {
@@ -169,7 +169,7 @@ TQString TemplateParser::getLName( const TQString &str )
   // else format is 'First Last'
   int sep_pos;
   TQString res;
-  if ( ( sep_pos = str.find(',') ) > 0 ) {
+  if ( ( sep_pos = str.tqfind(',') ) > 0 ) {
     int i;
     for ( i = sep_pos; i >= 0; --i ) {
       TQChar c = str[i];
@@ -180,7 +180,7 @@ TQString TemplateParser::getLName( const TQString &str )
       }
     }
   } else {
-    if ( ( sep_pos = str.find( ' ' ) ) > 0 ) {
+    if ( ( sep_pos = str.tqfind( ' ' ) ) > 0 ) {
       unsigned int i;
       bool begin = false;
       for ( i = sep_pos; i < str.length(); ++i ) {
@@ -297,11 +297,11 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
                               arg( path ).arg(file.errorString() ));
         }
 
-      } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
+      } else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) {
         // pipe message body throw command and insert it as quotation
-        kdDebug() << "Command: QUOTEPIPE=" << endl;
+        kdDebug() << "Command: TQUOTEPIPE=" << endl;
         TQString q;
-        int len = parseQuotes( "QUOTEPIPE=", cmd, q );
+        int len = parseQuotes( "TQUOTEPIPE=", cmd, q );
         i += len;
         TQString pipe_cmd = q;
         if ( mOrigMsg ) {
@@ -311,18 +311,18 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
           body.append( quote );
         }
 
-      } else if ( cmd.startsWith( "QUOTE" ) ) {
-        kdDebug() << "Command: QUOTE" << endl;
-        i += strlen( "QUOTE" );
+      } else if ( cmd.startsWith( "TQUOTE" ) ) {
+        kdDebug() << "Command: TQUOTE" << endl;
+        i += strlen( "TQUOTE" );
         if ( mOrigMsg ) {
           TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ),
                                                     shouldStripSignature(), mAllowDecryption );
           body.append( quote );
         }
 
-      } else if ( cmd.startsWith( "QHEADERS" ) ) {
-        kdDebug() << "Command: QHEADERS" << endl;
-        i += strlen( "QHEADERS" );
+      } else if ( cmd.startsWith( "TQHEADERS" ) ) {
+        kdDebug() << "Command: TQHEADERS" << endl;
+        i += strlen( "TQHEADERS" );
         if ( mOrigMsg ) {
           TQString quote = mOrigMsg->asQuotedString( "", mQuoteString,
                                                     mOrigMsg->headerAsSendableString(),
@@ -1004,10 +1004,10 @@ TQString TemplateParser::findTemplate()
   TQString tmpl;
 
   if ( !mFolder ) { // find folder message belongs to
-    mFolder = mMsg->parent();
+    mFolder = mMsg->tqparent();
     if ( !mFolder ) {
       if ( mOrigMsg ) {
-        mFolder = mOrigMsg->parent();
+        mFolder = mOrigMsg->tqparent();
       }
       if ( !mFolder ) {
         kdDebug(5006) << "Oops! No folder for message" << endl;
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 48bdbf57..679cbd00 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -32,11 +32,11 @@ class KProcess;
 /**
  * The TemplateParser transforms a message with a given template.
  *
- * A template tqcontains text and commands, such as %QUOTE or %ODATE, which will be
- * tqreplaced with the real values in process().
+ * A template contains text and commands, such as %TQUOTE or %ODATE, which will be
+ * replaced with the real values in process().
  *
  * The message given in the constructor is the message that is being transformed.
- * The message text will be tqreplaced by the processed text of the template, but other
+ * The message text will be replaced by the processed text of the template, but other
  * properties, such as the attachments or the subject, are preserved.
  *
  * There are two different kind of commands: Those that work on the message that is
@@ -54,6 +54,7 @@ class KProcess;
 class TemplateParser : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Mode {
@@ -71,7 +72,7 @@ class TemplateParser : public TQObject
 
     /**
      * Sets the selection. If this is set, only the selection will be added to commands such
-     * as %QUOTE. Otherwise, the whole message is quoted.
+     * as %TQUOTE. Otherwise, the whole message is quoted.
      * If this is not called at all, the whole message is quoted as well.
      * Call this before calling process().
      */
@@ -79,7 +80,7 @@ class TemplateParser : public TQObject
 
     /**
      * Sets whether the template parser is allowed to decrypt the original message when needing
-     * its message text, for example for the %QUOTE command.
+     * its message text, for example for the %TQUOTE command.
      * If true, it will tell the ObjectTreeParser it uses internally to decrypt the message,
      * and that will possibly show a password request dialog to the user.
      *
@@ -147,14 +148,14 @@ class TemplateParser : public TQObject
      *
      * In append mode, this will simply append the text to the body.
      *
-     * Otherwise, the content of the old message is deleted and tqreplaced with @p body.
+     * Otherwise, the content of the old message is deleted and replaced with @p body.
      * Attachments of the original message are also added back to the new message. 
      */
     void addProcessedBodyToMessage( const TQString &body );
 
     /**
      * Determines whether the signature should be stripped when getting the text of the original
-     * message, e.g. for commands such as %QUOTE
+     * message, e.g. for commands such as %TQUOTE
      */
     bool shouldStripSignature() const;
 
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 70dd926b..0e52599c 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -38,8 +38,8 @@
 
 #include "templatesconfiguration.h"
 
-TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name )
-  :TemplatesConfigurationBase( parent, name )
+TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *name )
+  :TemplatesConfigurationBase( tqparent, name )
 {
   TQFont f = KGlobalSettings::fixedFont();
   textEdit_new->setFont( f );
@@ -323,7 +323,7 @@ void TemplatesConfiguration::loadFromPhrases()
 
   str = replyPhrases.phraseReplySender();
   if ( !str.isEmpty() ) {
-    textEdit_reply->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
+    textEdit_reply->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
   }
   else {
     textEdit_reply->setText( defaultReply() );
@@ -331,7 +331,7 @@ void TemplatesConfiguration::loadFromPhrases()
 
   str = replyPhrases.phraseReplyAll();
   if ( !str.isEmpty() ) {
-    textEdit_reply_all->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
+    textEdit_reply_all->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
   }
   else {
     textEdit_reply_all->setText( defaultReplyAll() );
@@ -372,7 +372,7 @@ void TemplatesConfiguration::importFromPhrases()
 
   str = replyPhrases.phraseReplySender();
   if ( !str.isEmpty() ) {
-    GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
+    GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
   }
   else {
     GlobalSettings::self()->setTemplateReply( defaultReply() );
@@ -380,7 +380,7 @@ void TemplatesConfiguration::importFromPhrases()
 
   str = replyPhrases.phraseReplyAll();
   if ( !str.isEmpty() ) {
-    GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
+    GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
   }
   else {
     GlobalSettings::self()->setTemplateReplyAll( defaultReplyAll() );
@@ -521,7 +521,7 @@ TQString TemplatesConfiguration::defaultReply() {
     "%BLANK\n"
     "%REM=\"Default reply template\"%-\n"
     "On %ODATEEN %OTIMELONGEN you wrote:\n"
-    "%QUOTE\n"
+    "%TQUOTE\n"
     );
 }
 
@@ -531,7 +531,7 @@ TQString TemplatesConfiguration::defaultReplyAll() {
     "%BLANK\n"
     "%REM=\"Default reply all template\"%-\n"
     "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
-    "%QUOTE\n"
+    "%TQUOTE\n"
     );
 }
 
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index b1479af3..48293a06 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -29,10 +29,11 @@
 class TemplatesConfiguration : public TemplatesConfigurationBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    TemplatesConfiguration( TQWidget *parent = 0, const char *name = 0 );
+    TemplatesConfiguration( TQWidget *tqparent = 0, const char *name = 0 );
 
     void loadFromGlobal();
     void saveToGlobal();
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index 69c451b4..27856724 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TemplatesConfigurationBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TemplatesConfigurationBase</cstring>
     </property>
@@ -33,7 +33,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QToolBox">
+        <widget class="TQToolBox">
             <property name="name">
                 <cstring>toolBox1</cstring>
             </property>
@@ -60,7 +60,7 @@
             <property name="currentIndex">
                 <number>3</number>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page_new</cstring>
                 </property>
@@ -74,7 +74,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTextEdit">
+                    <widget class="TQTextEdit">
                         <property name="name">
                             <cstring>textEdit_new</cstring>
                         </property>
@@ -118,7 +118,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page_reply</cstring>
                 </property>
@@ -132,7 +132,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTextEdit">
+                    <widget class="TQTextEdit">
                         <property name="name">
                             <cstring>textEdit_reply</cstring>
                         </property>
@@ -161,7 +161,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page_reply_all</cstring>
                 </property>
@@ -175,7 +175,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTextEdit">
+                    <widget class="TQTextEdit">
                         <property name="name">
                             <cstring>textEdit_reply_all</cstring>
                         </property>
@@ -204,7 +204,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page_forward</cstring>
                 </property>
@@ -218,7 +218,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTextEdit">
+                    <widget class="TQTextEdit">
                         <property name="name">
                             <cstring>textEdit_forward</cstring>
                         </property>
@@ -256,7 +256,7 @@
                 <string>How does this work?</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout5</cstring>
             </property>
@@ -269,7 +269,7 @@
                         <cstring>mInsertCommand</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -291,7 +291,7 @@
                         <cstring>lineEdit_quote</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>lineEdit_quote</cstring>
                     </property>
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index c2f794dd..2a33f3aa 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -30,9 +30,9 @@
 
 #include "templatesinsertcommand.h"
 
-TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
+TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *tqparent,
                                                 const char *name )
-  : TQPushButton( parent, name )
+  : TQPushButton( tqparent, name )
 {
   setText( i18n( "&Insert Command..." ) );
   connect( this, TQT_SIGNAL( clicked() ),
@@ -148,7 +148,7 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   menu->insert( action );
   action = new KAction( i18n( "Quoted Headers" ),
                         0, mapper, TQT_SLOT( map() ), menu );
-  mapper->setMapping( action, CQHeaders );
+  mapper->setMapping( action, CTQHeaders );
   menu->insert( action );
   action = new KAction( i18n( "Headers as Is" ),
                         0, mapper, TQT_SLOT( map() ), menu );
@@ -334,7 +334,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   emit insertCommand( static_cast<Command>( cmd ) );
 
   switch( cmd ) {
-  case TemplatesInsertCommand::CQuote: emit insertCommand("%QUOTE"); break;
+  case TemplatesInsertCommand::CQuote: emit insertCommand("%TQUOTE"); break;
   case TemplatesInsertCommand::CText: emit insertCommand("%TEXT"); break;
   case TemplatesInsertCommand::COMsgId: emit insertCommand("%OMSGID"); break;
   case TemplatesInsertCommand::CODate: emit insertCommand("%ODATE"); break;
@@ -357,7 +357,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   case TemplatesInsertCommand::COFromFName: emit insertCommand("%OFROMFNAME"); break;
   case TemplatesInsertCommand::COFromLName: emit insertCommand("%OFROMLNAME"); break;
   case TemplatesInsertCommand::COFullSubject: emit insertCommand("%OFULLSUBJECT"); break;
-  case TemplatesInsertCommand::CQHeaders: emit insertCommand("%QHEADERS"); break;
+  case TemplatesInsertCommand::CTQHeaders: emit insertCommand("%TQHEADERS"); break;
   case TemplatesInsertCommand::CHeaders: emit insertCommand("%HEADERS"); break;
   case TemplatesInsertCommand::COHeader: emit insertCommand("%OHEADER=\"\"", -1); break;
   case TemplatesInsertCommand::CMsgId: emit insertCommand("%MSGID"); break;
@@ -384,7 +384,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   case TemplatesInsertCommand::CFullSubject: emit insertCommand("%FULLSUBJECT"); break;
   case TemplatesInsertCommand::CHeader: emit insertCommand("%HEADER=\"\"", -1); break;
   case TemplatesInsertCommand::CSystem: emit insertCommand("%SYSTEM=\"\"", -1); break;
-  case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%QUOTEPIPE=\"\"", -1); break;
+  case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%TQUOTEPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CTextPipe: emit insertCommand("%TEXTPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CMsgPipe: emit insertCommand("%MSGPIPE=\"\"", -1); break;
   case TemplatesInsertCommand::CBodyPipe: emit insertCommand("%BODYPIPE=\"\"", -1); break;
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 04878136..51255244 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -27,16 +27,17 @@
 
 class KActionMenu;
 
-class TemplatesInsertCommand : public QPushButton
+class TemplatesInsertCommand : public TQPushButton
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    TemplatesInsertCommand( TQWidget *parent, const char *name = 0 );
+    TemplatesInsertCommand( TQWidget *tqparent, const char *name = 0 );
     ~TemplatesInsertCommand();
 
   public:
-    enum Command {CDnl = 1, CRem, CInsert, CSystem, CQuotePipe, CQuote, CQHeaders, CHeaders, 
+    enum Command {CDnl = 1, CRem, CInsert, CSystem, CQuotePipe, CQuote, CTQHeaders, CHeaders, 
                   CTextPipe, CMsgPipe, CBodyPipe, CClearPipe, CText, 
                   CToAddr, CToName, CFromAddr, CFromName, CFullSubject, CMsgId, 
                   COHeader, CHeader, COToAddr, COToName, COFromAddr, COFromName, COFullSubject, 
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index e6b4b899..e11bc391 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -42,7 +42,7 @@ void MessageDictTester::testKMDictInsert()
     p("Insert: ");
     KMDictItem *item = new KMDictItem();
     m_dict->insert( 12345, item );
-    KMDictItem *found = m_dict->find( 12345 );
+    KMDictItem *found = m_dict->tqfind( 12345 );
     CHECK( item, found);
 }
  
@@ -50,7 +50,7 @@ void MessageDictTester::testKMDictRemove()
 {
   p("Remove: ");
   m_dict->remove( 12345 );
-  KMDictItem *item = m_dict->find( 12345 );
+  KMDictItem *item = m_dict->tqfind( 12345 );
   CHECK( item, (KMDictItem*)0 );
 }
 
@@ -71,7 +71,7 @@ void MessageDictTester::testKMDictReplace()
   KMDictItem *newItem = new KMDictItem();
   m_dict->insert( 12345, oldItem );
   m_dict->tqreplace( 12345, newItem );
-  KMDictItem *found = m_dict->find( 12345 );
+  KMDictItem *found = m_dict->tqfind( 12345 );
   CHECK( found, newItem );
 }
 
diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h
index 81385eff..52a09cc6 100644
--- a/kmail/tests/messagedicttests.h
+++ b/kmail/tests/messagedicttests.h
@@ -14,6 +14,7 @@ class KMDict;
 class MessageDictTester : public KUnitTest::SlotTester
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public slots:
     void setUp();
diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h
index e12bc15f..ef9a4b96 100644
--- a/kmail/tests/mimelibtests.h
+++ b/kmail/tests/mimelibtests.h
@@ -26,6 +26,7 @@ class DwString;
 class MimeLibTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public slots:
   void setUp();
diff --git a/kmail/tests/signedmail.mbox b/kmail/tests/signedmail.mbox
index 1df5f3ee..5d1a286a 100644
--- a/kmail/tests/signedmail.mbox
+++ b/kmail/tests/signedmail.mbox
@@ -31,7 +31,7 @@ Content-Type: multipart/signed;
 Message-Id: <20070403084156.C961269606@smtp4-g19.free.fr>
 To: undisclosed-recipients:;
 X-Virus-Scanned: by amavisd-new at kdab.net
-X-Spam-Status: Yes, score=7.598 tagged_above=3 required=6.3
+X-Spam-tqStatus: Yes, score=7.598 tagged_above=3 required=6.3
  tests=[BAYES_50=0.001, DATE_IN_PAST_96_XX=2.02, DNS_FROM_AHBL_RHSBL=0.231,
  DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_DSN=2.597, DNS_FROM_RFC_POST=1.708,
  UNDISC_RECIPS=0.841]
@@ -41,8 +41,8 @@ X-Spam-Flag: YES
 X-Kolab-Scheduling-Message: FALSE
 X-UID: 68768
 X-Length: 3235
-Status: RO
-X-Status: RPT
+tqStatus: RO
+X-tqStatus: RPT
 X-KMail-EncryptionState:  
 X-KMail-SignatureState:  
 X-KMail-MDN-Sent:  
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index 195758b8..ec6c1354 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -49,7 +49,7 @@ void UtilTester::test_lf2crlf()
   COMPARE( KMail::Util::lf2crlf( TQCString("") ), TQCString("") );
 
   // TQByteArray version
-  TQByteArray arr;  KMail::Util::setFromQCString( arr, src );
+  TQByteArray arr;  KMail::Util::setFromTQCString( arr, src );
   COMPARE( arr[arr.size()-1], '\r' );
   TQByteArray arrConv = KMail::Util::lf2crlf( arr );
   COMPARE( arrConv[arrConv.size()-1], '\r' );
@@ -81,14 +81,14 @@ void UtilTester::test_append()
   TQCString test;
   TQCString str = "foo";
   COMPARE( (int)str.size(), 4 ); // trailing nul included
-  TQByteArray s1 = KMail::Util::byteArrayFromQCStringNoDetach( str );
+  TQByteArray s1 = KMail::Util::byteArrayFromTQCStringNoDetach( str );
   COMPARE( (int)s1.size(), 3 );
   COMPARE( (int)str.size(), 3 ); // trailing nul got removed
   COMPARE( s1.data(), str.data() ); // yes, no detach
   COMPARE( s1[2], 'o' );
 
   TQCString bar( "bar" );
-  TQByteArray s2 = KMail::Util::byteArrayFromQCStringNoDetach( bar );
+  TQByteArray s2 = KMail::Util::byteArrayFromTQCStringNoDetach( bar );
   COMPARE( (int)s2.size(), 3 );
 
   KMail::Util::append( s1, s2 );
@@ -123,7 +123,7 @@ void UtilTester::test_insert()
   TQCString str = "foo";
   COMPARE( (int)str.size(), 4 ); // trailing nul included
   TQByteArray s1;
-  KMail::Util::setFromQCString( s1, str );
+  KMail::Util::setFromTQCString( s1, str );
 
   KMail::Util::insert( s1, 1, "bar" );
   COMPARE( (int)s1.size(), 6 );
@@ -140,7 +140,7 @@ void UtilTester::test_insert()
 
 void UtilTester::test_DwStringConversions( const TQCString& cstr )
 {
-  // QCString->DwString->QCString
+  // TQCString->DwString->TQCString
   COMPARE( (int)cstr.size(), 8 );
   DwString dwstr = KMail::Util::dwString( cstr );
   COMPARE( (int)dwstr.size(), 7 );
@@ -150,16 +150,16 @@ void UtilTester::test_DwStringConversions( const TQCString& cstr )
   COMPARE( cstr2, cstr );
   COMPARE( cstr2[6], 'r' );
 
-  // And also QCString->QByteArray
+  // And also TQCString->TQByteArray
   TQByteArray arr;
-  KMail::Util::setFromQCString( arr, cstr );
+  KMail::Util::setFromTQCString( arr, cstr );
   COMPARE( (int)arr.size(), 7 );
   COMPARE( arr[6], 'r' );
 
-  KMail::Util::setFromQCString( arr, TQCString() );
+  KMail::Util::setFromTQCString( arr, TQCString() );
   COMPARE( (int)arr.size(), 0 );
 
-  // DwString->QByteArray
+  // DwString->TQByteArray
   TQByteArray ba = KMail::Util::ByteArray( dwstr );
   COMPARE( (int)ba.size(), 7 );
   COMPARE( ba[6], 'r' );
@@ -186,17 +186,17 @@ void UtilTester::test_DwStringConversions()
   VERIFY( dwstr.empty() );
 }
 
-void UtilTester::test_QByteArrayQCString()
+void UtilTester::test_TQByteArrayTQCString()
 {
   TQCString str = "foobar";
   COMPARE( (int)str.size(), 7 ); // trailing nul included
-  TQByteArray s1 = KMail::Util::byteArrayFromQCStringNoDetach( str );
+  TQByteArray s1 = KMail::Util::byteArrayFromTQCStringNoDetach( str );
   COMPARE( (int)str.size(), 6 ); // trailing nul got removed
   COMPARE( s1.data(), str.data() ); // yes, no detach
   COMPARE( s1[5], 'r' );
   COMPARE( str[5], 'r' );
 
-  KMail::Util::restoreQCString( str );
+  KMail::Util::restoreTQCString( str );
   COMPARE( (int)str.size(), 7 ); // trailing nul included
   COMPARE( str[5], 'r' );
   COMPARE( str[6], '\0' );
diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h
index 2270cbcf..cb6c225a 100644
--- a/kmail/tests/utiltests.h
+++ b/kmail/tests/utiltests.h
@@ -12,6 +12,7 @@
 class UtilTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public slots:
   void setUp();
@@ -22,7 +23,7 @@ public slots:
   void test_append();
   void test_insert();
   void test_DwStringConversions();
-  void test_QByteArrayQCString();
+  void test_TQByteArrayTQCString();
 private:
   void test_DwStringConversions( const TQCString& cstr );
 };
diff --git a/kmail/textsource.cpp b/kmail/textsource.cpp
index 6649565a..2ac83d0c 100644
--- a/kmail/textsource.cpp
+++ b/kmail/textsource.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/textsource.h b/kmail/textsource.h
index e0250920..58c9612c 100644
--- a/kmail/textsource.h
+++ b/kmail/textsource.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/tips b/kmail/tips
index 1defde79..9aef8536 100644
--- a/kmail/tips
+++ b/kmail/tips
@@ -18,7 +18,7 @@ subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>
 added to the subject of some mailing lists by using the <em>rewrite
 header</em> filter action? Just use
 <pre>rewrite header &quot;Subject&quot;
-   replace &quot;\s*\[mailing list name\]\s*&quot;
+   tqreplace &quot;\s*\[mailing list name\]\s*&quot;
    with &quot;&quot;</pre>
 </p>
 </html>
@@ -60,7 +60,7 @@ in the first edit field of a search rule?</p>
 <tip category="KMail|Filters">
 <html>
 <p>...that you can filter out HTML only messages with the rule
-<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>
+<pre>&quot;Content-type&quot; tqcontains &quot;text/html&quot;?</pre>
 </p>
 </html>
 </tip>
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index e80d1cb2..bde29090 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -60,7 +60,7 @@ namespace KMail {
     do
     {
       newId = kapp->random();
-    } while ( usedIds.find(newId) != usedIds.end() );
+    } while ( usedIds.tqfind(newId) != usedIds.end() );
 
     return newId;
   }
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 74afe85b..a2a82337 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -27,9 +27,9 @@
 
 using namespace KMail;
 
-TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree,
+TreeBase::TreeBase( TQWidget *tqparent, KMFolderTree *folderTree,
         const TQString &preSelection, bool mustBeReadWrite )
-       : KListView( parent ), mFolderTree( folderTree )
+       : KListView( tqparent ), mFolderTree( folderTree )
 {
      Q_UNUSED( preSelection );
      Q_UNUSED( mustBeReadWrite );
@@ -116,13 +116,13 @@ void TreeBase::recolorRows()
         TQListViewItem * item = it.current() ;
         if ( item->isVisible() ) {
            bool visible = true;
-           TQListViewItem * parent = item->parent();
-           while ( parent ) {
-           if (!parent->isOpen()) {
+           TQListViewItem * tqparent = item->tqparent();
+           while ( tqparent ) {
+           if (!tqparent->isOpen()) {
              visible = false;
              break;
            }
-           parent = parent->parent();
+           tqparent = tqparent->tqparent();
          }
 
          if ( visible ) {
@@ -174,7 +174,7 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde
         }
         else {
           if ( depth > lastDepth ) {
-            // next lower level - parent node will get opened
+            // next lower level - tqparent node will get opened
             item = createItem( lastItem );
             lastItem->setOpen( true );
           }
@@ -183,15 +183,15 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde
             path = path.section( '/', 0, -2 - (lastDepth-depth) );
             if ( depth == lastDepth )
               // same level - behind previous item
-              item = createItem( lastItem->parent(), lastItem );
+              item = createItem( lastItem->tqparent(), lastItem );
             else if ( depth < lastDepth ) {
               // above previous level - might be more than one level difference
               // but highest possibility is top level
-              while ( ( depth <= --lastDepth ) && lastItem->parent() ) {
-                lastItem = static_cast<TQListViewItem *>( lastItem->parent() );
+              while ( ( depth <= --lastDepth ) && lastItem->tqparent() ) {
+                lastItem = static_cast<TQListViewItem *>( lastItem->tqparent() );
               }
-              if ( lastItem->parent() )
-                item = createItem( lastItem->parent(), lastItem );
+              if ( lastItem->tqparent() )
+                item = createItem( lastItem->tqparent(), lastItem );
               else {
                 // chain somehow broken - what does cause this ???
                 kdDebug( 5006 ) << "You shouldn't get here: depth=" << depth
diff --git a/kmail/treebase.h b/kmail/treebase.h
index 3822add2..e11a518c 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -33,8 +33,9 @@ class TreeItemBase;
 class TreeBase : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-    TreeBase( TQWidget * parent, KMFolderTree *folderTree,
+    TreeBase( TQWidget * tqparent, KMFolderTree *folderTree,
         const TQString &preSelection, bool mustBeReadWrite );
 	
     virtual  ~TreeBase() {}
@@ -49,7 +50,7 @@ class TreeBase : public KListView
     }
 
     void reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolders,
-                   const TQString& preSelection = TQString::null );
+                   const TQString& preSelection = TQString() );
 
     int folderColumn() const {  return mFolderColumn; }
     void setFolderColumn( const int folderCol ) { mFolderColumn = folderCol; }
diff --git a/kmail/undostack.h b/kmail/undostack.h
index 11a3a989..d1e9408a 100644
--- a/kmail/undostack.h
+++ b/kmail/undostack.h
@@ -41,9 +41,10 @@ public:
   KMFolder         *destFolder;
 };
 
-class UndoStack : public QObject
+class UndoStack : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   UndoStack(int size);
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index d788add0..e1707b1b 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -53,7 +53,7 @@
 #include <algorithm>
 using std::for_each;
 using std::remove;
-using std::find;
+using std::tqfind;
 
 KMail::URLHandlerManager * KMail::URLHandlerManager::self = 0;
 
@@ -116,7 +116,7 @@ namespace {
     bool handleContextMenuRequest( const KURL &, const TQPoint &, KMReaderWin * ) const {
       return false;
     }
-    TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString::null; }
+    TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString(); }
   };
 
   class AttachmentURLHandler : public KMail::URLHandler {
@@ -274,7 +274,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage(
   TQString path;
   partNode * node = partNodeFromXKMailUrl( url, w, &path );
   if ( !node )
-    return TQString::null;
+    return TQString();
 
   KMail::PartNodeBodyPart part( *node, w->overrideCodec() );
   for ( BodyPartHandlerList::const_iterator it = mHandlers.begin() ; it != mHandlers.end() ; ++it ) {
@@ -282,7 +282,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage(
     if ( !msg.isEmpty() )
       return msg;
   }
-  return TQString::null;
+  return TQString();
 }
 
 //
@@ -377,7 +377,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
     if ( !msg.isEmpty() )
       return msg;
   }
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -495,7 +495,7 @@ namespace {
       if ( url.path() == "showAttachmentQuicklist" )
         return i18n( "Show attachment list" );
     }
-    return TQString::null ;
+    return TQString() ;
   }
 }
 
@@ -532,7 +532,7 @@ namespace {
           }
         }
       }
-      return TQString::null ;
+      return TQString() ;
   }
 
 }
@@ -560,7 +560,7 @@ namespace {
   TQString SMimeURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const {
     TQString displayName, libName, keyId;
     if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) )
-      return TQString::null;
+      return TQString();
     return i18n("Show certificate 0x%1").arg( keyId );
   }
 }
@@ -578,7 +578,7 @@ namespace {
 namespace {
   TQString MailToURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const {
     if ( url.protocol() != "mailto" )
-      return TQString::null;
+      return TQString();
     return KMMessage::decodeMailtoUrl( url.url() );
   }
 }
@@ -605,7 +605,7 @@ namespace {
   {
     bool inHeader = false;
     const TQString place = url.queryItem( "place" ).lower();
-    if ( place != TQString::null ) {
+    if ( place != TQString() ) {
       inHeader = ( place == "header" );
     }
     return inHeader;
@@ -682,7 +682,7 @@ namespace {
   {
     partNode * node = partNodeForUrl( url, w );
     if ( !node )
-      return TQString::null;
+      return TQString();
 
     const KMMessagePart & msgPart = node->msgPart();
     TQString name = msgPart.fileName();
@@ -752,7 +752,7 @@ namespace {
 namespace {
   bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const {
     if ( w )
-      w->emitUrlClicked( url, Qt::LeftButton );
+      w->emitUrlClicked( url, TQt::LeftButton );
     return true;
   }
 
diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h
index 81595259..2e0959ed 100644
--- a/kmail/urlhandlermanager.h
+++ b/kmail/urlhandlermanager.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kmail/util.cpp b/kmail/util.cpp
index ca1b54b6..9586f70d 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -60,7 +60,7 @@ size_t KMail::Util::crlf2lf( char* str, const size_t strLen )
         return strLen;
     }
 
-    // tqreplace all occurrences of "\r\n" with "\n" (in place)
+    // replace all occurrences of "\r\n" with "\n" (in place)
     char* target = const_cast<char*>( source ); // target points to '\r'
     ++source; // source points to '\n'
     for ( ; source < sourceEnd; ++source ) {
diff --git a/kmail/util.h b/kmail/util.h
index 341f65df..9f291a2e 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -54,7 +54,7 @@ class TQWidget;
 namespace KMail
 {
     /**
-     * The Util namespace tqcontains a collection of helper functions use in
+     * The Util namespace contains a collection of helper functions use in
      * various places.
      */
 namespace Util {
@@ -93,21 +93,21 @@ namespace Util {
     TQByteArray ByteArray( const DwString& str );
 
     /**
-     * Construct a DwString from a QCString
+     * Construct a DwString from a TQCString
      */
     DwString dwString( const TQCString& str );
 
     /**
-     * Construct a DwString from a QByteArray
+     * Construct a DwString from a TQByteArray
      */
     DwString dwString( const TQByteArray& str );
 
     /**
      * Fills a TQByteArray from a TQCString - removing the trailing null.
      */
-    void setFromQCString( TQByteArray& arr, const TQCString& cstr );
+    void setFromTQCString( TQByteArray& arr, const TQCString& cstr );
 
-    inline void setFromQCString( TQByteArray& arr, const TQCString& cstr )
+    inline void setFromTQCString( TQByteArray& arr, const TQCString& cstr )
     {
       if ( cstr.size() )
         arr.duplicate( cstr.data(), cstr.size()-1 );
@@ -120,8 +120,8 @@ namespace Util {
      * Fast, but be careful, the TQCString gets modified by this; this is only good for
      * the case where the TQCString is going to be thrown away afterwards anyway.
      */
-    TQByteArray byteArrayFromQCStringNoDetach( TQCString& cstr );
-    inline TQByteArray byteArrayFromQCStringNoDetach( TQCString& cstr )
+    TQByteArray byteArrayFromTQCStringNoDetach( TQCString& cstr );
+    inline TQByteArray byteArrayFromTQCStringNoDetach( TQCString& cstr )
     {
       TQByteArray arr = cstr;
       if ( arr.size() )
@@ -130,10 +130,10 @@ namespace Util {
     }
 
     /**
-     * Restore the TQCString after byteArrayFromQCStringNoDetach modified it
+     * Restore the TQCString after byteArrayFromTQCStringNoDetach modified it
      */
-    void restoreQCString( TQCString& str );
-    inline void restoreQCString( TQCString& str )
+    void restoreTQCString( TQCString& str );
+    inline void restoreTQCString( TQCString& str )
     {
       if ( str.data() )
         str.resize( str.size() + 1 );
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index e706243c..edce8d85 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -156,7 +156,7 @@ namespace {
     const std::map<TQString,TQString> & results() const { return mResults; }
 
   private:
-    void process( BuilderMethod method, const TQString & string=TQString::null ) {
+    void process( BuilderMethod method, const TQString & string=TQString() ) {
       doProcess( method, string );
       mRecursionGuard.clear();
     }
@@ -232,7 +232,7 @@ namespace {
 
     { 0,   GIE::TestEnd, 0, 16, 0, 0 }, // 15
 
-    // block of command, find "stop", take nested if's into account:
+    // block of command, tqfind "stop", take nested if's into account:
     { 0,   GIE::BlockStart, 0, 17, 0, 0 },                // 16
     { 1,     GIE::CommandStart, "stop", 20, 19, "stop" }, // 17
     { -1,    GIE::Any, 0, 17, 0, 0 },                     // 18
@@ -265,7 +265,7 @@ namespace {
     { 0,   GIE::TestStart, "not", 2, 0, 0, },      // 1
     { 0,     GIE::TestStart, "address", 3, 0, 0 }, // 2
 
-    // :domain and :tqcontains in arbitrary order:
+    // :domain and :contains in arbitrary order:
     { 0,       GIE::TaggedArgument, "domain", 4, 5, 0 },     // 3
     { 0,       GIE::TaggedArgument, "tqcontains", 7, 0, 0 },   // 4
     { 0,       GIE::TaggedArgument, "tqcontains", 6, 0, 0 },   // 5
@@ -288,7 +288,7 @@ namespace {
     { 0,     GIE::TestEnd, 0, 18, 0, 0 },  // 17
     { 0,   GIE::TestEnd, 0, 19, 0, 0 },    // 18
 
-    // block of commands, find "stop", take nested if's into account:
+    // block of commands, tqfind "stop", take nested if's into account:
     { 0,   GIE::BlockStart, 0, 20, 0, 0 },                 // 19
     { 1,     GIE::CommandStart, "stop", 23, 22, "stop" },  // 20
     { -1,    GIE::Any, 0, 20, 0, 0 },                      // 21
@@ -308,7 +308,7 @@ namespace {
 
     TQString domainName() /*not const, since map::op[] isn't const*/ {
       return mResults.count( "stop" ) && mResults.count( "from" )
-        ? mResults["domainName"] : TQString::null ;
+        ? mResults["domainName"] : TQString() ;
     }
   };
 
@@ -420,7 +420,7 @@ namespace {
       mContext = None;
       mNotificationInterval = 0;
       mAliases.clear();
-      mMessageText = TQString::null;
+      mMessageText = TQString();
     }
   };
 
@@ -428,8 +428,8 @@ namespace {
 
 namespace KMail {
 
-  Vacation::Vacation( TQObject * parent, bool checkOnly, const char * name )
-    : TQObject( parent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
+  Vacation::Vacation( TQObject * tqparent, bool checkOnly, const char * name )
+    : TQObject( tqparent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
   {
     mUrl = findURL();
     kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl;
@@ -565,9 +565,9 @@ namespace KMail {
   TQString Vacation::defaultMessageText() {
     return i18n("I am out of office till %1.\n"
 		"\n"
-		"In urgent cases, please contact Mrs. <vacation tqreplacement>\n"
+		"In urgent cases, please contact Mrs. <vacation replacement>\n"
 		"\n"
-		"email: <email address of vacation tqreplacement>\n"
+		"email: <email address of vacation replacement>\n"
 		"phone: +49 711 1111 11\n"
 		"fax.:  +49 711 1111 12\n"
 		"\n"
diff --git a/kmail/vacation.h b/kmail/vacation.h
index cf6f5a8c..5913548b 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -37,8 +37,9 @@ namespace KMail {
 
   class Vacation : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 );
+    Vacation( TQObject * tqparent=0, bool checkOnly = false, const char * name=0 );
     virtual ~Vacation();
 
     bool isUsable() const { return !mUrl.isEmpty(); }
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 50dea24e..9e782adf 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -39,9 +39,9 @@ using KMime::HeaderParsing::parseAddressList;
 
 namespace KMail {
 
-  VacationDialog::VacationDialog( const TQString & caption, TQWidget * parent,
+  VacationDialog::VacationDialog( const TQString & caption, TQWidget * tqparent,
 				  const char * name, bool modal )
-    : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal )
+    : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, tqparent, name, modal )
   {
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
 
@@ -166,7 +166,7 @@ namespace KMail {
   }
 
   TQString VacationDialog::domainName() const {
-    return mDomainCheck->isChecked() ? mDomainEdit->text() : TQString::null ;
+    return mDomainCheck->isChecked() ? mDomainEdit->text() : TQString() ;
   }
 
   void VacationDialog::setDomainName( const TQString & domain ) {
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index a971b118..9cedf4ef 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -36,8 +36,9 @@ namespace KMail {
 
   class VacationDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    VacationDialog( const TQString & caption, TQWidget * parent=0,
+    VacationDialog( const TQString & caption, TQWidget * tqparent=0,
 		    const char * name=0, bool modal=true );
     virtual ~VacationDialog();
 
diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp
index 0e34f72c..0fd71d94 100644
--- a/kmail/vcardviewer.cpp
+++ b/kmail/vcardviewer.cpp
@@ -38,11 +38,11 @@ using KABC::Addressee;
 #include <tqstring.h>
 
 #if defined(KABC_VCARD_ENCODING_FIX)
-KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name )
+KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name )
 #else
-KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQString &vCard, const char *name )
+KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name )
 #endif
-  : KDialogBase( parent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close,
+  : KDialogBase( tqparent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close,
 		 true, i18n("&Import"), i18n("&Next Card"), i18n("&Previous Card") )
 {
   mAddresseeView = new AddresseeView(this);
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index 48da60ba..3da13c39 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -37,11 +37,12 @@ namespace KMail {
 class VCardViewer : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
 #if defined(KABC_VCARD_ENCODING_FIX)
-    VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name );
+    VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name );
 #else
-    VCardViewer( TQWidget *parent, const TQString &vCard, const char *name );
+    VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name );
 #endif
     virtual ~VCardViewer();
 
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index c2a4deb0..eb798405 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>WarningConfiguration</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WarningConfiguration</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>mWarnUnsigned</cstring>
             </property>
@@ -38,7 +38,7 @@ It is recommended to leave this option turned on for maximum integrity.
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>warnUnencryptedCB</cstring>
             </property>
@@ -60,7 +60,7 @@ It is recommended to leave this option turned on for maximum integrity.
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>warnReceiverNotInCertificateCB</cstring>
             </property>
@@ -82,7 +82,7 @@ It is recommended to leave this option turned on for maximum security.
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>warnGroupBox</cstring>
             </property>
@@ -96,7 +96,7 @@ It is recommended to leave this option turned on for maximum security.
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -107,7 +107,7 @@ It is recommended to leave this option turned on for maximum security.
                         <set>AlignCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -118,7 +118,7 @@ It is recommended to leave this option turned on for maximum security.
                         <set>AlignCenter</set>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="1">
+                <widget class="TQSpinBox" row="1" column="1">
                     <property name="name">
                         <cstring>mWarnSignKeyExpiresSB</cstring>
                     </property>
@@ -146,7 +146,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="2">
+                <widget class="TQSpinBox" row="1" column="2">
                     <property name="name">
                         <cstring>mWarnEncrKeyExpiresSB</cstring>
                     </property>
@@ -174,7 +174,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="2" column="2">
+                <widget class="TQSpinBox" row="2" column="2">
                     <property name="name">
                         <cstring>mWarnEncrChainCertExpiresSB</cstring>
                     </property>
@@ -202,7 +202,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="2" column="1">
+                <widget class="TQSpinBox" row="2" column="1">
                     <property name="name">
                         <cstring>mWarnSignChainCertExpiresSB</cstring>
                     </property>
@@ -230,7 +230,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="3" column="1">
+                <widget class="TQSpinBox" row="3" column="1">
                     <property name="name">
                         <cstring>mWarnSignRootCertExpiresSB</cstring>
                     </property>
@@ -258,7 +258,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="3" column="2">
+                <widget class="TQSpinBox" row="3" column="2">
                     <property name="name">
                         <cstring>mWarnEncrRootCertExpiresSB</cstring>
                     </property>
@@ -286,7 +286,7 @@ The recommended SPHINX setting is 14 days.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel1_2_2</cstring>
                     </property>
@@ -297,7 +297,7 @@ The recommended SPHINX setting is 14 days.
                         <cstring>mWarnSignRootCertExpiresSB</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -308,7 +308,7 @@ The recommended SPHINX setting is 14 days.
                         <cstring>mWarnSignChainCertExpiresSB</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -355,7 +355,7 @@ The recommended SPHINX setting is 14 days.
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout1</cstring>
             </property>
@@ -380,7 +380,7 @@ The recommended SPHINX setting is 14 days.
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>enableAllWarningsPB</cstring>
                     </property>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index fee9b269..1110641d 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -70,8 +70,8 @@ using namespace KPIM;
 
 namespace KMail {
 
-  XFaceConfigurator::XFaceConfigurator( TQWidget * parent, const char * name )
-    : TQWidget( parent, name )
+  XFaceConfigurator::XFaceConfigurator( TQWidget * tqparent, const char * name )
+    : TQWidget( tqparent, name )
   {
     // tmp. vars:
     TQLabel * label;
@@ -93,7 +93,7 @@ namespace KMail {
         i18n( "Check this box if you want KMail to add a so-called X-Face header to messages "
             "written with this identity. An X-Face is a small (48x48 pixels) black and "
             "white image that some mail clients are able to display." ) );
-    hlay->addWidget( mEnableCheck, Qt::AlignLeft | Qt::AlignVCenter );
+    hlay->addWidget( mEnableCheck, TQt::AlignLeft | TQt::AlignVCenter );
 
     mXFaceLabel = new TQLabel( this );
     TQWhatsThis::add(mXFaceLabel,
@@ -180,7 +180,7 @@ namespace KMail {
     TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) );
     mTextEdit->setFont( KGlobalSettings::fixedFont() );
     mTextEdit->setWrapPolicy( TQTextEdit::Anywhere );
-    mTextEdit->setTextFormat( Qt::PlainText );
+    mTextEdit->setTextFormat( TQt::PlainText );
     label2 = new KActiveLabel( i18n("Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."), page );
     page_vlay->addWidget( label2 );
 
@@ -225,7 +225,7 @@ namespace KMail {
   {
     TQStringList mimeTypes = KImageIO::mimeTypes (KImageIO::Reading);
     TQString filter = mimeTypes.join (" ");
-    KURL url = KFileDialog::getOpenURL( TQString::null, filter, this, TQString::null );
+    KURL url = KFileDialog::getOpenURL( TQString(), filter, this, TQString() );
     if ( !url.isEmpty() )
       setXfaceFromFile( url );
   }
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index 9d0d6332..8d0792c8 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -31,8 +31,9 @@ namespace KMail {
 
   class XFaceConfigurator : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    XFaceConfigurator( TQWidget * parent=0, const char * name=0 );
+    XFaceConfigurator( TQWidget * tqparent=0, const char * name=0 );
     virtual ~XFaceConfigurator();
 
     bool isXFaceEnabled() const;
diff --git a/kmailcvt/README b/kmailcvt/README
index dbdf247a..b97f783e 100644
--- a/kmailcvt/README
+++ b/kmailcvt/README
@@ -23,7 +23,7 @@ the following methods that you may want to use:
     void setOverall( int percent = 0 ); // Set overall percentage
     void addLog( const QString& log ); // Add a message for the user to see
     void alert( const QString& message ); // Tell user something has gone wrong
-    QWidget *parent(); // The parent widget
+    QWidget *tqparent(); // The tqparent widget
     
     bool removeDupMsg; // true, if user selected 'remove duplicated messages'
     
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index 121171af..f1d9eaff 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -51,7 +51,7 @@ void FilterEvolution::import(FilterInfo *info)
         evolDir = TQDir::homeDirPath();
     }
 
-    mailDir = KFileDialog::getExistingDirectory(evolDir, info->parent());
+    mailDir = KFileDialog::getExistingDirectory(evolDir, info->tqparent());
 
     if (mailDir.isEmpty()) {
         info->alert(i18n("No directory selected."));
@@ -69,7 +69,7 @@ void FilterEvolution::import(FilterInfo *info)
         TQStringList rootSubDirs = dir.entryList("[^\\.]*", TQDir::Dirs, TQDir::Name); // Removal of . and ..
         int currentDir = 1, numSubDirs = rootSubDirs.size();
         for(TQStringList::Iterator filename = rootSubDirs.begin() ; filename != rootSubDirs.end() ; ++filename, ++currentDir) {
-            importDirContents(info, dir.filePath(*filename), *filename, TQString::null);
+            importDirContents(info, dir.filePath(*filename), *filename, TQString());
             info->setOverall((int) ((float) currentDir / numSubDirs * 100));
         }
     }
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index 959a4b46..b8842e96 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -54,7 +54,7 @@ void FilterEvolution_v2::import(FilterInfo *info)
         evolDir = TQDir::homeDirPath();
     }
 
-    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
+    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
     KFileDialog *kfd;
     kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
@@ -85,7 +85,7 @@ void FilterEvolution_v2::import(FilterInfo *info)
         }
 
         /** import last but not least all archives from the root-dir */
-	importDirContents(info, true, mailDir, TQString::null, TQString::null);
+	importDirContents(info, true, mailDir, TQString(), TQString());
 
         info->addLog( i18n("Finished importing emails from %1").arg( mailDir ));
         if(count_duplicates > 0) {
@@ -125,7 +125,7 @@ void FilterEvolution_v2::importDirContents(FilterInfo *info, bool root,
 	    if (!root)
                  importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir);
             else 
-                 importMBox(info, dirName + temp_mailfile , temp_mailfile, TQString::null);
+                 importMBox(info, dirName + temp_mailfile , temp_mailfile, TQString());
         }
     }
 
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx
index 2a196156..081a2fda 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cxx
@@ -115,7 +115,7 @@ void FilterKMail_maildir::importDirContents( FilterInfo *info, const TQString& d
 
 
 /**
- * Extract the X-Status flag from a mailfile 
+ * Extract the X-tqStatus flag from a mailfile 
  * @param info Information storage for the operation.
  * @param fileName The full path to the file to import
  */
@@ -136,9 +136,9 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString&
 
                 while ( ! mailfile.atEnd() && mailfile.readLine(input.data(),MAX_LINE) ) {
 
-			if ((seperate = input.data()).left(10) == "X-Status: ") {
+			if ((seperate = input.data()).left(10) == "X-tqStatus: ") {
 				status_flag = seperate;
-				status_flag.remove("X-Status: ");
+				status_flag.remove("X-tqStatus: ");
 				status_flag = status_flag.stripWhiteSpace();
 				// qDebug("status_flag: %s", status_flag.latin1() );
 				break;		
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx
index 4bd3c423..c14d32ad 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cxx
@@ -53,7 +53,7 @@ void FilterLNotes::import(FilterInfo *info) {
     totalFiles = 0;
 
     TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("All Files (*)"),
-                                                           inf->parent() );
+                                                           inf->tqparent() );
     totalFiles = filenames.count();
     inf->setOverall(0);
 
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx
index 901fa698..f1c3bc72 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cxx
@@ -45,7 +45,7 @@ void FilterMailApp::import(FilterInfo *info)
     int overall_status = 0;
     bool first_msg = true;
 
-    TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->parent() );
+    TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->tqparent() );
 
     //qDebug("starting by looking in directory: %s", directory.latin1());
     if ( directory.isEmpty() ) {
@@ -144,8 +144,8 @@ void FilterMailApp::traverseDirectory(FilterInfo *info, const TQString &dirName)
     TQDir dir(dirName);
     dir.setFilter(TQDir::Dirs | TQDir::Files);
 
-    const QFileInfoList *fileinfolist = dir.entryInfoList();
-    QFileInfoListIterator it(*fileinfolist);
+    const TQFileInfoList *fileinfolist = dir.entryInfoList();
+    TQFileInfoListIterator it(*fileinfolist);
     TQFileInfo *fi;
 
     if ( info->shouldTerminate() ) return;
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 61f31339..0a7b08ff 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -45,7 +45,7 @@ void FilterMBox::import(FilterInfo *info)
     int overall_status = 0;
     bool first_msg = true;
 
-    TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->parent() );
+    TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->tqparent() );
     info->setOverall(0);
 
     for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) {
@@ -91,14 +91,14 @@ void FilterMBox::import(FilterInfo *info)
                 while ( ! mbox.atEnd() &&  (l = mbox.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) {
 			tmp.file()->writeBlock( input, l );
 
-			if ((seperate = input.data()).left(10) == "X-Status: ") {
+			if ((seperate = input.data()).left(10) == "X-tqStatus: ") {
 				x_status_flag = seperate;
-				x_status_flag.remove("X-Status: ");
+				x_status_flag.remove("X-tqStatus: ");
 				x_status_flag = x_status_flag.stripWhiteSpace();
 				// qDebug("x_status_flag: %s", x_status_flag.latin1() );		
 			}
 
-			// workaround to fix hang if a corrupted mbox tqcontains some 
+			// workaround to fix hang if a corrupted mbox contains some 
 			// binary data, for more see bug #106796
 			if (mbox.at() == filepos)
 			   mbox.at(mbox.size());
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index c60eced6..fb9d552a 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -55,7 +55,7 @@ FilterOE::~FilterOE()
 void FilterOE::import(FilterInfo *info)
 {
     // Select directory containing plain text emails
-    mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent());
+    mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent());
     if (mailDir.isEmpty()) { // No directory selected
         info->alert(i18n("No directory selected."));
         return;
@@ -167,7 +167,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
 
     // Read the header
     ds >> msgCount >> lastMsgNum >> fileSize;
-    ds.device()->at( ds.device()->at() + 64 ); // Skip 0's
+    ds.tqdevice()->at( ds.tqdevice()->at() + 64 ); // Skip 0's
     kdDebug() << "This mailbox has " << msgCount << " messages" << endl;
     if (msgCount == 0)
         return; // Don't import empty mailbox
@@ -212,9 +212,9 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds)
 {
     // Get item count & offset of index
     TQ_UINT32 itemCount, indexPtr;
-    ds.device()->at(0xc4);
+    ds.tqdevice()->at(0xc4);
     ds >> itemCount;
-    ds.device()->at(0xe4);
+    ds.tqdevice()->at(0xe4);
     ds >> indexPtr;
     kdDebug() << "Item count is " << itemCount << ", Index at " << indexPtr << endl;
 
@@ -223,7 +223,7 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds)
     totalEmails = itemCount;
     currentEmail = 0;
     // Parse the indexes
-    ds.device()->at(indexPtr);
+    ds.tqdevice()->at(indexPtr);
     dbxReadIndex(info, ds, indexPtr);
 }
 
@@ -231,15 +231,15 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     
     if(info->shouldTerminate()) return;
-    TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
+    TQ_UINT32 self, unknown, nextIndexPtr, tqparent, indexCount;
     TQ_UINT8 unknown2, ptrCount;
     TQ_UINT16 unknown3;
-    int wasAt = ds.device()->at();
-    ds.device()->at(filePos);
+    int wasAt = ds.tqdevice()->at();
+    ds.tqdevice()->at(filePos);
 
 
     kdDebug() << "Reading index of file " << folderName << endl;
-    ds >> self >> unknown >> nextIndexPtr >> parent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct
+    ds >> self >> unknown >> nextIndexPtr >> tqparent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct
 
     kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl;
     for (int count = 0; count < ptrCount; count++) {
@@ -260,7 +260,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
         dbxReadIndex(info, ds, nextIndexPtr);
     }
 
-    ds.device()->at(wasAt); // Restore file position to same as when function called
+    ds.tqdevice()->at(wasAt); // Restore file position to same as when function called
 }
 
 void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos)
@@ -268,11 +268,11 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
     TQ_UINT32 curOffset, blockSize;
     TQ_UINT16 unknown;
     TQ_UINT8 count, unknown2;
-    int wasAt = ds.device()->at();
+    int wasAt = ds.tqdevice()->at();
     
     TQString folderEntry[4];
     
-    ds.device()->at(filePos);
+    ds.tqdevice()->at(filePos);
 
     ds >> curOffset >> blockSize >> unknown >> count >> unknown2; // _dbx_email_headerstruct
     kdDebug() << "Data block has " << (int) count << " elements" << endl;
@@ -284,7 +284,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
 
         ds >> type >> value;
         value &= 0xffffff;
-        ds.device()->at(ds.device()->at() - 1); // We only wanted 3 bytes
+        ds.tqdevice()->at(ds.tqdevice()->at() - 1); // We only wanted 3 bytes
 
         if(!currentIsFolderFile) {
             if (type == 0x84) { // It's an email!
@@ -292,12 +292,12 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
                 dbxReadEmail(info, ds, value);
                 ++count0x84;
             } else if( type == 0x04) {
-                int currentFilePos = ds.device()->at();
-                ds.device()->at(filePos + 12 + value + (count*4) );
+                int currentFilePos = ds.tqdevice()->at();
+                ds.tqdevice()->at(filePos + 12 + value + (count*4) );
                 TQ_UINT32 newOFF;
                 ds >> newOFF;
                 kdDebug() << "**** Offset of emaildata (0x04) " <<  newOFF << endl;
-                ds.device()->at(currentFilePos);
+                ds.tqdevice()->at(currentFilePos);
                 dbxReadEmail(info, ds, newOFF);
                 ++count0x04;
             }
@@ -316,7 +316,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
                 folderEntry[2] = TQString::number(value); 
                 
             } else if (type == 0x81) {
-                // kdDebug() << "**** FOLDER: parent ID ****" << endl;
+                // kdDebug() << "**** FOLDER: tqparent ID ****" << endl;
                 folderEntry[3] =  TQString::number(value);
             }
         }
@@ -324,7 +324,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
     if(currentIsFolderFile) {
         folderStructure.append(folderEntry);
     }
-    ds.device()->at(wasAt); // Restore file position to same as when function called
+    ds.tqdevice()->at(wasAt); // Restore file position to same as when function called
 }
 
 void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
@@ -335,8 +335,8 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
     TQ_UINT8 intCount, unknown;
     KTempFile tmp;
     bool _break = false;
-    int wasAt = ds.device()->at();
-    ds.device()->at(filePos);
+    int wasAt = ds.tqdevice()->at();
+    ds.tqdevice()->at(filePos);
 
     do {
         ds >> self >> nextAddressOffset >> blockSize >> intCount >> unknown >> nextAddress; // _dbx_block_hdrstruct
@@ -348,7 +348,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
             _break = true;
             break;
         }
-        ds.device()->at(nextAddress);
+        ds.tqdevice()->at(nextAddress);
     } while (nextAddress != 0);
     tmp.close();
 
@@ -361,7 +361,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
         currentEmail++;
         int currentPercentage = (int) ( ( (float) currentEmail / totalEmails ) * 100 );
         info->setCurrent(currentPercentage);
-        ds.device()->at(wasAt);
+        ds.tqdevice()->at(wasAt);
     }
     tmp.unlink();
 }
@@ -371,18 +371,18 @@ TQString FilterOE::parseFolderString( TQDataStream& ds, int filePos )
 {
     char tmp;
     TQString returnString;
-    int wasAt = ds.device()->at();
-    ds.device()->at(filePos);
+    int wasAt = ds.tqdevice()->at();
+    ds.tqdevice()->at(filePos);
     
     // read while != 0x00
-    while( !ds.device()->atEnd() ) {
-        tmp = ds.device()->getch();
+    while( !ds.tqdevice()->atEnd() ) {
+        tmp = ds.tqdevice()->getch();
         if( tmp != 0x00) {
             returnString += tmp;
         }
         else break;
     }
-    ds.device()->at(wasAt);
+    ds.tqdevice()->at(wasAt);
     return returnString;
 }
 
@@ -410,9 +410,9 @@ TQString FilterOE::getFolderName(TQString filename)
                 }
             } else {
                 TQString _currentID = tmp[2];
-                TQString _parentID = tmp[3];
+                TQString _tqparentID = tmp[3];
                 if(_currentID == search) {
-                    if(_parentID.isEmpty()) { // this is the root of the folder
+                    if(_tqparentID.isEmpty()) { // this is the root of the folder
                         found = true;
                         break;
                     } else {
diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.hxx
index 821aa5df..e0e990c1 100644
--- a/kmailcvt/filter_oe.hxx
+++ b/kmailcvt/filter_oe.hxx
@@ -68,7 +68,7 @@ private: // Private methods
         1. descriptive folder name 
         2. filename 
         3. ID of current folder
-        4. ID of parent folder 
+        4. ID of tqparent folder 
     */
     typedef FolderStructureBase<4> FolderStructure;
     /** matrix with information about the folder structure*/
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx
index 65e2eae4..d584263d 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cxx
@@ -48,7 +48,7 @@ void FilterOpera::import(FilterInfo *info)
         startdir = TQDir::homeDirPath();
     }
 
-    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
+    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
     KFileDialog *kfd;
     kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
@@ -114,7 +114,7 @@ void FilterOpera::import(FilterInfo *info)
                         tmp.file()->writeBlock( input, l );
 
                         while ( ! operaArchiv.atEnd() &&  (l = operaArchiv.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) {
-                            /** remove in KMail unneeded Flags from Opera (for example: X-Opera-Status)*/
+                            /** remove in KMail unneeded Flags from Opera (for example: X-Opera-tqStatus)*/
                             if(seperate.left(8) != "X-Opera-")
                                 tmp.file()->writeBlock( input, l );
                         }
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx
index a5a9f407..bbb32de7 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cxx
@@ -50,7 +50,7 @@ void FilterOutlook::import(FilterInfo *info)
     info->addLog(i18n("No files found for import."));
 
     TQString outlookDir;
-    outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
+    outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
     TQDir importDir (outlookDir);
     TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name);
     for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) {
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx
index 04abea3d..45cdbf88 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cxx
@@ -39,7 +39,7 @@ FilterPlain::~FilterPlain()
 void FilterPlain::import(FilterInfo *info)
 {
     // Select directory containing plain text emails
-    TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent());
+    TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent());
     if (mailDir.isEmpty()) { // No directory selected
         info->alert(i18n("No directory selected."));
         return;
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index 126a6365..f0386d90 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -94,8 +94,8 @@ void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workF
         inf->setFrom(mailfileinfo.fileName());
 
         // Clear the other fields
-        inf->setTo(TQString::null);
-        inf->setCurrent(TQString::null);
+        inf->setTo(TQString());
+        inf->setCurrent(TQString());
         inf->setCurrent(-1);
 
         // call worker function, increase progressbar
@@ -186,7 +186,7 @@ void FilterPMail::importMailFolder(const TQString& file)
                 f.at(f.at() - l + 1); 
             }
             
-            // no problem to loose the last line in file. This only tqcontains a seperate char
+            // no problem to loose the last line in file. This only contains a seperate char
             while ( ! f.atEnd() &&  (l = f.readLine(input.data(),MAX_LINE))) {
                     if (inf->shouldTerminate()){
                         tempfile.close();
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx
index d3ac1e60..86f08ce6 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.hxx
@@ -53,11 +53,11 @@ private:
 
     /** Folder structure here has 5 entries. */
     typedef FolderStructureBase<5> FolderStructure;
-    /** List with the folder matrix, which tqcontains following strings:
+    /** List with the folder matrix, which contains following strings:
 	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
 	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
 	3. "ID:flag:filename" of folder/archiv   
-	4. "ID:name" of parent folder
+	4. "ID:name" of tqparent folder
 	5. name of folder/archiv
     */
     TQValueList<FolderStructure> folderMatrix;
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index 63345f01..9d6b219a 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -166,8 +166,8 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName)
 
 void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict<unsigned long> &dict )
 {
-    /* Each sylpheed mail directory tqcontains a .sylpheed_mark file which
-     * tqcontains all the flags for each messages. The tqlayout of this file
+    /* Each sylpheed mail directory contains a .sylpheed_mark file which
+     * contains all the flags for each messages. The tqlayout of this file
      * is documented in the source code of sylpheed: in procmsg.h for
      * the flag bits, and procmsg.c.
      *
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 98d23cb6..b2e737da 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -157,7 +157,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
         //      if you use readLine() to read from a file with binary data
         //      TQFile::at() and TQFile::atEnd() return wrong value. So we
         //      never get TQFile::atEnd() == true in some cases. This looks
-        //      like a bug in Qt3 maybe fixed in Qt4.
+        //      like a bug in TQt3 maybe fixed in TQt4.
         //
         while((l = tbb.readBlock(input.data(),50)) ) {
             if(info->shouldTerminate()) {
@@ -178,7 +178,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
                 }
             } else {
                 ++count;
-                endOfEmail = (tbb.at() - l + _tmp.find(regexp));
+                endOfEmail = (tbb.at() - l + _tmp.tqfind(regexp));
                 offsets.append(endOfEmail);
             }
         }
@@ -213,7 +213,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
                 tmp.file()->writeBlock( input, endPos-lastPos );
                 tmp.close();
 
-                //KMessageBox::warningContinueCancel(info->parent(), "");
+                //KMessageBox::warningContinueCancel(info->tqparent(), "");
                 if(info->removeDupMsg)
                     addMessage( info, _path, tmp.name() );
                 else
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index c6f3cd09..a058e28d 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -92,7 +92,7 @@ void FilterThunderbird::import(FilterInfo *info)
             if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {}
             else {
                 info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) );
-                importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString::null);
+                importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString());
             }
         }
 
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 1028e69c..02f83097 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -35,9 +35,9 @@
 
 bool FilterInfo::s_terminateASAP = false;
 
-FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* parent , bool _removeDupMsg)
+FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* tqparent , bool _removeDupMsg)
   : m_dlg( dlg ),
-    m_parent( parent )
+    m_tqparent( tqparent )
 {
   removeDupMsg = _removeDupMsg;
   s_terminateASAP = false;
@@ -49,7 +49,7 @@ FilterInfo::~FilterInfo()
 
 void FilterInfo::seStatusMsg( const TQString& status )
 {
-  m_dlg->_texStatus->setText( status );
+  m_dlg->_textqStatus->setText( status );
 }
 
 void FilterInfo::setFrom( const TQString& from )
@@ -92,14 +92,14 @@ void FilterInfo::clear()
   m_dlg->_log->clear();
   setCurrent();
   setOverall();
-  setCurrent( TQString::null );
-  setFrom( TQString::null );
-  setTo( TQString::null );
+  setCurrent( TQString() );
+  setFrom( TQString() );
+  setTo( TQString() );
 }
 
 void FilterInfo::alert( const TQString& message )
 {
-  KMessageBox::information( m_parent, message );
+  KMessageBox::information( m_tqparent, message );
 }
 
 void FilterInfo::terminateASAP()
@@ -136,7 +136,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName,
   msgURL.setPath( msgPath );
 
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
+    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags );
 
@@ -172,7 +172,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
   msgURL.setPath( msgPath );
 
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
+    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags );
   if ( !reply.isValid() )
@@ -200,7 +200,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
 void Filter::showKMailImportArchiveDialog( FilterInfo* info )
 {
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
+    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" );
   if ( !reply.isValid() )
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index b680ab5e..a5f468e4 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -33,7 +33,7 @@
 class FilterInfo
 {
   public:
-    FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg);
+    FilterInfo(KImportPageDlg *dlg, TQWidget *tqparent, bool _removeDupMsg);
    ~FilterInfo();
 
     void seStatusMsg( const TQString& status );
@@ -48,12 +48,12 @@ class FilterInfo
     static void terminateASAP();
     bool shouldTerminate();
 
-    TQWidget *parent() { return m_parent; }
+    TQWidget *tqparent() { return m_tqparent; }
     bool removeDupMsg;
 
   private:
     KImportPageDlg *m_dlg;
-    TQWidget      *m_parent;
+    TQWidget      *m_tqparent;
     static bool s_terminateASAP;
 };
 
@@ -61,7 +61,7 @@ class Filter
 {
   public:
     Filter( const TQString& name, const TQString& author,
-            const TQString& info = TQString::null );
+            const TQString& info = TQString() );
     virtual ~Filter() {}
     virtual void import( FilterInfo* ) = 0;
     TQString author() const { return m_author; }
@@ -91,7 +91,7 @@ class Filter
 
 
 /** 
-* Glorified QString[N] for (a) understandability (b) older gcc compatibility. 
+* Glorified TQString[N] for (a) understandability (b) older gcc compatibility. 
 */
 template <unsigned int size> class FolderStructureBase
 {
@@ -100,7 +100,7 @@ public:
 	/** Constructor. Need a default constructor for TQValueList. */
 	FolderStructureBase() {} ;
 
-	/** Constructor. Turn N QStrings into a folder structure 
+	/** Constructor. Turn N TQStrings into a folder structure 
 	*   description. 
 	*/
 	FolderStructureBase(const NString &s)
@@ -128,7 +128,7 @@ public:
 	*/
 	const TQString operator [](unsigned int i) const
 	{
-	    if (i<size) return d[i]; else return TQString::null;
+	    if (i<size) return d[i]; else return TQString();
 	} ;
 
 	/** Access the different fields, for writing. */
diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp
index 62e5b7de..5c62fb00 100644
--- a/kmailcvt/kimportpage.cpp
+++ b/kmailcvt/kimportpage.cpp
@@ -21,7 +21,7 @@
 
 #include "kimportpage.h"
 
-KImportPage::KImportPage(TQWidget *parent, const char *name ) : KImportPageDlg(parent,name) {
+KImportPage::KImportPage(TQWidget *tqparent, const char *name ) : KImportPageDlg(tqparent,name) {
 
 	mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
 }
diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h
index 0b014824..b7f4de53 100644
--- a/kmailcvt/kimportpage.h
+++ b/kmailcvt/kimportpage.h
@@ -22,8 +22,9 @@
 
 class KImportPage : public KImportPageDlg  {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KImportPage(TQWidget *parent=0, const char *name=0);
+	KImportPage(TQWidget *tqparent=0, const char *name=0);
 	~KImportPage();
 };
 
diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui
index 88366d6b..b0d6e835 100644
--- a/kmailcvt/kimportpagedlg.ui
+++ b/kmailcvt/kimportpagedlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KImportPageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KImportPageDlg</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>mIntroSidebar</cstring>
             </property>
@@ -67,7 +67,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout16</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout90</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
@@ -91,7 +91,7 @@
                                 <string>From:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -99,7 +99,7 @@
                                 <string>To:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -107,9 +107,9 @@
                                 <string>Current:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>_texStatus</cstring>
+                                <cstring>_textqStatus</cstring>
                             </property>
                             <property name="text">
                                 <string>Importing in progress...</string>
@@ -118,7 +118,7 @@
                                 <set>AlignTop</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="1">
+                        <widget class="TQLabel" row="1" column="1">
                             <property name="name">
                                 <cstring>_current</cstring>
                             </property>
@@ -134,7 +134,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="1">
+                        <widget class="TQLabel" row="3" column="1">
                             <property name="name">
                                 <cstring>_to</cstring>
                             </property>
@@ -150,7 +150,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="5" column="0">
+                        <widget class="TQLabel" row="5" column="0">
                             <property name="name">
                                 <cstring>textLabel4</cstring>
                             </property>
@@ -158,7 +158,7 @@
                                 <string>Total:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>_from</cstring>
                             </property>
@@ -174,24 +174,24 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QProgressBar" row="5" column="1">
+                        <widget class="TQProgressBar" row="5" column="1">
                             <property name="name">
                                 <cstring>_done_overall</cstring>
                             </property>
                         </widget>
-                        <widget class="QProgressBar" row="4" column="1">
+                        <widget class="TQProgressBar" row="4" column="1">
                             <property name="name">
                                 <cstring>_done_current</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QListBox">
+                <widget class="TQListBox">
                     <property name="name">
                         <cstring>_log</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 9d5ddbb9..5334ac52 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include "filters.hxx"
 
-KMailCVT::KMailCVT(TQWidget *parent, const char *name)
-	: KWizard(parent, name, true) {
+KMailCVT::KMailCVT(TQWidget *tqparent, const char *name)
+	: KWizard(tqparent, name, true) {
 
 	setCaption( i18n( "KMailCVT Import Tool" ) );
 
@@ -41,9 +41,9 @@ KMailCVT::~KMailCVT() {
 
 void KMailCVT::endImport() {
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
-    KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
+    KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
-  DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call(  "dcopAddMessage", TQString::null, TQString::null, TQString::null);
+  DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call(  "dcopAddMessage", TQString(), TQString(), TQString());
   if ( !reply.isValid() )
     return;
   reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopResetAddMessage" );
diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h
index 34907bcc..e5febb23 100644
--- a/kmailcvt/kmailcvt.h
+++ b/kmailcvt/kmailcvt.h
@@ -27,8 +27,9 @@
 /** KMailCVT is the base class of the project */
 class KMailCVT : public KWizard {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMailCVT(TQWidget* parent=0, const char *name=0);
+	KMailCVT(TQWidget* tqparent=0, const char *name=0);
 	~KMailCVT();
 
 	virtual void next();
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index b8af0d0b..e8a7ce32 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -39,7 +39,7 @@
 
 #include "kselfilterpage.h"
 
-KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) {
+KSelFilterPage::KSelFilterPage(TQWidget *tqparent, const char *name ) : KSelFilterPageDlg(tqparent,name) {
 
 	mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
 	mFilterList.setAutoDelete( TRUE );
diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h
index 1c5908e1..4dc4aa6d 100644
--- a/kmailcvt/kselfilterpage.h
+++ b/kmailcvt/kselfilterpage.h
@@ -25,8 +25,9 @@ template <class T> class TQPtrList;
 
 class KSelFilterPage : public KSelFilterPageDlg  {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KSelFilterPage(TQWidget *parent=0, const char *name=0);
+	KSelFilterPage(TQWidget *tqparent=0, const char *name=0);
 	~KSelFilterPage();
 public:
 	void  addFilter(Filter *f);
diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui
index 80e2eafe..cb2bd5ac 100644
--- a/kmailcvt/kselfilterpagedlg.ui
+++ b/kmailcvt/kselfilterpagedlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KSelFilterPageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KSelFilterPageDlg</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>mIntroSidebar</cstring>
             </property>
@@ -67,7 +67,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout19</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel6</cstring>
                     </property>
@@ -104,7 +104,7 @@ This program will help you import your email from your previous email program in
                     <property name="wordwrap" stdset="0">
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>mFilterCombo</cstring>
                     </property>
@@ -117,7 +117,7 @@ This program will help you import your email from your previous email program in
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>mDesc</cstring>
                     </property>
@@ -125,7 +125,7 @@ This program will help you import your email from your previous email program in
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>remDupMsg</cstring>
                     </property>
diff --git a/kmobile/DESIGN b/kmobile/DESIGN
index 287a3d9a..96dea2b1 100644
--- a/kmobile/DESIGN
+++ b/kmobile/DESIGN
@@ -7,10 +7,10 @@
 
 "kmobile" is suite to easily access "Mobile Devices",
 which means, that you have one single interface to access
-any type of mobile device (e.g. cellular phone, PDAs, 
+any type of mobile tqdevice (e.g. cellular phone, PDAs, 
 MP3-Players, Digital Cameras and a lot more).
 
-Each of this devices have different types of information,
+Each of this tqdevices have different types of information,
 (capatibilities) which can be:
   - An addressbook
   - A collection of notes
@@ -18,28 +18,28 @@ Each of this devices have different types of information,
   - a file storage section (e.g. pictures in digital cameras)
   - and more
  
-The whole interface is pretty extendable. Each device has
-a device driver, which reports the capatibilities of the 
-connected device to the higher level.
-So, if you once write a device driver, you can access it's 
+The whole interface is pretty extendable. Each tqdevice has
+a tqdevice driver, which reports the capatibilities of the 
+connected tqdevice to the higher level.
+So, if you once write a tqdevice driver, you can access it's 
 contents from any KDE application later.
 
 Currently the whole interface is divided into 3 sections:
 
-a) The low-level device driver
+a) The low-level tqdevice driver
 b) A mid-layer, which is realized in the "kmobile" application
 c) A userland library, to which KDE applications should link.
 
 
 Here is some background info:
 
-a) The low-level device driver (libkmobile_xxxx.so)
+a) The low-level tqdevice driver (libkmobile_xxxx.so)
 
 The low-level driver has to be derived from the KMobileDevice class
 (#include <kmobiledevice.h>). The drivers should be located below the
-directory /device, and you can find a sample implementation in
-/device/skeleton-directory. See below for some hints on how to
-write such a device driver.
+directory /tqdevice, and you can find a sample implementation in
+/tqdevice/skeleton-directory. See below for some hints on how to
+write such a tqdevice driver.
 
 
 b) The mid-layer (kmobile)
@@ -47,7 +47,7 @@ b) The mid-layer (kmobile)
 The mid-layer handles the main functionality, which is entirely
 implemented in the kmobile application. All low-level drivers
 are loaded by kmobile only, and then all low-level functions
-to any device is made available to other applications
+to any tqdevice is made available to other applications
 with a DCOP interface. Normal KDE applications should prefer the 
 userland library (see below) instead of using direct DCOP calls.
 Nevertheless, the DCOP interface might be very interesting to write
@@ -56,14 +56,14 @@ standalone command line tools.
 
 c) The userland library (libkmobileclient.so)
 
-Any KDE application which wants to access mobile devices
+Any KDE application which wants to access mobile tqdevices
 should #include <kmobileclient.h> and link to the libkmobileclient.la
 library. libkmobileclient translates all calls to DCOP calls and
-makes accessing mobile devices completely transparent to the
+makes accessing mobile tqdevices completely transparent to the
 application.
 
 One sample program which uses the client library is the kmobile
-kioslave. In Konqueror you might access any mobile device directly
+kioslave. In Konqueror you might access any mobile tqdevice directly
 by giving "mobile:/" as the URL.
 
 
@@ -72,7 +72,7 @@ by giving "mobile:/" as the URL.
 
 HINTS FOR DRIVER DEVELOPERS:
 ----------------------------
-- KMobile device drivers are very similiar to kioslaves. Refer
+- KMobile tqdevice drivers are very similiar to kioslaves. Refer
   at the kioslave documentation if needed.
 
 - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>)
@@ -86,8 +86,8 @@ HINTS FOR DRIVER DEVELOPERS:
   all calls to your driver, so you always will have a clean state
 
 - use lockDevice("/dev/ttyS1") and unlockDevice("/dev/ttyS1") to
-  lock those devices system-wide (creates /var/lock/LCK..<devname> files),
-  and to prevent other applications to access the same physical ports/devices
+  lock those tqdevices system-wide (creates /var/lock/LCK..<devname> files),
+  and to prevent other applications to access the same physical ports/tqdevices
 
 - use the helper functions createDirEntry() and createFileEntry() to
   create the right UDSEntries for listEntries(), stat(), ...
diff --git a/kmobile/TODO b/kmobile/TODO
index f5b209fc..c3cd68d8 100644
--- a/kmobile/TODO
+++ b/kmobile/TODO
@@ -1,7 +1,7 @@
 DONE:
 -----
-- devices:/ kioslave integration
-- show per-device icons in konqueror (same as in the kmobile view)
+- tqdevices:/ kioslave integration
+- show per-tqdevice icons in konqueror (same as in the kmobile view)
 - fix mimetypes and their location under /share/mimelnk
 - kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated)
 - system tray plugin
@@ -10,11 +10,11 @@ DONE:
 TODO:
 -----
 - fix doubled loading of plugins
-- where do I get the device name from the kmobile unique process? 
+- where do I get the tqdevice name from the kmobile unique process? 
 - finish the functions which are available to client apps.
 - kitchensync driver/plugin (starting...)
 - a plugin for the left side of the "Open File Dialog". ->
-  makes direct access to mobile devices really easy
+  makes direct access to mobile tqdevices really easy
 - make the daemon a KDED (KDE Meta Daemon) module (kdelibs/kded/HOWTO, README.kded)
 - more drivers (always)
 
diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop
index adb3c9ab..6e39cce6 100644
--- a/kmobile/devices/digicam/libkmobile_digicam.desktop
+++ b/kmobile/devices/digicam/libkmobile_digicam.desktop
@@ -107,6 +107,6 @@ Comment[uk]=Цей драйвер підтримує багато цифрови
 Comment[zh_CN]=此驱动程�支�许多数�相机
 Comment[zh_TW]=此驅動程�支�許多數�相機
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+ServiceTypes=kdetqdevice/mobiletqdevice
 X-KDE-Library=libkmobile_digicam
 Icon=mobile_camera
diff --git a/kmobile/devices/gammu/libkmobile_gammu.desktop b/kmobile/devices/gammu/libkmobile_gammu.desktop
index 925e6fac..daaa2372 100644
--- a/kmobile/devices/gammu/libkmobile_gammu.desktop
+++ b/kmobile/devices/gammu/libkmobile_gammu.desktop
@@ -57,7 +57,7 @@ Comment[af]=Hierdie drywer ondersteun baie Nokia en ander selfone d.m.v. die gam
 Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно �окиа, чрез библиотеката gammu
 Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gammu biblioteke
 Comment[ca]=Aquest controlador accepta molts NOKIA i d'altres telèfons mòbils mitjançant la biblioteca «gammu»
-Comment[cs]=Tento ovlada� podporuje mnoho mobilních telefonů NOKIA a dalších pomocí knihovny gammu
+Comment[cs]=Tento ovlada� podporuje mnoho mobilních telefonů NOKIA a dalších potqmocí knihovny gammu
 Comment[cy]=Cynhala'r gyrrydd yma lawer o ffoniau NOKIA a ffoniau symudol eraill drwy'r rhaglengell gammu
 Comment[da]=Denne driver understøtter mange NOKIA og andre mobiltelefoner via gammu-biblioteket
 Comment[de]=Ein Treiber, der zahlreiche NOKIA- und sonstige Mobiltelefone über die gammu-Bibliothek unterstützt
@@ -85,11 +85,11 @@ Comment[nds]=Disse Driever ünnerstütt vele Nokia- un anner Mobiltelefonen öve
 Comment[ne]=यो ड�राइभरले गाम� लाइब�रेरीबाट धेरै नोकिया र अन�य मोबाइल फोन समर�थन गर�छ
 Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek
 Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gammu-biblioteket
-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gammu
+Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za potqmocą biblioteki gammu
 Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gammu'
 Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gammu
 Comment[ru]=Этот драйвер поддерживает множе�тво моделей мобильных телефонов Nokia и других производителей через библиотеку gammu
-Comment[sk]=Tento ovláda� podporuje veľa mobilov NOKIA a iných pomocou knižnice gammu
+Comment[sk]=Tento ovláda� podporuje veľa mobilov NOKIA a iných potqmocou knižnice gammu
 Comment[sl]=Ta gonilnik preko knjižnice gammu podpira mnoge prenosne telefone NOKIA kot tudi druge
 Comment[sr]=Овај управљачки програм подржава многе Nokia-ине и друге мобилне телефоне преко библиотеке gammu
 Comment[sr@Latn]=Ovaj upravlja�ki program podržava mnoge Nokia-ine i druge mobilne telefone preko biblioteke gammu
@@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн
 Comment[zh_CN]=此驱动程�通过 gammu 库支�许多诺基亚和其它移动电�
 Comment[zh_TW]=此驅動程�支�許多 NOKIA �其他手機，使用 gammu 函�庫
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+ServiceTypes=kdetqdevice/mobiletqdevice
 X-KDE-Library=libkmobile_gammu
 Icon=mobile_phone
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 0b2889a6..dabccb89 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -56,10 +56,10 @@
 K_EXPORT_COMPONENT_FACTORY( libkmobile_gnokii, KMobileGnokii() )
 
 /* createObject needs to be reimplemented by every KMobileDevice driver */
-TQObject *KMobileGnokii::createObject( TQObject *parent, const char *name,
+TQObject *KMobileGnokii::createObject( TQObject *tqparent, const char *name,
         const char *, const TQStringList &args )
 {
-  return new KMobileGnokii( parent, name, args );
+  return new KMobileGnokii( tqparent, name, args );
 }
 
 
@@ -74,16 +74,16 @@ static gn_calnote_list calnote_list;
 
 
 /**
- *  The KDE gnokii mobile device driver.
+ *  The KDE gnokii mobile tqdevice driver.
  */
 
 KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList &args )
 	: KMobileDevice(obj, name, args)
 {
-  // set initial device info
+  // set initial tqdevice info
   setClassType( Phone );
-  m_deviceName = i18n("Mobile Phone accessed via GNOKII");
-  m_deviceRevision = "";
+  m_tqdeviceName = i18n("Mobile Phone accessed via GNOKII");
+  m_tqdeviceRevision = "";
   m_connectionName = "/dev/ircomm0";
   setCapabilities( hasAddressBook | hasNotes );
 
@@ -148,7 +148,7 @@ bool KMobileGnokii::setGnokiiStateMachine()
 {
   // set the state machine to our configuration
   qstrncpy( state.config.model, m_modelnr.utf8(), sizeof(state.config.model)-1 );
-  qstrncpy( state.config.port_device, m_port.utf8(), sizeof(state.config.port_device)-1 );
+  qstrncpy( state.config.port_tqdevice, m_port.utf8(), sizeof(state.config.port_tqdevice)-1 );
   state.config.connection_type = connectionToValue(m_connection);
   state.config.serial_baudrate = m_baud.toUInt();
   return true;
@@ -206,7 +206,7 @@ bool KMobileGnokii::loadDeviceConfiguration()
 static void busterminate(void)
 {
 	gn_sm_functions(GN_OP_Terminate, NULL, &state);
-	if (lockfile) gn_device_unlock(lockfile);
+	if (lockfile) gn_tqdevice_unlock(lockfile);
 }
 
 static TQString businit(void)
@@ -222,7 +222,7 @@ static TQString businit(void)
 	aux = gn_cfg_get(gn_cfg_info, "global", "use_locking");
 	// Defaults to 'no'
 	if (aux && !strcmp(aux, "yes")) {
-		lockfile = gn_device_lock(state.config.port_device);
+		lockfile = gn_tqdevice_lock(state.config.port_tqdevice);
 		if (lockfile == NULL) {
 			return i18n("Lock file error.\n "
 			"Please exit all other running instances of gnokii and try again.");
@@ -269,7 +269,7 @@ static TQString businit(void)
 
 	PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei);
 
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -282,7 +282,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me
 	memset(memstat, 0, sizeof(*memstat));
 	memstat->memory_type = memtype;
 	data.memory_status = memstat;
-	error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state);
+	error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state);
 	GNOKII_CHECK_ERROR(error);
 	if (error != GN_ERR_NONE) {
 		switch (memtype) {
@@ -378,7 +378,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   // try to split Name into FamilyName and GivenName
   s = TQString(entry.name).simplifyWhiteSpace();
   a->setFormattedName(s);
-  if (s.find(',')!=-1) {
+  if (s.tqfind(',')!=-1) {
   	addrlist = TQStringList::split(',', s);
 	if (addrlist.count()==2) {
 		a->setFamilyName(addrlist[0].simplifyWhiteSpace());
@@ -493,8 +493,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 
 
 
-// connect the device and ask user to turn device on (if necessary)
-bool KMobileGnokii::connectDevice(TQWidget * /*parent*/)
+// connect the tqdevice and ask user to turn tqdevice on (if necessary)
+bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/)
 {
   if (connected())
 	return true;
@@ -505,8 +505,8 @@ bool KMobileGnokii::connectDevice(TQWidget * /*parent*/)
   return m_connected;
 }
 
-// disconnect the device and return true, if sucessful
-bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/)
+// disconnect the tqdevice and return true, if sucessful
+bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/)
 {
   if (!connected())
 	return true;
@@ -517,11 +517,11 @@ bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/)
 }
 
 // provice the own configuration dialog
-bool KMobileGnokii::configDialog(TQWidget *parent)
+bool KMobileGnokii::configDialog(TQWidget *tqparent)
 {
   TQString model, connection, port, baud;
   int ok = 0;
-  GnokiiConfig *dialog = new GnokiiConfig(parent);
+  GnokiiConfig *dialog = new GnokiiConfig(tqparent);
   if (dialog) {
 	dialog->setValues(m_modelnr, m_connection, m_port, m_baud);
 	ok = dialog->exec();
@@ -545,7 +545,7 @@ TQString KMobileGnokii::iconFileName() const
 
 // return a unique ID, e.g. the IMEI number of phones, or a serial number
 // this String is used to have a unique identification for syncronisation.
-TQString KMobileGnokii::deviceUniqueID()
+TQString KMobileGnokii::tqdeviceUniqueID()
 { 
   return TQString("GNOKII-IMEI-%1").arg(TQString::fromLocal8Bit(imei));
 }
@@ -609,7 +609,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
 
 int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
 {
-  /* XXX: this is a read-only device */
+  /* XXX: this is a read-only tqdevice */
   return KIO::ERR_WRITE_ACCESS_DENIED;
 }
 
@@ -619,7 +619,7 @@ int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
  * Calendar support                                                               *
  **********************************************************************************/
 
-static void QDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts )
+static void TQDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts )
 {
   ts.year = qdt.date().year();
   ts.month = qdt.date().month();
@@ -630,7 +630,7 @@ static void QDateTime_2_timestamp( const TQDateTime &qdt, gn_timestamp &ts )
   ts.timezone = 0;
 }
 
-static TQDateTime timestamp_2_QDateTime( const gn_timestamp &ts )
+static TQDateTime timestamp_2_TQDateTime( const gn_timestamp &ts )
 {
   return TQDateTime(	TQDate(ts.year, ts.month, ts.day),
 			TQTime(ts.hour, ts.minute, ts.second)    );
@@ -700,7 +700,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
 
   print_calnote( entry );
 
-  TQDateTime dt_start = timestamp_2_QDateTime(entry.time);
+  TQDateTime dt_start = timestamp_2_TQDateTime(entry.time);
   TQDateTime dt_end = dt_start.addSecs( 60*60 ); // XXX: assume one hour
   event.setDtStart( dt_start );
   event.setDtEnd( dt_end );
@@ -727,7 +727,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
 
   // alarm:
   if (entry.alarm.enabled) {
-    TQDateTime at = timestamp_2_QDateTime(entry.alarm.timestamp);
+    TQDateTime at = timestamp_2_TQDateTime(entry.alarm.timestamp);
     if (at.isValid() && dt_start.isValid()) {
       int seconds = abs(at.secsTo(dt_start));
       seconds %= 60*60*24; /* max. 1 day in advance... */
@@ -779,7 +779,7 @@ int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event )
   error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state);
   // GNOKII_CHECK_ERROR(error);
 
-  QDateTime_2_timestamp( event.dtStart(), entry.time );
+  TQDateTime_2_timestamp( event.dtStart(), entry.time );
   strncpy(entry.text, event.summary().utf8(), sizeof(entry.text)-1);
 
   // type:
@@ -802,12 +802,12 @@ int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event )
 	if (eventalarm) {
 		if (eventalarm->hasTime()) {
 
-		   QDateTime_2_timestamp( eventalarm->time(), entry.alarm.timestamp );
+		   TQDateTime_2_timestamp( eventalarm->time(), entry.alarm.timestamp );
 		} else
 		if (eventalarm->hasStartOffset()) {
 		   TQDateTime dt = event.dtStart();
 		   dt = dt.addSecs(-eventalarm->startOffset().asSeconds());
-		   QDateTime_2_timestamp( dt, entry.alarm.timestamp );
+		   TQDateTime_2_timestamp( dt, entry.alarm.timestamp );
 		}
 	}
   }
@@ -871,7 +871,7 @@ int KMobileGnokii::readNote( int index, TQString &note )
 	"Device Driver  : %4\n"
 	"Device Revision: %5\n")
 	.arg(index).arg(index)
-	.arg(deviceClassName()).arg(deviceName()).arg(revision()); 
+	.arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); 
   return 0;
 }
 
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index 6be2196a..9562c222 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LIBKMOBILE_GNOKII_H
@@ -30,25 +30,26 @@
 class KMobileGnokii : public KMobileDevice
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileGnokii();
 
     // createObject needs to be reimplemented by every KMobileDevice driver
-    TQObject *createObject( TQObject *parent=0, const char *name=0, 
-	const char *classname="TQObject", const TQStringList &args=TQStringList() );
+    TQObject *createObject( TQObject *tqparent=0, const char *name=0, 
+	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
-    bool connectDevice(TQWidget *parent);
-    bool disconnectDevice(TQWidget *parent);
+    bool connectDevice(TQWidget *tqparent);
+    bool disconnectDevice(TQWidget *tqparent);
 
-    // provide a device-specific configure dialog
-    bool configDialog(TQWidget *parent);
+    // provide a tqdevice-specific configure dialog
+    bool configDialog(TQWidget *tqparent);
 
     // filename and path to gnokii-icon
     TQString iconFileName() const;
 
-    TQString deviceUniqueID();
+    TQString tqdeviceUniqueID();
 
     /*
      * Addressbook / Phonebook support
diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp
index 07bc46f4..f5bcd648 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.cpp
+++ b/kmobile/devices/gnokii/gnokiiconfig.cpp
@@ -43,8 +43,8 @@
 #define BAUDRATES	"57600 38400 19200 14400 9600 4800 2400"
 
 
-GnokiiConfig::GnokiiConfig( TQWidget* parent, const char* name, bool modal, WFlags fl )
-	: GnokiiConfigUI(parent, name, modal, fl)
+GnokiiConfig::GnokiiConfig( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+	: GnokiiConfigUI(tqparent, name, modal, fl)
 {
    TQStringList list = TQStringList::split(" ", MODELS);
    cb_Model->insertStringList(list);
@@ -85,7 +85,7 @@ void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &po
 
 void GnokiiConfig::slotCheckValues(const TQString &txt)
 {
-   bool disable_serial = (TQString("infrared irda").find(txt,0,false)>=0);
+   bool disable_serial = (TQString("infrared irda").tqfind(txt,0,false)>=0);
    textLabelBaudRate->setDisabled(disable_serial);
    cb_Baud->setDisabled(disable_serial);
 }
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index 30f548bf..bb6ffe77 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -26,8 +26,9 @@
 class GnokiiConfig : public GnokiiConfigUI
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    GnokiiConfig( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~GnokiiConfig();
 
     void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud);
diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui
index 24b663f8..418cc0a7 100644
--- a/kmobile/devices/gnokii/gnokiiconfigui.ui
+++ b/kmobile/devices/gnokii/gnokiiconfigui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>GnokiiConfigUI</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>GnokiiConfigUI</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -87,7 +87,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -100,7 +100,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QFrame" row="0" column="0">
+        <widget class="TQFrame" row="0" column="0">
             <property name="name">
                 <cstring>frame7</cstring>
             </property>
@@ -122,12 +122,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
                     <property name="text">
-                        <string>Please configure your Gnokii mobile device</string>
+                        <string>Please configure your Gnokii mobile tqdevice</string>
                     </property>
                 </widget>
                 <spacer row="2" column="0">
@@ -147,7 +147,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QFrame" row="1" column="0">
+                <widget class="TQFrame" row="1" column="0">
                     <property name="name">
                         <cstring>frame8</cstring>
                     </property>
@@ -161,12 +161,12 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="3" column="1">
+                        <widget class="TQComboBox" row="3" column="1">
                             <property name="name">
                                 <cstring>cb_Baud</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>cb_Connection</cstring>
                             </property>
@@ -179,7 +179,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="2" column="1">
+                        <widget class="TQComboBox" row="2" column="1">
                             <property name="name">
                                 <cstring>cb_Port</cstring>
                             </property>
@@ -187,7 +187,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="0" column="1">
+                        <widget class="TQComboBox" row="0" column="1">
                             <property name="name">
                                 <cstring>cb_Model</cstring>
                             </property>
@@ -209,7 +209,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -217,7 +217,7 @@
                                 <string>Connection:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
@@ -233,7 +233,7 @@
                                 <string>Phone model:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
@@ -241,7 +241,7 @@
                                 <string>Port:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>textLabelBaudRate</cstring>
                             </property>
diff --git a/kmobile/devices/gnokii/libkmobile_gnokii.desktop b/kmobile/devices/gnokii/libkmobile_gnokii.desktop
index f6ec4b96..986eded0 100644
--- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop
+++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop
@@ -57,7 +57,7 @@ Comment[af]=Hierdie drywer ondersteun baie Nokia en ander selfone d.m.v. die gno
 Comment[bg]=Драйвер за поддръжка на мобилни телефони, предимно �окиа, чрез библиотеката gnokii
 Comment[bs]=Ovaj drajver podržava mnoge NOKIA i druge mobilne telefone putem gnokii biblioteke
 Comment[ca]=Aquest controlador accepta molts NOKIA i d'altres telèfons mòbils mitjançant la biblioteca «gnokii»
-Comment[cs]=Tento ovlada� podporuje mnoho mobilních telefonů NOKIA a dalších pomocí knihovny gnokii
+Comment[cs]=Tento ovlada� podporuje mnoho mobilních telefonů NOKIA a dalších potqmocí knihovny gnokii
 Comment[cy]=Cynhala'r gyrrydd yma lawer o ffoniau NOKIA a ffoniau symudol eraill drwy'r rhaglengell gnokii
 Comment[da]=Denne driver understøtter mange NOKIA og andre mobiltelefoner via gnokii-biblioteket
 Comment[de]=Ein Treiber, der zahlreiche NOKIA- und sonstige Mobiltelefone über die gnokii-Bibliothek unterstützt
@@ -85,11 +85,11 @@ Comment[nds]=Disse Driever ünnerstütt vele Nokia- un anner Mobiltelefonen öve
 Comment[ne]=यो ड�राइभरले जिनोकी लाइब�रेरीबाट धेरै नोकिया र अन�य मोबाइल फोन समर�थन गर�छ
 Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek
 Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gnokii-biblioteket
-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gnokii
+Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za potqmocą biblioteki gnokii
 Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gnokii'
 Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gnokii
 Comment[ru]=Этот драйвер поддерживает множе�тво моделей мобильных телефонов Nokia и других производителей через библиотеку gnokii
-Comment[sk]=Tento ovláda� podporuje veľa mobilov NOKIA a iných pomocou knižnice gnokii
+Comment[sk]=Tento ovláda� podporuje veľa mobilov NOKIA a iných potqmocou knižnice gnokii
 Comment[sl]=Ta gonilnik preko knjižnice gnokii podpira mnoge prenosne telefone NOKIA kot tudi druge
 Comment[sr]=Овај управљачки програм подржава многе Nokia-ине и друге мобилне телефоне преко библиотеке gnokii
 Comment[sr@Latn]=Ovaj upravlja�ki program podržava mnoge Nokia-ine i druge mobilne telefone preko biblioteke gnokii
@@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн
 Comment[zh_CN]=此驱动程�通过 gnokii 库支�许多诺基亚和其它移动电�
 Comment[zh_TW]=此驅動程�支�許多 NOKIA �其他手機，使用 gnokii 函�庫
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+ServiceTypes=kdetqdevice/mobiletqdevice
 X-KDE-Library=libkmobile_gnokii
 Icon=mobile_phone
diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
index 72943d15..2b22ca6e 100644
--- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop
+++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
@@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного при�трою
 Comment[zh_CN]=移动万能设备
 Comment[zh_TW]=行動通訊空殼�置
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+ServiceTypes=kdetqdevice/mobiletqdevice
 X-KDE-Library=libkmobile_skeleton
 Icon=mobile_unknown
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index e6b1d9c5..c027baae 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -35,24 +35,24 @@
 K_EXPORT_COMPONENT_FACTORY( libkmobile_skeleton, KMobileSkeleton() )
 
 /* createObject needs to be reimplemented by every KMobileDevice driver */
-TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name,
+TQObject *KMobileSkeleton::createObject( TQObject *tqparent, const char *name,
         const char *, const TQStringList &args )
 {
-  return new KMobileSkeleton( parent, name, args );
+  return new KMobileSkeleton( tqparent, name, args );
 }
 
 
 /**
- *  The KDE skeleton mobile device driver.
+ *  The KDE skeleton mobile tqdevice driver.
  */
 
 KMobileSkeleton::KMobileSkeleton(TQObject *obj, const char *name, const TQStringList &args )
 	: KMobileDevice(obj, name, args)
 {
-  // set initial device info
+  // set initial tqdevice info
   setClassType( Phone );
-  m_deviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)");
-  m_deviceRevision = "0.1";
+  m_tqdeviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)");
+  m_tqdeviceRevision = "0.1";
   setCapabilities( hasAddressBook | hasNotes );
 }
 
@@ -60,26 +60,26 @@ KMobileSkeleton::~KMobileSkeleton()
 {
 }
 
-// connect the device and ask user to turn device on (if necessary)
-bool KMobileSkeleton::connectDevice(TQWidget *parent)
+// connect the tqdevice and ask user to turn tqdevice on (if necessary)
+bool KMobileSkeleton::connectDevice(TQWidget *tqparent)
 {
-  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent,
-	i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_deviceName),
-	m_deviceClassName ) )
+  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent,
+	i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_tqdeviceName),
+	m_tqdeviceClassName ) )
 	return false;
   // connect it now...
   m_connected = true;
   return m_connected;
 }
 
-// disconnect the device and return true, if sucessful
+// disconnect the tqdevice and return true, if sucessful
 bool KMobileSkeleton::disconnectDevice(TQWidget *)
 {
   m_connected = true;
   return true;
 }
 
-// returns true, if this device is read-only (default: false)
+// returns true, if this tqdevice is read-only (default: false)
 bool KMobileSkeleton::isReadOnly() const
 {
   return true;
@@ -87,7 +87,7 @@ bool KMobileSkeleton::isReadOnly() const
 
 // return a unique ID, e.g. the IMEI number of phones, or a serial number
 // this String is used to have a unique identification for syncronisation.
-TQString KMobileSkeleton::deviceUniqueID()
+TQString KMobileSkeleton::tqdeviceUniqueID()
 { 
   return TQString::fromLocal8Bit("SkElEtOn-123456789");
 }
@@ -132,7 +132,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
 
 int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool )
 {
-  /* this is a read-only device */
+  /* this is a read-only tqdevice */
   return KIO::ERR_WRITE_ACCESS_DENIED;
 }
 
@@ -157,7 +157,7 @@ int KMobileSkeleton::readNote( int index, TQString &note )
 	"Device Driver  : %4\n"
 	"Device Revision: %5\n")
 	.arg(index).arg(index)
-	.arg(deviceClassName()).arg(deviceName()).arg(revision()); 
+	.arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); 
   return 0;
 }
 
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index de57947a..8d5c3db4 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LIBKMOBILE_SKELETON_H
@@ -29,26 +29,27 @@
 class KMobileSkeleton : public KMobileDevice
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileSkeleton();
 
     // createObject needs to be reimplemented by every KMobileDevice driver
-    TQObject *createObject( TQObject *parent=0, const char *name=0,
-	const char *classname="TQObject", const TQStringList &args=TQStringList() );
+    TQObject *createObject( TQObject *tqparent=0, const char *name=0,
+	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
-    bool connectDevice(TQWidget *parent);
-    bool disconnectDevice(TQWidget *parent);
+    bool connectDevice(TQWidget *tqparent);
+    bool disconnectDevice(TQWidget *tqparent);
 
-    // returns true, if this device is read-only (default: false)
+    // returns true, if this tqdevice is read-only (default: false)
     bool isReadOnly() const;
 
     // you may provide your own icon() implementation to display
     // an appropriate Pixmap (e.g. a Palm Pilot or a Zaurus image).
     TQString iconFileName() const;
 
-    TQString deviceUniqueID();
+    TQString tqdeviceUniqueID();
 
     /*
      * Addressbook / Phonebook support
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp
index 5cf5bed5..b22930e2 100644
--- a/kmobile/kioslave/kio_mobile.cpp
+++ b/kmobile/kioslave/kio_mobile.cpp
@@ -78,7 +78,7 @@ KMobileProtocol::~KMobileProtocol()
 }
 
 /*
- * getDeviceAndRessource("mobile:/<devicename>/<resource>/...") - split
+ * getDeviceAndRessource("mobile:/<tqdevicename>/<resource>/...") - split
  */
 int KMobileProtocol::getDeviceAndRessource(const TQString &_path,
 	TQString &devName, TQString &resource, TQString &devPath, 
@@ -87,7 +87,7 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path,
 //  PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").arg(_path);
   TQStringList path = TQStringList::split('/', _path, false);
 
-  devName = resource = devPath = TQString::null;
+  devName = resource = devPath = TQString();
   devCaps = KMobileDevice::hasNothing;
 
   if (path.count() >= 1)  { devName = path[0];  path.pop_front(); };
@@ -120,7 +120,7 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path,
 
 
 static
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null)
+void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
 {
 	KIO::UDSAtom	atom;
 	atom.m_uds = ID;
@@ -227,7 +227,7 @@ void KMobileProtocol::get(const KURL &url)
 
 
 /*
- * listRoot() - gives listing of all devices
+ * listRoot() - gives listing of all tqdevices
  */
 void KMobileProtocol::listRoot(const KURL& url)
 {
@@ -235,8 +235,8 @@ void KMobileProtocol::listRoot(const KURL& url)
 
   KIO::UDSEntry entry;
 
-  TQStringList deviceNames = m_dev.deviceNames();
-  unsigned int dirs = deviceNames.count();
+  TQStringList tqdeviceNames = m_dev.tqdeviceNames();
+  unsigned int dirs = tqdeviceNames.count();
   totalSize(dirs);
 
   int classMask = KMobileDevice::Unclassified;
@@ -251,14 +251,14 @@ void KMobileProtocol::listRoot(const KURL& url)
 
   for (unsigned int i=0; i<dirs; i++) {
 
-	TQString devName = deviceNames[i];
+	TQString devName = tqdeviceNames[i];
 
 	if (classMask != KMobileDevice::Unclassified && 
 	    m_dev.classType(devName) != classMask)
 		continue;	
 
         createDirEntry(entry, devName, "mobile:/"+devName, 
-			KMOBILE_MIMETYPE_DEVICE_KONQUEROR(devName));
+			KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(devName));
         listEntry(entry, false);
 
 	processedSize(i+1);
@@ -307,7 +307,7 @@ TQString KMobileProtocol::entryMimeType(int cap)
 }
 
 /*
- * listTopDeviceDir("mobile:/<devicename>") - sub-directory of a devices
+ * listTopDeviceDir("mobile:/<tqdevicename>") - sub-directory of a tqdevices
  */
 
 void KMobileProtocol::listTopDeviceDir(const TQString &devName)
@@ -334,7 +334,7 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName)
 
 
 /*
- * listEntries("mobile:/<devicename>/<resource>") - resources of a device
+ * listEntries("mobile:/<tqdevicename>/<resource>") - resources of a tqdevice
  */
 void KMobileProtocol::listEntries(const TQString &devName, 
 	const TQString &resource, const TQString &devPath,
@@ -356,7 +356,7 @@ void KMobileProtocol::listEntries(const TQString &devName,
 }
 
 /*
- * listAddressBook("mobile:/<devicename>/Addressbook) - list the addressbook
+ * listAddressBook("mobile:/<tqdevicename>/Addressbook) - list the addressbook
  */
 void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &resource)
 {
@@ -377,7 +377,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r
 #if 0
   	TQString content = m_dev.readAddress(devName, i);
         if ( rx.search( content ) < 0 )
-		name = TQString::null;
+		name = TQString();
 	else
 		name = "_" + rx.cap(1);
 #endif
@@ -405,7 +405,7 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr
 {
   PRINT_DEBUG << TQString("getVCard(%1)\n").arg(path);
 
-  int index = path.find('.');
+  int index = path.tqfind('.');
   if (index>0)
 	index = path.left(index).toInt();
   if (index<0 || index>=m_dev.numAddresses(devName))
@@ -421,7 +421,7 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr
 }
 
 /*
- * listCalendar("mobile:/<devicename>/Calendar) - list the calendar entries
+ * listCalendar("mobile:/<tqdevicename>/Calendar) - list the calendar entries
  */
 void KMobileProtocol::listCalendar( const TQString &devName, const TQString &resource)
 {
@@ -460,7 +460,7 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ
 
 
 /*
- * listNotes("mobile:/<devicename>/Notes) - list the notes
+ * listNotes("mobile:/<tqdevicename>/Notes) - list the notes
  */
 void KMobileProtocol::listNotes( const TQString &devName, const TQString &resource)
 {
@@ -494,7 +494,7 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri
 {
   PRINT_DEBUG << TQString("getNote(%1)\n").arg(path);
 
-  int index = path.find('_');
+  int index = path.tqfind('_');
   if (index>0)
 	index = path.left(index).toInt();
   if (index<0 || index>=m_dev.numNotes(devName))
@@ -510,7 +510,7 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri
 }
 
 /*
- * listFileStorage("mobile:/<devicename>/Files) - list the files on the device
+ * listFileStorage("mobile:/<tqdevicename>/Files) - list the files on the tqdevice
  */
 void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &resource, const TQString &devPath)
 {
@@ -536,7 +536,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result,
 
 
 /**
- * Test if the url tqcontains a directory or a file.
+ * Test if the url contains a directory or a file.
  */
 void KMobileProtocol::stat( const KURL &url )
 {
diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/kioslave/mimetypes/mobile_device.desktop
index 4462b124..a04b0b8f 100644
--- a/kmobile/kioslave/mimetypes/mobile_device.desktop
+++ b/kmobile/kioslave/mimetypes/mobile_device.desktop
@@ -58,7 +58,7 @@ Comment[zh_CN]=移动设备
 Comment[zh_TW]=行動�置
 Icon=kmobile
 Type=MimeType
-MimeType=kdedevice/mobiledevice
+MimeType=kdetqdevice/mobiletqdevice
 Patterns=
 
 X-KDE-AutoEmbed=true
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 07fa1582..a34215e4 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -77,7 +77,7 @@ KMobile::KMobile()
     connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
             this,   TQT_SLOT(changeStatusbar(const TQString&)));
 
-    // restore all configured devices
+    // restore all configured tqdevices
     restoreAll();
 
     // setup the system tray
@@ -105,13 +105,13 @@ void KMobile::setupActions()
     KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     new KAction(i18n("&Add Device..."), "folder_new", 0,
-		this, TQT_SLOT(addDevice()), actionCollection(), "device_add");
-    new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ),
-		"Delete", this,  TQT_SLOT(removeDevice()), actionCollection(), "device_remove");
+		this, TQT_SLOT(addDevice()), actionCollection(), "tqdevice_add");
+    new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this tqdevice") ),
+		"Delete", this,  TQT_SLOT(removeDevice()), actionCollection(), "tqdevice_remove");
     new KAction(i18n("Re&name Device..."), 0, Key_F2,
-		this, TQT_SLOT(renameDevice()), actionCollection(), "device_rename");
+		this, TQT_SLOT(renameDevice()), actionCollection(), "tqdevice_rename");
     new KAction(i18n("&Configure Device..."), "configure", 0,
-		this, TQT_SLOT(configDevice()), actionCollection(), "device_configure");
+		this, TQT_SLOT(configDevice()), actionCollection(), "tqdevice_configure");
 
     createGUI();
 
@@ -240,7 +240,7 @@ void KMobile::optionsPreferences()
 
 void KMobile::renameDevice()
 {
-    // rename the current selected device
+    // rename the current selected tqdevice
     TQIconViewItem *item = m_view->currentItem();
     if (item)
        item->rename();
@@ -258,7 +258,7 @@ void KMobile::addDevice()
 
   dialog->setCaption( i18n("Add New Mobile or Portable Device") );
 
-  dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") );
+  dialog->helpText->setText( i18n("Please select the category to which your new tqdevice belongs:") );
   dialog->addButton->setText( i18n("&Scan for New Devices...") );
   dialog->addButton->setDisabled(true);
   dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
@@ -297,7 +297,7 @@ void KMobile::addDevice()
 
   ptr = list[index];
 
-  // add the new device to the list
+  // add the new tqdevice to the list
   if (!m_view->addNewDevice(m_config, ptr)) {
 	KMessageBox::error(this, 
 		TQString("<qt>KMobile could not load the <b>%1</b> Device Driver.<p>"
@@ -313,34 +313,34 @@ void KMobile::addDevice()
 #if 0
 /*
  * show dialog to user, in which he may choose and select one of the already
- * configured mobile devices.
+ * configured mobile tqdevices.
  */
-KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, 
+KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *tqparent, 
 		enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ )
 {
   int num;
 
-  m_parent = parent;
+  m_tqparent = tqparent;
 
-  // do we already have some devices configured ?
+  // do we already have some tqdevices configured ?
   num = readDevicesList();
   if (!num) {
      int answ;
-     answ = KMessageBox::questionYesNo(parent,
-		i18n( "<qt>You have no mobile devices configured yet.<p>"
-			"Do you want to add a device now ?</qt>" ),
+     answ = KMessageBox::questionYesNo(tqparent,
+		i18n( "<qt>You have no mobile tqdevices configured yet.<p>"
+			"Do you want to add a tqdevice now ?</qt>" ),
 		i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") );
      if (answ != KMessageBox::Yes)
 	return 0L;
-     // add a new device
-     addDeviceDialog(parent);
+     // add a new tqdevice
+     addDeviceDialog(tqparent);
   }
   num = readDevicesList();
   if (!num) 
     return 0L;
 
-  // let the user select one of the configured devices
-  KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent);
+  // let the user select one of the configured tqdevices
+  KMobile_selectiondialog *dialog = new KMobile_selectiondialog(tqparent);
   if (!dialog)
     return 0L;
 
@@ -384,7 +384,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent,
 
 void KMobile::removeDevice()
 {
-    // remove the current selected device
+    // remove the current selected tqdevice
     TQIconViewItem *item = m_view->currentItem();
     if (item)
        m_view->removeDevice( item->text() );
@@ -392,7 +392,7 @@ void KMobile::removeDevice()
 
 void KMobile::configDevice()
 {
-    // configure the current selected device
+    // configure the current selected tqdevice
     TQIconViewItem *item = m_view->currentItem();
     if (item)
        m_view->configDevice( item->text() );
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index 18403ffa..b576352f 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -23,6 +23,7 @@ class SystemTray;
 class KMobile : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui
index f637ca9f..f2e6a5d2 100644
--- a/kmobile/kmobile_selectiondialog.ui
+++ b/kmobile/kmobile_selectiondialog.ui
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout3</cstring>
             </property>
@@ -27,15 +27,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>helpText</cstring>
                     </property>
                     <property name="text">
-                        <string>&lt;b&gt;Select mobile device:&lt;/b&gt;</string>
+                        <string>&lt;b&gt;Select mobile tqdevice:&lt;/b&gt;</string>
                     </property>
                 </widget>
-                <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
+                <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>iconView</cstring>
                     </property>
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 05bcff55..51818553 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -111,7 +111,7 @@ bool KMobileClient::startKMobileApplication()
 	reply >> ret; \
   return ret;
 
-#define RETURN_QSTRING( FUNC, PARAMS ) \
+#define RETURN_TQSTRING( FUNC, PARAMS ) \
   RETURN_TYPE( FUNC, PARAMS, TQString )
 
 #define RETURN_BOOL( FUNC, PARAMS ) \
@@ -122,110 +122,110 @@ bool KMobileClient::startKMobileApplication()
 
 
 
-TQStringList KMobileClient::deviceNames()
+TQStringList KMobileClient::tqdeviceNames()
 {
   if (!isKMobileAvailable())
 	return TQStringList();
-  RETURN_TYPE( "deviceNames()", TQString::tqfromLatin1(""), TQStringList );
+  RETURN_TYPE( "tqdeviceNames()", TQString::tqfromLatin1(""), TQStringList );
 }
 
-void KMobileClient::removeDevice( TQString deviceName )
+void KMobileClient::removeDevice( TQString tqdeviceName )
 {
-  PREPARE( "removeDevice(TQString)", deviceName );
+  PREPARE( "removeDevice(TQString)", tqdeviceName );
   Q_UNUSED(ok);
 }
 
-void KMobileClient::configDevice( TQString deviceName )
+void KMobileClient::configDevice( TQString tqdeviceName )
 {
-  PREPARE( "configDevice(TQString)", deviceName );
+  PREPARE( "configDevice(TQString)", tqdeviceName );
   Q_UNUSED(ok);
 }
 
 
-bool KMobileClient::connectDevice( TQString deviceName )
+bool KMobileClient::connectDevice( TQString tqdeviceName )
 {
-  RETURN_BOOL( "connectDevice(TQString)", deviceName );
+  RETURN_BOOL( "connectDevice(TQString)", tqdeviceName );
 }
 
-bool KMobileClient::disconnectDevice( TQString deviceName )
+bool KMobileClient::disconnectDevice( TQString tqdeviceName )
 {
-  RETURN_BOOL( "disconnectDevice(TQString)", deviceName );
+  RETURN_BOOL( "disconnectDevice(TQString)", tqdeviceName );
 }
 
-bool KMobileClient::connected( TQString deviceName )
+bool KMobileClient::connected( TQString tqdeviceName )
 {
-  RETURN_BOOL( "connected(TQString)", deviceName );
+  RETURN_BOOL( "connected(TQString)", tqdeviceName );
 }
 
 
-TQString KMobileClient::deviceClassName( TQString deviceName )
+TQString KMobileClient::tqdeviceClassName( TQString tqdeviceName )
 {
-  RETURN_QSTRING( "deviceClassName(TQString)", deviceName );
+  RETURN_TQSTRING( "tqdeviceClassName(TQString)", tqdeviceName );
 }
 
-TQString KMobileClient::deviceName( TQString deviceName )
+TQString KMobileClient::tqdeviceName( TQString tqdeviceName )
 {
-  RETURN_QSTRING( "deviceName(TQString)", deviceName );
+  RETURN_TQSTRING( "tqdeviceName(TQString)", tqdeviceName );
 }
 
-TQString KMobileClient::revision( TQString deviceName )
+TQString KMobileClient::revision( TQString tqdeviceName )
 {
-  RETURN_QSTRING( "revision(TQString)", deviceName );
+  RETURN_TQSTRING( "revision(TQString)", tqdeviceName );
 }
 
-int KMobileClient::classType( TQString deviceName )
+int KMobileClient::classType( TQString tqdeviceName )
 {
-  RETURN_INT( "classType(TQString)", deviceName );
+  RETURN_INT( "classType(TQString)", tqdeviceName );
 }
 
-int KMobileClient::capabilities( TQString deviceName )
+int KMobileClient::capabilities( TQString tqdeviceName )
 {
-  RETURN_INT( "capabilities(TQString)", deviceName );
+  RETURN_INT( "capabilities(TQString)", tqdeviceName );
 }
 
-TQString KMobileClient::nameForCap( TQString deviceName, int cap )
+TQString KMobileClient::nameForCap( TQString tqdeviceName, int cap )
 {
-  RETURN_QSTRING( "nameForCap(TQString,int)", deviceName << cap );
+  RETURN_TQSTRING( "nameForCap(TQString,int)", tqdeviceName << cap );
 }
 
-TQString KMobileClient::iconFileName( TQString deviceName )
+TQString KMobileClient::iconFileName( TQString tqdeviceName )
 {
-  RETURN_QSTRING( "iconFileName(TQString)", deviceName );
+  RETURN_TQSTRING( "iconFileName(TQString)", tqdeviceName );
 }
 
-int KMobileClient::numAddresses( TQString deviceName )
+int KMobileClient::numAddresses( TQString tqdeviceName )
 {
-  RETURN_INT( "numAddresses(TQString)", deviceName );
+  RETURN_INT( "numAddresses(TQString)", tqdeviceName );
 }
 
-TQString KMobileClient::readAddress( TQString deviceName, int index )
+TQString KMobileClient::readAddress( TQString tqdeviceName, int index )
 {
-  RETURN_QSTRING( "readAddress(TQString,int)", deviceName << index );
+  RETURN_TQSTRING( "readAddress(TQString,int)", tqdeviceName << index );
 }
 
-bool KMobileClient::storeAddress( TQString deviceName, int index, TQString vcard, bool append )
+bool KMobileClient::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append )
 {
-  RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", deviceName << index << vcard << append );
+  RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", tqdeviceName << index << vcard << append );
 }
 
-int KMobileClient::numCalendarEntries( TQString deviceName )
+int KMobileClient::numCalendarEntries( TQString tqdeviceName )
 {
-  RETURN_INT( "numCalendarEntries(TQString)", deviceName );
+  RETURN_INT( "numCalendarEntries(TQString)", tqdeviceName );
 }
 
-int KMobileClient::numNotes( TQString deviceName )
+int KMobileClient::numNotes( TQString tqdeviceName )
 {
-  RETURN_INT( "numNotes(TQString)", deviceName );
+  RETURN_INT( "numNotes(TQString)", tqdeviceName );
 }
 
-TQString KMobileClient::readNote( TQString deviceName, int index )
+TQString KMobileClient::readNote( TQString tqdeviceName, int index )
 {
-  RETURN_QSTRING( "readNote(TQString,int)", deviceName << index );
+  RETURN_TQSTRING( "readNote(TQString,int)", tqdeviceName << index );
 }
 
-bool KMobileClient::storeNote( TQString deviceName, int index, TQString note )
+bool KMobileClient::storeNote( TQString tqdeviceName, int index, TQString note )
 {
-  RETURN_BOOL( "storeNote(TQString,int,TQString)", deviceName << index << note );
+  RETURN_BOOL( "storeNote(TQString,int,TQString)", tqdeviceName << index << note );
 }
 
 
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index 8ad6204a..1a813a45 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -11,6 +11,7 @@
 class KDE_EXPORT KMobileClient : public DCOPClient
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KMobileClient();
     virtual ~KMobileClient();
@@ -23,34 +24,34 @@ public:
     /**
      * DCOP implementation
      */
-    TQStringList deviceNames();
+    TQStringList tqdeviceNames();
 
-    void removeDevice( TQString deviceName );
-    void configDevice( TQString deviceName );
+    void removeDevice( TQString tqdeviceName );
+    void configDevice( TQString tqdeviceName );
 
-    bool connectDevice( TQString deviceName );
-    bool disconnectDevice( TQString deviceName );
-    bool connected( TQString deviceName );
+    bool connectDevice( TQString tqdeviceName );
+    bool disconnectDevice( TQString tqdeviceName );
+    bool connected( TQString tqdeviceName );
 
-    TQString deviceClassName( TQString deviceName );
-    TQString deviceName( TQString deviceName );
-    TQString revision( TQString deviceName );
-    int classType( TQString deviceName );
+    TQString tqdeviceClassName( TQString tqdeviceName );
+    TQString tqdeviceName( TQString tqdeviceName );
+    TQString revision( TQString tqdeviceName );
+    int classType( TQString tqdeviceName );
 
-    int capabilities( TQString deviceName );
-    TQString nameForCap( TQString deviceName, int cap );
+    int capabilities( TQString tqdeviceName );
+    TQString nameForCap( TQString tqdeviceName, int cap );
 
-    TQString iconFileName( TQString deviceName );
+    TQString iconFileName( TQString tqdeviceName );
 
-    int     numAddresses( TQString deviceName );
-    TQString readAddress( TQString deviceName, int index );
-    bool    storeAddress( TQString deviceName, int index, TQString vcard, bool append );
+    int     numAddresses( TQString tqdeviceName );
+    TQString readAddress( TQString tqdeviceName, int index );
+    bool    storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append );
 
-    int numCalendarEntries( TQString deviceName );
+    int numCalendarEntries( TQString tqdeviceName );
 
-    int numNotes( TQString deviceName );
-    TQString readNote( TQString deviceName, int index );
-    bool storeNote( TQString deviceName, int index, TQString note );
+    int numNotes( TQString tqdeviceName );
+    TQString readNote( TQString tqdeviceName, int index );
+    bool storeNote( TQString tqdeviceName, int index, TQString note );
 
 private:
     TQCString m_clientAppId;
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index cfcbf6e8..9fdddf6f 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -44,7 +44,7 @@
 #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: "
 
 /**
- *  The base plugin class of all mobile device drivers.
+ *  The base plugin class of all mobile tqdevice drivers.
  */
 
 KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList &args)
@@ -53,8 +53,8 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList
 {
   setClassType(Unclassified);
   setCapabilities(hasNothing);
-  m_deviceName = i18n("Unknown Device");
-  m_deviceRevision = i18n("n/a");  /* not available */
+  m_tqdeviceName = i18n("Unknown Device");
+  m_tqdeviceRevision = i18n("n/a");  /* not available */
   m_connectionName = i18n("Unknown Connection");
 
   // set the config file name
@@ -78,20 +78,20 @@ bool KMobileDevice::connected()
 }
 
 // returns e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
-TQString KMobileDevice::deviceClassName() const
+TQString KMobileDevice::tqdeviceClassName() const
 {
-  return m_deviceClassName;
+  return m_tqdeviceClassName;
 }
 
-// returns real device name, e.g. "Nokia 6310" or "Rio MP3 Player"
-TQString KMobileDevice::deviceName() const
+// returns real tqdevice name, e.g. "Nokia 6310" or "Rio MP3 Player"
+TQString KMobileDevice::tqdeviceName() const
 {
-  return m_deviceName;
+  return m_tqdeviceName;
 }
 
 TQString KMobileDevice::revision() const
 {
-  return m_deviceRevision;
+  return m_tqdeviceRevision;
 }
 
 bool KMobileDevice::isSlowDevice() const
@@ -104,18 +104,18 @@ bool KMobileDevice::isReadOnly() const
   return false;
 }
 
-bool KMobileDevice::configDialog( TQWidget *parent )
+bool KMobileDevice::configDialog( TQWidget *tqparent )
 {
-  KMessageBox::information( parent,
-		i18n("This device does not need any configuration."),
-		deviceName() );
+  KMessageBox::information( tqparent,
+		i18n("This tqdevice does not need any configuration."),
+		tqdeviceName() );
   return true;
 }
 
 void KMobileDevice::setClassType( enum ClassType ct )
 {
   m_classType = ct;
-  m_deviceClassName = defaultClassName(ct);
+  m_tqdeviceClassName = defaultClassName(ct);
 }
 
 enum KMobileDevice::ClassType KMobileDevice::classType() const
@@ -239,11 +239,11 @@ int KMobileDevice::storeNote( int, const TQString & )
 
 /*
  * File storage support
- * @param fileName  path and name of a file in the mobile device, e.g. "/MYFILE.TXT", "/mp3/song1.mp3"
+ * @param fileName  path and name of a file in the mobile tqdevice, e.g. "/MYFILE.TXT", "/mp3/song1.mp3"
  */
 
 static
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null)
+void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
 {
 	KIO::UDSAtom atom;
 	atom.m_uds = ID;
@@ -282,64 +282,64 @@ void KMobileDevice::createFileEntry(KIO::UDSEntry& entry, const TQString& name,
 
 void KMobileDevice::listDir( const TQString & )
 {
-  emit error(KIO::ERR_CANNOT_ENTER_DIRECTORY,TQString::null);
+  emit error(KIO::ERR_CANNOT_ENTER_DIRECTORY,TQString());
 }
 
 void KMobileDevice::mkdir( const TQString &, int )
 {
-  emit error(KIO::ERR_COULD_NOT_MKDIR, TQString::null);
+  emit error(KIO::ERR_COULD_NOT_MKDIR, TQString());
 }
 
 void KMobileDevice::rename( const TQString &, const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::symlink( const TQString &, const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::del( const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::stat( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::chmod( const TQString &, int )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::get( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::put( const TQString &, int, bool, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::mimetype( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::special( const TQByteArray & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString::null);
+  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 
 
 
 /*
- * device locking/unlocking functions
+ * tqdevice locking/unlocking functions
  */
 
 #ifdef HAVE_BAUDBOY_H
@@ -374,7 +374,7 @@ void KMobileDevice::special( const TQByteArray & )
 
 #define DEVICE_LOCK_PATH_PREFIX "/var/lock/LCK.."
 
-bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason)
+bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason)
 {
 #ifdef HAVE_BAUDBOY_H
   return ttylock(device.local8bit()) == EXIT_SUCCESS;
@@ -383,9 +383,9 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason)
   return !dev_lock(device.local8bit());
 # else
   int pid = -1;
-  TQStringList all = TQStringList::split('/', device);
+  TQStringList all = TQStringList::split('/', tqdevice);
   if (!all.count()) {
-	err_reason = i18n("Invalid device (%1)").arg(device);
+	err_reason = i18n("Invalid tqdevice (%1)").arg(tqdevice);
 	return false;
   }
   TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1];
@@ -410,12 +410,12 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason)
 	sleep(1);
 	if (!file.remove()) {
 		PRINT_DEBUG << TQString("Overriding failed, please check the permissions\n");
-		PRINT_DEBUG << TQString("Cannot lock device %1\n").arg(device);
+		PRINT_DEBUG << TQString("Cannot lock tqdevice %1\n").arg(tqdevice);
 		err_reason = i18n("Lockfile %1 is stale. Please check permissions.").arg(lockName);
 		return false;
 	}
      } else {
-	err_reason = i18n("Device %1 already locked.").arg(device);
+	err_reason = i18n("Device %1 already locked.").arg(tqdevice);
 	return false;
     }
   }
@@ -424,7 +424,7 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason)
   int fd = open(lockName.local8Bit(), O_CREAT | O_EXCL | O_WRONLY, 0644);
   if (fd == -1) {
 	if (errno == EEXIST)
-		err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(device);
+		err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(tqdevice);
 	else if (errno == EACCES)
 		err_reason = i18n("Please check permission on lock directory.");
 	else if (errno == ENOENT)
@@ -439,16 +439,16 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason)
   close(fd);
 
   PRINT_DEBUG << TQString("%1: Device %2 locked with lockfile %3.\n")
-	.arg(deviceName()).arg(device).arg(lockName);
+	.arg(tqdeviceName()).arg(tqdevice).arg(lockName);
 
-  err_reason = TQString::null;
+  err_reason = TQString();
 
   return true;
 # endif
 #endif
 }
 
-bool KMobileDevice::unlockDevice(const TQString &device)
+bool KMobileDevice::unlockDevice(const TQString &tqdevice)
 {
 #ifdef HAVE_BAUDBOY_H
   return ttyunlock(device.local8bit()) == EXIT_SUCCESS;
@@ -456,7 +456,7 @@ bool KMobileDevice::unlockDevice(const TQString &device)
 # ifdef HAVE_LOCKDEV_H
   return 0 <= dev_unlock(device.local8bit(), getpid());
 # else
-  TQStringList all = TQStringList::split('/', device);
+  TQStringList all = TQStringList::split('/', tqdevice);
   if (!all.count()) return false;
   TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1];
   TQFile file(lockName);
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 04bd10d2..16e12aad 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -37,24 +37,24 @@
 
 class KConfig;
 
-#define KMOBILE_MIMETYPE_DEVICE			"kdedevice/mobiledevice"
-#define KMOBILE_MIMETYPE_DEVICE_KONQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name)
+#define KMOBILE_MIMETYPE_DEVICE			"kdetqdevice/mobiletqdevice"
+#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").arg(name)
 #define KMOBILE_MIMETYPE_INODE			"inode/"
 #define KMOBILE_ICON_UNKNOWN			"mobile_unknown"
 
 /**
- * @short Represents the base class for dynamically loaded mobile device drivers.
+ * @short Represents the base class for dynamically loaded mobile tqdevice drivers.
  *
- * KMobileDevice is the base class for all hardware device drivers.
+ * KMobileDevice is the base class for all hardware tqdevice drivers.
  * Every derived class has to add additional functionality.
  *
  * For a KMobileSomeDevice driver you have to write the following code:
  * <pre>
- * K_EXPORT_COMPONENT_FACTORY( libkmobile_somedevice, KMobileSomeDevice() );
- * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name,
+ * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() );
+ * TQObject *KMobileSomeDevice::createObject( TQObject *tqparent, const char *name,
  *      const char *, const TQStringList &args )
  * {
- *    return new KMobileSomeDevice( parent, name, args );
+ *    return new KMobileSomeDevice( tqparent, name, args );
  * }
  * </pre>
  *
@@ -65,13 +65,14 @@ class KConfig;
 class KDE_EXPORT KMobileDevice : public KLibFactory
 {
 Q_OBJECT
+  TQ_OBJECT
     friend class KMobileView;
 
 public:
     /**
      * Construct a new KMobileDevice.
      *
-     * @param obj The parent object. This is usually 0.
+     * @param obj The tqparent object. This is usually 0.
      * @param name The object name. For session management and window management to work.
      * @param args Additional commandline parameters - the first entry has the config file name.
      */
@@ -82,46 +83,46 @@ public:
     /**
      * Connect to the device.
      *
-     * @param parent The parent widget. It will be used as parent for message boxes.
+     * @param tqparent The tqparent widget. It will be used as tqparent for message boxes.
      */
-    virtual bool connectDevice( TQWidget *parent = 0 ) = 0;
+    virtual bool connectDevice( TQWidget *tqparent = 0 ) = 0;
 
     /**
      * Disconnect from the device.
      *
-     * @param parent The parent widget. It will be used as parent for message boxes.
+     * @param tqparent The tqparent widget. It will be used as tqparent for message boxes.
      */
-    virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0;
+    virtual bool disconnectDevice( TQWidget *tqparent = 0 ) = 0;
 
     /**
-     * Returns true, if the device is currently connected and the link is online.
+     * Returns true, if the tqdevice is currently connected and the link is online.
      */
     virtual bool connected();
 
     /**
-     * Returns the classname, to which the device belongs. Examples are e.g.
+     * Returns the classname, to which the tqdevice belongs. Examples are e.g.
      *  "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
      */
-    virtual TQString deviceClassName() const;
+    virtual TQString tqdeviceClassName() const;
 
     /**
-     * Returns the real devices name, e.g. "Nokia 6310" or "Rio MP3 Player"
+     * Returns the real tqdevices name, e.g. "Nokia 6310" or "Rio MP3 Player"
      */
-    virtual TQString deviceName() const;
+    virtual TQString tqdeviceName() const;
 
     /**
-     * Returns the hardware revision of the devices, e.g. "Revision 1.2"
+     * Returns the hardware revision of the tqdevices, e.g. "Revision 1.2"
      */
     virtual TQString revision() const;
 
     /**
-     * Returns an unique ID for the device, e.g. IMEI number on phones, or serial number.
+     * Returns an unique ID for the tqdevice, e.g. IMEI number on phones, or serial number.
      * The returned String is used to have a unique identification for syncronisation.
      */
-    virtual TQString deviceUniqueID() = 0;
+    virtual TQString tqdeviceUniqueID() = 0;
 
     /**
-     * Returns true, if the device is connected via a slow connection.
+     * Returns true, if the tqdevice is connected via a slow connection.
      * Good examples for slow connections are serial or infrared ports.
      */
     virtual bool isSlowDevice() const;
@@ -132,11 +133,11 @@ public:
     virtual bool isReadOnly() const;
 
     /**
-     * Pop-up a device-specific configuration dialog.
+     * Pop-up a tqdevice-specific configuration dialog.
      *
-     * @param parent The parent widget. It will be used as parent for the configuration dialog.
+     * @param tqparent The tqparent widget. It will be used as tqparent for the configuration dialog.
      */
-    virtual bool configDialog(TQWidget *parent);
+    virtual bool configDialog(TQWidget *tqparent);
 
     // The ClassType may be used e.g. to select an suitable icon
     enum ClassType {
@@ -157,14 +158,14 @@ public:
     static TQString defaultIconFileName( ClassType ct = Unclassified );
     static TQString defaultClassName( ClassType ct = Unclassified );
 
-    // The capabilities of this device (bitmapped value)
+    // The capabilities of this tqdevice (bitmapped value)
     enum Capabilities {
 	hasNothing     = 0,	// not supported
 	hasAddressBook = 1,	// mobile phones, organizers, ...
 	hasCalendar    = 2,	// organizers, mobile phones, ...
 	hasNotes       = 4,	// organizers, mobile phones, ...
 	hasFileStorage = 8,	// organizers, handhelds, mp3-player, ...
-	hasAnyCapability = 0xffff // used to select devices independent of the capatibilities
+	hasAnyCapability = 0xffff // used to select tqdevices independent of the capatibilities
     };
     int capabilities() const;
     const TQString nameForCap(int cap) const;
@@ -205,7 +206,7 @@ public:
      */
 
     /**
-     * helper functions for the kmobile device drivers
+     * helper functions for the kmobile tqdevice drivers
      */
     void createDirEntry(KIO::UDSEntry& entry, const TQString& name,
 		const TQString& url, const TQString& mime) const;
@@ -316,7 +317,7 @@ public:
 signals:
     /**
      * Call this from stat() to express details about an object, the
-     * UDSEntry customarily tqcontains the atoms describing file name, size,
+     * UDSEntry customarily contains the atoms describing file name, size,
      * mimetype, etc.
      * @param _entry The UDSEntry containing all of the object attributes.
      */
@@ -447,9 +448,9 @@ signals:
      * @return a button code, as defined in KMessageBox, or 0 on communication error.
      */
     int messageBox( MessageBoxType type, const TQString &text,
-                    const TQString &caption = TQString::null,
-                    const TQString &buttonYes = TQString::null,
-                    const TQString &buttonNo = TQString::null );
+                    const TQString &caption = TQString(),
+                    const TQString &buttonYes = TQString(),
+                    const TQString &buttonNo = TQString() );
 
     /**
      * Call this in @ref #get and @ref #copy, to give the total size
@@ -469,7 +470,7 @@ signals:
     void connectionChanged( bool conn_established );
 
 protected:
-    // only available to sub-classed device drivers:
+    // only available to sub-classed tqdevice drivers:
     void setClassType( enum ClassType ct );
     void setCapabilities( int caps );
     KConfig *config() const { return m_config; };
@@ -477,21 +478,21 @@ protected:
 
 
     /**
-     * Lock/Unlock serial ports and other devices
-     * @param device Name of a device port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0)
-     * Returns true, if device could be locked or unlocked
+     * Lock/Unlock serial ports and other tqdevices
+     * @param tqdevice Name of a tqdevice port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0)
+     * Returns true, if tqdevice could be locked or unlocked
      */
-    bool lockDevice(const TQString &device, TQString &err_reason);
-    bool unlockDevice(const TQString &device);
+    bool lockDevice(const TQString &tqdevice, TQString &err_reason);
+    bool unlockDevice(const TQString &tqdevice);
 
 protected:
-    TQMutex  m_mutex;		// mutex to syncronize DCOP accesses to this device
+    TQMutex  m_mutex;		// mutex to syncronize DCOP accesses to this tqdevice
     TQString m_configFileName;
-    KConfig *m_config;		// this is where this device should store it's configuration
+    KConfig *m_config;		// this is where this tqdevice should store it's configuration
     enum ClassType m_classType;
-    TQString m_deviceClassName;	// e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
-    TQString m_deviceName;	// e.g. "Nokia 6310", "Opie"
-    TQString m_deviceRevision;	// e.g. "Revision 1.2" or "n/a"
+    TQString m_tqdeviceClassName;	// e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
+    TQString m_tqdeviceName;	// e.g. "Nokia 6310", "Opie"
+    TQString m_tqdeviceRevision;	// e.g. "Revision 1.2" or "n/a"
     TQString m_connectionName;	// e.g. "IRDA", "USB", "Cable", "gnokii", "gammu", ...
     int m_caps;			// see enum Capabilities
     bool m_connected;
diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h
index 60974b26..5d39f236 100644
--- a/kmobile/kmobileiface.h
+++ b/kmobile/kmobileiface.h
@@ -16,40 +16,40 @@ class kmobileIface : virtual public DCOPObject
 public:
 
 k_dcop:
-    virtual TQStringList deviceNames() = 0;
+    virtual TQStringList tqdeviceNames() = 0;
 
-    virtual void removeDevice( TQString deviceName ) = 0;
-    virtual void configDevice( TQString deviceName ) = 0;
+    virtual void removeDevice( TQString tqdeviceName ) = 0;
+    virtual void configDevice( TQString tqdeviceName ) = 0;
 
-    virtual bool connectDevice( TQString deviceName ) = 0;
-    virtual bool disconnectDevice( TQString deviceName ) = 0;
-    virtual bool connected( TQString deviceName ) = 0;
+    virtual bool connectDevice( TQString tqdeviceName ) = 0;
+    virtual bool disconnectDevice( TQString tqdeviceName ) = 0;
+    virtual bool connected( TQString tqdeviceName ) = 0;
 
-    virtual TQString deviceClassName( TQString deviceName ) = 0;
-    virtual TQString deviceName( TQString deviceName ) = 0;
-    virtual TQString revision( TQString deviceName ) = 0;
-    virtual int classType( TQString deviceName ) = 0;
+    virtual TQString tqdeviceClassName( TQString tqdeviceName ) = 0;
+    virtual TQString tqdeviceName( TQString tqdeviceName ) = 0;
+    virtual TQString revision( TQString tqdeviceName ) = 0;
+    virtual int classType( TQString tqdeviceName ) = 0;
 
-    virtual int capabilities( TQString deviceName ) = 0;
-    virtual TQString nameForCap( TQString deviceName, int cap ) = 0;
+    virtual int capabilities( TQString tqdeviceName ) = 0;
+    virtual TQString nameForCap( TQString tqdeviceName, int cap ) = 0;
 
-    virtual TQString iconFileName( TQString deviceName ) = 0;
+    virtual TQString iconFileName( TQString tqdeviceName ) = 0;
 
-    virtual int     numAddresses( TQString deviceName ) = 0;
-    virtual TQString readAddress( TQString deviceName, int index ) = 0;
-    virtual bool    storeAddress( TQString deviceName, int index, TQString vcard, bool append ) = 0;
+    virtual int     numAddresses( TQString tqdeviceName ) = 0;
+    virtual TQString readAddress( TQString tqdeviceName, int index ) = 0;
+    virtual bool    storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) = 0;
 
-    virtual int numCalendarEntries( TQString deviceName ) = 0;
+    virtual int numCalendarEntries( TQString tqdeviceName ) = 0;
 
-    virtual int numNotes( TQString deviceName ) = 0;
-    virtual TQString readNote( TQString deviceName, int index ) = 0;
-    virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0;
+    virtual int numNotes( TQString tqdeviceName ) = 0;
+    virtual TQString readNote( TQString tqdeviceName, int index ) = 0;
+    virtual bool storeNote( TQString tqdeviceName, int index, TQString note ) = 0;
 
     /*
-     * DCOP functions for the devices:/ kioslave
+     * DCOP functions for the tqdevices:/ kioslave
      */
 k_dcop:
-    virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0;
+    virtual TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) = 0;
 };
 
 #endif // _KMOBILEIFACE_H_
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 3780c980..0ea93353 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -29,17 +29,17 @@
 
 #define PRINT_DEBUG kdDebug() << "KMobileItem: "
 
-KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr service)
-	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
+KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr service)
+	: TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L)
 {
    config = _config;
 
    Q_CHECK_PTR(service);
    if (service) {
 	setText(service->name());
-	m_deviceDesktopFile = service->desktopEntryName();
-	m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text());
-	m_deviceConfigFile = m_deviceConfigFile.tqreplace(' ', "");
+	m_tqdeviceDesktopFile = service->desktopEntryName();
+	m_tqdeviceConfigFile = TQString("kmobile_%1_rc").arg(text());
+	m_tqdeviceConfigFile = m_tqdeviceConfigFile.tqreplace(' ', "");
 	m_iconName = service->icon();
    };
 
@@ -51,8 +51,8 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser
 }
 
 /* restore this item from the config file */
-KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, int reload_index)
-	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
+KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, int reload_index)
+	: TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L)
 {
    config = _config;
 
@@ -75,8 +75,8 @@ void KMobileItem::configSave() const
 {
    config->setGroup( config_SectionName() );
    config->writeEntry( "Name", text() );
-   config->writeEntry( "Config", m_deviceConfigFile );
-   config->writeEntry( "DesktopFile", m_deviceDesktopFile );
+   config->writeEntry( "Config", m_tqdeviceConfigFile );
+   config->writeEntry( "DesktopFile", m_tqdeviceDesktopFile );
    config->writeEntry( "IconName", m_iconName );
    config->sync();
 }
@@ -85,12 +85,12 @@ bool KMobileItem::configLoad(int idx)
 {
    config->setGroup( config_SectionName(idx) );
    setText( config->readEntry("Name") );
-   m_deviceConfigFile	= config->readEntry( "Config" );
-   m_deviceDesktopFile	= config->readEntry( "DesktopFile" );
+   m_tqdeviceConfigFile	= config->readEntry( "Config" );
+   m_tqdeviceDesktopFile	= config->readEntry( "DesktopFile" );
    m_iconName		= config->readEntry( "IconName" );
 
-   if (text().isEmpty() || m_deviceConfigFile.isEmpty() ||
-	m_deviceDesktopFile.isEmpty() || m_iconName.isEmpty() )
+   if (text().isEmpty() || m_tqdeviceConfigFile.isEmpty() ||
+	m_tqdeviceDesktopFile.isEmpty() || m_iconName.isEmpty() )
 	return false;
 
    return true;
@@ -110,7 +110,7 @@ TQString KMobileItem::config_SectionName(int idx) const
 /* this MimeType is used by konqueror */
 TQString KMobileItem::getKonquMimeType() const
 {
-   return KMOBILE_MIMETYPE_DEVICE_KONQUEROR(text());
+   return KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(text());
 }
 
 /* provide MimeType for konqueror */
@@ -120,12 +120,12 @@ void KMobileItem::writeKonquMimeFile() const
    TQString icon = m_iconName;
    int p = icon.findRev('/');
    if (p>=0) icon = icon.mid(p+1);
-   p = icon.find('.');
+   p = icon.tqfind('.');
    if (p>=0) icon = icon.left(p);
 
    TQString comment;
    if (m_dev)
-	comment = m_dev->deviceClassName();
+	comment = m_dev->tqdeviceClassName();
    if (comment.isEmpty())
 	comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified);
 
@@ -142,7 +142,7 @@ void KMobileItem::writeKonquMimeFile() const
 
 
 /*
- * get a list of all services providing a libkmobile device driver
+ * get a list of all services providing a libkmobile tqdevice driver
  */
 KTrader::OfferList KMobileItem::getMobileDevicesList()
 {
@@ -158,16 +158,16 @@ KService::Ptr KMobileItem::getServicePtr() const
   KService::Ptr ptr;
   for ( it = list.begin(); it != list.end(); ++it ) {
     KService::Ptr ptr = *it;
-    if (ptr->desktopEntryName() == m_deviceDesktopFile)
+    if (ptr->desktopEntryName() == m_tqdeviceDesktopFile)
  	return ptr;
   }
   PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n")
-			.arg(m_deviceDesktopFile);
+			.arg(m_tqdeviceDesktopFile);
   return 0L;
 }
 
 /*
- * loads & initializes the device and returns a pointer to it.
+ * loads & initializes the tqdevice and returns a pointer to it.
  */
 bool KMobileItem::driverAvailable()
 {
@@ -184,9 +184,9 @@ bool KMobileItem::driverAvailable()
 	return false;
 
    m_dev = static_cast<KMobileDevice *>(factory->create(this, ptr->name().utf8(),
-				"KMobileDevice", TQStringList(m_deviceConfigFile)));
+				"KMobileDevice", TQStringList(m_tqdeviceConfigFile)));
    PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n")
-			.arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile);
+			.arg((unsigned long)m_dev, 0, 16).arg(m_tqdeviceConfigFile);
 
    return (m_dev != 0);
 }
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index 2977fda7..cfbca72c 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -13,10 +13,11 @@
 class KMobileItem : public TQObject, public TQIconViewItem 
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class KMobileView;
 public:
-    KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service);
-    KMobileItem(TQIconView *parent, KConfig *config, int reload_index);
+    KMobileItem(TQIconView *tqparent, KConfig *config, KService::Ptr service);
+    KMobileItem(TQIconView *tqparent, KConfig *config, int reload_index);
     virtual ~KMobileItem();
 
     void configSave() const;
@@ -43,8 +44,8 @@ private slots:
 private:
     KConfig *config;
 
-    TQString m_deviceConfigFile;
-    TQString m_deviceDesktopFile;
+    TQString m_tqdeviceConfigFile;
+    TQString m_tqdeviceDesktopFile;
 
     TQString m_iconName;
 };
diff --git a/kmobile/kmobileui.rc b/kmobile/kmobileui.rc
index 95af1dd3..9b259334 100644
--- a/kmobile/kmobileui.rc
+++ b/kmobile/kmobileui.rc
@@ -8,22 +8,22 @@
   </Menu>
   <Menu name="Device">
     <text>&amp;Device</text>
-    <Action name="device_add" />
-    <Action name="device_remove" />
+    <Action name="tqdevice_add" />
+    <Action name="tqdevice_remove" />
     <Separator/>
-    <Action name="device_rename" />
-    <Action name="device_changeicon" />
+    <Action name="tqdevice_rename" />
+    <Action name="tqdevice_changeicon" />
     <Separator/>
-    <Action name="device_configure" />
+    <Action name="tqdevice_configure" />
   </Menu>
  </MenuBar>
  <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >
   <text>Main Toolbar</text>
   <Action name="file_save" />
   <Separator/>
-  <Action name="device_add" />
-  <Action name="device_remove" />
+  <Action name="tqdevice_add" />
+  <Action name="tqdevice_remove" />
   <Separator/>
-  <Action name="device_configure"/>
+  <Action name="tqdevice_configure"/>
  </ToolBar>
 </kpartgui>
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 616b9edc..7a83f52e 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -32,8 +32,8 @@
 #include "kmobileitem.h"
 
 
-KMobileView::KMobileView(TQWidget *parent, KConfig *_config)
-    : DCOPObject("kmobileIface"), TQIconView(parent)
+KMobileView::KMobileView(TQWidget *tqparent, KConfig *_config)
+    : DCOPObject("kmobileIface"), TQIconView(tqparent)
 {
    m_config = _config;
    setSelectionMode(TQIconView::Single);
@@ -49,7 +49,7 @@ KMobileView::~KMobileView()
 
 bool KMobileView::addNewDevice(KConfig *config, KService::Ptr service)
 {
-   kdDebug() << "New mobile device item:\n";
+   kdDebug() << "New mobile tqdevice item:\n";
    kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n")
 		.arg(service->library()).arg(service->name()).arg(service->icon())
 		.arg(service->comment());
@@ -89,10 +89,10 @@ void KMobileView::restoreAll()
    emit signalChangeStatusbar( i18n("Configuration restored") );
 }
 
-KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const
+KMobileItem *KMobileView::findDevice( const TQString &tqdeviceName ) const
 {
    for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) {
-	if (item->text() == deviceName)
+	if (item->text() == tqdeviceName)
 		return static_cast<KMobileItem *>(item);
    }
    return 0L;
@@ -119,7 +119,7 @@ void KMobileView::slotDoubleClicked( TQIconViewItem * item )
 #define MUTEX_UNLOCK(dev)  dev->m_mutex.unlock(); }
 
 
-TQStringList KMobileView::deviceNames()
+TQStringList KMobileView::tqdeviceNames()
 {
    TQStringList names;
    for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) {
@@ -128,15 +128,15 @@ TQStringList KMobileView::deviceNames()
    return names;
 }
 
-void KMobileView::removeDevice( TQString deviceName )
+void KMobileView::removeDevice( TQString tqdeviceName )
 {
-   delete findDevice(deviceName);
-   emit signalChangeStatusbar( i18n("%1 removed").arg(deviceName) );
+   delete findDevice(tqdeviceName);
+   emit signalChangeStatusbar( i18n("%1 removed").arg(tqdeviceName) );
 }
 
-void KMobileView::configDevice( TQString deviceName )
+void KMobileView::configDevice( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return;
    MUTEX_LOCK(dev->m_dev);
@@ -145,9 +145,9 @@ void KMobileView::configDevice( TQString deviceName )
 }
 
 
-bool KMobileView::connectDevice( TQString deviceName )
+bool KMobileView::connectDevice( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return false;
    bool connected;
@@ -155,14 +155,14 @@ bool KMobileView::connectDevice( TQString deviceName )
    connected = dev->m_dev->connectDevice();
    MUTEX_UNLOCK(dev->m_dev);
    emit signalChangeStatusbar(
-	connected ? i18n("Connection to %1 established").arg(deviceName)
-	          : i18n("Connection to %1 failed").arg(deviceName) );
+	connected ? i18n("Connection to %1 established").arg(tqdeviceName)
+	          : i18n("Connection to %1 failed").arg(tqdeviceName) );
    return connected;
 }
 
-bool KMobileView::disconnectDevice( TQString deviceName )
+bool KMobileView::disconnectDevice( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return true;
    bool disconnected;
@@ -170,14 +170,14 @@ bool KMobileView::disconnectDevice( TQString deviceName )
    disconnected = dev->m_dev->disconnectDevice();
    MUTEX_UNLOCK(dev->m_dev);
    emit signalChangeStatusbar(
-	disconnected ? i18n("%1 disconnected").arg(deviceName)
-	             : i18n("Disconnection of %1 failed").arg(deviceName) );
+	disconnected ? i18n("%1 disconnected").arg(tqdeviceName)
+	             : i18n("Disconnection of %1 failed").arg(tqdeviceName) );
    return disconnected;
 }
 
-bool KMobileView::connected( TQString deviceName )
+bool KMobileView::connected( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return false;
    bool conn;
@@ -188,35 +188,35 @@ bool KMobileView::connected( TQString deviceName )
 }
 
 
-TQString KMobileView::deviceClassName( TQString deviceName )
+TQString KMobileView::tqdeviceClassName( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
    TQString cn;
    MUTEX_LOCK(dev->m_dev);
-   cn = dev->m_dev->deviceClassName();
+   cn = dev->m_dev->tqdeviceClassName();
    MUTEX_UNLOCK(dev->m_dev);
    return cn;
 }
 
-TQString KMobileView::deviceName( TQString deviceName )
+TQString KMobileView::tqdeviceName( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
    TQString dn;
    MUTEX_LOCK(dev->m_dev);
-   dn = dev->m_dev->deviceName();
+   dn = dev->m_dev->tqdeviceName();
    MUTEX_UNLOCK(dev->m_dev);
    return dn;
 }
 
-TQString KMobileView::revision( TQString deviceName )
+TQString KMobileView::revision( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
    TQString rev;
    MUTEX_LOCK(dev->m_dev);
    rev = dev->m_dev->revision();
@@ -224,9 +224,9 @@ TQString KMobileView::revision( TQString deviceName )
    return rev;
 }
 
-int KMobileView::classType( TQString deviceName )
+int KMobileView::classType( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return KMobileDevice::Unclassified;
    int ct;
@@ -236,9 +236,9 @@ int KMobileView::classType( TQString deviceName )
    return ct;
 }
 
-int KMobileView::capabilities( TQString deviceName )
+int KMobileView::capabilities( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return KMobileDevice::hasNothing;
    int cap;
@@ -248,11 +248,11 @@ int KMobileView::capabilities( TQString deviceName )
    return cap;
 }
 
-TQString KMobileView::nameForCap( TQString deviceName, int cap )
+TQString KMobileView::nameForCap( TQString tqdeviceName, int cap )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
    TQString nc;
    MUTEX_LOCK(dev->m_dev);
    nc = dev->m_dev->nameForCap(cap);
@@ -260,11 +260,11 @@ TQString KMobileView::nameForCap( TQString deviceName, int cap )
    return nc;
 }
 
-TQString KMobileView::iconFileName( TQString deviceName )
+TQString KMobileView::iconFileName( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
    TQString fn;
    MUTEX_LOCK(dev->m_dev);
    fn = dev->m_dev->iconFileName();
@@ -272,9 +272,9 @@ TQString KMobileView::iconFileName( TQString deviceName )
    return fn;
 }
 
-int KMobileView::numAddresses( TQString deviceName )
+int KMobileView::numAddresses( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return 0;
    int num;
@@ -284,11 +284,11 @@ int KMobileView::numAddresses( TQString deviceName )
    return num;
 }
 
-TQString KMobileView::readAddress( TQString deviceName, int index )
+TQString KMobileView::readAddress( TQString tqdeviceName, int index )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
 
    int err;
    KABC::Addressee adr;
@@ -296,22 +296,22 @@ TQString KMobileView::readAddress( TQString deviceName, int index )
    err = dev->m_dev->readAddress(index, adr);
    MUTEX_UNLOCK(dev->m_dev);
    if (err)
-	return TQString::null;
+	return TQString();
 
    KABC::VCardConverter converter;
    TQString str = converter.createVCard(adr);
    if (str.isEmpty())
-        return TQString::null;
+        return TQString();
 
    emit signalChangeStatusbar( i18n("Read addressbook entry %1 from %2")
-		.arg(index).arg(deviceName) );
+		.arg(index).arg(tqdeviceName) );
 
    return str;
 }
 
-bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, bool append )
+bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return false;
 
@@ -325,14 +325,14 @@ bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard,
    err = dev->m_dev->storeAddress(index, adr, append);
    MUTEX_UNLOCK(dev->m_dev);
    emit signalChangeStatusbar(
-	err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(deviceName)
-	    : i18n("Contact %1 stored on %2").arg(index).arg(deviceName) );
+	err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(tqdeviceName)
+	    : i18n("Contact %1 stored on %2").arg(index).arg(tqdeviceName) );
    return (err == 0);
 }
 
-int KMobileView::numCalendarEntries( TQString deviceName )
+int KMobileView::numCalendarEntries( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return 0;
    int num;
@@ -342,9 +342,9 @@ int KMobileView::numCalendarEntries( TQString deviceName )
    return num;
 }
 
-int KMobileView::numNotes( TQString deviceName )
+int KMobileView::numNotes( TQString tqdeviceName )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return 0;
    int num;
@@ -354,11 +354,11 @@ int KMobileView::numNotes( TQString deviceName )
    return num;
 }
 
-TQString KMobileView::readNote( TQString deviceName, int index )
+TQString KMobileView::readNote( TQString tqdeviceName, int index )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
-	return TQString::null;
+	return TQString();
 
    TQString note;
    int err;
@@ -366,15 +366,15 @@ TQString KMobileView::readNote( TQString deviceName, int index )
    err = dev->m_dev->readNote(index, note);
    MUTEX_UNLOCK(dev->m_dev);
    if (err)
-	return TQString::null;
+	return TQString();
    emit signalChangeStatusbar( i18n("Read note %1 from %2")
-		.arg(index).arg(deviceName) );
+		.arg(index).arg(tqdeviceName) );
    return note;
 }
 
-bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
+bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note )
 {
-   KMobileItem *dev = findDevice(deviceName);
+   KMobileItem *dev = findDevice(tqdeviceName);
    if (!dev || !dev->driverAvailable())
 	return false;
 
@@ -385,28 +385,28 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
    if (err)
 	return false;
    emit signalChangeStatusbar( i18n("Stored note %1 to %2")
-		.arg(index).arg(deviceName) );
+		.arg(index).arg(tqdeviceName) );
    return true;
 }
 
 
 
 /*
- * DCOP Implementation for the devices:/ kioslave
+ * DCOP Implementation for the tqdevices:/ kioslave
  */
 
 /*
- * returns the information for the given deviceName for usage in the
- * the devices kioslave. The TQStringList returned is comparable to the
- * format of /etc/fstab file. Please refer to the devices kioslave for
+ * returns the information for the given tqdeviceName for usage in the
+ * the tqdevices kioslave. The TQStringList returned is comparable to the
+ * format of /etc/fstab file. Please refer to the tqdevices kioslave for
  * further information.
- * If deviceName is empty, this functions returns information for all
- * active mobile devices.
- * (function is only used by the devices kioslave - don't use elsewhere !)
+ * If tqdeviceName is empty, this functions returns information for all
+ * active mobile tqdevices.
+ * (function is only used by the tqdevices kioslave - don't use elsewhere !)
  */
-TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
+TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName)
 {
-   TQStringList mobiles = deviceNames();
+   TQStringList mobiles = tqdeviceNames();
    if (mobiles.count() == 0)
 	return mobiles;
 
@@ -414,10 +414,10 @@ TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
    for ( TQStringList::Iterator it = mobiles.begin(); it != mobiles.end(); ++it ) {
 	TQString name = *it;
 
-	if (deviceName.isEmpty())
+	if (tqdeviceName.isEmpty())
 		mountList << name;
 	else
-		if (deviceName!=name)
+		if (tqdeviceName!=name)
 			continue;
 
 	KMobileItem *dev = findDevice(name);
@@ -429,7 +429,7 @@ TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
 	mountList << mime;
 	mountList << "true"; // mountState
 	mountList << "---";
-	if (!deviceName.isEmpty())
+	if (!tqdeviceName.isEmpty())
 		break;
    }
    return mountList;
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index 079eaf92..bcbfd4e1 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -23,8 +23,9 @@ class KMobileItem;
 class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMobileView(TQWidget *parent, KConfig *_config);
+    KMobileView(TQWidget *tqparent, KConfig *_config);
     virtual ~KMobileView();
 
     bool addNewDevice(KConfig *config, KService::Ptr service);
@@ -33,44 +34,44 @@ public:
     /**
      * DCOP implementation
      */
-    TQStringList deviceNames();
+    TQStringList tqdeviceNames();
 
-    void removeDevice( TQString deviceName );
-    void configDevice( TQString deviceName );
+    void removeDevice( TQString tqdeviceName );
+    void configDevice( TQString tqdeviceName );
 
-    bool connectDevice( TQString deviceName );
-    bool disconnectDevice( TQString deviceName );
-    bool connected( TQString deviceName );
+    bool connectDevice( TQString tqdeviceName );
+    bool disconnectDevice( TQString tqdeviceName );
+    bool connected( TQString tqdeviceName );
 
-    TQString deviceClassName( TQString deviceName );
-    TQString deviceName( TQString deviceName );
-    TQString revision( TQString deviceName );
-    int classType( TQString deviceName );
+    TQString tqdeviceClassName( TQString tqdeviceName );
+    TQString tqdeviceName( TQString tqdeviceName );
+    TQString revision( TQString tqdeviceName );
+    int classType( TQString tqdeviceName );
 
-    int capabilities( TQString deviceName );
-    TQString nameForCap( TQString deviceName, int cap );
+    int capabilities( TQString tqdeviceName );
+    TQString nameForCap( TQString tqdeviceName, int cap );
 
-    TQString iconFileName( TQString deviceName );
+    TQString iconFileName( TQString tqdeviceName );
 
-    int     numAddresses( TQString deviceName );
-    TQString readAddress( TQString deviceName, int index );
-    bool    storeAddress( TQString deviceName, int index, TQString vcard, bool append );
+    int     numAddresses( TQString tqdeviceName );
+    TQString readAddress( TQString tqdeviceName, int index );
+    bool    storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append );
 
-    int numCalendarEntries( TQString deviceName );
+    int numCalendarEntries( TQString tqdeviceName );
 
-    int numNotes( TQString deviceName );
-    TQString readNote( TQString deviceName, int index );
-    bool storeNote( TQString deviceName, int index, TQString note );
+    int numNotes( TQString tqdeviceName );
+    TQString readNote( TQString tqdeviceName, int index );
+    bool storeNote( TQString tqdeviceName, int index, TQString note );
 
-    /* devices kioslave support: */
-    TQStringList kio_devices_deviceInfo(TQString deviceName);
+    /* tqdevices kioslave support: */
+    TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName);
 
 public:
     void saveAll();
     void restoreAll();
 
 protected:
-    KMobileItem * findDevice( const TQString &deviceName ) const;
+    KMobileItem * findDevice( const TQString &tqdeviceName ) const;
 
 protected slots:
     void slotDoubleClicked( TQIconViewItem * item );
diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop
index b6444d2a..dedeb370 100644
--- a/kmobile/libkmobile.desktop
+++ b/kmobile/libkmobile.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=kdedevice/mobiledevice
+X-KDE-ServiceType=kdetqdevice/mobiletqdevice
 Name=KDE Mobile Device Lowlevel Hardware Driver
 Name[af]=KDE draagbare toestel laevlak hardeware toestel
 Name[bs]=KDE hardverski drajver niskog nivoa za mobilne uređaje
@@ -28,11 +28,11 @@ Name[kk]=KDE-нің қалта құрылғы жабдықтың төмен де
 Name[km]=កម្មវិធី​បញ្ជា​ផ្នែករឹង​កម្រិ�​ទាប​របស់​ឧបករណ�​ចល�� KDE
 Name[lt]=KDE mobiliųjų įrenginių žemo lygmens aparatinės įrangos tvarkyklė
 Name[ms]=Pemacu Perkakasan Tahap Rendah Peranti Mudah Alih KDE 
-Name[nb]=KDE lavnivå maskinvaredriver for mobile enheter
+Name[nb]=KDE lavnivå tqmaskinvaredriver for mobile enheter
 Name[nds]=Sietstoop-Driever för Mobilreedschappen
 Name[ne]=केडीई मोबाइल यन�त�रको न�यूनस�तर हार�डवेयर ड�राइभर
 Name[nl]=Hardware-stuurprogramma voor mobiele apparaten
-Name[nn]=Lågnivå maskinvaredrivar for mobileiningar i KDE
+Name[nn]=Lågnivå tqmaskinvaredrivar for mobileiningar i KDE
 Name[pl]=Niskopoziomowy sterownik sprzętu urządzenia przenośnego dla KDE
 Name[pt]=Controlador de Baixo-Nível de Dispositivos Móveis do KDE
 Name[pt_BR]=Driver de Hardware de Baixo Nível de Dispositivos Móveis do KDE
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index 1b03f971..c9d7d124 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 
 static const char description[] =
-    I18N_NOOP("KDE mobile devices manager");
+    I18N_NOOP("KDE mobile tqdevices manager");
 
 static const char version[] = "0.1";
 
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index 2bb90744..a6d11335 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -24,8 +24,8 @@ KMobilePreferences::KMobilePreferences()
     m_pageTwo = new KMobilePrefPageTwo(frame);
 }
 
-KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
-    : TQFrame(parent)
+KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent)
+    : TQFrame(tqparent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
@@ -33,8 +33,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
     new TQLabel(i18n("Add something here"), this);
 }
 
-KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent)
-    : TQFrame(parent)
+KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *tqparent)
+    : TQFrame(tqparent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
diff --git a/kmobile/pref.h b/kmobile/pref.h
index 0b6415a3..64157108 100644
--- a/kmobile/pref.h
+++ b/kmobile/pref.h
@@ -14,6 +14,7 @@ class KMobilePrefPageTwo;
 class KMobilePreferences : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KMobilePreferences();
 
@@ -22,18 +23,20 @@ private:
     KMobilePrefPageTwo *m_pageTwo;
 };
 
-class KMobilePrefPageOne : public QFrame
+class KMobilePrefPageOne : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMobilePrefPageOne(TQWidget *parent = 0);
+    KMobilePrefPageOne(TQWidget *tqparent = 0);
 };
 
-class KMobilePrefPageTwo : public QFrame
+class KMobilePrefPageTwo : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMobilePrefPageTwo(TQWidget *parent = 0);
+    KMobilePrefPageTwo(TQWidget *tqparent = 0);
 };
 
 #endif // _KMOBILEPREF_H_
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index 01f21c8a..e40dff64 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -35,7 +35,7 @@
 #include "kmobileview.h"
 
 
-SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name)
+SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tqparent, name)
 
 {
     m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small);
@@ -43,8 +43,8 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare
 
     setToolTip();
 
-    m_actionCollection = parent->actionCollection();
-    KAction *addAction = m_actionCollection->action("device_add");
+    m_actionCollection = tqparent->actionCollection();
+    KAction *addAction = m_actionCollection->action("tqdevice_add");
     
     KPopupMenu* menu = contextMenu();
     addAction->plug(menu);
@@ -60,15 +60,15 @@ SystemTray::~SystemTray()
 
 void SystemTray::contextMenuAboutToShow(KPopupMenu *menu)
 {
-    KMobile *main = static_cast<KMobile *>(parent());
+    KMobile *main = static_cast<KMobile *>(tqparent());
 
     const int pos = 3;
     while (menu->idAt(pos)>=SYSTEMTRAY_STARTID &&
 	   menu->idAt(pos)<=(SYSTEMTRAY_STARTID+1000))
 	menu->removeItemAt(pos);
 
-    // create menu entries for each mobile device and add it's icon
-    TQStringList list = main->mainView()->deviceNames();
+    // create menu entries for each mobile tqdevice and add it's icon
+    TQStringList list = main->mainView()->tqdeviceNames();
     for (unsigned int no=0; no<list.count(); no++) {
 	TQString devName = list[no];
         TQString iconName = main->mainView()->iconFileName(devName);
@@ -84,7 +84,7 @@ void SystemTray::menuItemSelected()
     if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000)
 	return;
     TQString devName = contextMenu()->text(m_menuID);
-    KMobile *main = static_cast<KMobile *>(parent());
+    KMobile *main = static_cast<KMobile *>(tqparent());
     main->mainView()->startKonqueror(devName);
 }
 
diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h
index 4fdef04c..dce84617 100644
--- a/kmobile/systemtray.h
+++ b/kmobile/systemtray.h
@@ -28,9 +28,10 @@ class KAction;
 class SystemTray : public KSystemTray
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SystemTray(KMainWindow *parent = 0, const char *name = 0);
+    SystemTray(KMainWindow *tqparent = 0, const char *name = 0);
     virtual ~SystemTray();
 
 protected slots:
@@ -41,7 +42,7 @@ protected:
     void contextMenuAboutToShow( KPopupMenu* menu );
 
 private:
-    void setToolTip(const TQString &tip = TQString::null);
+    void setToolTip(const TQString &tip = TQString());
 
     TQPixmap m_appPix;
     TQLabel *m_currentLabel;
diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp
index e8ff8558..5d6d1752 100644
--- a/kmobile/testlibkmobile.cpp
+++ b/kmobile/testlibkmobile.cpp
@@ -25,16 +25,16 @@ int main(int argc, char **argv)
 
     TQCString replyType;
     TQByteArray replyData;
-    ok = client->call("kmobile", "kmobileIface", "deviceNames()", data, replyType, replyData);
+    ok = client->call("kmobile", "kmobileIface", "tqdeviceNames()", data, replyType, replyData);
 
     TQDataStream reply(replyData, IO_ReadOnly); 
-    TQStringList deviceNames; 
-    reply >> deviceNames;
+    TQStringList tqdeviceNames; 
+    reply >> tqdeviceNames;
 
     kdDebug() << TQString("%1\n").arg(ok?"Ok":"Failure");
-    kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(deviceNames.count());
-    for (int i=0; i<deviceNames.count(); i++)
-      kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(deviceNames[i]);
+    kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(tqdeviceNames.count());
+    for (int i=0; i<tqdeviceNames.count(); i++)
+      kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(tqdeviceNames[i]);
 
   //  return app.exec();
 }
diff --git a/knode/ChangeLog b/knode/ChangeLog
index f9585f5f..646df19d 100644
--- a/knode/ChangeLog
+++ b/knode/ChangeLog
@@ -130,7 +130,7 @@ changes between 0.1.13 and 0.3.2
 - ability to display attachments inline
 - posting of MIME multipart-messages (attachments)
 - significantly improved composer:
-  + all standard editor features (find, replace, select all, ...)
+  + all standard editor features (tqfind, tqreplace, select all, ...)
   + spellchecker
   + optional external editor
   + nice attachment handling
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 491d2c9b..301c9bb5 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -75,11 +75,11 @@ using namespace KNode;
 
 TQValueList<ArticleWidget*> ArticleWidget::mInstances;
 
-ArticleWidget::ArticleWidget( TQWidget *parent,
+ArticleWidget::ArticleWidget( TQWidget *tqparent,
                               KXMLGUIClient *guiClient,
                               KActionCollection *actionCollection,
                               const char *name ) :
-  TQWidget( parent, name ),
+  TQWidget( tqparent, name ),
   mArticle( 0 ),
   mViewer( 0 ),
   mCSSHelper( 0 ),
@@ -139,7 +139,7 @@ void ArticleWidget::initActions()
   mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrint()), mActionCollection );
   mCopySelectionAction = KStdAction::copy( this, TQT_SLOT(slotCopySelection()), mActionCollection );
   mSelectAllAction = KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), mActionCollection );
-  mFindAction = KStdAction::find( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
+  mFindAction = KStdAction::tqfind( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
   mFindAction->setText( i18n("F&ind in Article...") );
   mViewSourceAction = new KAction( i18n("&View Source"),  Key_V , this,
     TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" );
@@ -374,7 +374,7 @@ void ArticleWidget::displayArticle()
   mViewer->view()->ensureVisible( 0, 0 );
 
   if ( !mArticle->hasContent() ) {
-    displayErrorMessage( i18n("The article tqcontains no data.") );
+    displayErrorMessage( i18n("The article contains no data.") );
     return;
   }
 
@@ -410,12 +410,12 @@ void ArticleWidget::displayArticle()
   // signature, we show a nice header:
   TQPtrList<Kpgp::Block> pgpBlocks;
   TQStrList nonPgpBlocks;
-  bool tqcontainsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
+  bool containsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
 
   mViewer->write ( html );
   html = TQString();
 
-  if ( tqcontainsPGP ) {
+  if ( containsPGP ) {
     TQPtrListIterator<Kpgp::Block> pbit( pgpBlocks );
     TQStrListIterator npbit( nonPgpBlocks );
     TQTextCodec *codec;
@@ -490,7 +490,7 @@ void ArticleWidget::displayArticle()
       }
     }
     else {
-      if ( !tqcontainsPGP ) {
+      if ( !containsPGP ) {
         TQStringList lines;
         text->decodedText( lines, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() );
         displayBodyBlock( lines );
@@ -535,7 +535,7 @@ void ArticleWidget::displayErrorMessage( const TQString &msg )
   KNConfigManager *cfgMgr = knGlobals.configManager();
   if ( cfgMgr->readNewsGeneral()->autoMark() &&
        mArticle && mArticle->type() == KMime::Base::ATremote && !mArticle->isOrphant() &&
-       ( msg.find("430") != -1 || msg.find("423") != -1 ) ) {
+       ( msg.tqfind("430") != -1 || msg.tqfind("423") != -1 ) ) {
     KNRemoteArticle::List l;
     l.append( static_cast<KNRemoteArticle*>( mArticle ) );
     knGlobals.articleManager()->setRead( l, true );
@@ -836,7 +836,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum )
   TQString label = ct->name();
   if ( label.isEmpty() )
     label = i18n("unnamed" );
-  // if label consists of only whitespace tqreplace them by underscores
+  // if label consists of only whitespace replace them by underscores
   if ( (uint)label.tqcontains( ' ' ) == label.length() )
     label.tqreplace( TQRegExp( " ", true, true ), "_" );
   label = toHtmlString( label, None );
@@ -882,7 +882,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum )
   } else { // icon
     TQCString mimetype = ct->mimeType();
     KPIM::kAsciiToLower( mimetype.data() );
-    TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString::null, false );
+    TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false );
     TQString iconFile = KGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop );
     html += "<div><a href=\"" + href + "\"><img src=\"" +
             iconFile + "\" border=\"0\">" + label +
@@ -928,7 +928,7 @@ int ArticleWidget::quotingDepth( const TQString &line, const TQString &quoteChar
     // skip spaces
     if ( line[i].isSpace() )
       continue;
-    if ( quoteChars.find( line[i] ) != -1 )
+    if ( quoteChars.tqfind( line[i] ) != -1 )
       ++level;
     else
       break;
@@ -972,7 +972,7 @@ void ArticleWidget::updateContents()
 TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int partNum )
 {
   // more or less KMail code
-  KTempFile *tempFile = new KTempFile( TQString::null, "." + TQString::number( partNum ) );
+  KTempFile *tempFile = new KTempFile( TQString(), "." + TQString::number( partNum ) );
   tempFile->setAutoDelete( true );
   TQString fname = tempFile->name();
   delete tempFile;
@@ -981,7 +981,7 @@ TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int part
     // Not there or not writable
     if( ::mkdir( TQFile::encodeName( fname ), 0 ) != 0
         || ::chmod( TQFile::encodeName( fname ), S_IRWXU ) != 0 )
-      return TQString::null; //failed create
+      return TQString(); //failed create
 
   Q_ASSERT( !fname.isNull() );
 
@@ -1000,7 +1000,7 @@ TQString ArticleWidget::writeAttachmentToTempFile( KMime::Content *att, int part
   size_t size = data.size();
   // ### KMail does crlf2lf conversion here before writing the file
   if( !KPIM::kBytesToFile( data.data(), size, fname, false, false, false ) )
-    return TQString::null;
+    return TQString();
 
   mTempFiles.append( fname );
   // make file read-only so that nobody gets the impression that he might
@@ -1167,7 +1167,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen)
     KMime::Content *c = mAttachments.at( partNum );
     if ( !c )
       return;
-    // TODO: tqreplace with message box as done in KMail
+    // TODO: replace with message box as done in KMail
     KNConfigManager *cfgMgr = knGlobals.configManager();
     if ( forceOpen || cfgMgr->readNewsViewer()->openAttachmentsOnClick() )
       knGlobals.articleManager()->openContent( c );
@@ -1240,7 +1240,7 @@ void ArticleWidget::slotSelectAll()
 
 void ArticleWidget::slotFind()
 {
-  mViewer->tqfindText();
+  mViewer->findText();
 }
 
 
@@ -1408,8 +1408,8 @@ void ArticleWidget::slotCopyURL()
     address = mCurrentURL.path();
   else
     address = mCurrentURL.url();
-  TQApplication::clipboard()->setText( address, QClipboard::Clipboard );
-  TQApplication::clipboard()->setText( address, QClipboard::Selection );
+  TQApplication::clipboard()->setText( address, TQClipboard::Clipboard );
+  TQApplication::clipboard()->setText( address, TQClipboard::Selection );
 }
 
 void ArticleWidget::slotAddBookmark()
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index 2d44fdfc..7333bf5d 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -53,10 +53,11 @@ class CSSHelper;
 class ArticleWidget : public TQWidget, public KNJobConsumer {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /// Construct a new article widget
-    ArticleWidget( TQWidget *parent,
+    ArticleWidget( TQWidget *tqparent,
                    KXMLGUIClient *guiClient,
                    KActionCollection *actionCollection,
                    const char *name = 0 );
@@ -125,7 +126,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer {
     /// displays the given error message in the viewer
     void displayErrorMessage( const TQString &msg );
 
-    /// display the message header (should be tqreplaced by KMail's HeaderStyle class)
+    /// display the message header (should be replaced by KMail's HeaderStyle class)
     void displayHeader();
     /** displays the given text block, including quote and signature handling
      *  @param lines A list of lines to display.
diff --git a/knode/filters/1.fltr b/knode/filters/1.fltr
index f66021cd..16e64457 100644
--- a/knode/filters/1.fltr
+++ b/knode/filters/1.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/2.fltr b/knode/filters/2.fltr
index 7b11f48e..f9f7b84f 100644
--- a/knode/filters/2.fltr
+++ b/knode/filters/2.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=true
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/3.fltr b/knode/filters/3.fltr
index e7c3e0f6..82139623 100644
--- a/knode/filters/3.fltr
+++ b/knode/filters/3.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/4.fltr b/knode/filters/4.fltr
index 4972266f..ee6cb67b 100644
--- a/knode/filters/4.fltr
+++ b/knode/filters/4.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/5.fltr b/knode/filters/5.fltr
index 24ca696b..1386f4d7 100644
--- a/knode/filters/5.fltr
+++ b/knode/filters/5.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=true
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/6.fltr b/knode/filters/6.fltr
index 7ad3d612..867e8029 100644
--- a/knode/filters/6.fltr
+++ b/knode/filters/6.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/7.fltr b/knode/filters/7.fltr
index 81fec0cd..07f16f3b 100644
--- a/knode/filters/7.fltr
+++ b/knode/filters/7.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=%MYNAME
-contains=true
+tqcontains=true
 enabled=true
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/filters/8.fltr b/knode/filters/8.fltr
index 5978c616..dc0859ff 100644
--- a/knode/filters/8.fltr
+++ b/knode/filters/8.fltr
@@ -6,7 +6,7 @@ val1=0
 val2=0
 [FROM]
 Data=%MYNAME
-contains=true
+tqcontains=true
 enabled=true
 regX=false
 [GENERAL]
@@ -37,6 +37,6 @@ EN_R=false
 EN_US=false
 [SUBJECT]
 Data=
-contains=true
+tqcontains=true
 enabled=false
 regX=false
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index be497e6d..0007ffe6 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -32,8 +32,8 @@
 #include "knmainwidget.h"
 
 
-KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
-  KListView(parent,name),
+KNHeaderView::KNHeaderView(TQWidget *tqparent, const char *name) :
+  KListView(tqparent,name),
   mSortCol( -1 ),
   mSortAsc( true ),
   mSortByThreadChangeDate( false ),
@@ -61,8 +61,8 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
   setRootIsDecorated( true );
   setSorting( mPaintInfo.dateCol );
   header()->setMovingEnabled( true );
-  setColumnAlignment( mPaintInfo.sizeCol, Qt::AlignRight );
-  setColumnAlignment( mPaintInfo.scoreCol, Qt::AlignRight );
+  setColumnAlignment( mPaintInfo.sizeCol, TQt::AlignRight );
+  setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight );
 
   // due to our own column text squeezing we need to tqrepaint on column resizing
   disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) );
@@ -171,11 +171,11 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i )
   if ( !i )
     return;
 
- TQListViewItem *parent = i->parent();
-  while ( parent ) {
-    if ( !parent->isOpen() )
-      parent->setOpen( true );
-    parent = parent->parent();
+ TQListViewItem *tqparent = i->tqparent();
+  while ( tqparent ) {
+    if ( !tqparent->isOpen() )
+      tqparent->setOpen( true );
+    tqparent = tqparent->tqparent();
   }
 
   mDelayedCenter = -1;
@@ -582,9 +582,9 @@ void KNHeaderView::resetCurrentTime()
 
 //BEGIN: KNHeaderViewToolTip ==================================================
 
-KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *parent ) :
-  TQToolTip( parent->viewport() ),
-  listView( parent )
+KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *tqparent ) :
+  TQToolTip( tqparent->viewport() ),
+  listView( tqparent )
 {
 }
 
diff --git a/knode/headerview.h b/knode/headerview.h
index 519b7d84..c7d4c9f6 100644
--- a/knode/headerview.h
+++ b/knode/headerview.h
@@ -27,11 +27,12 @@ class KNHdrViewItem;
 class KNHeaderView : public KListView  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   friend class KNHdrViewItem;
 
   public:
-    KNHeaderView( TQWidget *parent, const char *name = 0 );
+    KNHeaderView( TQWidget *tqparent, const char *name = 0 );
     ~KNHeaderView();
 
     void setActive( TQListViewItem *item );
@@ -107,7 +108,7 @@ class KNHeaderView : public KListView  {
 class KNHeaderViewToolTip : public TQToolTip {
 
   public:
-    KNHeaderViewToolTip( KNHeaderView *parent );
+    KNHeaderViewToolTip( KNHeaderView *tqparent );
 
   protected:
     void maybeTip( const TQPoint &p );
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 76466ddb..af319731 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -34,8 +34,8 @@
 KWallet::Wallet* KNAccountManager::mWallet = 0;
 bool KNAccountManager::mWalletOpenFailed = false;
 
-KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name)
-  : TQObject(parent, name), gManager(gm), c_urrentAccount(0),
+KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * tqparent, const char * name)
+  : TQObject(tqparent, name), gManager(gm), c_urrentAccount(0),
   mAsyncOpening( false )
 {
   s_mtp = new KNServerInfo();
@@ -168,9 +168,9 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a)
 
     TQDir dir(a->path());
     if (dir.exists()) {
-      const QFileInfoList *list = dir.entryInfoList();  // get list of matching files and delete all
+      const TQFileInfoList *list = dir.entryInfoList();  // get list of matching files and delete all
       if (list) {
-        QFileInfoListIterator it( *list );
+        TQFileInfoListIterator it( *list );
         while (it.current()) {
           dir.remove(it.current()->fileName());
           ++it;
diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h
index f871e2be..53f048b5 100644
--- a/knode/knaccountmanager.h
+++ b/knode/knaccountmanager.h
@@ -27,12 +27,13 @@ class KNNntpAccount;
 class KNServerInfo;
 
 
-class KNAccountManager : public QObject
+class KNAccountManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNAccountManager(KNGroupManager *gm, TQObject * parent=0, const char * name=0);
+    KNAccountManager(KNGroupManager *gm, TQObject * tqparent=0, const char * name=0);
     ~KNAccountManager();
 
     void prepareShutdown();
diff --git a/knode/knapplication.h b/knode/knapplication.h
index 68c051e6..66751f9a 100644
--- a/knode/knapplication.h
+++ b/knode/knapplication.h
@@ -22,6 +22,7 @@
 class KNApplication : public KUniqueApplication
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KNApplication(): KUniqueApplication() { };
 
diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp
index 437639d1..a46b9838 100644
--- a/knode/knarticle.cpp
+++ b/knode/knarticle.cpp
@@ -435,7 +435,7 @@ KNAttachment::KNAttachment(Content *c)
 KNAttachment::KNAttachment(KNLoadHelper *helper)
   : c_ontent(0), l_oadHelper(helper), f_ile(helper->getFile()), i_sAttached(false), h_asChanged(true)
 {
-  setMimeType((KMimeMagic::self()->tqfindFileType(f_ile->name()))->mimeType());
+  setMimeType((KMimeMagic::self()->findFileType(f_ile->name()))->mimeType());
   n_ame=helper->getURL().fileName();
 }
 
@@ -453,7 +453,7 @@ void KNAttachment::setMimeType(const TQString &s)
   m_imeType=s.latin1();
   h_asChanged=true;
 
-  if(m_imeType.find("text/", 0, false)==-1) {
+  if(m_imeType.tqfind("text/", 0, false)==-1) {
     f_b64=true;
     e_ncoding.setCte(Headers::CEbase64);
   }
diff --git a/knode/knarticle.h b/knode/knarticle.h
index e36bfdfe..798742e1 100644
--- a/knode/knarticle.h
+++ b/knode/knarticle.h
@@ -35,7 +35,7 @@ class KNHdrViewItem;
 class KNArticleCollection;
 
 /** This class encapsulates a generic article. It provides all the
-    usual headers of a RFC822-message. Further more it tqcontains an
+    usual headers of a RFC822-message. Further more it contains an
     unique id and can store a pointer to a @ref TQListViewItem. It is
     used as a base class for all visible articles. */
 
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 493e2e22..1421b405 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -63,7 +63,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a)
   art->setDoPost(true);
   art->setDoMail(false);
 
-  KNComposer *c = new KNComposer( art, TQString::null, sig, TQString::null, true );
+  KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true );
   mCompList.append( c );
   connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
   c->show();
@@ -92,7 +92,7 @@ void KNArticleFactory::createPosting(KNGroup *g)
   art->setDoMail(false);
   art->newsgroups()->fromUnicodeString(g->groupname(), art->defaultCharset());
 
-  KNComposer *c=new KNComposer(art, TQString::null, sig, TQString::null, true);
+  KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true);
   mCompList.append( c );
   connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
   c->show();
@@ -140,7 +140,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
       if( post && // user wanted to reply by public posting?
           // ask the user if she wants to ignore this F'up-To: poster
           ( KMessageBox::Yes != KMessageBox::questionYesNo(knGlobals.topWidget,
-                i18n("The author has requested a reply by email instead\nof a followup to the newsgroup. (Followup-To: poster)\nDo you want to reply in public anyway?"), TQString::null, i18n("Reply Public"), i18n("Reply by Email")) ))
+                i18n("The author has requested a reply by email instead\nof a followup to the newsgroup. (Followup-To: poster)\nDo you want to reply in public anyway?"), TQString(), i18n("Reply Public"), i18n("Reply by Email")) ))
       {
         art->setDoPost(false);
         art->setDoMail(true);
@@ -192,7 +192,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
     authorWantsMailCopies = mailCopiesTo->alwaysCopy();
     if (authorWantsMailCopies)         // warn the user
       KMessageBox::information(knGlobals.topWidget,i18n("The author requested a mail copy of your reply. (Mail-Copies-To header)"),
-                               TQString::null,"mailCopiesToWarning");
+                               TQString(),"mailCopiesToWarning");
     if (authorWantsMailCopies && mailCopiesTo->hasEmail()) {
       address.setName(mailCopiesTo->name());
       address.setEmail(mailCopiesTo->email());
@@ -219,7 +219,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
   attribution+="\n\n";
 
   TQString quoted=attribution;
-  TQString notRewraped=TQString::null;
+  TQString notRewraped=TQString();
   TQStringList text;
   TQStringList::Iterator line;
   bool incSig=knGlobals.configManager()->postNewsComposer()->includeSignature();
@@ -279,7 +279,7 @@ void KNArticleFactory::createForward(KNArticle *a)
   bool incAtt = ( !knGlobals.configManager()->postNewsTechnical()->useExternalMailer() &&
                   ct->isMultipart() && ct->isSubtype("mixed") &&
                   KMessageBox::Yes == KMessageBox::questionYesNo(knGlobals.topWidget,
-                  i18n("This article tqcontains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward"))
+                  i18n("This article contains attachments. Do you want them to be forwarded as well?"), TQString(), i18n("Forward"), i18n("Do Not Forward"))
                 );
 
   if (knGlobals.configManager()->postNewsTechnical()->useOwnCharset())
@@ -341,13 +341,13 @@ void KNArticleFactory::createForward(KNArticle *a)
 
 
   if (knGlobals.configManager()->postNewsTechnical()->useExternalMailer()) {
-    sendMailExternal(TQString::null, subject, fwd);
+    sendMailExternal(TQString(), subject, fwd);
     delete art;
     return;
   }
 
   //open composer
-  KNComposer *c=new KNComposer(art, fwd, sig, TQString::null, true);
+  KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true);
   mCompList.append( c );
   connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
   c->show();
@@ -360,7 +360,7 @@ void KNArticleFactory::createCancel(KNArticle *a)
     return;
 
   if(KMessageBox::No==KMessageBox::questionYesNo(knGlobals.topWidget,
-    i18n("Do you really want to cancel this article?"), TQString::null, i18n("Cancel Article"), KStdGuiItem::cancel()))
+    i18n("Do you really want to cancel this article?"), TQString(), i18n("Cancel Article"), KStdGuiItem::cancel()))
     return;
 
   bool sendNow;
@@ -440,7 +440,7 @@ void KNArticleFactory::createSupersede(KNArticle *a)
     return;
 
   if(KMessageBox::No==KMessageBox::questionYesNo(knGlobals.topWidget,
-    i18n("Do you really want to supersede this article?"), TQString::null, i18n("Supersede"), KStdGuiItem::cancel()))
+    i18n("Do you really want to supersede this article?"), TQString(), i18n("Supersede"), KStdGuiItem::cancel()))
     return;
 
   KNGroup *grp;
@@ -523,7 +523,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address)
   art->to()->addAddress((*address));
 
   //open composer
-  KNComposer *c=new KNComposer(art, TQString::null, sig, TQString::null, true);
+  KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true);
   mCompList.append( c );
   connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*)));
   c->show();
@@ -534,7 +534,7 @@ void KNArticleFactory::sendMailExternal(const TQString &address, const TQString
 {
   KURL mailtoURL;
   TQStringList queries;
-  TQString query=TQString::null;
+  TQString query=TQString();
   mailtoURL.setProtocol("mailto");
 
   if (!address.isEmpty())
@@ -596,7 +596,7 @@ void KNArticleFactory::edit(KNLocalArticle *a)
     knGlobals.articleManager()->loadArticle(a);
 
   //open composer
-  com=new KNComposer(a, TQString::null, id->getSignature());
+  com=new KNComposer(a, TQString(), id->getSignature());
   if(id->useSigGenerator() && !id->getSigGeneratorStdErr().isEmpty())
   KMessageBox::information(knGlobals.topWidget,
                             i18n("<qt>The signature generator program produced the "
@@ -880,7 +880,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
         value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
       }
       else
-        if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
+        if(value.tqfind("%NAME") != -1 || value.tqfind("%EMAIL") != -1)
           continue;
 
       art->setHeader( new KMime::Headers::Generic( (TQCString("X-")+(*it).name()), art, value, pnt->charset() ) );
@@ -898,7 +898,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
                                    .arg(id->getSigGeneratorStdErr()));
   }
   else
-    sig=TQString::null;
+    sig=TQString();
 
   return art;
 }
@@ -1073,7 +1073,7 @@ KNSendErrorDialog::KNSendErrorDialog()
   new TQLabel(TQString("<b>%1</b><br>%2").arg(i18n("Errors occurred while sending these articles:"))
                                        .arg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page);
   j_obs=new KNDialogListBox(true, page);
-  e_rror=new TQLabel(TQString::null, page);
+  e_rror=new TQLabel(TQString(), page);
 
   connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int)));
 
diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h
index c37c781a..030ac9f3 100644
--- a/knode/knarticlefactory.h
+++ b/knode/knarticlefactory.h
@@ -39,6 +39,7 @@ namespace KNConfig {
 class KNArticleFactory : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum replyType { RTgroup, RTmail, RTboth };
@@ -49,14 +50,14 @@ class KNArticleFactory : public TQObject , public KNJobConsumer {
     //factory methods
     void createPosting(KNNntpAccount *a);
     void createPosting(KNGroup *g);
-    void createReply(KNRemoteArticle *a, TQString selectedText=TQString::null, bool post=true, bool mail=false);
+    void createReply(KNRemoteArticle *a, TQString selectedText=TQString(), bool post=true, bool mail=false);
     void createForward(KNArticle *a);
     void createCancel(KNArticle *a);
     void createSupersede(KNArticle *a);
     void createMail(KMime::Headers::AddressField *address);
 
     // send a mail via an external program...
-    void sendMailExternal(const TQString &address=TQString::null, const TQString &subject=TQString::null, const TQString &body=TQString::null);
+    void sendMailExternal(const TQString &address=TQString(), const TQString &subject=TQString(), const TQString &body=TQString());
 
     //article handling
     void edit(KNLocalArticle *a);
@@ -96,6 +97,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer {
 class KNSendErrorDialog : public KDialogBase  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNSendErrorDialog();
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index bb2f2338..56460a34 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -189,7 +189,7 @@ void KNArticleFilter::doFilter(KNGroup *g)
 
   if(!l_oaded) load();
 
-  subject.expand(g);  // tqreplace placeholders
+  subject.expand(g);  // replace placeholders
   from.expand(g);
   messageId.expand(g);
   references.expand(g);
@@ -287,7 +287,7 @@ void KNArticleFilter::doFilter(KNFolder *f)
 
   if(!l_oaded) load();
 
-  subject.expand(0);  // tqreplace placeholders
+  subject.expand(0);  // replace placeholders
   from.expand(0);
   messageId.expand(0);
   references.expand(0);
@@ -311,7 +311,7 @@ TQString KNArticleFilter::translatedName()
       else
         return n_ame;
     } else
-      return TQString::null;
+      return TQString();
   } else
     return n_ame;
 }
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index d1aec96a..4e97c2d2 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -74,21 +74,21 @@ void KNArticleManager::deleteTempFiles()
 }
 
 
-void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *parent)
+void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *tqparent)
 {
-  KNSaveHelper helper(c->contentType()->name(),parent);
+  KNSaveHelper helper(c->contentType()->name(),tqparent);
 
   TQFile *file = helper.getFile(i18n("Save Attachment"));
 
   if (file) {
     TQByteArray data=c->decodedContent();
     if (file->writeBlock(data.data(), data.size()) == -1 )
-      KNHelper::displayExternalFileError( parent );
+      KNHelper::displayExternalFileError( tqparent );
   }
 }
 
 
-void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent)
+void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *tqparent)
 {
   TQString fName = a->subject()->asUnicodeString();
   TQString s = "";
@@ -101,13 +101,13 @@ void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent)
   fName = s.simplifyWhiteSpace();
   fName.tqreplace(TQRegExp("[\\s]"),"_");
 
-  KNSaveHelper helper(fName,parent);
+  KNSaveHelper helper(fName,tqparent);
   TQFile *file = helper.getFile(i18n("Save Article"));
 
   if (file) {
     TQCString tmp=a->encodedContent(false);
     if ( file->writeBlock(tmp.data(), tmp.size()) == -1 )
-      KNHelper::displayExternalFileError( parent );
+      KNHelper::displayExternalFileError( tqparent );
   }
 }
 
@@ -140,7 +140,7 @@ TQString KNArticleManager::saveContentToTemp(KMime::Content *c)
   if (tmpFile->status()!=0) {
     KNHelper::displayTempFileError();
     delete tmpFile;
-    return TQString::null;
+    return TQString();
   }
 
   mTempFiles.append(tmpFile);
@@ -272,7 +272,7 @@ void KNArticleManager::showHdrs(bool clear)
 
     }
 
-    if (current && !current->filterResult()) {   // try to find a parent that is visible
+    if (current && !current->filterResult()) {   // try to find a tqparent that is visible
       int idRef;
       while (current && !current->filterResult()) {
         idRef=current->idRef();
@@ -324,7 +324,7 @@ void KNArticleManager::showHdrs(bool clear)
     knGlobals.top->articleViewer()->setArticle( 0 );
   }
 
-  knGlobals.seStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString());
   updateStatusString();
   knGlobals.top->setCursorBusy(false);
 }
@@ -997,7 +997,7 @@ void KNArticleManager::updateStatusString()
     if(f_ilter)
       knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
     else
-      knGlobals.seStatusMsg(TQString::null, SB_FILTER);
+      knGlobals.seStatusMsg(TQString(), SB_FILTER);
   }
   else if(f_older) {
     if(f_ilter)
@@ -1006,10 +1006,10 @@ void KNArticleManager::updateStatusString()
       displCnt=f_older->count();
     knGlobals.seStatusMsg(i18n(" %1: %2 displayed")
       .arg(f_older->name()).arg(displCnt), SB_GROUP);
-    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString(), SB_FILTER);
   } else {
-    knGlobals.seStatusMsg(TQString::null, SB_GROUP);
-    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString(), SB_GROUP);
+    knGlobals.seStatusMsg(TQString(), SB_FILTER);
   }
 }
 
diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h
index 25d43179..08423cf8 100644
--- a/knode/knarticlemanager.h
+++ b/knode/knarticlemanager.h
@@ -39,6 +39,7 @@ class KNJobData;
 class KNArticleManager : public TQObject, public KNJobConsumer {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNArticleManager();
@@ -46,8 +47,8 @@ class KNArticleManager : public TQObject, public KNJobConsumer {
 
     //content handling
     void deleteTempFiles();
-    void saveContentToFile(KMime::Content *c, TQWidget *parent);
-    void saveArticleToFile(KNArticle *a, TQWidget *parent);
+    void saveContentToFile(KMime::Content *c, TQWidget *tqparent);
+    void saveArticleToFile(KNArticle *a, TQWidget *tqparent);
     TQString saveContentToTemp(KMime::Content *c);
     void openContent(KMime::Content *c);
 
diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h
index 1859e773..297790eb 100644
--- a/knode/knarticlewindow.h
+++ b/knode/knarticlewindow.h
@@ -27,6 +27,7 @@ namespace KNode {
 class KNArticleWindow : public KMainWindow  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNArticleWindow(KNArticle *art);
diff --git a/knode/kncollection.h b/knode/kncollection.h
index f6c4b915..697021c4 100644
--- a/knode/kncollection.h
+++ b/knode/kncollection.h
@@ -45,8 +45,8 @@ class KNCollection {
     virtual bool readInfo(const TQString &confPath)=0;
     virtual void saveInfo()=0;
 
-    // parent
-    KNCollection* parent()const                    { return p_arent; }
+    // tqparent
+    KNCollection* tqparent()const                    { return p_arent; }
     virtual void setParent(KNCollection *p)   { p_arent=p; }
 
     // name
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 40cce774..ef97c653 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -32,8 +32,8 @@
 #include "kncollectionview.h"
 #include "kncollectionviewitem.h"
 
-KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) :
-  KFolderTree(parent, name),
+KNCollectionView::KNCollectionView(TQWidget *tqparent, const char* name) :
+  KFolderTree(tqparent, name),
   mActiveItem( 0 ),
   mPopup( 0 )
 {
@@ -221,13 +221,13 @@ void KNCollectionView::addFolder(KNFolder *f)
 {
   KNCollectionViewItem *it;
 
-  if (!f->parent()) {
+  if (!f->tqparent()) {
     // root folder
     it = new KNCollectionViewItem(this, KFolderTreeItem::Local);
   } else {
-    // make sure the parent folder has already been added
-    if (!f->parent()->listItem())
-      addFolder( static_cast<KNFolder*>(f->parent()) );
+    // make sure the tqparent folder has already been added
+    if (!f->tqparent()->listItem())
+      addFolder( static_cast<KNFolder*>(f->tqparent()) );
     // handle special folders
     KFolderTreeItem::Type type = KFolderTreeItem::Other;
     switch ( f->id() ) {
@@ -238,7 +238,7 @@ void KNCollectionView::addFolder(KNFolder *f)
       case 3:
         type = KFolderTreeItem::SentMail; break;
     }
-    it = new KNCollectionViewItem( f->parent()->listItem(), KFolderTreeItem::Local, type );
+    it = new KNCollectionViewItem( f->tqparent()->listItem(), KFolderTreeItem::Local, type );
   }
   f->setListItem( it );
   updateFolder( f );
diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h
index 000e1289..fe25618f 100644
--- a/knode/kncollectionview.h
+++ b/knode/kncollectionview.h
@@ -27,9 +27,10 @@ class KNCollectionViewItem;
 class KNCollectionView : public KFolderTree {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNCollectionView(TQWidget *parent, const char *name = 0);
+    KNCollectionView(TQWidget *tqparent, const char *name = 0);
     ~KNCollectionView();
 
     void setActive(TQListViewItem *item);
diff --git a/knode/kncollectionviewitem.cpp b/knode/kncollectionviewitem.cpp
index 35f2ae2c..0be47ddc 100644
--- a/knode/kncollectionviewitem.cpp
+++ b/knode/kncollectionviewitem.cpp
@@ -32,15 +32,15 @@
 #include "knconfigmanager.h"
 
 
-KNCollectionViewItem::KNCollectionViewItem( KFolderTree *parent, Protocol protocol, Type type) :
-  KFolderTreeItem(parent, TQString::null, protocol, type), coll(0)
+KNCollectionViewItem::KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol, Type type) :
+  KFolderTreeItem(tqparent, TQString(), protocol, type), coll(0)
 {
   setIcon();
 }
 
 
 KNCollectionViewItem::KNCollectionViewItem( KFolderTreeItem *it, Protocol protocol, Type type, int unread, int total ) :
-  KFolderTreeItem(it, TQString::null, protocol, type, unread, total), coll(0)
+  KFolderTreeItem(it, TQString(), protocol, type, unread, total), coll(0)
 {
   setIcon();
 }
@@ -137,7 +137,7 @@ void KNCollectionViewItem::paintCell( TQPainter * p, const TQColorGroup & cg,int
   if (px)
     pxWidth += px->width();
 
-  // temporary set the squeezed text and use the parent class to paint it
+  // temporary set the squeezed text and use the tqparent class to paint it
   TQString curText = text( column );
   if ( p->fontMetrics().width( curText ) > width - pxWidth ) {
     setText( column, squeezeFolderName( curText, p->fontMetrics(), width - pxWidth ) );
@@ -157,7 +157,7 @@ TQString KNCollectionViewItem::squeezeFolderName( const TQString &text,
     int curPos = 0, nextPos = 0;
     TQString temp;
     while ( (uint)fm.width(t) > width && nextPos != -1 ) {
-      nextPos = t.find('.', curPos);
+      nextPos = t.tqfind('.', curPos);
       if ( nextPos != -1 ) {
         temp = t[curPos];
         t.tqreplace( curPos, nextPos - curPos, temp );
diff --git a/knode/kncollectionviewitem.h b/knode/kncollectionviewitem.h
index 4f343147..14381a29 100644
--- a/knode/kncollectionviewitem.h
+++ b/knode/kncollectionviewitem.h
@@ -28,8 +28,8 @@ class KNCollection;
 class KNCollectionViewItem : public KFolderTreeItem  {
 
   public:
-    KNCollectionViewItem( KFolderTree *parent, Protocol protocol = NONE, Type type = Root);
-    KNCollectionViewItem( KFolderTreeItem *parent, Protocol protocol = NONE,
+    KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol = NONE, Type type = Root);
+    KNCollectionViewItem( KFolderTreeItem *tqparent, Protocol protocol = NONE,
                           Type type = Other, int unread = 0, int total = 0 );
     ~KNCollectionViewItem();
 
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index aabb8e66..4e928a49 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -63,8 +63,8 @@ using KRecentAddress::RecentAddresses;
 #include <kstdguiitem.h>
 
 KNLineEdit::KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion,
-                       TQWidget *parent, const char *name)
-    : KNLineEditInherited(parent,useCompletion,name)    , composerView(_composerView)
+                       TQWidget *tqparent, const char *name)
+    : KNLineEditInherited(tqparent,useCompletion,name)    , composerView(_composerView)
 
 {
 }
@@ -131,8 +131,8 @@ void KNLineEdit::keyPressEvent(TQKeyEvent *e)
   KNLineEditInherited::keyPressEvent(e);
 }
 
-KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name)
-    :KNLineEdit( _composerView, useCompletion, parent,name )
+KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name)
+    :KNLineEdit( _composerView, useCompletion, tqparent,name )
 {
 }
 
@@ -189,15 +189,15 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
 
   //statusbar
   KStatusBar *sb=statusBar();
-  sb->insertItem(TQString::null, 1,1);                 // type
+  sb->insertItem(TQString(), 1,1);                 // type
   sb->setItemAlignment (1,AlignLeft | AlignVCenter);
-  sb->insertItem(TQString::null, 2,1);                 // charset
+  sb->insertItem(TQString(), 2,1);                 // charset
   sb->setItemAlignment (2,AlignLeft | AlignVCenter);
-  sb->insertItem(TQString::null, 3,0);                 // column
+  sb->insertItem(TQString(), 3,0);                 // column
   sb->setItemAlignment (3,AlignCenter | AlignVCenter);
-  sb->insertItem(TQString::null, 4,0);                 // column
+  sb->insertItem(TQString(), 4,0);                 // column
   sb->setItemAlignment (4,AlignCenter | AlignVCenter);
-  sb->insertItem(TQString::null, 5,0);                 // line
+  sb->insertItem(TQString(), 5,0);                 // line
   sb->setItemAlignment (5,AlignCenter | AlignVCenter);
   connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos()));
   connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar()));
@@ -235,8 +235,8 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
 
   KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
 
-  KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::tqfindNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfind(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
+  KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
 
   KStdAction::tqreplace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
 
@@ -579,7 +579,7 @@ bool KNComposer::hasValidData()
 
     if (groupCount>5)
       if (!(KMessageBox::warningYesNo( this, i18n("You are crossposting to more than five newsgroups.\nPlease reconsider whether this is really useful\nand remove groups in which your article is off-topic.\nDo you want to re-edit the article or send it anyway?"),
-                                       TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
+                                       TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
         return false;
 
     if ( !followUp && groupCount > 2 ) {
@@ -588,7 +588,7 @@ bool KNComposer::hasValidData()
                 "Please use the \"Followup-To\" header to direct the replies "
                 "to your article into one group.\n"
                 "Do you want to re-edit the article or send it anyway?"),
-           TQString::null, i18n("&Send"), i18n("edit article","&Edit"), "missingFollowUpTo" )
+           TQString(), i18n("&Send"), i18n("edit article","&Edit"), "missingFollowUpTo" )
            != KMessageBox::Yes )
         return false;
     }
@@ -600,7 +600,7 @@ bool KNComposer::hasValidData()
 
     if (fupCount>5)
       if (!(KMessageBox::warningYesNo( this, i18n("You are directing replies to more than five newsgroups.\nPlease reconsider whether this is really useful.\nDo you want to re-edit the article or send it anyway?"),
-                                       TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
+                                       TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
         return false;
   }
 
@@ -658,7 +658,7 @@ bool KNComposer::hasValidData()
   }
 
   if (n_eeds8Bit && (c_harset.lower()=="us-ascii")) {
-    KMessageBox::sorry(this, i18n("Your message tqcontains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
+    KMessageBox::sorry(this, i18n("Your message contains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
     return false;
   }
 
@@ -670,7 +670,7 @@ bool KNComposer::hasValidData()
   if ((textLines>1)&&(notQuoted==1)) {
     if (hasAttributionLine)
       if (!(KMessageBox::warningYesNo( this, i18n("Your article seems to consist entirely of quoted text;\ndo you want to re-edit the article or send it anyway?"),
-                                       TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
+                                       TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
         return false;
   } else {
     if (notQuoted==0) {
@@ -682,20 +682,20 @@ bool KNComposer::hasValidData()
 
   if (longLine)
     if (!(KMessageBox::warningYesNo( this,
-          i18n("Your article tqcontains lines longer than 80 characters.\n"
+          i18n("Your article contains lines longer than 80 characters.\n"
 	       "Do you want to re-edit the article or send it anyway?"),
-          TQString::null, i18n("&Send"),
+          TQString(), i18n("&Send"),
 	  i18n("edit article","&Edit")) == KMessageBox::Yes))
       return false;
 
   if (sigLength>8) {
     if (!(KMessageBox::warningYesNo( this, i18n("Your signature is more than 8 lines long.\nYou should shorten it to match the widely accepted limit of 4 lines.\nDo you want to re-edit the article or send it anyway?"),
-                                     TQString::null, i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
+                                     TQString(), i18n("&Send"),i18n("edit article","&Edit")) == KMessageBox::Yes))
       return false;
   } else
     if (sigLength>4)
        KMessageBox::information(this, i18n("Your signature exceeds the widely-accepted limit of 4 lines:\nplease consider shortening your signature;\notherwise, you will probably annoy your readers."),
-                                TQString::null,"longSignatureWarning");
+                                TQString(),"longSignatureWarning");
 
   // check if article can be signed
   if ( a_ctPGPsign->isChecked() ) {
@@ -721,7 +721,7 @@ bool KNComposer::hasValidData()
                         "in the account properties or in the "
                         "group properties.\n"
                         "The article will be sent unsigned." ),
-                   TQString::null, i18n( "Send Unsigned" ),
+                   TQString(), i18n( "Send Unsigned" ),
                    "sendUnsignedDialog" )
                == KMessageBox::Cancel )
              return false;
@@ -876,7 +876,7 @@ void KNComposer::closeEvent(TQCloseEvent *e)
   }
   else {
     switch ( KMessageBox::warningYesNoCancel( this, i18n("Do you want to save this article in the draft folder?"),
-                                              TQString::null, KStdGuiItem::save(), KStdGuiItem::discard())) {
+                                              TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
       case KMessageBox::Yes :
         r_esult=CRsave;
         break;
@@ -900,7 +900,7 @@ void KNComposer::initData(const TQString &text)
 {
   //Subject
   if(a_rticle->subject()->isEmpty())
-    slotSubjectChanged(TQString::null);
+    slotSubjectChanged(TQString());
   else
     v_iew->s_ubject->setText(a_rticle->subject()->asUnicodeString());
 
@@ -957,7 +957,7 @@ void KNComposer::initData(const TQString &text)
 }
 
 
-// inserts at cursor position if clear is false, tqreplaces content otherwise
+// inserts at cursor position if clear is false, replaces content otherwise
 // puts the file content into a box if box==true
 // "file" is already open for reading
 void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitle)
@@ -1165,7 +1165,7 @@ void KNComposer::slotToggleDoMail()
   if (a_ctDoMail->isChecked()) {
     if (a_uthorDislikesMailCopies) {
       if (!(KMessageBox::warningContinueCancel(this, i18n("The poster does not want a mail copy of your reply (Mail-Copies-To: nobody);\nplease respect their request."),
-                                               TQString::null, i18n("&Send Copy")) == KMessageBox::Continue)) {
+                                               TQString(), i18n("&Send Copy")) == KMessageBox::Continue)) {
         a_ctDoMail->setChecked(false); //revert
         return;
       }
@@ -1231,7 +1231,7 @@ void KNComposer::slotToggleWordWrap()
 
 void KNComposer::slotUndoRewrap()
 {
-  if (KMessageBox::warningContinueCancel( this, i18n("This will tqreplace all text you have written.")) == KMessageBox::Continue) {
+  if (KMessageBox::warningContinueCancel( this, i18n("This will replace all text you have written.")) == KMessageBox::Continue) {
     v_iew->e_dit->setText(u_nwraped);
     slotAppendSig();
   }
@@ -1422,7 +1422,7 @@ void KNComposer::slotNewToolbarConfig()
 
 void KNComposer::slotSubjectChanged(const TQString &t)
 {
-  // tqreplace newlines
+  // replace newlines
   TQString subject = t;
   subject.tqreplace( '\n', ' ' );
   subject.tqreplace( '\r', ' ' );
@@ -1438,7 +1438,7 @@ void KNComposer::slotSubjectChanged(const TQString &t)
 
 void KNComposer::slotGroupsChanged(const TQString &t)
 {
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   bool splitOk;
   TQString currText=v_iew->f_up2->currentText();
 
@@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
   hdrL->addWidget(l_to, 0,0);
   hdrL->addWidget(t_o, 0,1);
   hdrL->addWidget(t_oBtn, 0,2);
-  connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked()));
+  connect(t_oBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotToBtnClicked()));
 
   //Newsgroups
   g_roups=new KNLineEdit(this, false, hdrFrame);
@@ -1756,8 +1756,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
   hdrL->addWidget(g_roups, 1,1);
   hdrL->addWidget(g_roupsBtn, 1,2);
   connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)),
-          parent(), TQT_SLOT(slotGroupsChanged(const TQString&)));
-  connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked()));
+          tqparent(), TQT_SLOT(slotGroupsChanged(const TQString&)));
+  connect(g_roupsBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotGroupsBtnClicked()));
 
   //Followup-To
   f_up2=new KComboBox(true, hdrFrame);
@@ -1773,7 +1773,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
   hdrL->addWidget(l, 3,0);
   hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2);
   connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)),
-          parent(), TQT_SLOT(slotSubjectChanged(const TQString&)));
+          tqparent(), TQT_SLOT(slotSubjectChanged(const TQString&)));
 
   //Editor
   e_dit=new Editor(this, composer, main);
@@ -1798,13 +1798,13 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
 
   TQVBoxLayout *notL=new TQVBoxLayout(e_dit);
   notL->addStretch(1);
-  n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit);
+  n_otification=new TQGroupBox(2, TQt::Horizontal, e_dit);
   l=new TQLabel(i18n("You are currently editing the article body\nin an external editor. To continue, you have\nto close the external editor."), n_otification);
   c_ancelEditorBtn=new TQPushButton(i18n("&Kill External Editor"), n_otification);
   n_otification->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   n_otification->setLineWidth(2);
   n_otification->hide();
-  notL->addWidget(n_otification, 0, Qt::AlignHCenter);
+  notL->addWidget(n_otification, 0, TQt::AlignHCenter);
   notL->addStretch(1);
 
   //finish GUI
@@ -1907,33 +1907,33 @@ void KNComposer::ComposerView::showAttachmentView()
 
     //connections
     connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-            parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
+            tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
     connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )),
-            parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
+            tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*)));
 
     connect(a_ttView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-            parent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&)));
+            tqparent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&)));
     connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)),
-            parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*)));
+            tqparent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*)));
     connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-            parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
+            tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
     connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-            parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
+            tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*)));
 
     //buttons
     a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget);
-    connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile()));
+    connect(a_ttAddBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachFile()));
     topL->addWidget(a_ttAddBtn, 0,1);
 
     a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget);
     a_ttRemoveBtn->setEnabled(false);
-    connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment()));
+    connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotRemoveAttachment()));
     topL->addWidget(a_ttRemoveBtn, 1,1);
 
     a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget);
     a_ttEditBtn->setEnabled(false);
-    connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties()));
-    topL->addWidget(a_ttEditBtn, 2,1, Qt::AlignTop);
+    connect(a_ttEditBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachmentProperties()));
+    topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop);
 
     topL->setRowStretch(2,1);
     topL->setColStretch(0,1);
@@ -1991,8 +1991,8 @@ void KNComposer::ComposerView::hideExternalNotification()
 //=====================================================================================
 
 #include <kcursor.h>
-KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent, char *name)
-    : KEdit(parent, name), m_composer( _composer ), m_composerView(_composerView)
+KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent, char *name)
+    : KEdit(tqparent, name), m_composer( _composer ), m_composerView(_composerView)
 {
   setOverwriteEnabled(true);
   spell = 0L;
@@ -2047,18 +2047,18 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
     {
       //Get word right clicked on
       firstSpace = paraText.findRev( m_bound, charPos ) + 1;
-      lastSpace = paraText.find( m_bound, charPos );
+      lastSpace = paraText.tqfind( m_bound, charPos );
       if( lastSpace == -1 )
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && m_tqreplacements.tqcontains( word ) )
+      if( !word.isEmpty() && m_replacements.tqcontains( word ) )
       {
         KPopupMenu p;
         p.insertTitle( i18n("Suggestions") );
 
         //Add the suggestions to the popup menu
-        TQStringList reps = m_tqreplacements[word];
+        TQStringList reps = m_replacements[word];
         if( reps.count() > 0 )
         {
           int listPos = 0;
@@ -2081,11 +2081,11 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
           int parIdx = 1, txtIdx = 1;
           getCursorPosition(&parIdx, &txtIdx);
           setSelection(para, firstSpace, para, lastSpace);
-          insert(m_tqreplacements[word][id]);
+          insert(m_replacements[word][id]);
           // Restore the cursor position; if the cursor was behind the
           // misspelled word then adjust the cursor position
           if ( para == parIdx && txtIdx >= lastSpace )
-            txtIdx += m_tqreplacements[word][id].length() - word.length();
+            txtIdx += m_replacements[word][id].length() - word.length();
           setCursorPosition(parIdx, txtIdx);
         }
         //Cancel original event
@@ -2099,7 +2099,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
 
 void KNComposer::Editor::slotAddSuggestion( const TQString &text, const TQStringList &lst, unsigned int )
 {
-  m_tqreplacements[text] = lst;
+  m_replacements[text] = lst;
 }
 
 // expand tabs to avoid the "tab-damage",
@@ -2137,12 +2137,12 @@ TQStringList KNComposer::Editor::processedText()
     }
   }
 
-  TQString tqreplacement;
+  TQString replacement;
   int tabPos;
   for (TQStringList::Iterator it = ret.begin(); it != ret.end(); ++it ) {
-    while ((tabPos=(*it).find('\t'))!=-1) {
-      tqreplacement.fill(TQChar(' '), 8-(tabPos%8));
-      (*it).tqreplace(tabPos, 1, tqreplacement);
+    while ((tabPos=(*it).tqfind('\t'))!=-1) {
+      replacement.fill(TQChar(' '), 8-(tabPos%8));
+      (*it).tqreplace(tabPos, 1, replacement);
     }
   }
 
@@ -2261,7 +2261,7 @@ void KNComposer::Editor::slotRemoveBox()
 
     setAutoUpdate(false);
 
-    // find & remove box begin
+    // tqfind & remove box begin
     int x = l;
     while ((x>=0)&&(textLine(x).left(5)!=",----"))
       x--;
@@ -2278,7 +2278,7 @@ void KNComposer::Editor::slotRemoveBox()
       }
     }
 
-    // find & remove box end
+    // tqfind & remove box end
     x = l;
     while ((x<numLines())&&(textLine(x).left(5)!="`----"))
       x++;
@@ -2332,7 +2332,7 @@ void KNComposer::Editor::keyPressEvent ( TQKeyEvent *e)
         int line, col;
         getCursorPosition( &line, &col );
         TQString lineText = text( line );
-        // returns line with additional trailing space (bug in Qt?), cut it off
+        // returns line with additional trailing space (bug in TQt?), cut it off
         lineText.truncate( lineText.length() - 1 );
         // special treatment of quoted lines only if the cursor is neither at
         // the begin nor at the end of the line
@@ -2490,8 +2490,8 @@ void KNComposer::Editor::slotCorrectWord()
 //=====================================================================================
 
 
-KNComposer::AttachmentView::AttachmentView(TQWidget *parent, char *name)
- : KListView(parent, name)
+KNComposer::AttachmentView::AttachmentView(TQWidget *tqparent, char *name)
+ : KListView(tqparent, name)
 {
   setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);  // match the TQMultiLineEdit style
   addColumn(i18n("File"), 115);
@@ -2560,9 +2560,9 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
 
   fileL->addRowSpacing(0, fontMetrics().lineSpacing()-9);
   fileL->addWidget(new TQLabel(i18n("Name:"), fileGB) ,1,0);
-  fileL->addWidget(new TQLabel(TQString("<b>%1</b>").arg(a->name()), fileGB), 1,1, Qt::AlignLeft);
+  fileL->addWidget(new TQLabel(TQString("<b>%1</b>").arg(a->name()), fileGB), 1,1, TQt::AlignLeft);
   fileL->addWidget(new TQLabel(i18n("Size:"), fileGB), 2,0);
-  fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, Qt::AlignLeft);
+  fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft);
 
   fileL->setColStretch(1,1);
   topL->addWidget(fileGB);
@@ -2626,11 +2626,11 @@ void KNComposer::AttachmentPropertiesDlg::apply()
 
 void KNComposer::AttachmentPropertiesDlg::accept()
 {
-  if(m_imeType->text().find('/')==-1) {
+  if(m_imeType->text().tqfind('/')==-1) {
     KMessageBox::sorry(this, i18n("You have set an invalid mime-type.\nPlease change it."));
     return;
   }
-  else if(n_onTextAsText && m_imeType->text().find("text/", 0, false)!=-1 &&
+  else if(n_onTextAsText && m_imeType->text().tqfind("text/", 0, false)!=-1 &&
        KMessageBox::warningContinueCancel(this,
        i18n("You have changed the mime-type of this non-textual attachment\nto text. This might cause an error while loading or encoding the file.\nProceed?")
        ) == KMessageBox::Cancel) return;
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index 05d6de0a..83b406be 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -44,6 +44,7 @@ class SpellingFilter;
 class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum composerResult { CRsendNow, CRsendLater, CRdelAsk,
@@ -52,7 +53,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
 
     // unwraped == original, not rewraped text
     // firstEdit==true: place the cursor at the end of the article
-    KNComposer(KNLocalArticle *a, const TQString &text=TQString::null, const TQString &sig=TQString::null, const TQString &unwraped=TQString::null, bool firstEdit=false, bool dislikesCopies=false, bool createCopy=false);
+    KNComposer(KNLocalArticle *a, const TQString &text=TQString(), const TQString &sig=TQString(), const TQString &unwraped=TQString(), bool firstEdit=false, bool dislikesCopies=false, bool createCopy=false);
     ~KNComposer();
     void setConfig(bool onlyFonts);
     void setMessageMode(MessageMode mode);
@@ -68,10 +69,10 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
     //set data from the given article
     void initData(const TQString &text);
 
-    // inserts at cursor position if clear is false, tqreplaces content otherwise
+    // inserts at cursor position if clear is false, replaces content otherwise
     // puts the file content into a box if box==true
     // "file" is already open for reading
-    void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString::null);
+    void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString());
 
     // ask for a filename, handle network urls
     void insertFile(bool clear=false, bool box=false);
@@ -251,9 +252,10 @@ class KNComposer::ComposerView  : public TQSplitter {
 class KNComposer::Editor : public KEdit {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent=0, char *name=0);
+    Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent=0, char *name=0);
     ~Editor();
     TQStringList processedText();
 
@@ -295,7 +297,7 @@ private:
     KNComposer *m_composer;
     KNComposer::ComposerView *m_composerView;
     KSpell *spell;
-    TQMap<TQString,TQStringList> m_tqreplacements;
+    TQMap<TQString,TQStringList> m_replacements;
     TQRegExp m_bound;
 };
 
@@ -303,9 +305,10 @@ private:
 class KNComposer::AttachmentView : public KListView {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AttachmentView(TQWidget *parent, char *name=0);
+    AttachmentView(TQWidget *tqparent, char *name=0);
     ~AttachmentView();
 
   protected:
@@ -330,6 +333,7 @@ class KNComposer::AttachmentViewItem : public KListViewItem {
 class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AttachmentPropertiesDlg( KNAttachment *a, TQWidget *p=0, const char *n=0);
@@ -354,13 +358,14 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 class KNLineEdit : public KABC::AddressLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
     typedef KABC::AddressLineEdit KNLineEditInherited;
 public:
 
-    KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *parent = 0,
+    KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *tqparent = 0,
                const char *name = 0);
 protected:
-    // Inherited. Always called by the parent when this widget is created.
+    // Inherited. Always called by the tqparent when this widget is created.
     virtual void loadAddresses();
     void keyPressEvent(TQKeyEvent *e);
     virtual TQPopupMenu *createPopupMenu();
@@ -373,8 +378,9 @@ private:
 class KNLineEditSpell : public KNLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0);
+    KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name = 0);
     void highLightWord( unsigned int length, unsigned int pos );
     void spellCheckDone( const TQString &s );
     void spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos);
diff --git a/knode/kncomposerui.rc b/knode/kncomposerui.rc
index 0a203d26..4e0ec378 100644
--- a/knode/kncomposerui.rc
+++ b/knode/kncomposerui.rc
@@ -20,9 +20,9 @@
     <Action name="paste_quoted"/>
     <Action name="edit_select_all"/>
     <Separator/>
-    <Action name="edit_find"/>
+    <Action name="edit_tqfind"/>
     <Action name="edit_find_next"/>
-    <Action name="edit_replace"/>
+    <Action name="edit_tqreplace"/>
   </Menu>
   <Menu name="attach"><text>&amp;Attach</text>
     <Action name="append_signature"/>
@@ -91,8 +91,8 @@
   <Action name="paste_quoted"/>
   <Action name="edit_select_all"/>
   <Separator/>
-  <Action name="edit_find"/>
-  <Action name="edit_replace"/>
+  <Action name="edit_tqfind"/>
+  <Action name="edit_tqreplace"/>
   <Separator/>
   <Menu name="spell"><text>Spell Result</text>
      <ActionList name="spell_result"/>
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index cfeb8f00..a7534386 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -112,8 +112,8 @@ bool KNConfig::Identity::emailIsValid()
 
 TQString KNConfig::Identity::getSignature()
 {
-  s_igContents = TQString::null;      // don't cache file contents
-  s_igStdErr = TQString::null;
+  s_igContents = TQString();      // don't cache file contents
+  s_igStdErr = TQString();
 
   if (u_seSigFile) {
     if(!s_igPath.isEmpty()) {
@@ -486,7 +486,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
     case signWarn:
       return TQColor( 0xFF, 0xFF, 0x40 );
     case signErr:
-      return Qt::red;
+      return TQt::red;
 
     case htmlWarning:
       return TQColor( 0xFF, 0x40, 0x40 );
@@ -862,7 +862,7 @@ void KNConfig::Scoring::save()
 KNConfig::XHeader::XHeader(const TQString &s)
 {
   if(s.left(2)=="X-") {
-    int pos=s.find(": ");
+    int pos=s.tqfind(": ");
     if(pos!=-1) {
       n_ame=s.mid(2, pos-2).latin1();
       pos+=2;
@@ -999,7 +999,7 @@ int KNConfig::PostNewsTechnical::indexForCharset(const TQCString &str)
 
 TQCString KNConfig::PostNewsTechnical::findComposerCharset(TQCString cs)
 {
-  TQCString *ret=findComposerCSCache.find(cs);
+  TQCString *ret=findComposerCSCache.tqfind(cs);
   if (ret)
     return *ret;
 
diff --git a/knode/knconfig.h b/knode/knconfig.h
index 6bca3ab1..f2fd7d11 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -66,6 +66,7 @@ class Base {
 class KDE_EXPORT Identity : public TQObject, public Base {
 
 Q_OBJECT
+  TQ_OBJECT
 
   friend class IdentityWidget;
 
diff --git a/knode/knconfigmanager.h b/knode/knconfigmanager.h
index 5a002a93..4ec08c41 100644
--- a/knode/knconfigmanager.h
+++ b/knode/knconfigmanager.h
@@ -27,6 +27,7 @@ class KNConfigDialog;
 class KNConfigManager : TQObject {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNConfigManager(TQObject *p=0, const char *n=0);
@@ -71,6 +72,7 @@ class KNConfigManager : TQObject {
 class KNConfigDialog : public KCMultiDialog {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNConfigDialog(TQWidget *p=0, const char *n=0);
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index 030838ac..fa0593c2 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -28,8 +28,8 @@
 //
 // common config page with tabs (code mostly taken from kmail)
 //
-KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * name )
-  : KCModule( parent, name )
+KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * tqparent, const char * name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   mTabWidget = new TQTabWidget( this );
@@ -72,11 +72,11 @@ void KNConfig::BasePageWithTabs::defaults() {
 //
 extern "C"
 {
-  KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *tqparent, const char * )
   {
     KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget(
       knGlobals.configManager()->identity(),
-      parent,
+      tqparent,
       "kcmknode_config_identity" );
     return page;
   }
@@ -89,15 +89,15 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_accounts( TQWidget *parent, const char * )
+  KCModule *create_knode_config_accounts( TQWidget *tqparent, const char * )
   {
-    KNConfig::AccountsPage *page = new KNConfig::AccountsPage( parent, "kcmknode_config_accounts" );
+    KNConfig::AccountsPage *page = new KNConfig::AccountsPage( tqparent, "kcmknode_config_accounts" );
     return page;
   }
 }
 
-KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name)
-  : BasePageWithTabs(parent, name) {
+KNConfig::AccountsPage::AccountsPage(TQWidget *tqparent, const char *name)
+  : BasePageWithTabs(tqparent, name) {
 
   addTab(new KNConfig::NntpAccountListWidget(this), i18n("Newsgroup Servers"));
   addTab(new KNConfig::SmtpAccountWidget(this), i18n("Mail Server (SMTP)"));
@@ -110,9 +110,9 @@ KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_appearance( TQWidget *parent, const char * )
+  KCModule *create_knode_config_appearance( TQWidget *tqparent, const char * )
   {
-    KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( parent, "kcmknode_config_appearance" );
+    KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( tqparent, "kcmknode_config_appearance" );
     return page;
   }
 }
@@ -124,15 +124,15 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_read_news( TQWidget *parent, const char * )
+  KCModule *create_knode_config_read_news( TQWidget *tqparent, const char * )
   {
-    KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( parent, "kcmknode_config_read_news" );
+    KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( tqparent, "kcmknode_config_read_news" );
     return page;
   }
 }
 
-KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name)
-  : BasePageWithTabs(parent, name) {
+KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *tqparent, const char *name)
+  : BasePageWithTabs(tqparent, name) {
 
   KNConfigManager *cfgMgr = knGlobals.configManager();
   addTab(new KNConfig::ReadNewsGeneralWidget(cfgMgr->readNewsGeneral(), this), i18n("General"));
@@ -150,15 +150,15 @@ KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_post_news( TQWidget *parent, const char * )
+  KCModule *create_knode_config_post_news( TQWidget *tqparent, const char * )
   {
-    KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( parent, "kcmknode_config_post_news" );
+    KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( tqparent, "kcmknode_config_post_news" );
     return page;
   }
 }
 
-KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name)
-  : BasePageWithTabs(parent, name) {
+KNConfig::PostNewsPage::PostNewsPage(TQWidget *tqparent, const char *name)
+  : BasePageWithTabs(tqparent, name) {
 
   KNConfigManager *cfgMgr = knGlobals.configManager();
   addTab(new KNConfig::PostNewsTechnicalWidget(cfgMgr->postNewsTechnical(), this), i18n("Technical"));
@@ -173,9 +173,9 @@ KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_privacy( TQWidget *parent, const char * )
+  KCModule *create_knode_config_privacy( TQWidget *tqparent, const char * )
   {
-    KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( parent, "kcmknode_config_privacy" );
+    KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( tqparent, "kcmknode_config_privacy" );
     return page;
   }
 }
@@ -187,9 +187,9 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_cleanup( TQWidget *parent, const char * )
+  KCModule *create_knode_config_cleanup( TQWidget *tqparent, const char * )
   {
-    KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( parent, "kcmknode_config_cleanup" );
+    KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( tqparent, "kcmknode_config_cleanup" );
     return page;
   }
 }
diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h
index c1426fbc..3f009c1d 100644
--- a/knode/knconfigpages.h
+++ b/knode/knconfigpages.h
@@ -31,8 +31,9 @@ namespace KNConfig {
  */
 class KDE_EXPORT BasePageWithTabs : public KCModule {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    BasePageWithTabs( TQWidget * parent=0, const char * name=0 );
+    BasePageWithTabs( TQWidget * tqparent=0, const char * name=0 );
     ~BasePageWithTabs() {};
 
     virtual void load();
@@ -51,26 +52,29 @@ class KDE_EXPORT BasePageWithTabs : public KCModule {
 // accounts page
 class AccountsPage : public BasePageWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AccountsPage(TQWidget *parent = 0, const char *name = 0);
+    AccountsPage(TQWidget *tqparent = 0, const char *name = 0);
 };
 
 
 // read news page
 class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
   Q_OBJECT
+  TQ_OBJECT
  
   public:
-    ReadNewsPage(TQWidget *parent = 0, const char *name = 0);
+    ReadNewsPage(TQWidget *tqparent = 0, const char *name = 0);
 };
 
 // post news page
 class KDE_EXPORT PostNewsPage : public BasePageWithTabs {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PostNewsPage(TQWidget *parent = 0, const char *name = 0);
+    PostNewsPage(TQWidget *tqparent = 0, const char *name = 0);
 };
 
 
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index d70ebfa4..e02338fa 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -163,7 +163,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *
   topL->addMultiCellWidget(s_igEdit, 9, 9, 0, 2);
 
   s_igEditor = new TQTextEdit(this);
-  s_igEditor->setTextFormat(Qt::PlainText);
+  s_igEditor->setTextFormat(TQt::PlainText);
   topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2);
   connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) );
 
@@ -213,7 +213,7 @@ void KNConfig::IdentityWidget::save()
   d_ata->s_igningKey = s_igningKey->keyIDs().first();
   d_ata->u_seSigFile=s_igFile->isChecked();
   d_ata->u_seSigGenerator=s_igGenerator->isChecked();
-  d_ata->s_igPath=c_ompletion->tqreplacedPath(s_ig->text());
+  d_ata->s_igPath=c_ompletion->replacedPath(s_ig->text());
   d_ata->s_igText=s_igEditor->text();
 
   if(d_ata->isGlobal())
@@ -242,7 +242,7 @@ void KNConfig::IdentityWidget::slotSignatureType(int type)
 
 void KNConfig::IdentityWidget::slotSignatureChoose()
 {
-  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->tqreplacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature"));
+  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->replacedPath(s_ig->text()),TQString(),this,i18n("Choose Signature"));
   if(!tmp.isEmpty()) s_ig->setText(tmp);
   emit changed( true );
 }
@@ -250,7 +250,7 @@ void KNConfig::IdentityWidget::slotSignatureChoose()
 
 void KNConfig::IdentityWidget::slotSignatureEdit()
 {
-  TQString fileName = c_ompletion->tqreplacedPath(s_ig->text()).stripWhiteSpace();
+  TQString fileName = c_ompletion->replacedPath(s_ig->text()).stripWhiteSpace();
 
   if (fileName.isEmpty()) {
     KMessageBox::sorry(this, i18n("You must specify a filename."));
@@ -294,7 +294,7 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *
   topL->addMultiCellWidget(l_box, 0,4, 0,0);
 
   // info box
-  TQGroupBox *gb = new TQGroupBox(2,Qt::Vertical,TQString::null,this);
+  TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this);
   topL->addWidget(gb,5,0);
 
   s_erverInfo = new TQLabel(gb);
@@ -749,7 +749,7 @@ void KNConfig::AppearanceWidget::ColorListItem::paint( TQPainter *p )
 
   p->drawText( 30+3*2, fm.ascent() + fm.leading()/2, text() );
 
-  p->setPen( Qt::black );
+  p->setPen( TQt::black );
   p->drawRect( 3, 1, 30, h-1 );
   p->fillRect( 4, 2, 28, h-3, mColor );
 }
@@ -2074,7 +2074,7 @@ void KNConfig::PostNewsTechnicalWidget::slotItemSelected(int)
 
 void KNConfig::PostNewsTechnicalWidget::slotAddBtnClicked()
 {
-  XHeaderConfDialog *dlg=new XHeaderConfDialog(TQString::null, this);
+  XHeaderConfDialog *dlg=new XHeaderConfDialog(TQString(), this);
   if (dlg->exec())
     l_box->insertItem(dlg->result());
 
@@ -2131,7 +2131,7 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c
   new TQLabel(":", page);
   v_alue=new KLineEdit(page);
 
-  int pos=h.find(": ", 2);
+  int pos=h.tqfind(": ", 2);
   if(pos!=-1) {
     n_ame->setText(h.mid(2, pos-2));
     pos+=2;
@@ -2237,7 +2237,7 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
   connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
   editorL->addWidget(btn,1,2);
 
-  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be tqreplaced with the filename to edit."), editorB),2,2,0,2);
+  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2);
 
   e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB);
   editorL->addMultiCellWidget(e_xternCB, 3,3,0,2);
@@ -2293,7 +2293,7 @@ void KNConfig::PostNewsComposerWidget::slotChooseEditor()
   if (path.right(3) == " %f")
     path.truncate(path.length()-3);
 
-  path=KFileDialog::getOpenFileName(path, TQString::null, this, i18n("Choose Editor"));
+  path=KFileDialog::getOpenFileName(path, TQString(), this, i18n("Choose Editor"));
 
   if (!path.isEmpty())
     e_ditor->setText(path+" %f");
@@ -2360,8 +2360,8 @@ void KNConfig::PrivacyWidget::save()
 //BEGIN: Cleanup configuration widgets ---------------------------------------
 
 
-KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mData( data )
+KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mData( data )
 {
   TQVBoxLayout *top = new TQVBoxLayout( this );
 
@@ -2372,7 +2372,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
   }
 
   mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
-  mExpGroup->setColumnLayout(0, Qt::Vertical );
+  mExpGroup->setColumnLayout(0, TQt::Vertical );
   mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   mExpGroup->tqlayout()->setMargin( KDialog::marginHint() );
   top->addWidget( mExpGroup );
@@ -2387,7 +2387,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
   mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
   TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup );
   grid->addWidget( label, 2, 0 );
-  grid->addWidget( mExpDays, 2, 1, Qt::AlignRight );
+  grid->addWidget( mExpDays, 2, 1, TQt::AlignRight );
   connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
   connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) );
   connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) );
@@ -2396,14 +2396,14 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
   mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
   label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup );
   grid->addWidget( label, 3, 0 );
-  grid->addWidget( mExpReadDays, 3, 1, Qt::AlignRight );
+  grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight );
   connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
   connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) );
 
   mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup );
   label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup );
   grid->addWidget( label, 4, 0 );
-  grid->addWidget( mExpUnreadDays, 4, 1, Qt::AlignRight );
+  grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight );
   connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) );
   connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) );
 
@@ -2481,7 +2481,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
   // === folders =========================================================
 
   TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
-  foldersB->setColumnLayout(0, Qt::Vertical );
+  foldersB->setColumnLayout(0, TQt::Vertical );
   foldersB->tqlayout()->setSpacing( KDialog::spacingHint() );
   foldersB->tqlayout()->setMargin( KDialog::marginHint() );
 
@@ -2497,7 +2497,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
   f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB);
   f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB);
   foldersL->addWidget(f_olderDaysL,2,0);
-  foldersL->addWidget(f_olderDays,2,1,Qt::AlignRight);
+  foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight);
   connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
   connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int)));
 
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index da6af2dd..806f6b82 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -66,6 +66,7 @@ namespace KNConfig {
 class KDE_EXPORT IdentityWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     IdentityWidget(Identity *d, TQWidget *p=0, const char *n=0);
@@ -107,6 +108,7 @@ class KDE_EXPORT IdentityWidget : public KCModule {
 class KDE_EXPORT NntpAccountListWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     NntpAccountListWidget(TQWidget *p=0, const char *n=0);
@@ -154,6 +156,7 @@ class KDE_EXPORT NntpAccountListWidget : public KCModule {
 class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     NntpAccountConfDialog(KNNntpAccount* acc, TQWidget *p=0, const char *n=0);
@@ -195,6 +198,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase {
 
 Q_OBJECT
+  TQ_OBJECT
 
   public:
     SmtpAccountWidget(TQWidget *p=0, const char *n=0);
@@ -216,6 +220,7 @@ Q_OBJECT
 class KDE_EXPORT AppearanceWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AppearanceWidget(TQWidget *p=0, const char *n=0);
@@ -231,7 +236,7 @@ class KDE_EXPORT AppearanceWidget : public KCModule {
     class KDE_EXPORT ColorListItem : public TQListBoxText {
 
       public:
-        ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+        ColorListItem( const TQString &text, const TQColor &color=TQt::black );
         ~ColorListItem();
         const TQColor& color()                     { return mColor; }
         void  setColor( const TQColor &color )     { mColor = color; }
@@ -344,6 +349,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public KCModule {
 class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ReadNewsViewerWidget(ReadNewsViewer *d, TQWidget *p=0, const char *n=0);
@@ -370,6 +376,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DisplayedHeadersWidget(DisplayedHeaders *d, TQWidget *p=0, const char *n=0);
@@ -416,6 +423,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DisplayedHeaderConfDialog(KNDisplayedHeader *h, TQWidget *p=0, char *n=0);
@@ -440,6 +448,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT ScoringWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ScoringWidget(Scoring *d, TQWidget *p=0, const char *n=0);
@@ -460,6 +469,7 @@ class KDE_EXPORT ScoringWidget : public KCModule {
 class KDE_EXPORT FilterListWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     FilterListWidget(TQWidget *p=0, const char *n=0);
@@ -525,6 +535,7 @@ class KDE_EXPORT FilterListWidget : public KCModule {
 class KDE_EXPORT PostNewsTechnicalWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PostNewsTechnicalWidget(PostNewsTechnical *d, TQWidget *p=0, const char *n=0);
@@ -562,7 +573,7 @@ class KDE_EXPORT PostNewsTechnicalWidget : public KCModule {
 class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
 
   public:
-    XHeaderConfDialog(const TQString &h=TQString::null, TQWidget *p=0, const char *n=0);
+    XHeaderConfDialog(const TQString &h=TQString(), TQWidget *p=0, const char *n=0);
     ~XHeaderConfDialog();
 
     TQString result();
@@ -578,6 +589,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT PostNewsComposerWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PostNewsComposerWidget(PostNewsComposer *d, TQWidget *p=0, const char *n=0);
@@ -623,6 +635,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public KCModule {
 class KDE_EXPORT PrivacyWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PrivacyWidget(TQWidget *p=0, const char *n=0);
@@ -642,9 +655,10 @@ class KDE_EXPORT PrivacyWidget : public KCModule {
 class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupCleanupWidget( Cleanup *data, TQWidget *parent = 0, const char *name = 0 );
+    GroupCleanupWidget( Cleanup *data, TQWidget *tqparent = 0, const char *name = 0 );
 
     void load();
     void save();
@@ -670,6 +684,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 class KDE_EXPORT CleanupWidget : public KCModule {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     CleanupWidget(TQWidget *p=0, const char *n=0);
@@ -702,6 +717,7 @@ class KDE_EXPORT CleanupWidget : public KCModule {
 
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     CacheWidget(Cache *d, TQWidget *p=0, const char *n=0);
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index ce25167e..e925c26d 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -405,7 +405,7 @@ int KNConvert::Converter04::convertFolder(TQString srcPrefix, TQString dstPrefix
     buff.at(readBytes)='\0'; //terminate string;
 
     //remove "X-KNode-Overview"
-    int pos=buff.find('\n');
+    int pos=buff.tqfind('\n');
     if(pos>-1)
       buff.remove(0, pos+1);
 
diff --git a/knode/knconvert.h b/knode/knconvert.h
index 49d3d7c5..4db14718 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -35,6 +35,7 @@ class KProcess;
 class KDE_EXPORT KNConvert : public TQDialog {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static bool needToConvert(const TQString &oldVersion);
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index da8b1a2c..1f6952f4 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -95,7 +95,7 @@ TQString KNDisplayedHeader::translatedName()
       else
         return n_ame;
     } else
-      return TQString::null;
+      return TQString();
   } else
     return n_ame;
 }
@@ -135,7 +135,7 @@ void  KNDisplayedHeader::createTags()
   const char *tokens[] = {  "<big>","</big>","<b>","</b>",
                             "<i>","</i>","<u>","</u>" };
 
-  for(int i=0; i<4; i++) t_ags[i]=TQString::null;
+  for(int i=0; i<4; i++) t_ags[i]=TQString();
 
   if(f_lags.at(0)) {    // <big>
     t_ags[0]=tokens[0];
diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp
index 3c7daee1..f3870c1b 100644
--- a/knode/knfilterconfigwidget.cpp
+++ b/knode/knfilterconfigwidget.cpp
@@ -25,8 +25,8 @@
 #include "knfilterconfigwidget.h"
 
 
-KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name ) :
-  TQTabWidget(parent,name)
+KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *tqparent, const char *name ) :
+  TQTabWidget(tqparent,name)
 {
   TQWidget *sf, *idW, *add;
   sf=new TQWidget(this);
@@ -50,7 +50,7 @@ KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name )
   addTab(idW, i18n("M&essage-IDs"));
 
   status=new KNStatusFilterWidget(this);
-  addTab(status, i18n("&Status"));
+  addTab(status, i18n("&tqStatus"));
 
   add=new TQWidget(this);
   TQVBoxLayout *addL=new TQVBoxLayout(add, 8,5);
diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h
index 8d87d53f..94a100d7 100644
--- a/knode/knfilterconfigwidget.h
+++ b/knode/knfilterconfigwidget.h
@@ -27,12 +27,13 @@ class KNRangeFilterWidget;
 class KNFilterConfigWidget : public TQTabWidget  {
 
   Q_OBJECT
+  TQ_OBJECT
   
   friend class KNFilterDialog;
   friend class KNSearchDialog;
 
   public:
-    KNFilterConfigWidget(TQWidget *parent=0, const char *name=0);
+    KNFilterConfigWidget(TQWidget *tqparent=0, const char *name=0);
     ~KNFilterConfigWidget();
     
     void reset();
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index f0151766..0cd0b2ad 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -30,9 +30,9 @@
 #include "knfilterdialog.h"
 
 
-KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name)
+KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *tqparent, const char *name)
   : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()),
-                Ok|Cancel|Help, Ok, parent, name),
+                Ok|Cancel|Help, Ok, tqparent, name),
     fltr(f)
 {
   TQFrame* page=plainPage();
diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h
index 3dc7ee64..69e5c45d 100644
--- a/knode/knfilterdialog.h
+++ b/knode/knfilterdialog.h
@@ -29,11 +29,12 @@ class TQCheckBox;
 class KNFilterDialog : public KDialogBase {
 
   Q_OBJECT
+  TQ_OBJECT
 
   friend class KNFilterManager;
 
   public:
-    KNFilterDialog(KNArticleFilter *f=0, TQWidget *parent=0, const char *name=0);
+    KNFilterDialog(KNArticleFilter *f=0, TQWidget *tqparent=0, const char *name=0);
     ~KNFilterDialog();
 
     KNArticleFilter* filter() { return fltr; }
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 9ea8d7ac..0d01698e 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -30,8 +30,8 @@
 
 
 KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix,
-                                            TQObject* parent, const char *name )
- : KActionMenu(text,pix,parent,name), currentItem(-42)
+                                            TQObject* tqparent, const char *name )
+ : KActionMenu(text,pix,tqparent,name), currentItem(-42)
 {
   popupMenu()->setCheckable(true);
   connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int)));
@@ -61,8 +61,8 @@ void KNFilterSelectAction::slotMenuActivated(int id)
 
 //==============================================================================
 
-KNFilterManager::KNFilterManager(TQObject * parent, const char * name)
- : TQObject(parent,name), fset(0), currFilter(0), a_ctFilter(0)
+KNFilterManager::KNFilterManager(TQObject * tqparent, const char * name)
+ : TQObject(tqparent,name), fset(0), currFilter(0), a_ctFilter(0)
 {
   loadFilters();
 
@@ -262,7 +262,7 @@ void KNFilterManager::copyFilter(KNArticleFilter *f)
 void KNFilterManager::deleteFilter(KNArticleFilter *f)
 {
   if ( KMessageBox::warningContinueCancel( fset ? fset : knGlobals.topWidget,
-       i18n("Do you really want to delete this filter?"), TQString::null, KGuiItem( i18n("&Delete"), "editdelete" ) )
+       i18n("Do you really want to delete this filter?"), TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) )
        == KMessageBox::Continue ) {
     if ( mFilterList.remove( f ) ) { // does not delete surplus config files
       if ( fset ) {                 // we reuse ids to reduce the number of dead files
diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h
index 2dc431f3..c5c1f974 100644
--- a/knode/knfiltermanager.h
+++ b/knode/knfiltermanager.h
@@ -31,10 +31,11 @@ class KNFilterDialog;
 class KNFilterSelectAction : public KActionMenu
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNFilterSelectAction( const TQString& text, const TQString& pix,
-                          TQObject* parent, const char *name );
+                          TQObject* tqparent, const char *name );
     ~KNFilterSelectAction();
 
     void setCurrentItem(int id);
@@ -50,12 +51,13 @@ class KNFilterSelectAction : public KActionMenu
 };
 
 
-class KNFilterManager : public QObject
+class KNFilterManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNFilterManager(TQObject * parent = 0, const char * name = 0);
+    KNFilterManager(TQObject * tqparent = 0, const char * name = 0);
     ~KNFilterManager();
 
     void readOptions();
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 81f4f01a..0044abc8 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -41,8 +41,8 @@ KNFolder::KNFolder()
 }
 
 
-KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
-  : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true)
+KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent)
+  : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
 {
   TQString fname=path()+TQString("custom_%1").arg(i_d);
 
@@ -51,7 +51,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
   i_ndexFile.setName(fname+".idx");
   i_nfoPath=fname+".info";
 
-  p_arentId=parent?parent->id():-1;
+  p_arentId=tqparent?tqparent->id():-1;
 
   if(i_ndexFile.exists())
     c_ount=i_ndexFile.size()/sizeof(DynData);
@@ -60,8 +60,8 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
 }
 
 
-KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent)
-  : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true)
+KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent)
+  : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
 {
   TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d);
 
@@ -70,7 +70,7 @@ KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolde
   i_ndexFile.setName(fname+".idx");
   i_nfoPath=fname+".info";
 
-  p_arentId=parent?parent->id():-1;
+  p_arentId=tqparent?tqparent->id():-1;
 
   if(i_ndexFile.exists())
     c_ount=i_ndexFile.size()/sizeof(DynData);
@@ -115,7 +115,7 @@ bool KNFolder::readInfo(const TQString &infoPath)
   if (!isRootFolder() && !isStandardFolder()) {
     n_ame=info.readEntry("name");
     i_d=info.readNumEntry("id", -1);
-    p_arentId=info.readNumEntry("parentId", -1);
+    p_arentId=info.readNumEntry("tqparentId", -1);
   }
   w_asOpen=info.readBoolEntry("wasOpen", true);
 
@@ -147,7 +147,7 @@ void KNFolder::saveInfo()
     if (!isRootFolder() && !isStandardFolder()) {
       info.writeEntry("name", n_ame);
       info.writeEntry("id", i_d);
-      info.writeEntry("parentId", p_arentId);
+      info.writeEntry("tqparentId", p_arentId);
     }
     if(l_istItem)
       info.writeEntry("wasOpen", l_istItem->isOpen());
@@ -187,7 +187,7 @@ bool KNFolder::loadHdrs()
   }
 
   TQCString tmp;
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   KNLocalArticle *art;
   DynData dynamic;
   int pos1=0, pos2=0, cnt=0, byteCount;
@@ -244,8 +244,8 @@ bool KNFolder::loadHdrs()
 
     //set overview
     bool end=false;
-    pos1=tmp.find(' ')+1;
-    pos2=tmp.find('\t', pos1);
+    pos1=tmp.tqfind(' ')+1;
+    pos2=tmp.tqfind('\t', pos1);
     if (pos2 == -1) {
       pos2=tmp.length();
       end=true;
@@ -254,7 +254,7 @@ bool KNFolder::loadHdrs()
 
     if (!end) {
       pos1=pos2+1;
-      pos2=tmp.find('\t', pos1);
+      pos2=tmp.tqfind('\t', pos1);
       if (pos2 == -1) {
         pos2=tmp.length();
         end=true;
@@ -264,7 +264,7 @@ bool KNFolder::loadHdrs()
 
     if (!end) {
       pos1=pos2+1;
-      pos2=tmp.find('\t', pos1);
+      pos2=tmp.tqfind('\t', pos1);
       if (pos2 == -1) {
         pos2=tmp.length();
         end=true;
@@ -284,7 +284,7 @@ bool KNFolder::loadHdrs()
       clear();
       closeFiles();
 
-      knGlobals.seStatusMsg(TQString::null);
+      knGlobals.seStatusMsg(TQString());
       knGlobals.top->setCursorBusy(false);
       return false;
     }
@@ -297,7 +297,7 @@ bool KNFolder::loadHdrs()
   c_ount=cnt;
   updateListItem();
 
-  knGlobals.seStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString());
   knGlobals.top->setCursorBusy(false);
 
   return true;
diff --git a/knode/knfolder.h b/knode/knfolder.h
index 0be6dafd..692e02a6 100644
--- a/knode/knfolder.h
+++ b/knode/knfolder.h
@@ -28,8 +28,8 @@ class KNFolder : public KNArticleCollection  {
 
   public:
     KNFolder();
-    KNFolder(int id, const TQString &name, KNFolder *parent=0);
-    KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent=0);
+    KNFolder(int id, const TQString &name, KNFolder *tqparent=0);
+    KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent=0);
     ~KNFolder();
 
     //type
@@ -38,7 +38,7 @@ class KNFolder : public KNArticleCollection  {
     //id
     int id() const                           { return i_d; }
     void setId(int i)                   { i_d=i; }
-    int parentId() const                     { return p_arentId; }
+    int tqparentId() const                     { return p_arentId; }
     bool isStandardFolder()             { return (i_d > 0) && (i_d <=3); }
     bool isRootFolder()                 { return i_d==0; }
 
@@ -58,7 +58,7 @@ class KNFolder : public KNArticleCollection  {
     KNLocalArticle* byMessageId(const TQCString &mid)
                                         { return static_cast<KNLocalArticle*>(KNArticleCollection::byMessageId(mid)); }
 
-    //parent
+    //tqparent
     void setParent(KNCollection *p);
 
     //load, save and delete
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index e857f4bb..bdcbed4a 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -156,7 +156,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f)
 
   // find all subfolders of the folder we want to delete
   for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) {
-    p = (*it)->parent();
+    p = (*it)->tqparent();
     while ( p ) {
       if ( p == f ) {
         if ( (*it)->lockedArticles() > 0 )
@@ -164,7 +164,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f)
         del.append( (*it) );
         break;
       }
-      p = p->parent();
+      p = p->tqparent();
     }
   }
 
@@ -198,15 +198,15 @@ void KNFolderManager::emptyFolder(KNFolder *f)
 
 bool KNFolderManager::moveFolder(KNFolder *f, KNFolder *p)
 {
-  if(!f || p==f->parent()) // nothing to be done
+  if(!f || p==f->tqparent()) // nothing to be done
     return true;
 
   // is "p" a child of "f" ?
-  KNCollection *p2=p?p->parent():0;
+  KNCollection *p2=p?p->tqparent():0;
   while(p2) {
     if(p2==f)
       break;
-    p2=p2->parent();
+    p2=p2->tqparent();
   }
 
   if( (p2 && p2==f) || f==p || f->isStandardFolder() || f->isRootFolder()) //  no way ;-)
@@ -366,7 +366,7 @@ void KNFolderManager::importFromMBox(KNFolder *f)
     if (!list.isEmpty())
       knGlobals.articleManager()->moveIntoFolder(list, f);
 
-    knGlobals.seStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString());
     knGlobals.top->setCursorBusy(false);
   }
 
@@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
         knGlobals.top->secureProcessEvents();
     }
 
-    knGlobals.seStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString());
     knGlobals.top->setCursorBusy(false);
   }
 }
@@ -463,11 +463,11 @@ int KNFolderManager::loadCustomFolders()
       delete f;
   }
 
-  // set parents
+  // set tqparents
   if(cnt>0) {
     for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) {
-      if ( !(*it)->isRootFolder() ) {   // the root folder has no parent
-        KNFolder *par = folder( (*it)->parentId() );
+      if ( !(*it)->isRootFolder() ) {   // the root folder has no tqparent
+        KNFolder *par = folder( (*it)->tqparentId() );
         if ( !par )
           par = root();
         (*it)->setParent( par );
diff --git a/knode/knfoldermanager.h b/knode/knfoldermanager.h
index a6337d80..0920a675 100644
--- a/knode/knfoldermanager.h
+++ b/knode/knfoldermanager.h
@@ -23,9 +23,10 @@ class KNArticleManager;
 class KNCleanUp;
 
 
-class KNFolderManager : public QObject
+class KNFolderManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNFolderManager(KNArticleManager *a);
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 72ffa1f0..2cb801e8 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -76,7 +76,7 @@ class KDE_EXPORT KNGlobals {
     KNMemoryManager       *memoryManager();
 
     /** forwarded to top->seStatusMsg() if available */
-    void seStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN);
+    void seStatusMsg(const TQString& text = TQString(), int id = SB_MAIN);
 
 private:
     KSharedConfig::Ptr c_onfig;
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index 3584e744..1815027c 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -167,8 +167,8 @@ void KNGroup::saveInfo()
 
 KNNntpAccount* KNGroup::account()
 {
-  KNCollection *p=parent();
-  while(p->type()!=KNCollection::CTnntpAccount) p=p->parent();
+  KNCollection *p=tqparent();
+  while(p->type()!=KNCollection::CTnntpAccount) p=p->tqparent();
 
   return (KNNntpAccount*)p_arent;
 }
@@ -184,7 +184,7 @@ bool KNGroup::loadHdrs()
   kdDebug(5003) << "KNGroup::loadHdrs() : loading headers" << endl;
   TQCString buff, hdrValue;
   KNFile f;
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   int cnt=0, id, lines, fileFormatVersion, artNumber;
   unsigned int timeT;
   KNRemoteArticle *art;
@@ -254,7 +254,7 @@ bool KNGroup::loadHdrs()
         // following lines contain one header per line
         for (uint i = buff.toUInt(); i > 0; --i) {
           buff = f.readLine();
-          int pos = buff.find(':');
+          int pos = buff.tqfind(':');
           TQCString hdrName = buff.left( pos );
           // skip headers we already set above and which we actually never should
           // find here, but however it still happens... (eg. #101355)
@@ -388,7 +388,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
 {
   KNRemoteArticle *art=0, *art2=0;
   TQCString data, hdr, hdrName;
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   split.setIncludeSep(false);
   int new_cnt=0, added_cnt=0, todo=hdrs->count();
   TQTime timer;
@@ -457,7 +457,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
       if (!split.next())
         break;
       data = split.string();
-      int pos = hdr.find(':');
+      int pos = hdr.tqfind(':');
       hdrName = hdr.left( pos );
       // if the header format is 'full' we have to strip the header name
       if (hdr.findRev("full") == (int)(hdr.length() - 4))
@@ -492,7 +492,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
   }
 
   // now we build the threads
-  syncSearchIndex(); // recreate the msgId-index so it tqcontains the appended headers
+  syncSearchIndex(); // recreate the msgId-index so it contains the appended headers
   buildThreads(added_cnt, client);
   updateThreadInfo();
 
@@ -558,7 +558,7 @@ int KNGroup::saveStaticData(int cnt,bool ovr)
       // optional headers
       ts << mOptionalHeaders.count() << '\n';
       for (TQCString hdrName = mOptionalHeaders.first(); hdrName; hdrName = mOptionalHeaders.next()) {
-        hdrName = hdrName.left( hdrName.find(':') );
+        hdrName = hdrName.left( hdrName.tqfind(':') );
         KMime::Headers::Base *hdr = art->getHeaderByType( hdrName );
         if ( hdr )
           ts << hdrName << ": " << hdr->asUnicodeString() << '\n';
@@ -936,7 +936,7 @@ void KNGroup::scoreArticles(bool onlynew)
         incReadCount();
     }
 
-    knGlobals.seStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString());
     knGlobals.top->setCursorBusy(false);
 
     //kdDebug(5003) << KNScorableArticle::notifyC->collection() << endl;
@@ -965,7 +965,7 @@ void KNGroup::reorganize()
   saveStaticData(length(), true);
   saveDynamicData(length(), true);
   knGlobals.top->headerView()->tqrepaint();
-  knGlobals.seStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString());
   knGlobals.top->setCursorBusy(false);
 }
 
@@ -1050,7 +1050,7 @@ int KNGroup::statThrWithUnread()
 TQString KNGroup::prepareForExecution()
 {
   if (knGlobals.groupManager()->loadHeaders(this))
-    return TQString::null;
+    return TQString();
   else
     return i18n("Cannot load saved headers: %1").arg(groupname());
 }
diff --git a/knode/kngroup.h b/knode/kngroup.h
index 76a9d0dd..387ff0f6 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -35,7 +35,7 @@ namespace KNConfig {
 class KNGroup : public KNArticleCollection , public KNJobItem  {
 
   public:
-    enum Status { unknown=0, readOnly=1, postingAllowed=2, moderated=3 };
+    enum tqStatus { unknown=0, readOnly=1, postingAllowed=2, moderated=3 };
 
     KNGroup(KNCollection *p=0);
     ~KNGroup();
@@ -123,8 +123,8 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     KNNntpAccount* account();
     KNConfig::Identity* identity()const          { return i_dentity; }
     void setIdentity(KNConfig::Identity *i) { i_dentity=i; }
-    Status status()const                         { return s_tatus; }
-    void seStatus(Status s)                { s_tatus=s; }
+    tqStatus status()const                         { return s_tatus; }
+    void setqStatus(tqStatus s)                { s_tatus=s; }
     void showProperties();
 
     // cleanup configuration
@@ -153,7 +153,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     bool      l_ocked,
               u_seCharset;
 
-    Status    s_tatus;
+    tqStatus    s_tatus;
 
     TQStringList c_rosspostIDBuffer;
 
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index d8e3f835..d28e9ed9 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -34,9 +34,9 @@
 #include <tqpushbutton.h>
 
 
-KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a,
+KNGroupBrowser::KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a,
                                int buttons, bool newCBact, const TQString &user1, const TQString &user2) :
-  KDialogBase( parent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ),
+  KDialogBase( tqparent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ),
   incrementalFilter(false), a_ccount(a)
 {
   refilterTimer = new TQTimer();
@@ -190,7 +190,7 @@ bool KNGroupBrowser::itemInListView(TQListView *view, const KNGroupInfo &gi)
 }
 
 
-void KNGroupBrowser::createListItems(TQListViewItem *parent)
+void KNGroupBrowser::createListItems(TQListViewItem *tqparent)
 {
   TQString prefix, tlgn, compare;
   TQListViewItem *it;
@@ -198,11 +198,11 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent)
   int colon;
   bool expandit=false;
 
-  if(parent) {
-    TQListViewItem *p=parent;
+  if(tqparent) {
+    TQListViewItem *p=tqparent;
     while(p) {
       prefix.prepend(p->text(0));
-      p=p->parent();
+      p=p->tqparent();
     }
   }
 
@@ -217,7 +217,7 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent)
     compare=gn->name.mid(prefix.length());
 
     if(!expandit || !compare.startsWith(tlgn)) {
-     if((colon=compare.find('.'))!=-1) {
+     if((colon=compare.tqfind('.'))!=-1) {
         colon++;
         expandit=true;
       } else {
@@ -228,8 +228,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent)
       tlgn = compare.left(colon);
 
       if(expandit) {
-        if(parent)
-          it=new TQListViewItem(parent, tlgn);
+        if(tqparent)
+          it=new TQListViewItem(tqparent, tlgn);
         else
           it=new TQListViewItem(groupView, tlgn);
 
@@ -237,8 +237,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent)
         it->setExpandable(true);
       }
       else {
-        if(parent)
-          cit=new CheckItem(parent, *gn, this);
+        if(tqparent)
+          cit=new CheckItem(tqparent, *gn, this);
         else
           cit=new CheckItem(groupView, *gn, this);
         updateItemState(cit);
@@ -327,7 +327,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
     for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) {
       if ((notCheckSub||g->subscribed)&&
           (notCheckNew||g->newGroup)&&
-          (notCheckStr||(g->name.find(filtertxt)!=-1)))
+          (notCheckStr||(g->name.tqfind(filtertxt)!=-1)))
       tempList->append(g);
     }
 
@@ -339,7 +339,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
     for(KNGroupInfo *g=allList->first(); g; g=allList->next()) {
       if ((notCheckSub||g->subscribed)&&
           (notCheckNew||g->newGroup)&&
-          (notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.find(filtertxt)!=-1))))
+          (notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.tqfind(filtertxt)!=-1))))
         matchList->append(g);
     }
   }
diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h
index 5178fc57..4a32d627 100644
--- a/knode/kngroupbrowser.h
+++ b/knode/kngroupbrowser.h
@@ -35,6 +35,7 @@ class KNNntpAccount;
 class KNGroupBrowser : public KDialogBase {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     class CheckItem : public TQCheckListItem {
@@ -62,8 +63,8 @@ class KNGroupBrowser : public KDialogBase {
         KNGroupInfo info;
     };
 
-    KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a, int buttons=0,
-                   bool newCBact=false, const TQString &user1=TQString::null, const TQString &user2=TQString::null);
+    KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a, int buttons=0,
+                   bool newCBact=false, const TQString &user1=TQString(), const TQString &user2=TQString());
     ~KNGroupBrowser();
 
     KNNntpAccount* account()const      { return a_ccount; }
@@ -80,7 +81,7 @@ class KNGroupBrowser : public KDialogBase {
     void changeItemState(const KNGroupInfo &gi, bool s);
     bool itemInListView(TQListView *view, const KNGroupInfo &gi);
     void removeListItem(TQListView *view, const KNGroupInfo &gi);
-    void createListItems(TQListViewItem *parent=0);
+    void createListItems(TQListViewItem *tqparent=0);
 
     TQWidget *page;
     TQListView *groupView;
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index bff6dfd5..eadaf06b 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -34,8 +34,8 @@
 #include <tqpushbutton.h>
 
 
-KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) :
-  KNGroupBrowser(parent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") )
+KNGroupDialog::KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a) :
+  KNGroupBrowser(tqparent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") )
 {
   rightLabel->setText(i18n("Current changes:"));
   subView=new TQListView(page);
@@ -138,7 +138,7 @@ void KNGroupDialog::toSubscribe(TQSortedList<KNGroupInfo> *l)
   }
   if (moderated)   // warn the user
      KMessageBox::information(knGlobals.topWidget,i18n("You have subscribed to a moderated newsgroup.\nYour articles will not appear in the group immediately.\nThey have to go through a moderation process."),
-                              TQString::null,"subscribeModeratedWarning");
+                              TQString(),"subscribeModeratedWarning");
 }
 
 
@@ -292,7 +292,7 @@ void KNGroupDialog::slotUser2()
   topL->addMultiCellWidget(takeLast, 0, 0, 0, 1);
 
   TQLabel *l = new TQLabel(KGlobal::locale()->formatDate(lastDate, false),btnGrp);
-  topL->addWidget(l, 1, 1, Qt::AlignLeft);
+  topL->addWidget(l, 1, 1, TQt::AlignLeft);
 
   connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool)));
 
@@ -301,7 +301,7 @@ void KNGroupDialog::slotUser2()
 
   KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate);
   dateSel->setMinimumSize(dateSel->tqsizeHint());
-  topL->addWidget(dateSel, 3, 1, Qt::AlignLeft);
+  topL->addWidget(dateSel, 3, 1, TQt::AlignLeft);
 
   connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
 
diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h
index a2d74798..024e6707 100644
--- a/knode/kngroupdialog.h
+++ b/knode/kngroupdialog.h
@@ -23,9 +23,10 @@
 class KNGroupDialog : public KNGroupBrowser {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNGroupDialog(TQWidget *parent, KNNntpAccount *a);
+    KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a);
     ~KNGroupDialog();
 
     void toSubscribe(TQSortedList<KNGroupInfo> *l);
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 2bece357..48cfc117 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -51,7 +51,7 @@ KNGroupInfo::KNGroupInfo()
 }
 
 
-KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::Status s_tatus)
+KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::tqStatus s_tatus)
   : name(n_ame), description(d_escription), newGroup(n_ewGroup), subscribed(s_ubscribed),
     status(s_tatus)
 {
@@ -101,7 +101,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
   int sepPos1,sepPos2;
   TQString name,description;
   bool sub;
-  KNGroup::Status status=KNGroup::unknown;
+  KNGroup::tqStatus status=KNGroup::unknown;
   TQTime timer;
   uint size=f.size()+2;
 
@@ -111,16 +111,16 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
   if(f.open(IO_ReadOnly)) {
     while(!f.atEnd()) {
       line = f.readLine();
-      sepPos1 = line.find(' ');
+      sepPos1 = line.tqfind(' ');
 
       if (sepPos1==-1) {        // no description
         name = TQString::fromUtf8(line);
-        description = TQString::null;
+        description = TQString();
         status = KNGroup::unknown;
       } else {
         name = TQString::fromUtf8(line.left(sepPos1));
 
-        sepPos2 = line.find(' ',sepPos1+1);
+        sepPos2 = line.tqfind(' ',sepPos1+1);
         if (sepPos2==-1) {        // no status
           description = TQString::fromUtf8(line.right(line.length()-sepPos1-1));
           status = KNGroup::unknown;
@@ -201,7 +201,7 @@ void KNGroupListData::merge(TQSortedList<KNGroupInfo>* newGroups)
   bool subscribed;
 
   for (KNGroupInfo *i=newGroups->first(); i; i=newGroups->next()) {
-    if (groups->find(i)>=0) {
+    if (groups->tqfind(i)>=0) {
       subscribed = groups->current()->subscribed;
       groups->remove();   // avoid duplicates
     } else
@@ -224,8 +224,8 @@ TQSortedList<KNGroupInfo>* KNGroupListData::extractList()
 //===============================================================================
 
 
-KNGroupManager::KNGroupManager(TQObject * parent, const char * name)
-  : TQObject(parent,name)
+KNGroupManager::KNGroupManager(TQObject * tqparent, const char * name)
+  : TQObject(tqparent,name)
 {
   c_urrentGroup=0;
   a_rticleMgr = knGlobals.articleManager();
@@ -393,9 +393,9 @@ void KNGroupManager::expireAll(KNNntpAccount *a)
 }
 
 
-void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent)
+void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *tqparent)
 {
-  KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a);
+  KNGroupDialog* gDialog=new KNGroupDialog((tqparent!=0)? tqparent:knGlobals.topWidget, a);
 
   connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*)));
   connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*)));
@@ -408,8 +408,8 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent)
     TQStringList lst;
     gDialog->toUnsubscribe(&lst);
     if (lst.count()>0) {
-      if (KMessageBox::Yes == KMessageBox::questionYesNoList((parent!=0)? parent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"),
-                                                              lst, TQString::null, i18n("Unsubscribe"), KStdGuiItem::cancel())) {
+      if (KMessageBox::Yes == KMessageBox::questionYesNoList((tqparent!=0)? tqparent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"),
+                                                              lst, TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) {
         for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
           if((g=group(*it, a)))
             unsubscribeGroup(g);
@@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a)
   grp=new KNGroup(a);
   grp->setGroupname(gi->name);
   grp->setDescription(gi->description);
-  grp->seStatus(gi->status);
+  grp->setqStatus(gi->status);
   grp->saveInfo();
   mGroupList.append( grp );
   emit groupAdded(grp);
@@ -466,9 +466,9 @@ bool KNGroupManager::unsubscribeGroup(KNGroup *g)
         a_rticleMgr->updateStatusString();
       }
 
-      const QFileInfoList *list = dir.entryInfoList();  // get list of matching files and delete all
+      const TQFileInfoList *list = dir.entryInfoList();  // get list of matching files and delete all
       if (list) {
-        QFileInfoListIterator it( *list );
+        TQFileInfoListIterator it( *list );
         while (it.current()) {
           if (it.current()->fileName() == g->groupname()+".dynamic" ||
               it.current()->fileName() == g->groupname()+".static" ||
@@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j)
               for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() )
                 if ( inf->name == (*it)->groupname() ) {
                   (*it)->setDescription( inf->description );
-                  (*it)->seStatus( inf->status );
+                  (*it)->setqStatus( inf->status );
                   break;
                 }
             }
@@ -652,7 +652,7 @@ void KNGroupManager::slotLoadGroupList(KNNntpAccount *a)
   d->path = a->path();
 
   if(!TQFileInfo(d->path+"groups").exists()) {
-    if (KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget,i18n("You do not have any groups for this account;\ndo you want to fetch a current list?"), TQString::null, i18n("Fetch List"), i18n("Do Not Fetch"))) {
+    if (KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget,i18n("You do not have any groups for this account;\ndo you want to fetch a current list?"), TQString(), i18n("Fetch List"), i18n("Do Not Fetch"))) {
       delete d;
       slotFetchGroupList(a);
       return;
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index f93b5704..4105e7cd 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -31,20 +31,20 @@ class KNCleanUp;
 //=================================================================================
 
 /** helper classes for the group selection dialog
-    tqcontains info about a newsgroup (name, description) */
+    contains info about a newsgroup (name, description) */
 
 class KNGroupInfo {
 
   public:
 
     KNGroupInfo();
-    KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::Status s_tatus=KNGroup::unknown );
+    KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::tqStatus s_tatus=KNGroup::unknown );
     ~KNGroupInfo();
 
     /** group names will be utf-8 encoded in the future... */
     TQString name,description;
     bool newGroup, subscribed;
-    KNGroup::Status status;
+    KNGroup::tqStatus status;
 
     bool operator== (const KNGroupInfo &gi2);
     bool operator< (const KNGroupInfo &gi2);
@@ -78,10 +78,11 @@ class KNGroupListData : public KNJobItem {
 class KNGroupManager : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    KNGroupManager(TQObject * parent=0, const char * name=0);
+    KNGroupManager(TQObject * tqparent=0, const char * name=0);
     ~KNGroupManager();
 
     // group access
@@ -99,7 +100,7 @@ class KNGroupManager : public TQObject , public KNJobConsumer {
     void setCurrentGroup(KNGroup *g);
 
     // group handling
-    void showGroupDialog(KNNntpAccount *a, TQWidget *parent=0);
+    void showGroupDialog(KNNntpAccount *a, TQWidget *tqparent=0);
     void subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a);
     bool unsubscribeGroup(KNGroup *g=0);
     void showGroupProperties(KNGroup *g=0);
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index 4983b428..ef8e2870 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -29,9 +29,9 @@
 #include <tqlabel.h>
 
 
-KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name )
+KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *tqparent, const char *name )
   : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()),
-                Ok|Cancel|Help, Ok, parent, name),
+                Ok|Cancel|Help, Ok, tqparent, name),
     g_rp(group), n_ickChanged(false)
 {
 
@@ -85,7 +85,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
   l=new TQLabel(g_rp->description(),gb);
   grpL->addWidget(l,2,2);
 
-  l=new TQLabel(i18n("Status:"), gb);
+  l=new TQLabel(i18n("tqStatus:"), gb);
   grpL->addWidget(l,3,0);
   TQString status;
   switch (g_rp->status()) {
diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h
index 0c640bea..eb087dd4 100644
--- a/knode/kngrouppropdlg.h
+++ b/knode/kngrouppropdlg.h
@@ -35,7 +35,7 @@ namespace KNConfig {
 class KNGroupPropDlg : public KDialogBase  {
 
   public:
-    KNGroupPropDlg(KNGroup *group, TQWidget *parent=0, const char *name=0);
+    KNGroupPropDlg(KNGroup *group, TQWidget *tqparent=0, const char *name=0);
     ~KNGroupPropDlg();
 
     bool nickHasChanged()const { return n_ickChanged; }
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 199abce8..d5188ad1 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -27,11 +27,11 @@
 #include <tqpushbutton.h>
 
 
-KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act) :
-  KNGroupBrowser(parent, i18n("Select Destinations"), a)
+KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act) :
+  KNGroupBrowser(tqparent, i18n("Select Destinations"), a)
 {
   selView=new TQListView(page);
-  selView->addColumn(TQString::null);
+  selView->addColumn(TQString());
   selView->header()->hide();
   listL->addWidget(selView, 1,2);
   rightLabel->setText(i18n("Groups for this article:"));
@@ -105,7 +105,7 @@ TQString KNGroupSelectDialog::selectedGroups()const
 
   if (moderated && (count>=2))   // warn the user
      KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."),
-                              TQString::null,"crosspostModeratedWarning");
+                              TQString(),"crosspostModeratedWarning");
 
   return ret;
 }
diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h
index 11c6fd39..05b21970 100644
--- a/knode/kngroupselectdialog.h
+++ b/knode/kngroupselectdialog.h
@@ -23,9 +23,10 @@
 class KNGroupSelectDialog : public KNGroupBrowser {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act);
+    KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act);
     ~KNGroupSelectDialog();
 
     TQString selectedGroups()const;
diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp
index c7f500a0..748bcb4f 100644
--- a/knode/knhdrviewitem.cpp
+++ b/knode/knhdrviewitem.cpp
@@ -211,7 +211,7 @@ int KNHdrViewItem::width( const TQFontMetrics &fm, const TQListView *, int colum
 TQString KNHdrViewItem::text( int col ) const
 {
   if ( !art )
-    return TQString::null;
+    return TQString();
   KNHeaderView *hv = static_cast<KNHeaderView*>( listView() );
 
   if ( col == hv->paintInfo()->subCol ) {
@@ -222,14 +222,14 @@ TQString KNHdrViewItem::text( int col ) const
     if ( art->lines()->numberOfLines() != -1 )
       return TQString::number( art->lines()->numberOfLines() );
     else
-      return TQString::null;
+      return TQString();
   }
 
   if ( col == hv->paintInfo()->scoreCol ) {
     if ( art->type() == KMime::Base::ATremote )
       return TQString::number( static_cast<KNRemoteArticle*>( art )->score() );
     else
-      return TQString::null;
+      return TQString();
   }
 
   if ( col == hv->paintInfo()->dateCol ) {
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index a0def5d1..5d92ca82 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -95,7 +95,7 @@ void KNJobData::cancel()
     mJob = 0;
   }
   if ( mProgressItem ) {
-    mProgressItem->seStatus( "Canceled" );
+    mProgressItem->setqStatus( "Canceled" );
     mProgressItem->setComplete();
     mProgressItem = 0;
   }
@@ -139,8 +139,8 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
 
 void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
 {
-  kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
-  seStatus( msg );
+  kdDebug(5003) << k_funcinfo << "tqStatus: " << msg << endl;
+  setqStatus( msg );
 }
 
 
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 14b1bca7..3c98ef94 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -63,14 +63,15 @@ class KNJobItem {
     virtual bool isLocked()         { return false; }
     virtual void setLocked(bool)    { }
 
-    virtual TQString prepareForExecution() { return TQString::null; }
+    virtual TQString prepareForExecution() { return TQString(); }
 
 };
 
 
-class KNJobData : public QObject
+class KNJobData : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -114,7 +115,7 @@ class KNJobData : public QObject
     void createProgressItem();
 
     // safe forwards to the progress item
-    void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); }
+    void setqStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setqStatus( msg ); }
     void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); }
     void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } }
 
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 6686d3f0..8da3b97e 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -34,7 +34,7 @@
 #include "broadcaststatus.h"
 #include "krsqueezedtextlabel.h"
 #include "recentaddresses.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 using KRecentAddress::RecentAddresses;
 
 //GUI
@@ -70,9 +70,9 @@ using namespace KNode;
 
 KNGlobals knGlobals;
 
-KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* parent,
+KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* tqparent,
                             const char* name  )
-  : DCOPObject("KNodeIface"), KDockArea( parent, name ),
+  : DCOPObject("KNodeIface"), KDockArea( tqparent, name ),
     b_lockui( false ), m_GUIClient( client )
 {
   knGlobals.top=this;
@@ -307,9 +307,9 @@ void KNMainWidget::iniStatusBar()
   //statusbar
   KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
-  s_tatusFilter = new KRSqueezedTextLabel( TQString::null, sb );
+  s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb );
   s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter );
-  s_tatusGroup = new KRSqueezedTextLabel( TQString::null, sb );
+  s_tatusGroup = new KRSqueezedTextLabel( TQString(), sb );
   s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter );
 }
 
@@ -324,13 +324,13 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id)
   bar->clear();
   if (text.isEmpty() && (id==SB_MAIN)) {
     if (knGlobals.netAccess()->currentMsg().isEmpty())
-      BroadcasStatus::instance()->seStatusMsg(i18n(" Ready"));
+      BroadcastqStatus::instance()->seStatusMsg(i18n(" Ready"));
     else
-      BroadcasStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
+      BroadcastqStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
   } else {
     switch(id) {
       case SB_MAIN:
-        BroadcasStatus::instance()->seStatusMsg(text); break;
+        BroadcastqStatus::instance()->seStatusMsg(text); break;
       case SB_GROUP:
         s_tatusGroup->setText(text); break;
       case SB_FILTER:
@@ -670,7 +670,7 @@ void KNMainWidget::initActions()
   a_ctArtSortHeaders->setItems(items);
   a_ctArtSortHeaders->setShortcutConfigurable(false);
   connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int)));
-  a_ctArtSortHeadersKeyb   = new KAction(i18n("Sort"), TQString::null, Key_F7 , this,
+  a_ctArtSortHeadersKeyb   = new KAction(i18n("Sort"), TQString(), Key_F7 , this,
                              TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb");
   a_ctArtSortHeadersKeyb->plugAccel(a_ccel);
   a_ctArtFilter             = new KNFilterSelectAction(i18n("&Filter"), "filter",
@@ -678,7 +678,7 @@ void KNMainWidget::initActions()
   a_ctArtFilter->setShortcutConfigurable(false);
   a_ctArtFilterKeyb         = new KAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb");
   a_ctArtFilterKeyb->plugAccel(a_ccel);
-  a_ctArtSearch             = new KAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this,
+  a_ctArtSearch             = new KAction(i18n("&Search Articles..."),"mail_tqfind" , Key_F4 , this,
                               TQT_SLOT(slotArtSearch()), actionCollection(), "article_search");
   a_ctArtRefreshList        = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), this,
                               TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh");
@@ -748,7 +748,7 @@ void KNMainWidget::initActions()
   a_ctToggleArticleViewer    = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this,
                                TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer");
   a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer"));
-  a_ctToggleQuickSearch      = new KToggleAction(i18n("Show Quick Search"), TQString::null, this,
+  a_ctToggleQuickSearch      = new KToggleAction(i18n("Show Quick Search"), TQString(), this,
                                TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch");
   a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search"));
   a_ctSwitchToGroupView      = new KAction(i18n("Switch to Group View"), Key_G , this,
@@ -841,7 +841,7 @@ bool KNMainWidget::requestShutdown()
   if( a_rtFactory->jobsPending() &&
       KMessageBox::No==KMessageBox::warningYesNo(this, i18n(
 "KNode is currently sending articles. If you quit now you might lose these \
-articles.\nDo you want to quit anyway?"), TQString::null, KStdGuiItem::quit(), KStdGuiItem::cancel())
+articles.\nDo you want to quit anyway?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel())
     )
     return false;
 
@@ -903,7 +903,7 @@ bool KNMainWidget::queryClose()
 
 void KNMainWidget::showEvent(TQShowEvent *)
 {
-  slotCheckDockWidgeStatus();
+  slotCheckDockWidgetqStatus();
 }
 
 
@@ -963,7 +963,7 @@ void KNMainWidget::getSelectedThreads(KNRemoteArticle::List &l)
       art=static_cast<KNRemoteArticle*> ((static_cast<KNHdrViewItem*>(i))->art);
       // ignore the article if it is already in the list
       // (multiple aritcles are selected in one thread)
-      if ( l.find(art) == l.end() )
+      if ( l.tqfind(art) == l.end() )
         art->thread(l);
     }
 }
@@ -983,8 +983,8 @@ void KNMainWidget::closeCurrentThread()
 {
   TQListViewItem *item = h_drView->currentItem();
   if (item) {
-    while (item->parent())
-      item = item->parent();
+    while (item->tqparent())
+      item = item->tqparent();
     h_drView->setCurrentItem(item);
     item->setOpen(false);
     h_drView->ensureItemVisible(item);
@@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b)
 }
 
 
-void KNMainWidget::slotCheckDockWidgeStatus()
+void KNMainWidget::slotCheckDockWidgetqStatus()
 {
   a_ctToggleGroupView->setChecked(c_olDock->isVisible());
   a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible());
@@ -1511,7 +1511,7 @@ void KNMainWidget::slotGrpUnsubscribe()
   kdDebug(5003) << "KNMainWidget::slotGrpUnsubscribe()" << endl;
   if(g_rpManager->currentGroup()) {
     if(KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget,
-      i18n("Do you really want to unsubscribe from %1?").arg(g_rpManager->currentGroup()->groupname()), TQString::null, i18n("Unsubscribe"), KStdGuiItem::cancel()))
+      i18n("Do you really want to unsubscribe from %1?").arg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel()))
       if (g_rpManager->unsubscribeGroup(g_rpManager->currentGroup()))
         slotCollectionSelected(0);
   }
@@ -1588,7 +1588,7 @@ void KNMainWidget::slotFolDelete()
     KMessageBox::sorry(knGlobals.topWidget, i18n("You cannot delete a standard folder."));
 
   else if( KMessageBox::Continue==KMessageBox::warningContinueCancel(knGlobals.topWidget,
-      i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) {
+      i18n("Do you really want to delete this folder and all its tqchildren?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) {
 
     if(!f_olManager->deleteFolder(f_olManager->currentFolder()))
       KMessageBox::sorry(knGlobals.topWidget,
@@ -1946,8 +1946,8 @@ void KNMainWidget::slotFetchArticleWithID()
 
   if (dlg->exec()) {
     TQString id = dlg->messageId().simplifyWhiteSpace();
-    if (id.find(TQRegExp("*@*",false,true))!=-1) {
-      if (id.find(TQRegExp("<*>",false,true))==-1)   // add "<>" when necessary
+    if (id.tqfind(TQRegExp("*@*",false,true))!=-1) {
+      if (id.tqfind(TQRegExp("<*>",false,true))==-1)   // add "<>" when necessary
         id = TQString("<%1>").arg(id);
 
       if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened
@@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID()
 void KNMainWidget::slotToggleGroupView()
 {
   c_olDock->changeHideShowState();
-  slotCheckDockWidgeStatus();
+  slotCheckDockWidgetqStatus();
 }
 
 
@@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView()
       if ( !h_drDock->isDockBackPossible() ) {
           h_drDock->manualDock( a_rtDock, KDockWidget::DockTop );
           h_drDock->makeDockVisible();
-          slotCheckDockWidgeStatus();
+          slotCheckDockWidgetqStatus();
           return;
       }
 
   h_drDock->changeHideShowState();
-  slotCheckDockWidgeStatus();
+  slotCheckDockWidgetqStatus();
 }
 
 
 void KNMainWidget::slotToggleArticleViewer()
 {
   a_rtDock->changeHideShowState();
-  slotCheckDockWidgeStatus();
+  slotCheckDockWidgetqStatus();
 }
 
 void KNMainWidget::slotToggleQuickSearch()
@@ -2043,8 +2043,8 @@ KXMLGUIFactory* KNMainWidget::factory() const
 //--------------------------------
 
 
-FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ )
-    :KDialogBase(parent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok)
+FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ )
+    :KDialogBase(tqparent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok)
 {
   TQHBox *page = makeHBoxMainWidget();
 
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 4717e333..1ddba490 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -63,8 +63,9 @@ class KActionCollection;
 class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name );
+  KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* tqparent, const char* name );
   ~KNMainWidget();
 
   /** exit */
@@ -72,7 +73,7 @@ public:
   void prepareShutdown();
 
   //GUI
-  void seStatusMsg(const TQString& = TQString::null, int id=SB_MAIN);
+  void seStatusMsg(const TQString& = TQString(), int id=SB_MAIN);
   void seStatusHelpMsg(const TQString& text);
   void updateCaption();
   void setCursorBusy(bool b=true);
@@ -229,7 +230,7 @@ protected slots:
   void slotNetworkActive(bool b);
 
   //dock widget slots
-  void slotCheckDockWidgeStatus();
+  void slotCheckDockWidgetqStatus();
   void slotGroupDockHidden();
   void slotHeaderDockHidden();
   void slotArticleDockHidden();
@@ -413,8 +414,9 @@ private:
 class  FetchArticleIdDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FetchArticleIdDlg(TQWidget *parent, const char */*name*/ );
+    FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ );
     TQString messageId() const;
 
 protected slots:
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 016a39ee..bb32c04f 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -37,8 +37,8 @@
 using KPIM::ProgressManager;
 
 
-KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
-  : TQObject(parent,name), currentNntpJob(0), currentSmtpJob(0)
+KNNetAccess::KNNetAccess(TQObject *tqparent, const char *name )
+  : TQObject(tqparent,name), currentNntpJob(0), currentSmtpJob(0)
 {
   if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->seStatus( i18n( "Waiting for KWallet..." ) );
+    job->setqStatus( i18n( "Waiting for KWallet..." ) );
     return;
   }
 
@@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job)
         startJobNntp();
     }
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type )
     } else
       ++it;
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type )
     } else
       ++it;
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -317,7 +317,7 @@ void KNNetAccess::threadDoneNntp()
         info->setUser(user);
         info->setPass(pass);
         tmp->setAuthError(false);
-        tmp->setErrorString(TQString::null);
+        tmp->setErrorString(TQString());
 
         kdDebug(5003) << "KNNetAccess::threadDoneNntp(): trying again with authentication data" << endl;
 
@@ -331,7 +331,7 @@ void KNNetAccess::threadDoneNntp()
   nntpClient->removeJob();
   currentNntpJob = 0L;
 
-  currMsg = TQString::null;
+  currMsg = TQString();
   knGlobals.seStatusMsg();
   tmp->setComplete();
 
@@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp()
   if (!nntpJobQueue.isEmpty())
     startJobNntp();
 
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -358,7 +358,7 @@ void KNNetAccess::threadDoneSmtp()
   tmp = currentSmtpJob;
   currentSmtpJob = 0L;
   if (!currentNntpJob) {
-    currMsg = TQString::null;
+    currMsg = TQString();
     knGlobals.seStatusMsg();
   }
   tmp->setComplete();
@@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp()
   if (!smtpJobQueue.isEmpty())
     startJobSmtp();
 
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i)
       case KNProtocolClient::TSconnect:
         currMsg = i18n(" Connecting to server...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSloadGrouplist:
         currMsg = i18n(" Loading group list from disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSwriteGrouplist:
         currMsg = i18n(" Writing group list to disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadGrouplist:
         currMsg = i18n(" Downloading group list...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNewGroups:
         currMsg = i18n(" Looking for new groups...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadDesc:
         currMsg = i18n(" Downloading group descriptions...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNew:
         currMsg = i18n(" Downloading new headers...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSsortNew:
         currMsg = i18n(" Sorting...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadArticle:
         currMsg = i18n(" Downloading article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSsendArticle:
         currMsg = i18n(" Sending article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSjobStarted:
         currentNntpJob->setProgress(0);
@@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged()
 {
   TQValueList<KNJobData*>::ConstIterator it;
   for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) {
-    (*it)->seStatus( i18n("Waiting...") );
+    (*it)->setqStatus( i18n("Waiting...") );
     if ( (*it)->type() == KNJobData::JTmail )
       smtpJobQueue.append( (*it) );
     else
@@ -528,10 +528,10 @@ void KNNetAccess::slotCancelJob( KPIM::ProgressItem *item )
   if ( currentSmtpJob && currentSmtpJob->progressItem() == item )
     cancelCurrentSmtpJob();
 
-  updateStatus();
+  updatetqStatus();
 }
 
-void KNNetAccess::updateStatus( )
+void KNNetAccess::updatetqStatus( )
 {
   if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob
        && !currentSmtpJob && mWalletQueue.isEmpty() )
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index 0ad9498f..e7ad1fb7 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -37,10 +37,11 @@ class KNNntpClient;
 class KNNetAccess : public TQObject  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    KNNetAccess(TQObject *parent=0, const char *name=0);
+    KNNetAccess(TQObject *tqparent=0, const char *name=0);
     ~KNNetAccess();
 
     void addJob(KNJobData *job);
@@ -84,7 +85,7 @@ class KNNetAccess : public TQObject  {
     void cancelCurrentNntpJob( int type = 0 );
     void cancelCurrentSmtpJob( int type = 0 );
     /** Update activitiy status, i.e. emit netActive signal. */
-    void updateStatus();
+    void updatetqStatus();
 
   private slots:
     void slotJobResult( KIO::Job *job );
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index 1887baae..0e685531 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -181,10 +181,10 @@ TQString KNNntpAccount::path()
 }
 
 
-bool KNNntpAccount::editProperties(TQWidget *parent)
+bool KNNntpAccount::editProperties(TQWidget *tqparent)
 {
   if(!i_dentity) i_dentity=new KNConfig::Identity(false);
-  KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, parent);
+  KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, tqparent);
 
   bool ret=false;
   if (d->exec()) {
diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h
index 61133919..a84d7a28 100644
--- a/knode/knnntpaccount.h
+++ b/knode/knnntpaccount.h
@@ -35,6 +35,7 @@ namespace KNConfig {
 class KNNntpAccountIntervalChecking : public TQObject  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNNntpAccountIntervalChecking(KNNntpAccount *account);
@@ -65,7 +66,7 @@ class KNNntpAccount : public KNCollection , public KNServerInfo {
     //void syncInfo();
     TQString path();
     /** returns true when the user accepted */
-    bool editProperties(TQWidget *parent);
+    bool editProperties(TQWidget *tqparent);
 
     // news interval checking
     void startTimer();
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index dd4f28fe..a6b1e566 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -93,7 +93,7 @@ void KNNntpClient::doFetchGroups()
 
   char *s, *line;
   TQString name;
-  KNGroup::Status status;
+  KNGroup::tqStatus status;
   bool subscribed;
 
   while (getNextLine()) {
@@ -132,7 +132,7 @@ void KNNntpClient::doFetchGroups()
         default  : status = KNGroup::unknown;
       }
 
-      target->groups->append(new KNGroupInfo(name,TQString::null,false,subscribed,status));
+      target->groups->append(new KNGroupInfo(name,TQString(),false,subscribed,status));
     }
     doneLines++;
   }
@@ -140,7 +140,7 @@ void KNNntpClient::doFetchGroups()
   if (!job->success() || job->canceled())
     return;     // stopped...
 
-  QSortedVector<KNGroupInfo> tempVector;
+  TQSortedVector<KNGroupInfo> tempVector;
   target->groups->toVector(&tempVector);
   tempVector.sort();
 
@@ -228,7 +228,7 @@ void KNNntpClient::doCheckNewGroups()
 
   char *s, *line;
   TQString name;
-  KNGroup::Status status;
+  KNGroup::tqStatus status;
   TQSortedList<KNGroupInfo> tmpList;
   tmpList.setAutoDelete(true);
 
@@ -261,7 +261,7 @@ void KNNntpClient::doCheckNewGroups()
         default  : status = KNGroup::unknown;
       }
 
-      tmpList.append(new KNGroupInfo(name,TQString::null,true,false,status));
+      tmpList.append(new KNGroupInfo(name,TQString(),true,false,status));
     }
     doneLines++;
   }
@@ -525,7 +525,7 @@ void KNNntpClient::doPostArticle()
     TQCString s = getCurrentLine();
     int start = s.findRev(TQRegExp("<[^\\s]*@[^\\s]*>"));
     if (start != -1) {        // post response includes a recommended id
-      int end = s.find('>',start);
+      int end = s.tqfind('>',start);
       art->messageID()->from7BitString(s.mid(start,end-start+1));
       art->assemble();
       #ifndef NDEBUG
@@ -569,7 +569,7 @@ void KNNntpClient::doFetchSource()
 
 bool KNNntpClient::openConnection()
 {
-  currentGroup = TQString::null;
+  currentGroup = TQString();
 
   TQString oldPrefix = errorPrefix;
   errorPrefix=i18n("Unable to connect.\nThe following error occurred:\n");
diff --git a/knode/knode.cpp b/knode/knode.cpp
index d3df5b74..188851cf 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -55,7 +55,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
            TQT_SLOT( setCaption(const TQString&)) );
   setCentralWidget( m_mainWidget );
   setupStatusBar();
-  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
+  connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
     this, TQT_SLOT(slotShowStatusMsg(const TQString& )) );
   createGUI( "knodeui.rc" );
   knGlobals.instance = 0;
@@ -108,7 +108,7 @@ void KNMainWindow::setupStatusBar()
 
   statusBar()->addWidget( mLittleProgress, 0 , true );
 
-  mStatusMsgLabel = new KRSqueezedTextLabel( TQString::null, statusBar() );
+  mStatusMsgLabel = new KRSqueezedTextLabel( TQString(), statusBar() );
   mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
   statusBar()->addWidget( mStatusMsgLabel, 2 );
   statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2);
diff --git a/knode/knode.h b/knode/knode.h
index 2c350c62..8d82defe 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -44,6 +44,7 @@ class KNHeaderView;
 class KNMainWindow : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KNMainWindow( TQWidget* tqparentWidget=0 );
diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop
index e2ab8fcf..5fd3ee45 100644
--- a/knode/knode_config_privacy.desktop
+++ b/knode/knode_config_privacy.desktop
@@ -64,7 +64,7 @@ Comment[af]=Beskerm you privaatheid deur pos stukke te onderteken en te bevestig
 Comment[bg]=Защита на личната коре�понденци� чрез подпи�ване и проверка на �ъобщени�та
 Comment[bs]=Zaštitite vašu privatnost potpisivanjem i provjerom postinga
 Comment[ca]=Protegiu la vostra privadesa signant i verificant els missatges
-Comment[cs]=Chraňte své soukromí pomocí podepisování a ověřování podpisů
+Comment[cs]=Chraňte své soukromí potqmocí podepisování a ověřování podpisů
 Comment[da]=Beskyt dine private oplysninger ved at underskrive og verificere indsendelser
 Comment[de]=Schutz der Privatsphäre durch Signieren und Verifizieren von Beiträgen.
 Comment[el]=Π�οστατε�στε το από��ητό σας υπογ�άφοντας και επαληθε�οντας τα μην�ματα
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 3e54361a..0dc09d46 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "knode_part.h"
@@ -48,8 +48,8 @@ typedef KParts::GenericFactory< KNodePart > KNodeFactory;
 K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory )
 
 KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName,
-		     TQObject *parent, const char *name, const TQStringList &)
-  : KParts::ReadOnlyPart(parent, name),
+		     TQObject *tqparent, const char *name, const TQStringList &)
+  : KParts::ReadOnlyPart(tqparent, name),
   mParentWidget( tqparentWidget )
 {
   kdDebug(5003) << "KNodePart()" << endl;
diff --git a/knode/knode_part.h b/knode/knode_part.h
index 1e9a4904..b98b8d6f 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KNODE_PART_H
 #define KNODE_PART_H
@@ -42,9 +42,10 @@ class KNMainWidget;
 class KNodePart: public KParts::ReadOnlyPart
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KNodePart(TQWidget *tqparentWidget, const char *widgetName,
-              TQObject *parent, const char *name, const TQStringList &);
+              TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~KNodePart();
 
     TQWidget* tqparentWidget() const;
diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp
index 4831087c..4b9137a5 100644
--- a/knode/knprotocolclient.cpp
+++ b/knode/knprotocolclient.cpp
@@ -166,7 +166,7 @@ void KNProtocolClient::waitForWork()
         if (isConnected())         // connection is ready
           processJob();
       }
-      errorPrefix = TQString::null;
+      errorPrefix = TQString();
 
       clearPipe();
     }
@@ -218,7 +218,7 @@ bool KNProtocolClient::openConnection()
 }
 
 
-// sends QUIT-command and closes the socket
+// sends TQUIT-command and closes the socket
 void KNProtocolClient::closeConnection()
 {
   fd_set fdsW;
@@ -235,7 +235,7 @@ void KNProtocolClient::closeConnection()
   int ret = KSocks::self()->select(FD_SETSIZE, NULL, &fdsW, NULL, &tv);
 
   if (ret > 0) {    // we can write...
-    TQCString cmd = "QUIT\r\n";
+    TQCString cmd = "TQUIT\r\n";
     int todo = cmd.length();
     KSocks::self()->write(tcpSocket,&cmd.data()[0],todo);
   }
diff --git a/knode/knprotocolclient.h b/knode/knprotocolclient.h
index fa4d28d5..4957e133 100644
--- a/knode/knprotocolclient.h
+++ b/knode/knprotocolclient.h
@@ -62,7 +62,7 @@ class KNProtocolClient : public TQThread  {
     /** connect, handshake and authorization */
     virtual bool openConnection();
     bool isConnected()   { return (tcpSocket!=-1); };
-    /** sends QUIT-command and closes the socket */
+    /** sends TQUIT-command and closes the socket */
     virtual void closeConnection();
 
     /** sends a command (one line), return code is written to rep */
diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp
index a0f01856..23b5753e 100644
--- a/knode/knrangefilter.cpp
+++ b/knode/knrangefilter.cpp
@@ -96,8 +96,8 @@ void KNRangeFilter::save(KSimpleConfig *conf)
 //=====================================================================================
 //=====================================================================================
 
-KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit)
-  : TQGroupBox(value, parent)
+KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit)
+  : TQGroupBox(value, tqparent)
 {
   enabled=new TQCheckBox(this);
 
@@ -123,7 +123,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max
   TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 );
 
   topL->addRowSpacing(0, fontMetrics().lineSpacing()-4);
-  topL->addWidget(enabled,1,0, Qt::AlignHCenter);
+  topL->addWidget(enabled,1,0, TQt::AlignHCenter);
   topL->addColSpacing(0, 30);
   topL->addWidget(val1,1,1);
   topL->addWidget(op1,1,2);
diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h
index 346257f2..5c05d4e7 100644
--- a/knode/knrangefilter.h
+++ b/knode/knrangefilter.h
@@ -63,9 +63,10 @@ class KNRangeFilter {
 class KNRangeFilterWidget : public TQGroupBox {
       
   Q_OBJECT
+  TQ_OBJECT
     
   public:
-    KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit=TQString::null);
+    KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit=TQString());
     ~KNRangeFilterWidget();
         
     KNRangeFilter filter();
diff --git a/knode/knscoring.h b/knode/knscoring.h
index 68b23c58..00db3ee0 100644
--- a/knode/knscoring.h
+++ b/knode/knscoring.h
@@ -61,6 +61,7 @@ public:
 class KNScoringManager : public KScoringManager
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KNScoringManager();
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 4344cbba..5f8ff1ad 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -29,14 +29,14 @@
 #include "knsearchdialog.h"
 
 
-KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
-  : TQDialog(parent)
+KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *tqparent)
+  : TQDialog(tqparent)
 {
   setCaption(kapp->makeStdCaption( i18n("Search for Articles") ));
   setIcon(SmallIcon("knode"));
   TQGroupBox *bg=new TQGroupBox(this);
 
-  startBtn=new TQPushButton(SmallIcon("mail_find"),i18n("Sea&rch"), bg);
+  startBtn=new TQPushButton(SmallIcon("mail_tqfind"),i18n("Sea&rch"), bg);
   startBtn->setDefault(true);
   newBtn=new TQPushButton(SmallIcon("editclear"),i18n("C&lear"), bg);
   closeBtn=new KPushButton(KStdGuiItem::close(), bg);
diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h
index b056735b..784a855e 100644
--- a/knode/knsearchdialog.h
+++ b/knode/knsearchdialog.h
@@ -28,10 +28,11 @@ class KNArticleFilter;
 class KNSearchDialog : public TQDialog {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum searchType { STfolderSearch, STgroupSearch };
-    KNSearchDialog(searchType t=STgroupSearch, TQWidget *parent=0);
+    KNSearchDialog(searchType t=STgroupSearch, TQWidget *tqparent=0);
     ~KNSearchDialog();
 
     KNArticleFilter* filter() const  { return f_ilter; }
diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp
index f0b2b75d..607e4c39 100644
--- a/knode/knsourceviewwindow.cpp
+++ b/knode/knsourceviewwindow.cpp
@@ -27,7 +27,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text )
 {
   setWFlags(WType_TopLevel | WDestructiveClose);
   TQAccel *accel = new TQAccel( this, "browser close-accel" );
-  accel->connectItem( accel->insertItem( Qt::Key_Escape ), this , TQT_SLOT( close() ));
+  accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() ));
   KNConfig::Appearance *app=knGlobals.configManager()->appearance();
 
   setTextFormat( PlainText );
diff --git a/knode/knsourceviewwindow.h b/knode/knsourceviewwindow.h
index aabe14b5..6f720ea6 100644
--- a/knode/knsourceviewwindow.h
+++ b/knode/knsourceviewwindow.h
@@ -21,6 +21,7 @@
 class KNSourceViewWindow : public KTextBrowser {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNSourceViewWindow( const TQString &text );
diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp
index a1379a26..aa92dca5 100644
--- a/knode/knstatusfilter.cpp
+++ b/knode/knstatusfilter.cpp
@@ -94,8 +94,8 @@ bool KNStatusFilter::doFilter(KNRemoteArticle *a)
 
 //==============================================================================
 
-KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) :
-  TQButtonGroup(0, parent)
+KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *tqparent) :
+  TQButtonGroup(0, tqparent)
 {
   setFrameStyle(NoFrame);
   enR=new TQCheckBox(i18n("Is read:"), this);
@@ -197,7 +197,7 @@ void KNStatusFilterWidget::slotEnabled(int c)
 //==============================================================================
 
 
-KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *parent) : TQComboBox(parent)
+KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *tqparent) : TQComboBox(tqparent)
 {
   insertItem(i18n("True"));
   insertItem(i18n("False"));
diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h
index a408a96c..f4ec92cd 100644
--- a/knode/knstatusfilter.h
+++ b/knode/knstatusfilter.h
@@ -54,9 +54,10 @@ class KNStatusFilter {
 class KNStatusFilterWidget : public TQButtonGroup  {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNStatusFilterWidget(TQWidget *parent);
+    KNStatusFilterWidget(TQWidget *tqparent);
     ~KNStatusFilterWidget();
 
     KNStatusFilter filter();
@@ -69,7 +70,7 @@ class KNStatusFilterWidget : public TQButtonGroup  {
     class TFCombo : public TQComboBox {
 
       public:
-        TFCombo(TQWidget *parent);
+        TFCombo(TQWidget *tqparent);
         ~TFCombo();
         void setValue(bool b) { if(b) setCurrentItem(0); else setCurrentItem(1); }
         bool value() const         { return (currentItem()==0); }
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index 3f866902..1570da04 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -47,7 +47,7 @@ bool KNStringFilter::doFilter(const TQString &s)
       TQRegExp matcher(expanded);
       ret = ( matcher.search(s) >= 0 );
     } else
-      ret=(s.find(expanded,0,false)!=-1);
+      ret=(s.tqfind(expanded,0,false)!=-1);
 
     if(!con) ret=!ret;
   }
@@ -57,7 +57,7 @@ bool KNStringFilter::doFilter(const TQString &s)
 
 
 
-// tqreplace placeholders
+// replace placeholders
 void KNStringFilter::expand(KNGroup *g)
 {
   KNConfig::Identity *id = (g) ? g->identity() : 0;
@@ -94,8 +94,8 @@ void KNStringFilter::save(KSimpleConfig *conf)
 
 //===============================================================================
 
-KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *parent)
-  : TQGroupBox(title, parent)
+KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *tqparent)
+  : TQGroupBox(title, tqparent)
 {
   fType=new TQComboBox(this);
   fType->insertItem(i18n("Does Contain"));
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index 5720c6a8..44647641 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -37,7 +37,7 @@ class KNStringFilter {
     ~KNStringFilter() {}
 
     KNStringFilter& operator=(const KNStringFilter &sf);
-    /** tqreplace placeholders */
+    /** replace placeholders */
     void expand(KNGroup *g);
           
     void load(KSimpleConfig *conf);
@@ -58,9 +58,10 @@ class KNStringFilter {
 class KNStringFilterWidget : public TQGroupBox  {
   
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNStringFilterWidget(const TQString& title, TQWidget *parent);
+    KNStringFilterWidget(const TQString& title, TQWidget *tqparent);
     ~KNStringFilterWidget();
     
     KNStringFilter filter();
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index d3f1d7b5..0bf4fcc2 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -65,7 +65,7 @@ void KNListBoxItem::paint(TQPainter *p)
 int KNListBoxItem::height(const TQListBox *lb) const
 {
   if(p_m)
-    return QMAX( p_m->height(), lb->fontMetrics().lineSpacing() + 1 );
+    return TQMAX( p_m->height(), lb->fontMetrics().lineSpacing() + 1 );
   else
     return (lb->fontMetrics().lineSpacing() + 1);
 }
@@ -84,8 +84,8 @@ int KNListBoxItem::width(const TQListBox *lb) const
 
 // **** listbox for dialogs **************************************************
 
-KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * parent, const char * name)
- : TQListBox(parent, name), a_lwaysIgnore(alwaysIgnore)
+KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * tqparent, const char * name)
+ : TQListBox(tqparent, name), a_lwaysIgnore(alwaysIgnore)
 {
 }
 
@@ -107,8 +107,8 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e)
 //====================================================================================
 
 
-KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
-  : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false)
+KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name )
+  : KDockWidgetHeaderDrag(tqparent, dock, name), f_ocus(false)
 {
   connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
 }
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index d1a19e36..ce13cb8d 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -49,11 +49,11 @@ class KNListBoxItem : public TQListBoxItem  {
 
 
 /** a list box which ignores Enter, useful for dialogs */
-class KNDialogListBox : public QListBox
+class KNDialogListBox : public TQListBox
 {
    public:
     // alwaysIgnore==false: enter is ignored when the widget isn't visible/out of focus
-    KNDialogListBox(bool alwaysIgnore=false, TQWidget * parent=0, const char * name=0);
+    KNDialogListBox(bool alwaysIgnore=false, TQWidget * tqparent=0, const char * name=0);
     ~KNDialogListBox();
 
   protected:
@@ -69,9 +69,10 @@ class KNDialogListBox : public QListBox
 class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
+    KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock,
                             const char* name = 0);
     virtual ~KNDockWidgetHeaderDrag();
 
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 16433111..d8309b29 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SmtpAccountWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>mUseExternalMailer</cstring>
             </property>
@@ -24,7 +24,7 @@
                 <string>&amp;Use external mailer</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>mServerLabel</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <cstring>mServer</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>mPortLabel</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <cstring>mPort</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>mUserLabel</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <cstring>mUser</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>mPasswordLabel</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <cstring>mPassword</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>mLogin</cstring>
             </property>
@@ -86,7 +86,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -125,7 +125,7 @@
                 <cstring>mServer</cstring>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="6" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>mEncGroup</cstring>
             </property>
@@ -136,7 +136,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mEncNone</cstring>
                     </property>
@@ -147,7 +147,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mEncSSL</cstring>
                     </property>
@@ -158,7 +158,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mEncTLS</cstring>
                     </property>
@@ -219,11 +219,11 @@
         <slot>changed()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">useExternalMailerToggled(bool)</slot>
     <slot access="protected">loginToggled(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in declaration">kcmodule.h</include>
 </includes>
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 1e7dcba9..d634b7df 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -134,8 +134,8 @@ bool KNFile::increaseBuffer()
 
 TQString KNSaveHelper::lastPath;
 
-KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *parent)
-  : p_arent(parent), s_aveName(saveName), file(0), tmpFile(0)
+KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *tqparent)
+  : p_arent(tqparent), s_aveName(saveName), file(0), tmpFile(0)
 {
 }
 
@@ -157,7 +157,7 @@ KNSaveHelper::~KNSaveHelper()
 
 TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
 {
-  url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString::null, p_arent, dialogTitle);
+  url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString(), p_arent, dialogTitle);
 
   if (url.isEmpty())
     return 0;
@@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
   if (url.isLocalFile()) {
     if (TQFileInfo(url.path()).exists() &&
         (KMessageBox::warningContinueCancel(knGlobals.topWidget,
-                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to tqreplace it?</qt>").arg(url.path()),
+                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()),
                                             dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
       return 0;
     }
@@ -196,8 +196,8 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
 
 TQString KNLoadHelper::l_astPath;
 
-KNLoadHelper::KNLoadHelper(TQWidget *parent)
-  : p_arent(parent), f_ile(0)
+KNLoadHelper::KNLoadHelper(TQWidget *tqparent)
+  : p_arent(tqparent), f_ile(0)
 {
 }
 
@@ -215,7 +215,7 @@ KNFile* KNLoadHelper::getFile( const TQString &dialogTitle )
   if (f_ile)
     return f_ile;
 
-  KURL url = KFileDialog::getOpenURL(l_astPath,TQString::null,p_arent,dialogTitle);
+  KURL url = KFileDialog::getOpenURL(l_astPath,TQString(),p_arent,dialogTitle);
 
   if (url.isEmpty())
     return 0;
@@ -261,10 +261,10 @@ KNFile* KNLoadHelper::setURL(KURL url)
 
 
 // **** keyboard selection dialog *********************************************
-int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue)
+int KNHelper::selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue)
 {
   KDialogBase *dlg=new KDialogBase(KDialogBase::Plain, caption, KDialogBase::Ok|KDialogBase::Cancel,
-                                   KDialogBase::Ok, parent);
+                                   KDialogBase::Ok, tqparent);
   TQFrame *page = dlg->plainPage();
   TQHBoxLayout *pageL = new TQHBoxLayout(page,8,5);
 
@@ -390,7 +390,7 @@ void appendTextWPrefix(TQString &result, const TQString &text, int wrapAt, const
       txt.remove(0,breakPos+1);
     } else {
       result+=(prefix+txt+"\n");
-      txt=TQString::null;
+      txt=TQString();
     }
   }
 }
@@ -412,7 +412,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
     else
       thisLine.prepend(quoteChar+' ');
 
-    thisPrefix=TQString::null;
+    thisPrefix=TQString();
     TQChar c;
     for(int idx=0; idx<(int)(thisLine.length()); idx++) {
       c=thisLine.at(idx);
@@ -431,7 +431,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
         appendTextWPrefix(quoted, leftover, wrapAt, lastPrefix);
       else
         thisLine.prepend(leftover+" ");
-      leftover=TQString::null;
+      leftover=TQString();
     }
 
     if((int)(thisPrefix.length()+thisLine.length()) > wrapAt) {
diff --git a/knode/utilities.h b/knode/utilities.h
index 58dda6d8..936665a9 100644
--- a/knode/utilities.h
+++ b/knode/utilities.h
@@ -37,15 +37,15 @@ class KTempFile;
 //*****************************************************************************
 
 /** clone of TQSortedList... */
-template<class type> class Q_EXPORT QSortedVector : public TQPtrVector<type>
+template<class type> class TQ_EXPORT TQSortedVector : public TQPtrVector<type>
 {
 public:
-    QSortedVector() {}
-    QSortedVector ( uint size ) : TQPtrVector<type>(size) {}
-    QSortedVector( const QSortedVector<type> &l ) : TQPtrVector<type>(l) {}
-    ~QSortedVector() { TQPtrVector<type>::clear(); }
-    QSortedVector<type> &operator=(const QSortedVector<type> &l)
-      { return (QSortedVector<type>&)TQPtrList<type>::operator=(l); }
+    TQSortedVector() {}
+    TQSortedVector ( uint size ) : TQPtrVector<type>(size) {}
+    TQSortedVector( const TQSortedVector<type> &l ) : TQPtrVector<type>(l) {}
+    ~TQSortedVector() { TQPtrVector<type>::clear(); }
+    TQSortedVector<type> &operator=(const TQSortedVector<type> &l)
+      { return (TQSortedVector<type>&)TQPtrList<type>::operator=(l); }
 
     virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 )
       { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); }
@@ -58,7 +58,7 @@ public:
 class KNFile : public TQFile {
 
   public:
-    KNFile(const TQString& fname=TQString::null);
+    KNFile(const TQString& fname=TQString());
     ~KNFile();
     const TQCString& readLine();
     const TQCString& readLineWnewLine();
@@ -82,7 +82,7 @@ class KNSaveHelper {
 
 public:
 
-  KNSaveHelper(TQString saveName, TQWidget *parent);
+  KNSaveHelper(TQString saveName, TQWidget *tqparent);
   ~KNSaveHelper();
 
   /** returns a file open for writing */
@@ -107,7 +107,7 @@ class KNLoadHelper {
 
 public:
 
-  KNLoadHelper(TQWidget *parent);
+  KNLoadHelper(TQWidget *tqparent);
   ~KNLoadHelper();
 
   /** opens a file dialog and returns a file open for reading */
@@ -140,7 +140,7 @@ public:
   /** list selection dialog, used instead of a popup menu
       when a select action is called via the keyboard.
       returns -1 when the user canceled the dialog. */
-  static int selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue);
+  static int selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue);
 
   static void saveWindowSize(const TQString &name, const TQSize &s);
   static void restoreWindowSize(const TQString &name, TQWidget *d, const TQSize &defaultSize);
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index c5cfb84f..fb391828 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -3,7 +3,7 @@ ChangeLog for KNotes
 
 2006/07/10  Michael Brade <brade@kde.org>
 
-    * added DCOP methods to get and change geometry:
+    * added DCOP methods to get and change tqgeometry:
 	  height(), width(), move(), resize()
 
 2006/06/10  Michael Brade <brade@kde.org>
@@ -182,7 +182,7 @@ ChangeLog for KNotes
     * when there is no note after restoring a session, still show the "No Notes"
       item in the notes menu
     * each note now has its own KXMLGUIBilder to get rid of the reparent-call,
-      the builder's parent will be the widgets' parent
+      the builder's tqparent will be the widgets' tqparent
     * fixed #87696: allow default sizes as small as 50x50 pixels
 
 2004/08/20  Michael Brade <brade@kde.org>
@@ -347,7 +347,7 @@ ChangeLog for KNotes
 2004/03/15  Michael Brade <brade@kde.org>
 
     * removed const from KNotesApp::slotPreferences to make it possible to
-      set KNotesApp as parent of the config dialog -> fixes jumping to another
+      set KNotesApp as tqparent of the config dialog -> fixes jumping to another
       desktop when opening the config dialog
 
 2004/03/13  Michael Brade <brade@kde.org>
@@ -499,7 +499,7 @@ ChangeLog for KNotes
     * removed really old icons
     * made KNoteButtons always square
     * show the rich text actions only for actual rich text notes
-    * don't emit the bold/italic/underline signals when moving the cursor
+    * don't emit the bold/italic/underline Q_SIGNALS when moving the cursor
       or selecting text, otherwise this will change the selected text!
 
 2002/10/15  Michael Brade <brade@kde.org>
@@ -616,7 +616,7 @@ ChangeLog for KNotes
 2001/06/23  Michael Brade <brade@informatik.uni-muenchen.de>
 
     * fixed #18086 (add a size grip for the notes)
-    * update the title layout if the font was changed
+    * update the title tqlayout if the font was changed
 
 2001/06/17  Michael Brade <brade@informatik.uni-muenchen.de>
 
@@ -631,7 +631,7 @@ ChangeLog for KNotes
       - removed the size setting from the local note config dialog
       - #20172: separate font settings for title and body
     * don't reload the display setting if changing e.g. only the color -
-      the note's geometry could have been changed already
+      the note's tqgeometry could have been changed already
     * fixed some bugs introduced by the QTextEdit port
 
 2001/06/10  Michael Brade <brade@informatik.uni-muenchen.de>
@@ -811,7 +811,7 @@ ChangeLog for KNotes
 
     KNotes rewrite:
      - changed config file to use KConfig
-     - use KDockWindow and KUniqueApplication
+     - use KTQt::DockWindow and KUniqueApplication
      - Changed structure to make smaller files
 
 2000/01/30  Charles Samuels <charles@kde.org>
@@ -863,7 +863,7 @@ Tue Aug  3 02:23:09 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
     * added possibility to play a sound when an alarm is activated,
       configurable in the defaults dialog
     * replaced the custom spinboxes with QSpinBoxes and made the dialog use
-      layout management (still not perfect, yet)
+      tqlayout management (still not perfect, yet)
 
 1999-06-07  Petter Reinholdtsen <pere@td.org.uit.no>
     * knotes.cpp: Changed text Quit to Exit to match KDE style guide.
@@ -883,7 +883,7 @@ Tue Aug  3 02:23:09 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 Tue Feb 16 09:34:25 1999  David Faure  <faure@kde.org>
 
     * Added option "dock in panel" (to disable docking)
-    Docking is automatically re-enabled if the last note is deleted
+    TQt::Docking is automatically re-enabled if the last note is deleted
     * Move options submenu to toplevel RMB menu (too many submenus!)
     * Re-added "Quit" menu entry (in order to quit when docking is off)
 
@@ -922,7 +922,7 @@ Mon Nov 17 21:32:28 1997  Didier Belot <dib@avo.fr>
 
 Sat Nov 22 13:13:05 1997 Matthias Ettrich <ettrich@kde.org>
 
-    * sessionmanagement: uses kwm properties now, not only geometry info
+    * sessionmanagement: uses kwm properties now, not only tqgeometry info
     * look: pretty thin border. KPostit does no longer inherit QMultiline
             but simply QFrame. New class: KPostitMultilineEdit.
             New QMessage box for warning. Icon+Miniicon.
diff --git a/knotes/KNotesAppIface.h b/knotes/KNotesAppIface.h
index 7ddfdc28..ad24a58b 100644
--- a/knotes/KNotesAppIface.h
+++ b/knotes/KNotesAppIface.h
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -49,8 +49,8 @@ k_dcop:
      * @param text the body of the new note
      * @return the new notes' id
      */
-    virtual TQString newNote( const TQString& name = TQString::null,
-                             const TQString& text = TQString::null ) = 0;
+    virtual TQString newNote( const TQString& name = TQString(),
+                             const TQString& text = TQString() ) = 0;
 
     /**
      * Create a new note and inserts the current text in the clipboard
@@ -60,7 +60,7 @@ k_dcop:
      *        KNotes will choose an appropriate name
      * @return the new notes' id
      */
-    virtual TQString newNoteFromClipboard( const TQString& name = TQString::null ) = 0;
+    virtual TQString newNoteFromClipboard( const TQString& name = TQString() ) = 0;
 
     /**
      * Deletes a note forever.
@@ -98,14 +98,14 @@ k_dcop:
     /**
      * Returns the foreground/text color of a note.
      * @param noteId the id of the note in question
-     * @return the foreground/text color as a QString
+     * @return the foreground/text color as a TQString
      */
     virtual TQString fgColor( const TQString& noteId ) const = 0;
 
     /**
      * Returns the background color of a note.
      * @param noteId the id of the note in question
-     * @return the background color as a QString
+     * @return the background color as a TQString
      */
     virtual TQString bgColor( const TQString& noteId ) const = 0;
 
@@ -121,14 +121,14 @@ k_dcop:
     /**
      * Returns the title/name of a note.
      * @param noteId the id of the note in question
-     * @return the name as a QString
+     * @return the name as a TQString
      */
     virtual TQString name( const TQString& noteId ) const = 0;
 
     /**
      * Returns the text of a note.
      * @param noteId the id of the note in question
-     * @return the body as a QString
+     * @return the body as a TQString
      */
     virtual TQString text( const TQString& noteId ) const = 0;
 
diff --git a/knotes/KNotesIface.h b/knotes/KNotesIface.h
index dc9cd41d..1fba1860 100644
--- a/knotes/KNotesIface.h
+++ b/knotes/KNotesIface.h
@@ -39,8 +39,8 @@ k_dcop:
      * @param text the body of the new note
      * @return the new notes' id
      */
-    virtual TQString newNote( const TQString& name = TQString::null,
-                             const TQString& text = TQString::null ) = 0;
+    virtual TQString newNote( const TQString& name = TQString(),
+                             const TQString& text = TQString() ) = 0;
 
     /**
      * Create a new note and inserts the current text in the clipboard
@@ -50,7 +50,7 @@ k_dcop:
      *        KNotes will choose an appropriate name
      * @return the new notes' id
      */
-    virtual TQString newNoteFromClipboard( const TQString& name = TQString::null ) = 0;
+    virtual TQString newNoteFromClipboard( const TQString& name = TQString() ) = 0;
 
     /**
      * Deletes a note forever.
@@ -88,14 +88,14 @@ k_dcop:
     /**
      * Returns the title/name of a note.
      * @param noteId the id of the note in question
-     * @return the name as a QString
+     * @return the name as a TQString
      */
     virtual TQString name( const TQString& noteId ) const = 0;
 
     /**
      * Returns the text of a note.
      * @param noteId the id of the note in question
-     * @return the body as a QString
+     * @return the body as a TQString
      */
     virtual TQString text( const TQString& noteId ) const = 0;
 };
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index d4ce67b5..0f0ec426 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -81,10 +81,10 @@ extern Time qt_x_time;
 
 int KNote::s_ppOffset = 0;
 
-KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *name )
-  : TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
+KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name )
+  : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
     m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ),
-    m_config( 0 ), m_journal( j ), m_find( 0 ),
+    m_config( 0 ), m_journal( j ), m_tqfind( 0 ),
     m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ),
     m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false )
 {
@@ -266,7 +266,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     bool closeLeft = false;
     m_kwinConf->setGroup( "Style" );
     if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
+        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1;
 
     TQPixmap pushpin_pix;
     if ( closeLeft )
@@ -564,7 +564,7 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg )
 
     // set the color for the selection used to highlight the find stuff
     TQColor sel = palette().color( TQPalette::Active, TQColorGroup::Base ).dark();
-    if ( sel == Qt::black )
+    if ( sel == TQt::black )
         sel = palette().color( TQPalette::Active, TQColorGroup::Base ).light();
 
     m_editor->setSelectionAttributes( 1, sel, true );
@@ -577,33 +577,33 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg )
     emit sigColorChanged();
 }
 
-void KNote::find( const TQString& pattern, long options )
+void KNote::tqfind( const TQString& pattern, long options )
 {
-    delete m_find;
-    m_find = new KFind( pattern, options, this );
+    delete m_tqfind;
+    m_tqfind = new KFind( pattern, options, this );
 
-    connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )),
+    connect( m_tqfind, TQT_SIGNAL(highlight( const TQString &, int, int )),
              this, TQT_SLOT(slotHighlight( const TQString &, int, int )) );
-    connect( m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) );
+    connect( m_tqfind, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) );
 
-    m_find->setData( plainText() );
+    m_tqfind->setData( plainText() );
     slotFindNext();
 }
 
 void KNote::slotFindNext()
 {
     // TODO: honor FindBackwards
-    // TODO: dialogClosed() -> delete m_find
+    // TODO: dialogClosed() -> delete m_tqfind
 
     // Let KFind inspect the text fragment, and display a dialog if a match is found
-    KFind::Result res = m_find->find();
+    KFind::Result res = m_tqfind->tqfind();
 
     if ( res == KFind::NoMatch ) // i.e. at end-pos
     {
         m_editor->removeSelection( 1 );
         emit sigFindFinished();
-        delete m_find;
-        m_find = 0;
+        delete m_tqfind;
+        m_tqfind = 0;
     }
     else
     {
@@ -712,7 +712,7 @@ void KNote::slotRename()
     bool ok;
     aboutToEnterEventLoop();
     TQString oldName = m_label->text();
-    TQString newName = KInputDialog::getText( TQString::null,
+    TQString newName = KInputDialog::getText( TQString(),
         i18n("Please enter the new name:"), m_label->text(), &ok, this );
     eventLoopLeft();
     m_blockEmitDataChanged = false;
@@ -876,7 +876,7 @@ void KNote::slotSaveAs()
         convert->setText( i18n("Save note as plain text") );
     }
 
-    KFileDialog dlg( TQString::null, TQString::null, this, "filedialog", true, convert );
+    KFileDialog dlg( TQString(), TQString(), this, "filedialog", true, convert );
     dlg.setOperationMode( KFileDialog::Saving );
     dlg.setCaption( i18n("Save As") );
     aboutToEnterEventLoop();
@@ -984,7 +984,7 @@ void KNote::slotUpdateDesktopActions()
 
     TQStringList desktops;
     desktops.append( i18n("&All Desktops") );
-    desktops.append( TQString::null );           // Separator
+    desktops.append( TQString() );           // Separator
 
     int count = wm_root.numberOfDesktops();
     for ( int n = 1; n <= count; n++ )
@@ -1021,7 +1021,7 @@ void KNote::createFold()
 {
     TQPixmap fold( 15, 15 );
     TQPainter foldp( &fold );
-    foldp.setPen( Qt::NoPen );
+    foldp.setPen( TQt::NoPen );
     foldp.setBrush( palette().active().dark() );
     TQPointArray foldpoints( 3 );
     foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 );
@@ -1136,7 +1136,7 @@ void KNote::updateBackground( int y_offset )
     y_offset = y_offset % h;
 
     TQImage grad_img( w, h, 32 );
-    QRgb rgbcol;
+    TQRgb rgbcol;
     TQColor bg = palette().active().background();
 
     for ( int i = 0; i < h; ++i )
@@ -1155,7 +1155,7 @@ void KNote::updateBackground( int y_offset )
     }
 
     // setPaletteBackgroundPixmap makes TQTextEdit::color() stop working!!
-    m_editor->setPaper( TQBrush( Qt::black, TQPixmap( grad_img ) ) );
+    m_editor->setPaper( TQBrush( TQt::black, TQPixmap( grad_img ) ) );
 }
 
 void KNote::updateLayout()
@@ -1166,7 +1166,7 @@ void KNote::updateLayout()
 
     m_kwinConf->setGroup( "Style" );
     if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
+        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1;
 
     if ( s_ppOffset )
     {
diff --git a/knotes/knote.h b/knotes/knote.h
index 6bb2ffe8..eb548955 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -51,8 +51,9 @@ namespace KCal {
 class KNote : public TQFrame, virtual public KXMLGUIClient
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0,
+    KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *tqparent = 0,
            const char *name = 0 );
     ~KNote();
 
@@ -73,7 +74,7 @@ public:
     TQColor bgColor() const;
     void setColor( const TQColor& fg, const TQColor& bg );
 
-    void find( const TQString& pattern, long options );
+    void tqfind( const TQString& pattern, long options );
 
     bool isModified() const;
 
@@ -164,7 +165,7 @@ private:
     KNoteConfig   *m_config;
     KCal::Journal *m_journal;
 
-    KFind         *m_find;
+    KFind         *m_tqfind;
 
     KPopupMenu    *m_menu;
     KPopupMenu    *m_edit_menu;
diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp
index 2652af63..ca4d74e8 100644
--- a/knotes/knotealarmdlg.cpp
+++ b/knotes/knotealarmdlg.cpp
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -45,8 +45,8 @@
 #include "knotealarmdlg.h"
 
 
-KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok )
+KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok )
 {
     TQVBox *page = makeVBoxMainWidget();
     TQGroupBox *group = new TQGroupBox( 3, Vertical, i18n("Scheduled Alarm"), page );
diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h
index 9e97ee76..7d06d6c0 100644
--- a/knotes/knotealarmdlg.h
+++ b/knotes/knotealarmdlg.h
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -46,8 +46,9 @@ namespace KCal {
 class KNoteAlarmDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
+    KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 );
 
     void setIncidence( KCal::Journal *journal );
 
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index 230ba4d4..d9a6205e 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -30,8 +30,8 @@
 #include "knotebutton.h"
 
 
-KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name )
-    : TQPushButton( parent, name )
+KNoteButton::KNoteButton( const TQString& icon, TQWidget *tqparent, const char *name )
+    : TQPushButton( tqparent, name )
 {
     setFocusPolicy( NoFocus );
     tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 735fc107..594727ba 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -28,11 +28,12 @@ class TQEvent;
 class TQResizeEvent;
 
 
-class KNoteButton: public QPushButton
+class KNoteButton: public TQPushButton
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 );
+    KNoteButton( const TQString& icon, TQWidget *tqparent=0, const char *name=0 );
     ~KNoteButton();
 
     virtual TQSize tqsizeHint() const;
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index a8833709..950b9a9b 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -42,8 +42,8 @@
 
 
 KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title,
-        TQWidget *parent, const char *name )
-    : KConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList,
+        TQWidget *tqparent, const char *name )
+    : KConfigDialog( tqparent, name, config ? config : KNotesGlobalConfig::self(), IconList,
                      config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok )
 {
     setCaption( title );
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index c2220a56..71756082 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -30,9 +30,10 @@ class KNoteConfig;
 class KNoteConfigDlg : public KConfigDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KNoteConfigDlg( KNoteConfig *config, const TQString &title,
-                    TQWidget *parent=0, const char *name=0 );
+                    TQWidget *tqparent=0, const char *name=0 );
     ~KNoteConfigDlg();
 
 public slots:
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index d89cfd37..2796c297 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -36,8 +36,8 @@ static const short SEP = 5;
 static const short ICON_SIZE = 10;
 
 
-KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name )
-    : KTextEdit( parent, name ), m_note( 0 )
+KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char *name )
+    : KTextEdit( tqparent, name ), m_note( 0 )
 {
     setAcceptDrops( true );
     setWordWrap( WidgetWidth );
@@ -117,7 +117,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
     m_textSuper->setExclusiveGroup( "valign" );
     m_textSub->setExclusiveGroup( "valign" );
 
-// There is no easy possibility to implement text indenting with QTextEdit
+// There is no easy possibility to implement text indenting with TQTextEdit
 //
 //     m_textIncreaseIndent = new KAction( i18n("Increase Indent"), "format_increaseindent", 0,
 //                                         this, TQT_SLOT(textIncreaseIndent()),
@@ -219,7 +219,7 @@ void KNoteEdit::setTextFormat( TextFormat f )
         TQString t = text();
         KTextEdit::setTextFormat( f );
 
-        // if the note tqcontains html/xml source try to display it, otherwise
+        // if the note contains html/xml source try to display it, otherwise
         // get the modified text again and set it to preserve newlines
         if ( TQStyleSheet::mightBeRichText( t ) )
             setText( t );
@@ -451,7 +451,7 @@ void KNoteEdit::autoIndent()
 
     // This routine returns the whitespace before the first non white space
     // character in string.
-    // It is assumed that string tqcontains at least one non whitespace character
+    // It is assumed that string contains at least one non whitespace character
     // ie \n \r \t \v \f and space
     TQString indentString;
 
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 2e183bfc..959dee65 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -38,8 +38,9 @@ class KFontSizeAction;
 class KNoteEdit : public KTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 );
+    KNoteEdit( KActionCollection *actions, TQWidget *tqparent=0, const char *name=0 );
     ~KNoteEdit();
     void setNote( KNote *_note ) {
         m_note = _note;
diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp
index e78894ea..f00be4c5 100644
--- a/knotes/knotehostdlg.cpp
+++ b/knotes/knotehostdlg.cpp
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -46,8 +46,8 @@
 #include "knotesglobalconfig.h"
 
 
-KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok, true )
+KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok, true )
 {
     TQVBox *page = makeVBoxMainWidget();
     (void)new TQLabel( i18n("Hostname or IP address:"), page );
diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h
index 1e8c79ff..91959dc9 100644
--- a/knotes/knotehostdlg.h
+++ b/knotes/knotehostdlg.h
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -44,8 +44,9 @@ class KHistoryCombo;
 class KNoteHostDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
+    KNoteHostDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 );
     ~KNoteHostDlg();
 
     TQString host() const;
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index 593ed8f7..69ddb35b 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -71,7 +71,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter,
 {
     const int margin = 40;  // pt
 
-    TQPaintDeviceMetrics metrics( painter.device() );
+    TQPaintDeviceMetrics metrics( painter.tqdevice() );
     int marginX = margin * metrics.logicalDpiX() / 72;
     int marginY = margin * metrics.logicalDpiY() / 72;
 
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index 1f9e22e7..b248bdeb 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -42,8 +42,8 @@
 #include "knotesglobalconfig.h"
 
 
-KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, const char *name )
-  : TQObject( parent, name ),
+KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ),
     m_manager( manager ),
     m_checkTimer( 0, "m_checkTimer" )
 {
@@ -67,7 +67,7 @@ void KNotesAlarm::checkAlarms()
     TQValueList<KCal::Alarm *>::ConstIterator it;
     for ( it = alarms.constBegin(); it != alarms.constEnd(); ++it )
     {
-        KCal::Incidence *incidence = (*it)->parent();
+        KCal::Incidence *incidence = (*it)->tqparent();
         notes += incidence->summary();
     }
 
diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h
index 993c8490..ea022595 100644
--- a/knotes/knotesalarm.h
+++ b/knotes/knotesalarm.h
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -42,11 +42,12 @@ namespace KCal {
 }
 
 
-class KNotesAlarm : public QObject
+class KNotesAlarm : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 );
+    KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent = 0, const char *name = 0 );
 
 private slots:
     void checkAlarms();
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 231afede..79a3ca99 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -60,8 +60,8 @@ using namespace KNetwork;
 class KNotesKeyDialog : public KDialogBase
 {
 public:
-    KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 )
-        : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok )
+    KNotesKeyDialog( KGlobalAccel *globals, TQWidget *tqparent, const char* name = 0 )
+        : KDialogBase( tqparent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok )
     {
         m_keyChooser = new KKeyChooser( globals, this );
         setMainWidget( m_keyChooser );
@@ -94,7 +94,7 @@ int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCol
 
 KNotesApp::KNotesApp()
     : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ),
-      m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 )
+      m_alarm( 0 ), m_listener( 0 ), m_tqfind( 0 ), m_findPos( 0 )
 {
     connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) );
 
@@ -121,7 +121,7 @@ KNotesApp::KNotesApp()
         this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
     new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
 
-    m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
+    m_findAction = KStdAction::tqfind( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
     KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() );
     KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() );
     //FIXME: no shortcut removing!?
@@ -236,7 +236,7 @@ KNotesApp::~KNotesApp()
     delete m_guiBuilder;
 }
 
-bool KNotesApp::commitData( QSessionManager& )
+bool KNotesApp::commitData( TQSessionManager& )
 {
     saveConfigs();
     return true;
@@ -336,7 +336,7 @@ TQString KNotesApp::name( const TQString& id ) const
     if ( note )
         return note->name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString KNotesApp::text( const TQString& id ) const
@@ -345,7 +345,7 @@ TQString KNotesApp::text( const TQString& id ) const
     if ( note )
         return note->text();
     else
-        return TQString::null;
+        return TQString();
 }
 
 void KNotesApp::setName( const TQString& id, const TQString& newName )
@@ -372,7 +372,7 @@ TQString KNotesApp::fgColor( const TQString& id ) const
     if ( note )
         return note->fgColor().name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString KNotesApp::bgColor( const TQString& id ) const
@@ -381,7 +381,7 @@ TQString KNotesApp::bgColor( const TQString& id ) const
     if ( note )
         return note->bgColor().name();
     else
-        return TQString::null;
+        return TQString();
 }
 
 void KNotesApp::setColor( const TQString& id, const TQString& fgColor, const TQString& bgColor )
@@ -521,8 +521,8 @@ void KNotesApp::slotOpenFindDialog()
     m_findPos = new TQDictIterator<KNote>( m_noteList );
 
     // this could be in an own method if searching without a dialog should be possible
-    delete m_find;
-    m_find = new KFind( findDia.pattern(), findDia.options(), this );
+    delete m_tqfind;
+    m_tqfind = new KFind( findDia.pattern(), findDia.options(), this );
 
     slotFindNext();
 }
@@ -533,13 +533,13 @@ void KNotesApp::slotFindNext()
     {
         KNote *note = **m_findPos;
         ++*m_findPos;
-        note->find( m_find->pattern(), m_find->options() );
+        note->tqfind( m_tqfind->pattern(), m_tqfind->options() );
     }
     else
     {
-        m_find->displayFinalDialog();
-        delete m_find;
-        m_find = 0;
+        m_tqfind->displayFinalDialog();
+        delete m_tqfind;
+        m_tqfind = 0;
         delete m_findPos;
         m_findPos = 0;
     }
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 3048958d..fc167ddf 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -56,6 +56,7 @@ class KNotesApp : public TQLabel, public KSessionManaged, virtual public KXMLGUI
     virtual public KNotesAppIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KNotesApp();
     ~KNotesApp();
@@ -90,12 +91,12 @@ public:
     bool isNew( const TQString& app, const TQString& id ) const;
     bool isModified( const TQString& app, const TQString& id ) const;
 
-    bool commitData( QSessionManager& );
+    bool commitData( TQSessionManager& );
 
 public slots:
-    TQString newNote( const TQString& name = TQString::null,
-                     const TQString& text = TQString::null );
-    TQString newNoteFromClipboard( const TQString& name = TQString::null );
+    TQString newNote( const TQString& name = TQString(),
+                     const TQString& text = TQString() );
+    TQString newNoteFromClipboard( const TQString& name = TQString() );
 
     void hideAllNotes() const;
     void showAllNotes() const;
@@ -149,7 +150,7 @@ private:
     TQDict<KNote>    m_noteList;
     KNoteActionList m_noteActions;
 
-    KFind           *m_find;
+    KFind           *m_tqfind;
     TQDictIterator<KNote> *m_findPos;
 
     KPopupMenu      *m_note_menu;
diff --git a/knotes/knotesappui.rc b/knotes/knotesappui.rc
index d5d68273..a49a9028 100644
--- a/knotes/knotesappui.rc
+++ b/knotes/knotesappui.rc
@@ -7,7 +7,7 @@
     <Action name="new_note"/>
     <Action name="new_note_clipboard"/>
     <Separator/>
-    <Action name="edit_find"/>
+    <Action name="edit_tqfind"/>
     <Separator/>
     <Action name="show_all_notes"/>
     <Action name="hide_all_notes"/>
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index c51330fa..129517b3 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -177,7 +177,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     if ( fontfamily.isEmpty() )
         fontfamily = TQString( "Sans Serif" );
     uint size = input.readLine().toUInt();
-    size = QMAX( size, 4 );
+    size = TQMAX( size, 4 );
     uint weight = input.readLine().toUInt();
     bool italic = ( input.readLine().toUInt() == 1 );
     TQFont font( fontfamily, size, weight, italic );
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 259f9d36..ce4aafa4 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -130,7 +130,7 @@ void KNotesNetworkReceiver::slotConnectionClosed()
         TQString noteText = TQString( *m_buffer ).stripWhiteSpace();
 
         // First line is the note title or, in case of ATnotes, the id
-        int pos = noteText.find( TQRegExp("[\r\n]") );
+        int pos = noteText.tqfind( TQRegExp("[\r\n]") );
         TQString noteTitle = noteText.left( pos ).stripWhiteSpace() + m_titleAddon;
 
         noteText = noteText.mid( pos ).stripWhiteSpace();
diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h
index fdb84353..9f1cfdbb 100644
--- a/knotes/knotesnetrecv.h
+++ b/knotes/knotesnetrecv.h
@@ -19,11 +19,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -41,9 +41,10 @@ namespace KNetwork {
 }
 
 
-class KNotesNetworkReceiver : public QObject
+class KNotesNetworkReceiver : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KNotesNetworkReceiver( KNetwork::KBufferedSocket * );
     ~KNotesNetworkReceiver();
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index a08be4d0..fafcebac 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h
index 37a5233b..012b5eb0 100644
--- a/knotes/knotesnetsend.h
+++ b/knotes/knotesnetsend.h
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -43,6 +43,7 @@ using namespace KNetwork;
 class KNotesNetworkSender : public KNetwork::KBufferedSocket
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KNotesNetworkSender( const TQString& host, int port );
 
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 81c33489..96036212 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -21,11 +21,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/knotes/resourcelocal.h b/knotes/resourcelocal.h
index 0262674b..baeb710e 100644
--- a/knotes/resourcelocal.h
+++ b/knotes/resourcelocal.h
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp
index 0670956b..dcb3fa9a 100644
--- a/knotes/resourcelocal_plugin.cpp
+++ b/knotes/resourcelocal_plugin.cpp
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -43,9 +43,9 @@ public:
         return new ResourceLocal( config );
     }
 
-    KRES::ConfigWidget *configWidget( TQWidget *parent )
+    KRES::ConfigWidget *configWidget( TQWidget *tqparent )
     {
-        return new ResourceLocalConfig(parent);
+        return new ResourceLocalConfig(tqparent);
     }
 };
 
@@ -56,9 +56,9 @@ extern "C"
         return new LocalNotesFactory();
     }
 
-    KRES::ConfigWidget *config_widget( TQWidget* parent )
+    KRES::ConfigWidget *config_widget( TQWidget* tqparent )
     {
-        return new ResourceLocalConfig( parent, "Configure Local Resource" );
+        return new ResourceLocalConfig( tqparent, "Configure Local Resource" );
     }
 
     KRES::Resource *resource( const KConfig* config )
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 207730a1..c24e672a 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -29,8 +29,8 @@
 #include "resourcelocal.h"
 #include "resourcelocalconfig.h"
 
-ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent,  const char *name )
-    : KRES::ConfigWidget( parent, name )
+ResourceLocalConfig::ResourceLocalConfig( TQWidget *tqparent,  const char *name )
+    : KRES::ConfigWidget( tqparent, name )
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h
index 242b34a4..dfc1b677 100644
--- a/knotes/resourcelocalconfig.h
+++ b/knotes/resourcelocalconfig.h
@@ -28,8 +28,9 @@ class KURLRequester;
 class ResourceLocalConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 );
+        ResourceLocalConfig( TQWidget *tqparent = 0, const char *name = 0 );
         virtual ~ResourceLocalConfig();
 
     public slots:
diff --git a/knotes/resourcemanager.cpp b/knotes/resourcemanager.cpp
index 226d9000..4ede5b82 100644
--- a/knotes/resourcemanager.cpp
+++ b/knotes/resourcemanager.cpp
@@ -21,11 +21,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h
index a864fc38..e4476ced 100644
--- a/knotes/resourcemanager.h
+++ b/knotes/resourcemanager.h
@@ -21,11 +21,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
@@ -50,6 +50,7 @@ namespace KCal {
 class KNotesResourceManager : public TQObject, public KRES::ManagerObserver<ResourceNotes>
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KNotesResourceManager();
     virtual ~KNotesResourceManager();
diff --git a/knotes/resourcenotes.cpp b/knotes/resourcenotes.cpp
index 4295396c..13114272 100644
--- a/knotes/resourcenotes.cpp
+++ b/knotes/resourcenotes.cpp
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index 988c8dde..4fbf3b98 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -20,11 +20,11 @@
 
  In addition, as a special exception, the copyright holders give
  permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
  combinations including the two.  You must obey the GNU General
  Public License in all respects for all of the code used other than
- Qt.  If you modify this file, you may extend this exception to
+ TQt.  If you modify this file, you may extend this exception to
  your version of the file, but you are not obligated to do so.  If
  you do not wish to do so, delete this exception statement from
  your version.
diff --git a/kode/automakefile.cpp b/kode/automakefile.cpp
index 2be52ae3..8d14540c 100644
--- a/kode/automakefile.cpp
+++ b/kode/automakefile.cpp
@@ -35,7 +35,7 @@ AutoMakefile::AutoMakefile()
 void AutoMakefile::addTarget( const Target &t )
 {
   mTargets.append( t );
-  if ( mTargetTypes.find( t.type() ) == mTargetTypes.end() ) {
+  if ( mTargetTypes.tqfind( t.type() ) == mTargetTypes.end() ) {
     mTargetTypes.append( t.type() );
   }
 }
@@ -47,10 +47,10 @@ void AutoMakefile::addEntry( const TQString &variable, const TQString &value )
     return;
   }
   
-  TQStringList::ConstIterator it = mEntries.find( variable );
+  TQStringList::ConstIterator it = mEntries.tqfind( variable );
   if ( it == mEntries.end() ) {
     mEntries.append( variable );
-    TQMap<TQString,TQString>::Iterator it = mValues.find( variable );
+    TQMap<TQString,TQString>::Iterator it = mValues.tqfind( variable );
     if ( it == mValues.end() ) {
       mValues.insert( variable, value );
     } else {
diff --git a/kode/automakefile.h b/kode/automakefile.h
index ec0dce7e..5f22a757 100644
--- a/kode/automakefile.h
+++ b/kode/automakefile.h
@@ -75,7 +75,7 @@ class KDE_EXPORT AutoMakefile
     Target::List targets() const { return mTargets; }
 
     void addEntry( const TQString &variable,
-                   const TQString &value = TQString::null );
+                   const TQString &value = TQString() );
 
     void newLine();
 
diff --git a/kode/class.cpp b/kode/class.cpp
index 48c0e22f..ef26ff73 100644
--- a/kode/class.cpp
+++ b/kode/class.cpp
@@ -78,12 +78,12 @@ void Class::setNameSpace( const TQString &nameSpace )
 void Class::addInclude( const TQString &include,
   const TQString &forwardDeclaration )
 {
-  if ( mIncludes.find( include ) == mIncludes.end() ) {
+  if ( mIncludes.tqfind( include ) == mIncludes.end() ) {
     mIncludes.append( include );
   }
 
   if( !forwardDeclaration.isEmpty() &&
-      mForwardDeclarations.find( forwardDeclaration ) ==
+      mForwardDeclarations.tqfind( forwardDeclaration ) ==
       mForwardDeclarations.end() ) {
     mForwardDeclarations.append( forwardDeclaration );
   }
@@ -94,7 +94,7 @@ void Class::addHeaderInclude( const TQString &include )
   if ( include.isEmpty() )
     return;
 
-  if ( mHeaderIncludes.find( include ) == mHeaderIncludes.end() ) {
+  if ( mHeaderIncludes.tqfind( include ) == mHeaderIncludes.end() ) {
     mHeaderIncludes.append( include );
   }
 }
@@ -159,7 +159,7 @@ bool Class::hasFunction( const TQString &functionName ) const
   return false;
 }
 
-bool Class::isQObject() const
+bool Class::isTQObject() const
 {
   Function::List::ConstIterator it;
   for( it = mFunctions.begin(); it != mFunctions.end(); ++it ) {
diff --git a/kode/class.h b/kode/class.h
index 21edc015..ac7570ef 100644
--- a/kode/class.h
+++ b/kode/class.h
@@ -40,7 +40,7 @@ class KDE_EXPORT Class
     typedef TQValueList<Class> List;
     
     Class();
-    Class( const TQString &name, const TQString &nameSpace = TQString::null );
+    Class( const TQString &name, const TQString &nameSpace = TQString() );
 
     Class( const Class & );
     Class &operator=( const Class &c );
@@ -48,7 +48,7 @@ class KDE_EXPORT Class
     bool isValid() const;
 
     void addInclude( const TQString &file,
-      const TQString &forwardDeclaration = TQString::null );
+      const TQString &forwardDeclaration = TQString() );
     void addHeaderInclude( const TQString &file );
     void addHeaderIncludes( const TQStringList &files );
     void addBaseClass( const Class & );
@@ -75,7 +75,7 @@ class KDE_EXPORT Class
 
     bool hasFunction( const TQString &name ) const;
     
-    bool isQObject() const;
+    bool isTQObject() const;
     
   private:
     // WARNING: If you add member variables, you have to adjust the copy
diff --git a/kode/code.cpp b/kode/code.cpp
index da897693..0b28e546 100644
--- a/kode/code.cpp
+++ b/kode/code.cpp
@@ -41,7 +41,7 @@ Code::Code( int indent )
 void Code::clear()
 {
   mIndent = 0;
-  mText = TQString::null;
+  mText = TQString();
 }
 
 bool Code::isEmpty() const
diff --git a/kode/file.cpp b/kode/file.cpp
index 51c19131..b71109ec 100644
--- a/kode/file.cpp
+++ b/kode/file.cpp
@@ -47,7 +47,7 @@ TQString File::filename() const
     return className.lower();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 void File::setNameSpace( const TQString &n )
@@ -78,7 +78,7 @@ void File::addInclude( const TQString &i )
   TQString include = i;
   if( !include.endsWith( ".h" ) ) include.append( ".h" );
 
-  if ( mIncludes.find( include ) == mIncludes.end() ) {
+  if ( mIncludes.tqfind( include ) == mIncludes.end() ) {
     mIncludes.append( include );
   }
 }
diff --git a/kode/function.h b/kode/function.h
index 47f0dd75..ad1fea45 100644
--- a/kode/function.h
+++ b/kode/function.h
@@ -38,7 +38,7 @@ class KDE_EXPORT Function
     enum AccessSpecifier { Public = 1, Protected = 2, Private = 4, Signal = 8, Slot = 16 };
 
     Function();
-    Function( const TQString &name, const TQString &returnType = TQString::null,
+    Function( const TQString &name, const TQString &returnType = TQString(),
               int access = Public, bool isStatic = false );
 
     void setConst( bool isConst );
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 6542c288..5d01cefa 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -66,7 +66,7 @@ static const KCmdLineOptions options[] =
   { "filename <name>", I18N_NOOP("Name of file"), 0 },
   { "namespace <name>", I18N_NOOP("Namespace"), 0 },
   { "warning", I18N_NOOP("Create warning about code generation"), 0 },
-  { "qt-exception", I18N_NOOP("Add Qt exception to GPL"), 0 },
+  { "qt-exception", I18N_NOOP("Add TQt exception to GPL"), 0 },
   { "singleton", I18N_NOOP("Create a singleton class"), 0 },
   { "protocol", I18N_NOOP("kioslave protocol"), 0 },
   { "+[filename]", I18N_NOOP("Source code file name"), 0 },
@@ -167,17 +167,17 @@ int addProperty( KCmdLineArgs *args )
 //    out += line + "\n";
     switch( state ) {
       case FindClass:
-//        if ( line.find( TQRegExp( className ) ) >= 0 ) {
-        if ( line.find( TQRegExp( "^\\s*class\\s+" + className ) ) >= 0 ) {
+//        if ( line.tqfind( TQRegExp( className ) ) >= 0 ) {
+        if ( line.tqfind( TQRegExp( "^\\s*class\\s+" + className ) ) >= 0 ) {
           kdDebug() << "  FOUND CLASS" << endl;
           state = FindConstructor;
         }
         break;
       case FindConstructor:
-        if ( line.find( TQRegExp( "^\\s*" + className + "\\s*\\(" ) ) >= 0 ) {
+        if ( line.tqfind( TQRegExp( "^\\s*" + className + "\\s*\\(" ) ) >= 0 ) {
           kdDebug() << "  FOUND CONSTRUCTOR" << endl;
           out += readAhead;
-          readAhead = TQString::null;
+          readAhead = TQString();
           state = FindProperties;
         }
         break;
@@ -190,7 +190,7 @@ int addProperty( KCmdLineArgs *args )
               kdDebug() << "Function: " << function << endl;
               if ( function == className || function == "~" + className ) {
                 out += readAhead;
-                readAhead = TQString::null;
+                readAhead = TQString();
               } else {
                 if ( function.startsWith( "set" ) ) {
                   mutator = function.mid( 3 );
@@ -200,7 +200,7 @@ int addProperty( KCmdLineArgs *args )
                     accessor = function;
                     kdDebug() << "ACCESSOR: " << accessor << endl;
                     out += readAhead;
-                    readAhead = TQString::null;
+                    readAhead = TQString();
                   } else {
                     kdDebug() << "CREATE PROPERTY" << endl;
                     out += readAheadPrevious;
@@ -212,13 +212,13 @@ int addProperty( KCmdLineArgs *args )
                 }
               }
             }
-          } else if ( line.find( TQRegExp( "\\s*protected" ) ) >= 0 ) {
+          } else if ( line.tqfind( TQRegExp( "\\s*protected" ) ) >= 0 ) {
             state = FindPrivate;
-          } else if ( line.find( TQRegExp( "\\s*private" ) ) >= 0 ) {
+          } else if ( line.tqfind( TQRegExp( "\\s*private" ) ) >= 0 ) {
             if ( accessor.isEmpty() ) {
               addPropertyFunctions( out, type, name );
               out += readAhead;
-              readAhead = TQString::null;
+              readAhead = TQString();
               addPropertyVariable( out, type, name );
               state = Finish;
             } else {
@@ -227,7 +227,7 @@ int addProperty( KCmdLineArgs *args )
                 addPropertyFunctions( out, type, name );
                 out += "\n";
                 out += line + "\n";
-                readAhead = TQString::null;
+                readAhead = TQString();
               }
               state = FindVariables;
             }
@@ -235,10 +235,10 @@ int addProperty( KCmdLineArgs *args )
         }
         break;
       case FindPrivate:
-        if ( line.find( TQRegExp( "\\s*private" ) ) >= 0 ) {
+        if ( line.tqfind( TQRegExp( "\\s*private" ) ) >= 0 ) {
           if ( accessor.isEmpty() ) {
             out += readAhead;
-            readAhead = TQString::null;
+            readAhead = TQString();
             addPropertyVariable( out, type, name );
             state = Finish;
           } else {
@@ -248,9 +248,9 @@ int addProperty( KCmdLineArgs *args )
         break;
       case FindVariables:
         {
-          if ( line.find( "m" + accessor.lower(), 0, false ) >= 0 ) {
+          if ( line.tqfind( "m" + accessor.lower(), 0, false ) >= 0 ) {
             out += readAhead;
-            readAhead = TQString::null;
+            readAhead = TQString();
             addPropertyVariable( out, type, name );
             state = Finish;
           }
@@ -372,9 +372,9 @@ int create( KCmdLineArgs *args )
     authorEmail = a.preferredEmail();
   } else {
     KABC::Addressee::List as =
-        KABC::StdAddressBook::self()->tqfindByEmail( authorEmail );
+        KABC::StdAddressBook::self()->findByEmail( authorEmail );
     if ( as.isEmpty() ) {
-      kdDebug() << "Unable to find '" << authorEmail << "' in address book."
+      kdDebug() << "Unable to tqfind '" << authorEmail << "' in address book."
                 << endl;
     } else {
       a = as.first();
@@ -390,7 +390,7 @@ int create( KCmdLineArgs *args )
   KODE::License l;
   if ( args->isSet( "gpl" ) ) l = KODE::License( KODE::License::GPL );
   if ( args->isSet( "lgpl" ) ) l = KODE::License( KODE::License::LGPL );
-  l.setQtException( args->isSet( "qt-exception" ) );
+  l.setTQtException( args->isSet( "qt-exception" ) );
   file.setLicense( l );
 
   file.setNameSpace( args->getOption( "namespace" ) );
@@ -587,7 +587,7 @@ int create( KCmdLineArgs *args )
     TQFileInfo fi( protocolFilename );
     protocolFilename = fi.absFilePath();
 
-    KSaveFile::backupFile( protocolFilename, TQString::null, ".backup" );
+    KSaveFile::backupFile( protocolFilename, TQString(), ".backup" );
     
     TQFile::remove( protocolFilename );
     
diff --git a/kode/kwsdl/compiler.h b/kode/kwsdl/compiler.h
index 1bb27e1b..be773610 100644
--- a/kode/kwsdl/compiler.h
+++ b/kode/kwsdl/compiler.h
@@ -29,9 +29,10 @@
 
 namespace KWSDL {
 
-class Compiler : public QObject
+class Compiler : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Compiler();
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 3f97efe1..173ca7fb 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -37,7 +37,7 @@ static TQString escapeEnum( const TQString &str )
 
 Converter::Converter()
 {
-  mQObject = KODE::Class( "TQObject" );
+  mTQObject = KODE::Class( TQOBJECT_OBJECT_NAME_STRING );
 }
 
 void Converter::setWSDL( const WSDL &wsdl )
@@ -218,13 +218,13 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
   KODE::Function marshal( "marshal", "void" );
   marshal.setStatic( true );
   marshal.addArgument( "TQDomDocument &doc" );
-  marshal.addArgument( "TQDomElement &parent" );
+  marshal.addArgument( "TQDomElement &tqparent" );
   marshal.addArgument( "const TQString &name" );
   marshal.addArgument( "const " + typeName + "* value" );
 
   KODE::Function demarshal( "demarshal", "void" );
   demarshal.setStatic( true );
-  demarshal.addArgument( "const TQDomElement &parent" );
+  demarshal.addArgument( "const TQDomElement &tqparent" );
   demarshal.addArgument( typeName + "* value" );
 
   KODE::Code marshalCode, demarshalCode, code;
@@ -249,7 +249,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
         escapedEnums.append( escapeEnum( enums[ i ] ) );
 
       // marshal value
-      KODE::Function marshalValue( "marshalValue", "TQString" );
+      KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
       marshalValue.setStatic( true );
       marshalValue.addArgument( "const " + typeName + "* value" );
       code += "switch ( value->type() ) {";
@@ -275,7 +275,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
       // marshal
       marshalCode += "TQDomElement root = doc.createElement( name );";
       marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + type->name() + "\" );";
-      marshalCode += "parent.appendChild( root );";
+      marshalCode += "tqparent.appendChild( root );";
       marshalCode += "root.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );";
 
       // demarshal value
@@ -294,28 +294,28 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
       demarshalValue.setBody( code );
 
       // demarshal
-      demarshalCode += "Serializer::demarshalValue( parent.text(), value );";
+      demarshalCode += "Serializer::demarshalValue( tqparent.text(), value );";
 
       mSerializer.addFunction( marshalValue );
       mSerializer.addFunction( demarshalValue );
     } else if ( type->baseType() != Schema::XSDType::INVALID ) {
       marshalCode += "if ( value->value() ) {";
       marshalCode.indent();
-      marshalCode += "Serializer::marshal( doc, parent, name, value->value() );";
+      marshalCode += "Serializer::marshal( doc, tqparent, name, value->value() );";
       marshalCode.unindent();
       marshalCode += "}";
 
-      demarshalCode += "const TQString text = parent.text();";
+      demarshalCode += "const TQString text = tqparent.text();";
       demarshalCode.newLine();
       demarshalCode += "if ( !text.isEmpty() ) {";
       demarshalCode.indent();
       demarshalCode += baseType + "* data = new " + baseType + ";";
-      demarshalCode += "Serializer::demarshal( parent, value );";
+      demarshalCode += "Serializer::demarshal( tqparent, value );";
       demarshalCode += "value->setValue( data );";
       demarshalCode.unindent();
       demarshalCode += "}";
 
-      KODE::Function marshalValue( "marshalValue", "TQString" );
+      KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
       marshalValue.setStatic( true );
       marshalValue.addArgument( "const " + typeName + "* value" );
       marshalValue.setBody( "return Serializer::marshalValue( value->value() );" );
@@ -352,12 +352,12 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
     marshalCode += "}";
     marshalCode.newLine();
     marshalCode += "TQDomElement element = doc.createElement( name );";
-    marshalCode += "parent.appendChild( element );";
+    marshalCode += "tqparent.appendChild( element );";
     marshalCode += "element.appendChild( doc.createTextNode( list.join( \" \" ) ) );";
     marshalCode.unindent();
     marshalCode += "}";
 
-    demarshalCode += "const TQStringList list = TQStringList::split( \" \", parent.text(), false );";
+    demarshalCode += "const TQStringList list = TQStringList::split( \" \", tqparent.text(), false );";
     demarshalCode += "if ( !list.isEmpty() ) {";
     demarshalCode.indent();
     demarshalCode += "TQPtrList<" + listType + ">* entries = new TQPtrList<" + listType + ">;";
@@ -511,13 +511,13 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
   KODE::Function marshal( "marshal", "void" );
   marshal.setStatic( true );
   marshal.addArgument( "TQDomDocument &doc" );
-  marshal.addArgument( "TQDomElement &parent" );
+  marshal.addArgument( "TQDomElement &tqparent" );
   marshal.addArgument( "const TQString &name" );
   marshal.addArgument( "const " + typeName + "* value" );
 
   KODE::Function demarshal( "demarshal", "void" );
   demarshal.setStatic( true );
-  demarshal.addArgument( "const TQDomElement &parent" );
+  demarshal.addArgument( "const TQDomElement &tqparent" );
   demarshal.addArgument( typeName + "* value" );
 
   KODE::Code marshalCode, demarshalCode, demarshalFinalCode;
@@ -535,9 +535,9 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
 
   marshalCode += "TQDomElement root = doc.createElement( name );";
   marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + typeName + "\" );";
-  marshalCode += "parent.appendChild( root );";
+  marshalCode += "tqparent.appendChild( root );";
 
-  demarshalCode += "TQDomNode node = parent.firstChild();";
+  demarshalCode += "TQDomNode node = tqparent.firstChild();";
   demarshalCode += "while ( !node.isNull() ) {";
   demarshalCode.indent();
   demarshalCode += "TQDomElement element = node.toElement();";
@@ -568,7 +568,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
       marshalCode += "element.setAttribute( \"xmlns:ns1\", \"http://schemas.xmlsoap.org/soap/encoding/\" );";
       marshalCode += "element.setAttribute( \"xsi:type\", \"ns1:Array\" );";
       marshalCode += "element.setAttribute( \"ns1:arrayType\", \"ns1:" + typeName + "[\" + TQString::number( list->count() ) + \"]\" );";
-      marshalCode += "parent.appendChild( element );";
+      marshalCode += "tqparent.appendChild( element );";
       marshalCode.newLine();
       marshalCode += "TQPtrListIterator<" + typeName + "> it( *list );";
       marshalCode += "while ( it.current() != 0 ) {";
@@ -629,7 +629,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
 
     marshalCode += "if ( value->" + mNameMapper.escape( lowerName ) + "() )";
     marshalCode.indent();
-    marshalCode += "parent.setAttribute( \"" + (*attrIt).name() + "\","
+    marshalCode += "tqparent.setAttribute( \"" + (*attrIt).name() + "\","
                                          "Serializer::marshalValue( value->" + mNameMapper.escape( lowerName ) + "() ) );";
     marshalCode.newLine();
 
@@ -660,7 +660,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
 void Converter::convertService( const Service &service )
 {
   KODE::Class newClass( service.name() );
-  newClass.addBaseClass( mQObject );
+  newClass.addBaseClass( mTQObject );
   newClass.addHeaderInclude( "tqobject.h" );
   newClass.addHeaderInclude( "tqstring.h" );
   newClass.addHeaderInclude( "transport.h" );
@@ -839,7 +839,7 @@ void Converter::createUtilClasses()
     of typing and is easier to maintain at the end ;)
    */
   TypeEntry types[] = {
-    { "TQString", "xsd:string", "*value", "str" },
+    { TQSTRING_OBJECT_NAME_STRING, "xsd:string", "*value", "str" },
     { "bool", "xsd:boolean", "(*value ? \"true\" : \"false\")", "(str.lower() == \"true\" ? true : false)" },
     { "float", "xsd:TODO", "TQString::number( *value )", "str.toFloat()" },
     { "int", "xsd:int", "TQString::number( *value )", "str.toInt()" },
@@ -848,9 +848,9 @@ void Converter::createUtilClasses()
     { "char", "xsd:byte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
     { "unsigned char", "xsd:unsignedByte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
     { "short", "xsd:short", "TQString::number( *value )", "str.toShort()" },
-    { "TQByteArray", "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
-    { "TQDateTime", "xsd:dateTime", "value->toString( Qt::ISODate )", "TQDateTime::fromString( str, Qt::ISODate )" },
-    { "TQDate", "xsd:date", "value->toString( Qt::ISODate )", "TQDate::fromString( str, Qt::ISODate )" }
+    { TQBYTEARRAY_OBJECT_NAME_STRING, "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
+    { "TQDateTime", "xsd:dateTime", "value->toString( TQt::ISODate )", "TQDateTime::fromString( str, TQt::ISODate )" },
+    { "TQDate", "xsd:date", "value->toString( TQt::ISODate )", "TQDate::fromString( str, TQt::ISODate )" }
   };
 
   for ( uint i = 0; i < sizeof( types ) / sizeof( TypeEntry ); ++i ) {
@@ -859,7 +859,7 @@ void Converter::createUtilClasses()
 
     TypeEntry entry = types[ i ]; 
 
-    marshal = KODE::Function( "marshalValue", "TQString" );
+    marshal = KODE::Function( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
     marshal.setStatic( true );
     marshal.addArgument( "const " + entry.type + "* value" );
 
@@ -879,7 +879,7 @@ void Converter::createUtilClasses()
     marshal = KODE::Function( "marshal", "void" );
     marshal.setStatic( true );
     marshal.addArgument( "TQDomDocument &doc" );
-    marshal.addArgument( "TQDomElement &parent" );
+    marshal.addArgument( "TQDomElement &tqparent" );
     marshal.addArgument( "const TQString &name" );
     marshal.addArgument( "const " + entry.type + "* value" );
 
@@ -887,7 +887,7 @@ void Converter::createUtilClasses()
     code += "TQDomElement element = doc.createElement( name );";
     code += "element.setAttribute( \"xsi:type\", \"" + entry.xsdType + "\" );";
     code += "element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );";
-    code += "parent.appendChild( element );";
+    code += "tqparent.appendChild( element );";
     marshal.setBody( code );
 
     mSerializer.addFunction( marshal );
@@ -905,16 +905,16 @@ void Converter::createUtilClasses()
 void Converter::createTransportClass()
 {
   KODE::Class transport( "Transport" );
-  transport.addBaseClass( mQObject );
+  transport.addBaseClass( mTQObject );
   transport.addHeaderInclude( "tqobject.h" );
   transport.addHeaderInclude( "kio/job.h" );
 
   transport.addInclude( "kdebug.h" );
 
-  KODE::MemberVariable url( "url", "TQString" );
+  KODE::MemberVariable url( "url", TQSTRING_OBJECT_NAME_STRING );
   transport.addMemberVariable( url );
 
-  KODE::MemberVariable slotDataVar( "data", "TQByteArray" );
+  KODE::MemberVariable slotDataVar( "data", TQBYTEARRAY_OBJECT_NAME_STRING );
   transport.addMemberVariable( slotDataVar );
 
   // ctor
diff --git a/kode/kwsdl/converter.h b/kode/kwsdl/converter.h
index 45d530a3..1bbf4eb7 100644
--- a/kode/kwsdl/converter.h
+++ b/kode/kwsdl/converter.h
@@ -67,7 +67,7 @@ class Converter
 
     KODE::Class::List mClasses;
     KODE::Class mSerializer;
-    KODE::Class mQObject;
+    KODE::Class mTQObject;
 
     NameMapper mNameMapper;
     TypeMapper mTypeMapper;
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index 56643b3d..f517c7af 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -55,14 +55,14 @@ void BinaryInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:" + mTypeName );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void BinaryInputField::setData( const TQString &data )
@@ -76,9 +76,9 @@ TQString BinaryInputField::data() const
   return TQString::fromUtf8( data.data(), data.size() );
 }
 
-TQWidget *BinaryInputField::createWidget( TQWidget *parent )
+TQWidget *BinaryInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new BinaryWidget( parent );
+  mInputWidget = new BinaryWidget( tqparent );
 
   if ( !mValue.isEmpty() )
     mInputWidget->setData( mValue );
@@ -94,8 +94,8 @@ void BinaryInputField::valueChanged( const TQByteArray &value )
 }
 
 
-BinaryWidget::BinaryWidget( TQWidget *parent )
-  : TQWidget( parent, "BinaryWidget" ),
+BinaryWidget::BinaryWidget( TQWidget *tqparent )
+  : TQWidget( tqparent, "BinaryWidget" ),
     mMainWidget( 0 )
 {
   mLayout = new TQGridLayout( this, 3, 2, 11, 6 );
@@ -123,7 +123,7 @@ void BinaryWidget::setData( const TQByteArray &data )
     mimetype = result->mimeType();
 
   if ( !mimetype.isEmpty() ) {
-    KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 );
+    KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
     if ( part ) {
       KTempFile file;
       file.file()->writeBlock( data );
diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h
index e3893801..ad586f5d 100644
--- a/kode/kwsdl/kung/binaryinputfield.h
+++ b/kode/kwsdl/kung/binaryinputfield.h
@@ -33,17 +33,18 @@ class TQPushButton;
 class BinaryInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void valueChanged( const TQByteArray &value );
@@ -55,12 +56,13 @@ class BinaryInputField : public SimpleInputField
     TQString mTypeName;
 };
 
-class BinaryWidget : public QWidget
+class BinaryWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    BinaryWidget( TQWidget *parent );
+    BinaryWidget( TQWidget *tqparent );
 
     void setData( const TQByteArray &data );
 
diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp
index e3eb3eef..c05df02b 100644
--- a/kode/kwsdl/kung/boolinputfield.cpp
+++ b/kode/kwsdl/kung/boolinputfield.cpp
@@ -39,14 +39,14 @@ void BoolInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:boolean" );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void BoolInputField::setData( const TQString &data )
@@ -59,9 +59,9 @@ TQString BoolInputField::data() const
   return ( mValue ? "true" : "false" );
 }
 
-TQWidget *BoolInputField::createWidget( TQWidget *parent )
+TQWidget *BoolInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new TQCheckBox( parent );
+  mInputWidget = new TQCheckBox( tqparent );
 
   mInputWidget->setChecked( mValue );
 
diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h
index 6ec98c86..c48ca96b 100644
--- a/kode/kwsdl/kung/boolinputfield.h
+++ b/kode/kwsdl/kung/boolinputfield.h
@@ -31,17 +31,18 @@ class TQCheckBox;
 class BoolInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     BoolInputField( const TQString &name, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( bool );
diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp
index 1c43bd95..30662690 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.cpp
+++ b/kode/kwsdl/kung/complexbaseinputfield.cpp
@@ -99,7 +99,7 @@ void ComplexBaseInputField::setXMLData( const TQDomElement &element )
   }
 }
 
-void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
 
@@ -125,7 +125,7 @@ void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &pare
     }
   }
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void ComplexBaseInputField::setData( const TQString& )
@@ -137,10 +137,10 @@ TQString ComplexBaseInputField::data() const
   return TQString();
 }
 
-TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent )
+TQWidget *ComplexBaseInputField::createWidget( TQWidget *tqparent )
 {
-  TQGroupBox *inputWidget = new TQGroupBox( mName, parent );
-  inputWidget->setColumnLayout( 0, Qt::Horizontal );
+  TQGroupBox *inputWidget = new TQGroupBox( mName, tqparent );
+  inputWidget->setColumnLayout( 0, TQt::Horizontal );
   TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 );
 
   InputField::List::Iterator it;
diff --git a/kode/kwsdl/kung/complexbaseinputfield.h b/kode/kwsdl/kung/complexbaseinputfield.h
index 9fc47dbc..f47c6d04 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.h
+++ b/kode/kwsdl/kung/complexbaseinputfield.h
@@ -30,12 +30,12 @@ class ComplexBaseInputField : public ComplexInputField
     ComplexBaseInputField( const TQString &name, const Schema::ComplexType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 };
 
 #endif
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index 8d5c329c..ffb9af7a 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -39,29 +39,29 @@ void DateInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void DateInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void DateInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:date" );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void DateInputField::setData( const TQString &data )
 {
-  mValue = TQDate::fromString( data, Qt::ISODate );
+  mValue = TQDate::fromString( data, TQt::ISODate );
 }
 
 TQString DateInputField::data() const
 {
-  return mValue.toString( Qt::ISODate );
+  return mValue.toString( TQt::ISODate );
 }
 
-TQWidget *DateInputField::createWidget( TQWidget *parent )
+TQWidget *DateInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new KDatePicker( parent );
+  mInputWidget = new KDatePicker( tqparent );
 
   mInputWidget->setDate( mValue );
 
diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h
index 28efe5e3..8dcd0f89 100644
--- a/kode/kwsdl/kung/dateinputfield.h
+++ b/kode/kwsdl/kung/dateinputfield.h
@@ -32,17 +32,18 @@ class KDatePicker;
 class DateInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DateInputField( const TQString &name, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( TQDate );
diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h
index c770fe77..5b57f2c9 100644
--- a/kode/kwsdl/kung/dispatcher.h
+++ b/kode/kwsdl/kung/dispatcher.h
@@ -29,9 +29,10 @@
 class ConversationManager;
 class Transport;
 
-class Dispatcher : public QObject
+class Dispatcher : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Dispatcher();
diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp
index 78f73bcd..d1ffdd27 100644
--- a/kode/kwsdl/kung/doubleinputfield.cpp
+++ b/kode/kwsdl/kung/doubleinputfield.cpp
@@ -41,14 +41,14 @@ void DoubleInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:" + mTypeName );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void DoubleInputField::setData( const TQString &data )
@@ -61,9 +61,9 @@ TQString DoubleInputField::data() const
   return TQString::number( mValue );
 }
 
-TQWidget *DoubleInputField::createWidget( TQWidget *parent )
+TQWidget *DoubleInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new KDoubleSpinBox( parent );
+  mInputWidget = new KDoubleSpinBox( tqparent );
 
   if ( mType ) {
     if ( mType->facetType() & Schema::SimpleType::MININC )
diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h
index 61299a5c..78f72cd6 100644
--- a/kode/kwsdl/kung/doubleinputfield.h
+++ b/kode/kwsdl/kung/doubleinputfield.h
@@ -31,17 +31,18 @@ class KDoubleSpinBox;
 class DoubleInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( double );
diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp
index f290803b..5d3fcf08 100644
--- a/kode/kwsdl/kung/enuminputfield.cpp
+++ b/kode/kwsdl/kung/enuminputfield.cpp
@@ -43,14 +43,14 @@ void EnumInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:string" );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void EnumInputField::setData( const TQString &data )
@@ -63,9 +63,9 @@ TQString EnumInputField::data() const
   return mValue;
 }
 
-TQWidget *EnumInputField::createWidget( TQWidget *parent )
+TQWidget *EnumInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new KComboBox( parent );
+  mInputWidget = new KComboBox( tqparent );
 
   mInputWidget->insertStringList( mEnums );
   mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) );
diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h
index 14e36033..91d2b19f 100644
--- a/kode/kwsdl/kung/enuminputfield.h
+++ b/kode/kwsdl/kung/enuminputfield.h
@@ -31,17 +31,18 @@ class KComboBox;
 class EnumInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     EnumInputField( const TQString &name, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( int );
diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp
index 17aa601b..dc1a711c 100644
--- a/kode/kwsdl/kung/inputdialog.cpp
+++ b/kode/kwsdl/kung/inputdialog.cpp
@@ -23,8 +23,8 @@
 
 #include "inputdialog.h"
 
-InputDialog::InputDialog( TQWidget *page, TQWidget *parent )
-  : KDialogBase( Swallow, "", Ok | Cancel, Ok, parent, "", true, true )
+InputDialog::InputDialog( TQWidget *page, TQWidget *tqparent )
+  : KDialogBase( Swallow, "", Ok | Cancel, Ok, tqparent, "", true, true )
 {
   setMainWidget( page );
 
diff --git a/kode/kwsdl/kung/inputdialog.h b/kode/kwsdl/kung/inputdialog.h
index b592545b..fbefe4d1 100644
--- a/kode/kwsdl/kung/inputdialog.h
+++ b/kode/kwsdl/kung/inputdialog.h
@@ -27,7 +27,7 @@
 class InputDialog : public KDialogBase
 {
   public:
-    InputDialog( TQWidget *page, TQWidget *parent );
+    InputDialog( TQWidget *page, TQWidget *tqparent );
 };
 
 #endif
diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h
index 58b2d23b..100cc4bb 100644
--- a/kode/kwsdl/kung/inputfield.h
+++ b/kode/kwsdl/kung/inputfield.h
@@ -37,9 +37,10 @@ class ComplexType;
 /**
   Abstract base class for all kinds of input fields.
  */
-class InputField : public QObject
+class InputField : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     typedef TQValueList<InputField*> List;
@@ -67,7 +68,7 @@ class InputField : public QObject
     /**
       Returns the xml value of this field.
      */
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent ) = 0;
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ) = 0;
 
     /**
       Sets the plain data of this field as string.
@@ -83,7 +84,7 @@ class InputField : public QObject
       Returns a pointer to a new created input widget which can be used to
       to modify the value.
      */
-    virtual TQWidget *createWidget( TQWidget *parent ) = 0;
+    virtual TQWidget *createWidget( TQWidget *tqparent ) = 0;
 
     /**
       Add a child field.
diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp
index 022ec0d8..9db5c40a 100644
--- a/kode/kwsdl/kung/integerinputfield.cpp
+++ b/kode/kwsdl/kung/integerinputfield.cpp
@@ -43,14 +43,14 @@ void IntegerInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:" + mTypeName );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void IntegerInputField::setData( const TQString &data )
@@ -63,9 +63,9 @@ TQString IntegerInputField::data() const
   return TQString::number( mValue );
 }
 
-TQWidget *IntegerInputField::createWidget( TQWidget *parent )
+TQWidget *IntegerInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new KIntSpinBox( parent );
+  mInputWidget = new KIntSpinBox( tqparent );
 
   // basic restrictions
   if ( mTypeName == "byte" ) {
diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h
index 2cda162c..bf6e61ed 100644
--- a/kode/kwsdl/kung/integerinputfield.h
+++ b/kode/kwsdl/kung/integerinputfield.h
@@ -31,17 +31,18 @@ class KIntSpinBox;
 class IntegerInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( int );
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 7a5eeb71..a43f27b1 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -62,11 +62,11 @@ void ListInputField::setXMLData( const TQDomElement &element )
   }
 }
 
-void ListInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void ListInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   InputField::List::Iterator it;
   for ( it = mFields.begin(); it != mFields.end(); ++it ) {
-    (*it)->xmlData( document, parent );
+    (*it)->xmlData( document, tqparent );
   }
 }
 
@@ -79,17 +79,17 @@ TQString ListInputField::data() const
   return TQString();
 }
 
-TQWidget *ListInputField::createWidget( TQWidget *parent )
+TQWidget *ListInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new ListWidget( this, name(), mTypeName, parent );
+  mInputWidget = new ListWidget( this, name(), mTypeName, tqparent );
 
   return mInputWidget;
 }
 
 
-ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent )
-  : TQWidget( parent ),
-    mParentField( parentField ), mName( name ), mType( type )
+ListWidget::ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent )
+  : TQWidget( tqparent ),
+    mParentField( tqparentField ), mName( name ), mType( type )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h
index acf1e1c3..d36e091c 100644
--- a/kode/kwsdl/kung/listinputfield.h
+++ b/kode/kwsdl/kung/listinputfield.h
@@ -33,29 +33,31 @@ class TQPushButton;
 class ListInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private:
     ListWidget *mInputWidget;
     TQString mTypeName;
 };
 
-class ListWidget : public QWidget
+class ListWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent );
+    ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent );
 
     void update();
 
diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h
index 7762e292..d48d935c 100644
--- a/kode/kwsdl/kung/loader.h
+++ b/kode/kwsdl/kung/loader.h
@@ -26,9 +26,10 @@
 
 class Dispatcher;
 
-class Loader : public QObject
+class Loader : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Loader();
diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp
index 6cdb7e57..bef2cd2f 100644
--- a/kode/kwsdl/kung/outputdialog.cpp
+++ b/kode/kwsdl/kung/outputdialog.cpp
@@ -23,8 +23,8 @@
 
 #include "outputdialog.h"
 
-OutputDialog::OutputDialog( TQWidget *page, TQWidget *parent )
-  : KDialogBase( Swallow, "", Ok, Ok, parent, "", true, true )
+OutputDialog::OutputDialog( TQWidget *page, TQWidget *tqparent )
+  : KDialogBase( Swallow, "", Ok, Ok, tqparent, "", true, true )
 {
   setMainWidget( page );
 }
diff --git a/kode/kwsdl/kung/outputdialog.h b/kode/kwsdl/kung/outputdialog.h
index a3c55878..bab04320 100644
--- a/kode/kwsdl/kung/outputdialog.h
+++ b/kode/kwsdl/kung/outputdialog.h
@@ -27,7 +27,7 @@
 class OutputDialog : public KDialogBase
 {
   public:
-    OutputDialog( TQWidget *page, TQWidget *parent );
+    OutputDialog( TQWidget *page, TQWidget *tqparent );
 };
 
 #endif
diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp
index 04f66ffa..d7e5639b 100644
--- a/kode/kwsdl/kung/pageinputfield.cpp
+++ b/kode/kwsdl/kung/pageinputfield.cpp
@@ -65,7 +65,7 @@ void PageInputField::setXMLData( const TQDomElement &element )
   }
 }
 
-void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( "ns1:" + mName );
 
@@ -73,7 +73,7 @@ void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
   for ( it = mFields.begin(); it != mFields.end(); ++it )
     (*it)->xmlData( document, element );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void PageInputField::setData( const TQString& )
@@ -85,16 +85,16 @@ TQString PageInputField::data() const
   return TQString();
 }
 
-TQWidget *PageInputField::createWidget( TQWidget *parent )
+TQWidget *PageInputField::createWidget( TQWidget *tqparent )
 {
-  TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" );
+  TQWidget *mInputWidget = new TQWidget( tqparent, "PageInputWidget" );
   TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
 
   InputField::List::Iterator it;
   int row = 0;
   for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
     TQLabel *label = new TQLabel( (*it)->name(), mInputWidget );
-    label->tqsetAlignment( Qt::AlignTop );
+    label->tqsetAlignment( TQt::AlignTop );
     tqlayout->addWidget( label, row, 0 );
     tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
   }
diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h
index 152d337e..05321c31 100644
--- a/kode/kwsdl/kung/pageinputfield.h
+++ b/kode/kwsdl/kung/pageinputfield.h
@@ -31,17 +31,18 @@
 class PageInputField : public InputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PageInputField( const TQString &name, const KWSDL::Message &message );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private:
     TQWidget *mInputWidget;
diff --git a/kode/kwsdl/kung/simplebaseinputfield.cpp b/kode/kwsdl/kung/simplebaseinputfield.cpp
index 0198723c..bd2aa90e 100644
--- a/kode/kwsdl/kung/simplebaseinputfield.cpp
+++ b/kode/kwsdl/kung/simplebaseinputfield.cpp
@@ -59,14 +59,14 @@ void SimpleBaseInputField::setXMLData( const TQDomElement &element )
   }
 }
 
-void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   if ( mType->subType() == Schema::SimpleType::TypeRestriction ) {
     InputField *field = mFields.first();
     if ( !field ) {
       qDebug( "SimpleBaseInputField: No child found" );
     } else {
-      field->xmlData( document, parent );
+      field->xmlData( document, tqparent );
     }
   } else {
     qDebug( "SimpleBaseInputField: Unsupported subtype" );
@@ -103,7 +103,7 @@ TQString SimpleBaseInputField::data() const
   return TQString();
 }
 
-TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent )
+TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent )
 {
   if ( mType->subType() == Schema::SimpleType::TypeRestriction ) {
     InputField *field = mFields.first();
@@ -111,7 +111,7 @@ TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent )
       qDebug( "SimpleBaseInputField: No child found" );
       return 0;
     } else {
-      return field->createWidget( parent );
+      return field->createWidget( tqparent );
     }
   } else {
     qDebug( "SimpleBaseInputField: Unsupported subtype" );
diff --git a/kode/kwsdl/kung/simplebaseinputfield.h b/kode/kwsdl/kung/simplebaseinputfield.h
index dab7e906..aa52bc08 100644
--- a/kode/kwsdl/kung/simplebaseinputfield.h
+++ b/kode/kwsdl/kung/simplebaseinputfield.h
@@ -30,12 +30,12 @@ class SimpleBaseInputField : public SimpleInputField
     SimpleBaseInputField( const TQString &name, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 };
 
 #endif
diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp
index 390c5bc1..6f1bc4f7 100644
--- a/kode/kwsdl/kung/stringinputfield.cpp
+++ b/kode/kwsdl/kung/stringinputfield.cpp
@@ -42,14 +42,14 @@ void StringInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void StringInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void StringInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:" + mTypeName );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void StringInputField::setData( const TQString &data )
@@ -62,9 +62,9 @@ TQString StringInputField::data() const
   return mValue;
 }
 
-TQWidget *StringInputField::createWidget( TQWidget *parent )
+TQWidget *StringInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new TQLineEdit( parent );
+  mInputWidget = new TQLineEdit( tqparent );
 
   if ( mType ) {
     if ( mType->facetType() & Schema::SimpleType::LENGTH ) // TODO: using TQValidator here?
diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h
index f8e8d546..cd53a9b1 100644
--- a/kode/kwsdl/kung/stringinputfield.h
+++ b/kode/kwsdl/kung/stringinputfield.h
@@ -31,17 +31,18 @@ class TQLineEdit;
 class StringInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( const TQString& );
diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp
index 9da18a0c..29b89fca 100644
--- a/kode/kwsdl/kung/timeinputfield.cpp
+++ b/kode/kwsdl/kung/timeinputfield.cpp
@@ -39,29 +39,29 @@ void TimeInputField::setXMLData( const TQDomElement &element )
   setData( element.text() );
 }
 
-void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
 {
   TQDomElement element = document.createElement( mName );
   element.setAttribute( "xsi:type", "xsd:time" );
   TQDomText text = document.createTextNode( data() );
   element.appendChild( text );
 
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void TimeInputField::setData( const TQString &data )
 {
-  mValue = TQTime::fromString( data, Qt::ISODate );
+  mValue = TQTime::fromString( data, TQt::ISODate );
 }
 
 TQString TimeInputField::data() const
 {
-  return mValue.toString( Qt::ISODate );
+  return mValue.toString( TQt::ISODate );
 }
 
-TQWidget *TimeInputField::createWidget( TQWidget *parent )
+TQWidget *TimeInputField::createWidget( TQWidget *tqparent )
 {
-  mInputWidget = new KTimeWidget( parent );
+  mInputWidget = new KTimeWidget( tqparent );
 
   mInputWidget->setTime( mValue );
 
diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h
index c363151d..f3b14c9d 100644
--- a/kode/kwsdl/kung/timeinputfield.h
+++ b/kode/kwsdl/kung/timeinputfield.h
@@ -32,17 +32,18 @@ class KTimeWidget;
 class TimeInputField : public SimpleInputField
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     TimeInputField( const TQString &name, const Schema::SimpleType *type );
 
     virtual void setXMLData( const TQDomElement &element );
-    virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+    virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
 
     virtual void setData( const TQString &data );
     virtual TQString data() const;
 
-    virtual TQWidget *createWidget( TQWidget *parent );
+    virtual TQWidget *createWidget( TQWidget *tqparent );
 
   private slots:
     void inputChanged( const TQTime& );
diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h
index 240755d1..6e6bec1c 100644
--- a/kode/kwsdl/kung/transport.h
+++ b/kode/kwsdl/kung/transport.h
@@ -23,9 +23,10 @@
 #include <tqobject.h>
 #include <kio/job.h>
 
-class Transport : public QObject
+class Transport : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Transport( const TQString &url );
diff --git a/kode/kwsdl/parser.cpp b/kode/kwsdl/parser.cpp
index 49f77eca..b8512490 100644
--- a/kode/kwsdl/parser.cpp
+++ b/kode/kwsdl/parser.cpp
@@ -27,7 +27,7 @@ using namespace KWSDL;
 
 static TQString sns( const TQString &str )
 {
-  int pos = str.find( ':' );
+  int pos = str.tqfind( ':' );
   if ( pos != -1 )
     return str.mid( pos + 1 );
   else
@@ -94,9 +94,9 @@ void Parser::parse( const TQDomElement &root )
   }
 }
 
-void Parser::parseTypes( const TQDomElement &parent )
+void Parser::parseTypes( const TQDomElement &tqparent )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -108,9 +108,9 @@ void Parser::parseTypes( const TQDomElement &parent )
   }
 }
 
-void Parser::parseMessage( const TQDomElement &parent, Message &message )
+void Parser::parseMessage( const TQDomElement &tqparent, Message &message )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -130,9 +130,9 @@ void Parser::parseMessage( const TQDomElement &parent, Message &message )
   }
 }
 
-void Parser::parsePortType( const TQDomElement &parent, Port &port )
+void Parser::parsePortType( const TQDomElement &tqparent, Port &port )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -161,11 +161,11 @@ void Parser::parsePortType( const TQDomElement &parent, Port &port )
   }
 }
 
-void Parser::parseBinding( const TQDomElement &parent )
+void Parser::parseBinding( const TQDomElement &tqparent )
 {
-  Binding binding( sns( parent.attribute( "name" ) ), sns( parent.attribute( "type" ) ) );
+  Binding binding( sns( tqparent.attribute( "name" ) ), sns( tqparent.attribute( "type" ) ) );
 
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -216,9 +216,9 @@ void Parser::parseBinding( const TQDomElement &parent )
   mBindings.append( binding );
 }
 
-void Parser::parseService( const TQDomElement &parent )
+void Parser::parseService( const TQDomElement &tqparent )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h
index c665c3da..1c2ef738 100644
--- a/kode/kwsdl/schema/fileprovider.h
+++ b/kode/kwsdl/schema/fileprovider.h
@@ -30,9 +30,10 @@ class Job;
 
 namespace Schema {
 
-class FileProvider : QObject
+class FileProvider : TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     FileProvider();
diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp
index ba62b0c3..4571f5cc 100644
--- a/kode/kwsdl/schema/parser.cpp
+++ b/kode/kwsdl/schema/parser.cpp
@@ -446,7 +446,7 @@ void Parser::addElement( const TQDomElement &element, ComplexType *cType )
              && ct->elementName( 0 ) == "any" ) {
 
           // if the complex type is <any> then we dont need a type for it.
-          // make the parent's type as XSDType::ANY
+          // make the tqparent's type as XSDType::ANY
           delete ct;
           type_id = XSDType::ANY;
         } else {
diff --git a/kode/kwsdl/schema/qualifiedname.cpp b/kode/kwsdl/schema/qualifiedname.cpp
index 350bca32..41e6fd84 100644
--- a/kode/kwsdl/schema/qualifiedname.cpp
+++ b/kode/kwsdl/schema/qualifiedname.cpp
@@ -65,7 +65,7 @@ bool QualifiedName::operator==( const QualifiedName &qn ) const
 
 void QualifiedName::parse( const TQString &str )
 {
-  int pos = str.find( ':' );
+  int pos = str.tqfind( ':' );
   if ( pos != -1 ) {
     mPrefix = str.left( pos );
     mLocalName = str.mid( pos + 1 );
diff --git a/kode/kwsdl/schema/qualifiedname.h b/kode/kwsdl/schema/qualifiedname.h
index f879836c..b4328911 100644
--- a/kode/kwsdl/schema/qualifiedname.h
+++ b/kode/kwsdl/schema/qualifiedname.h
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
  */
 
-#ifndef SCHEMA_QUALIFIEDNAME_H
-#define SCHEMA_QUALIFIEDNAME_H
+#ifndef SCHEMA_TQUALIFIEDNAME_H
+#define SCHEMA_TQUALIFIEDNAME_H
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
diff --git a/kode/kwsdl/schema/typestable.cpp b/kode/kwsdl/schema/typestable.cpp
index 91a85f51..a58aa708 100644
--- a/kode/kwsdl/schema/typestable.cpp
+++ b/kode/kwsdl/schema/typestable.cpp
@@ -50,7 +50,7 @@ TypesTable::TypesTable()
     mBasicTypes["dateTime"] = XSDType::DATETIME;
     mBasicTypes["date"] = XSDType::DATE;
     mBasicTypes["token"] = XSDType::TOKEN;
-    mBasicTypes["QName"] = XSDType::QNAME;
+    mBasicTypes["TQName"] = XSDType::TQNAME;
     mBasicTypes["NCName"] = XSDType::NCNAME;
     mBasicTypes["NMTOKEN"] = XSDType::NMTOKEN;
     mBasicTypes["NMTOKENS"] = XSDType::NMTOKENS;
diff --git a/kode/kwsdl/schema/xsdtype.h b/kode/kwsdl/schema/xsdtype.h
index b1077ebe..ab54190f 100644
--- a/kode/kwsdl/schema/xsdtype.h
+++ b/kode/kwsdl/schema/xsdtype.h
@@ -67,7 +67,7 @@ class XSDType
       DATETIME,
       DATE,
       TOKEN,
-      QNAME,
+      TQNAME,
       NCNAME,
       NMTOKEN,
       NMTOKENS,
diff --git a/kode/kwsdl/tests/google/directorycategory.cpp b/kode/kwsdl/tests/google/directorycategory.cpp
index 6a61dab5..e4cc5605 100644
--- a/kode/kwsdl/tests/google/directorycategory.cpp
+++ b/kode/kwsdl/tests/google/directorycategory.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "directorycategory.h"
diff --git a/kode/kwsdl/tests/google/directorycategory.h b/kode/kwsdl/tests/google/directorycategory.h
index d7805e50..3230dfb1 100644
--- a/kode/kwsdl/tests/google/directorycategory.h
+++ b/kode/kwsdl/tests/google/directorycategory.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DIRECTORYCATEGORY_H
 #define DIRECTORYCATEGORY_H
diff --git a/kode/kwsdl/tests/google/directorycategoryarray.cpp b/kode/kwsdl/tests/google/directorycategoryarray.cpp
index b8305222..b290fc3d 100644
--- a/kode/kwsdl/tests/google/directorycategoryarray.cpp
+++ b/kode/kwsdl/tests/google/directorycategoryarray.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "directorycategoryarray.h"
diff --git a/kode/kwsdl/tests/google/directorycategoryarray.h b/kode/kwsdl/tests/google/directorycategoryarray.h
index f4c27995..adce04e9 100644
--- a/kode/kwsdl/tests/google/directorycategoryarray.h
+++ b/kode/kwsdl/tests/google/directorycategoryarray.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DIRECTORYCATEGORYARRAY_H
 #define DIRECTORYCATEGORYARRAY_H
diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cc
index 5e26c769..d60c0417 100644
--- a/kode/kwsdl/tests/google/googlesearch.cc
+++ b/kode/kwsdl/tests/google/googlesearch.cc
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "googlesearch.hh"
diff --git a/kode/kwsdl/tests/google/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.hh
index a1c490bb..b6400616 100644
--- a/kode/kwsdl/tests/google/googlesearch.hh
+++ b/kode/kwsdl/tests/google/googlesearch.hh
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef GOOGLESEARCH_H
@@ -28,9 +28,10 @@
 #include <tqobject.h>
 #include "googlesearchservice.h"
 
-class GoogleSearch : public QObject
+class GoogleSearch : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     GoogleSearch();
diff --git a/kode/kwsdl/tests/google/googlesearchresult.cpp b/kode/kwsdl/tests/google/googlesearchresult.cpp
index faa209ce..451ff4e5 100644
--- a/kode/kwsdl/tests/google/googlesearchresult.cpp
+++ b/kode/kwsdl/tests/google/googlesearchresult.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "googlesearchresult.h"
diff --git a/kode/kwsdl/tests/google/googlesearchresult.h b/kode/kwsdl/tests/google/googlesearchresult.h
index 537bb1bc..251053b3 100644
--- a/kode/kwsdl/tests/google/googlesearchresult.h
+++ b/kode/kwsdl/tests/google/googlesearchresult.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef GOOGLESEARCHRESULT_H
 #define GOOGLESEARCHRESULT_H
diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp
index a45aec9e..e609249e 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.cpp
+++ b/kode/kwsdl/tests/google/googlesearchservice.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "googlesearchservice.h"
diff --git a/kode/kwsdl/tests/google/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h
index 6efd6523..7e79fdba 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.h
+++ b/kode/kwsdl/tests/google/googlesearchservice.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef GOOGLESEARCHSERVICE_H
 #define GOOGLESEARCHSERVICE_H
@@ -30,9 +30,10 @@
 #include <tqcstring.h>
 #include <googlesearchresult.h>
 
-class GoogleSearchService : public QObject
+class GoogleSearchService : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     void doGetCachedPage( TQString* key, TQString* url );
diff --git a/kode/kwsdl/tests/google/resultelement.cpp b/kode/kwsdl/tests/google/resultelement.cpp
index c340f8b0..f4e78a01 100644
--- a/kode/kwsdl/tests/google/resultelement.cpp
+++ b/kode/kwsdl/tests/google/resultelement.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "resultelement.h"
diff --git a/kode/kwsdl/tests/google/resultelement.h b/kode/kwsdl/tests/google/resultelement.h
index bf13486c..b66ae716 100644
--- a/kode/kwsdl/tests/google/resultelement.h
+++ b/kode/kwsdl/tests/google/resultelement.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef RESULTELEMENT_H
 #define RESULTELEMENT_H
diff --git a/kode/kwsdl/tests/google/resultelementarray.cpp b/kode/kwsdl/tests/google/resultelementarray.cpp
index 0ea65755..210f57db 100644
--- a/kode/kwsdl/tests/google/resultelementarray.cpp
+++ b/kode/kwsdl/tests/google/resultelementarray.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "resultelementarray.h"
diff --git a/kode/kwsdl/tests/google/resultelementarray.h b/kode/kwsdl/tests/google/resultelementarray.h
index 97217117..7303a283 100644
--- a/kode/kwsdl/tests/google/resultelementarray.h
+++ b/kode/kwsdl/tests/google/resultelementarray.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef RESULTELEMENTARRAY_H
 #define RESULTELEMENTARRAY_H
diff --git a/kode/kwsdl/tests/google/serializer.cpp b/kode/kwsdl/tests/google/serializer.cpp
index 4b0ea8ba..281f3269 100644
--- a/kode/kwsdl/tests/google/serializer.cpp
+++ b/kode/kwsdl/tests/google/serializer.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "serializer.h"
@@ -41,12 +41,12 @@ void Serializer::demarshalValue( const TQString &str, TQString *value )
   *value = str;
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:string" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, TQString* value )
@@ -64,12 +64,12 @@ void Serializer::demarshalValue( const TQString &str, bool *value )
   *value = (str.lower() == "true" ? true : false);
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:boolean" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, bool* value )
@@ -87,12 +87,12 @@ void Serializer::demarshalValue( const TQString &str, float *value )
   *value = str.toFloat();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:TODO" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, float* value )
@@ -110,12 +110,12 @@ void Serializer::demarshalValue( const TQString &str, int *value )
   *value = str.toInt();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:int" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, int* value )
@@ -133,12 +133,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned int *value )
   *value = str.toUInt();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:unsignedByte" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, unsigned int* value )
@@ -156,12 +156,12 @@ void Serializer::demarshalValue( const TQString &str, double *value )
   *value = str.toDouble();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:double" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, double* value )
@@ -179,12 +179,12 @@ void Serializer::demarshalValue( const TQString &str, char *value )
   *value = str[ 0 ].latin1();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:byte" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, char* value )
@@ -202,12 +202,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned char *value )
   *value = str[ 0 ].latin1();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:unsignedByte" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, unsigned char* value )
@@ -225,12 +225,12 @@ void Serializer::demarshalValue( const TQString &str, short *value )
   *value = str.toShort();
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:short" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, short* value )
@@ -248,12 +248,12 @@ void Serializer::demarshalValue( const TQString &str, TQByteArray *value )
   *value = KCodecs::base64Decode( str.utf8() );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:base64Binary" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, TQByteArray* value )
@@ -263,20 +263,20 @@ void Serializer::demarshal( const TQDomElement &element, TQByteArray* value )
 
 TQString Serializer::marshalValue( const TQDateTime* value )
 {
-  return value->toString( Qt::ISODate );
+  return value->toString( TQt::ISODate );
 }
 
 void Serializer::demarshalValue( const TQString &str, TQDateTime *value )
 {
-  *value = TQDateTime::fromString( str, Qt::ISODate );
+  *value = TQDateTime::fromString( str, TQt::ISODate );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:dateTime" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, TQDateTime* value )
@@ -286,20 +286,20 @@ void Serializer::demarshal( const TQDomElement &element, TQDateTime* value )
 
 TQString Serializer::marshalValue( const TQDate* value )
 {
-  return value->toString( Qt::ISODate );
+  return value->toString( TQt::ISODate );
 }
 
 void Serializer::demarshalValue( const TQString &str, TQDate *value )
 {
-  *value = TQDate::fromString( str, Qt::ISODate );
+  *value = TQDate::fromString( str, TQt::ISODate );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value )
 {
   TQDomElement element = doc.createElement( name );
   element.setAttribute( "xsi:type", "xsd:date" );
   element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
-  parent.appendChild( element );
+  tqparent.appendChild( element );
 }
 
 void Serializer::demarshal( const TQDomElement &element, TQDate* value )
@@ -307,11 +307,11 @@ void Serializer::demarshal( const TQDomElement &element, TQDate* value )
   Serializer::demarshalValue( element.text(), value );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value )
 {
   TQDomElement root = doc.createElement( name );
   root.setAttribute( "xsi:type", "ns1:ResultElementArray" );
-  parent.appendChild( root );
+  tqparent.appendChild( root );
   if ( value->items() ) {
     const TQPtrList<ResultElement>* list = value->items();
   
@@ -319,7 +319,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
     element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" );
     element.setAttribute( "xsi:type", "ns1:Array" );
     element.setAttribute( "ns1:arrayType", "ns1:ResultElement[" + TQString::number( list->count() ) + "]" );
-    parent.appendChild( element );
+    tqparent.appendChild( element );
   
     TQPtrListIterator<ResultElement> it( *list );
     while ( it.current() != 0 ) {
@@ -329,11 +329,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
   }
 }
 
-void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* value )
+void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* value )
 {
   TQPtrList<ResultElement>* itemsList = new TQPtrList<ResultElement>();
   itemsList->setAutoDelete( true );
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -349,11 +349,11 @@ void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* valu
   value->setItems( itemsList );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value )
 {
   TQDomElement root = doc.createElement( name );
   root.setAttribute( "xsi:type", "ns1:DirectoryCategoryArray" );
-  parent.appendChild( root );
+  tqparent.appendChild( root );
   if ( value->items() ) {
     const TQPtrList<DirectoryCategory>* list = value->items();
   
@@ -361,7 +361,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
     element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" );
     element.setAttribute( "xsi:type", "ns1:Array" );
     element.setAttribute( "ns1:arrayType", "ns1:DirectoryCategory[" + TQString::number( list->count() ) + "]" );
-    parent.appendChild( element );
+    tqparent.appendChild( element );
   
     TQPtrListIterator<DirectoryCategory> it( *list );
     while ( it.current() != 0 ) {
@@ -371,11 +371,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
   }
 }
 
-void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray* value )
+void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value )
 {
   TQPtrList<DirectoryCategory>* itemsList = new TQPtrList<DirectoryCategory>();
   itemsList->setAutoDelete( true );
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -391,11 +391,11 @@ void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray*
   value->setItems( itemsList );
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value )
 {
   TQDomElement root = doc.createElement( name );
   root.setAttribute( "xsi:type", "ns1:GoogleSearchResult" );
-  parent.appendChild( root );
+  tqparent.appendChild( root );
   if ( value->documentFiltering() ) {
     Serializer::marshal( doc, root, "documentFiltering", value->documentFiltering() );
   }
@@ -431,9 +431,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
   }
 }
 
-void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* value )
+void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* value )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -498,11 +498,11 @@ void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* valu
   
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value )
 {
   TQDomElement root = doc.createElement( name );
   root.setAttribute( "xsi:type", "ns1:DirectoryCategory" );
-  parent.appendChild( root );
+  tqparent.appendChild( root );
   if ( value->fullViewableName() ) {
     Serializer::marshal( doc, root, "fullViewableName", value->fullViewableName() );
   }
@@ -511,9 +511,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
   }
 }
 
-void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value )
+void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* value )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
@@ -533,11 +533,11 @@ void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value
   
 }
 
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value )
 {
   TQDomElement root = doc.createElement( name );
   root.setAttribute( "xsi:type", "ns1:ResultElement" );
-  parent.appendChild( root );
+  tqparent.appendChild( root );
   if ( value->summary() ) {
     Serializer::marshal( doc, root, "summary", value->summary() );
   }
@@ -567,9 +567,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
   }
 }
 
-void Serializer::demarshal( const TQDomElement &parent, ResultElement* value )
+void Serializer::demarshal( const TQDomElement &tqparent, ResultElement* value )
 {
-  TQDomNode node = parent.firstChild();
+  TQDomNode node = tqparent.firstChild();
   while ( !node.isNull() ) {
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
diff --git a/kode/kwsdl/tests/google/serializer.h b/kode/kwsdl/tests/google/serializer.h
index eb60d3f2..4b5ff192 100644
--- a/kode/kwsdl/tests/google/serializer.h
+++ b/kode/kwsdl/tests/google/serializer.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef SERIALIZER_H
 #define SERIALIZER_H
@@ -41,62 +41,62 @@ class Serializer
   public:
     static TQString marshalValue( const TQString* value );
     static void demarshalValue( const TQString &str, TQString *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value );
     static void demarshal( const TQDomElement &element, TQString* value );
     static TQString marshalValue( const bool* value );
     static void demarshalValue( const TQString &str, bool *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value );
     static void demarshal( const TQDomElement &element, bool* value );
     static TQString marshalValue( const float* value );
     static void demarshalValue( const TQString &str, float *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value );
     static void demarshal( const TQDomElement &element, float* value );
     static TQString marshalValue( const int* value );
     static void demarshalValue( const TQString &str, int *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value );
     static void demarshal( const TQDomElement &element, int* value );
     static TQString marshalValue( const unsigned int* value );
     static void demarshalValue( const TQString &str, unsigned int *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value );
     static void demarshal( const TQDomElement &element, unsigned int* value );
     static TQString marshalValue( const double* value );
     static void demarshalValue( const TQString &str, double *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value );
     static void demarshal( const TQDomElement &element, double* value );
     static TQString marshalValue( const char* value );
     static void demarshalValue( const TQString &str, char *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value );
     static void demarshal( const TQDomElement &element, char* value );
     static TQString marshalValue( const unsigned char* value );
     static void demarshalValue( const TQString &str, unsigned char *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value );
     static void demarshal( const TQDomElement &element, unsigned char* value );
     static TQString marshalValue( const short* value );
     static void demarshalValue( const TQString &str, short *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value );
     static void demarshal( const TQDomElement &element, short* value );
     static TQString marshalValue( const TQByteArray* value );
     static void demarshalValue( const TQString &str, TQByteArray *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value );
     static void demarshal( const TQDomElement &element, TQByteArray* value );
     static TQString marshalValue( const TQDateTime* value );
     static void demarshalValue( const TQString &str, TQDateTime *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value );
     static void demarshal( const TQDomElement &element, TQDateTime* value );
     static TQString marshalValue( const TQDate* value );
     static void demarshalValue( const TQString &str, TQDate *value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value );
     static void demarshal( const TQDomElement &element, TQDate* value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value );
-    static void demarshal( const TQDomElement &parent, ResultElementArray* value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value );
-    static void demarshal( const TQDomElement &parent, DirectoryCategoryArray* value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value );
-    static void demarshal( const TQDomElement &parent, GoogleSearchResult* value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value );
-    static void demarshal( const TQDomElement &parent, DirectoryCategory* value );
-    static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value );
-    static void demarshal( const TQDomElement &parent, ResultElement* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value );
+    static void demarshal( const TQDomElement &tqparent, ResultElementArray* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value );
+    static void demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value );
+    static void demarshal( const TQDomElement &tqparent, GoogleSearchResult* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value );
+    static void demarshal( const TQDomElement &tqparent, DirectoryCategory* value );
+    static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value );
+    static void demarshal( const TQDomElement &tqparent, ResultElement* value );
   
 };
 
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index 5d7d92f2..55d3c7a8 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "transport.h"
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index f2386832..54dbf694 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TRANSPORT_H
 #define TRANSPORT_H
@@ -27,9 +27,10 @@
 #include <tqobject.h>
 #include <kio/job.h>
 
-class Transport : public QObject
+class Transport : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Transport( const TQString &url );
diff --git a/kode/kwsdl/typemapper.cpp b/kode/kwsdl/typemapper.cpp
index 88842ece..024b4f42 100644
--- a/kode/kwsdl/typemapper.cpp
+++ b/kode/kwsdl/typemapper.cpp
@@ -33,21 +33,21 @@ using namespace KWSDL;
 
 TypeMapper::TypeMapper()
 {
-  mMap.insert( "any", TypeInfo( "any", "TQString", "tqstring.h" ) );
-  mMap.insert( "anyURI", TypeInfo( "anyUri", "TQString", "tqstring.h" ) );
-  mMap.insert( "base64Binary", TypeInfo( "base64Binary", "TQByteArray", "tqcstring.h" ) );
-  mMap.insert( "binary", TypeInfo( "binary", "TQByteArray", "tqcstring.h" ) );
+  mMap.insert( "any", TypeInfo( "any", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+  mMap.insert( "anyURI", TypeInfo( "anyUri", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+  mMap.insert( "base64Binary", TypeInfo( "base64Binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
+  mMap.insert( "binary", TypeInfo( "binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
   mMap.insert( "boolean", TypeInfo( "boolean", "bool", "" ) );
   mMap.insert( "byte", TypeInfo( "byte", "char", "" ) );
   mMap.insert( "date", TypeInfo( "date", "TQDate", "tqdatetime.h" ) );
   mMap.insert( "dateTime", TypeInfo( "dateTime", "TQDateTime", "tqdatetime.h" ) );
   mMap.insert( "decimal", TypeInfo( "decimal", "float", "" ) );
   mMap.insert( "double", TypeInfo( "double", "double", "" ) );
-  mMap.insert( "duration", TypeInfo( "duration", "TQString", "tqstring.h" ) ); // TODO: add duration class
+  mMap.insert( "duration", TypeInfo( "duration", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); // TODO: add duration class
   mMap.insert( "int", TypeInfo( "int", "int", "" ) );
-  mMap.insert( "language", TypeInfo( "language", "TQString", "tqstring.h" ) );
+  mMap.insert( "language", TypeInfo( "language", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
   mMap.insert( "short", TypeInfo( "short", "short", "" ) );
-  mMap.insert( "string", TypeInfo( "string", "TQString", "tqstring.h" ) );
+  mMap.insert( "string", TypeInfo( "string", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
   mMap.insert( "unsignedByte", TypeInfo( "unsignedByte", "unsigned char", "" ) );
   mMap.insert( "unsignedInt", TypeInfo( "unsignedInt", "unsigned int", "" ) );
 }
@@ -71,7 +71,7 @@ TQString TypeMapper::type( const Schema::Element *element ) const
 
   TQString type;
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() )
     type = it.data().type;
 
@@ -89,7 +89,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const
 
   TQString type;
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() )
     type = it.data().type;
 
@@ -104,7 +104,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const
 TQString TypeMapper::type( const TQString &typeName ) const
 {
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() )
     return it.data().type;
 
@@ -147,7 +147,7 @@ TQStringList TypeMapper::header( const Schema::Element *element ) const
   TQStringList headers;
 
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() ) {
     if ( !it.data().header.isEmpty() )
       headers.append( it.data().header );
@@ -167,10 +167,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Element *element
   TQMap<TQString, TQString> headers;
 
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() ) {
     if ( !it.data().header.isEmpty() ) {
-      if ( it.data().type == "TQByteArray" )
+      if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
         headers.insert( it.data().header, TQString() );
       else
         headers.insert( it.data().header, it.data().type );
@@ -193,7 +193,7 @@ TQStringList TypeMapper::header( const Schema::Attribute *attribute ) const
   TQStringList headers;
 
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() ) {
     if ( !it.data().header.isEmpty() )
       headers.append( it.data().header );
@@ -210,10 +210,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib
   TQMap<TQString, TQString> headers;
 
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() ) {
     if ( !it.data().header.isEmpty() ) {
-      if ( it.data().type == "TQByteArray" )
+      if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
         headers.insert( it.data().header, TQString() );
       else
         headers.insert( it.data().header, it.data().type );
@@ -228,7 +228,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib
 
 TQStringList TypeMapper::header( const TQString &typeName ) const
 {
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() )
     return it.data().header;
 
@@ -249,10 +249,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const TQString &typeName ) cons
   TQMap<TQString, TQString> headers;
 
   // check basic types
-  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+  TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
   if ( it != mMap.end() ) {
     if ( !it.data().header.isEmpty() ) {
-      if ( it.data().type == "TQByteArray" )
+      if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
         headers.insert( it.data().header, TQString() );
       else
         headers.insert( it.data().header, it.data().type );
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 25e91edc..66dccccb 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -95,7 +95,7 @@ void Creator::createProperty( KODE::Class &c, const TQString &type,
 void Creator::createElementFunctions( KODE::Class &c, Element *e )
 {
   if ( e->hasText ) {
-    createProperty( c, "TQString", e->name );
+    createProperty( c, TQSTRING_OBJECT_NAME_STRING, e->name );
     if ( mXmlParserType == XmlParserCustomExternal ) {
       createTextElementParserCustom( c, e );
     }
@@ -137,7 +137,7 @@ void Creator::createClass( Element *element )
 {
   TQString className = upperFirst( element->name );
 
-  if ( mProcessedClasses.find( className ) != mProcessedClasses.end() ) {
+  if ( mProcessedClasses.tqfind( className ) != mProcessedClasses.end() ) {
     return;
   }
 
@@ -150,7 +150,7 @@ void Creator::createClass( Element *element )
        itA != element->attributes.end(); ++itA ) {
     Attribute *a = *itA;
 
-    createProperty( c, "TQString", a->name );
+    createProperty( c, TQSTRING_OBJECT_NAME_STRING, a->name );
   }
 
   TQValueList<Element *>::ConstIterator itE;
@@ -176,7 +176,7 @@ void Creator::createClass( Element *element )
 
 void Creator::createElementWriter( KODE::Class &c, Element *element )
 {
-  KODE::Function writer( "writeElement", "TQString" );
+  KODE::Function writer( "writeElement", TQSTRING_OBJECT_NAME_STRING );
   
   KODE::Code code;
   
@@ -268,7 +268,7 @@ void Creator::createElementParser( KODE::Class &c, Element *e )
 
 void Creator::createTextElementParserCustom( KODE::Class &, Element *e )
 {
-  KODE::Function parser( "parseElement" + upperFirst( e->name ), "TQString" );
+  KODE::Function parser( "parseElement" + upperFirst( e->name ), TQSTRING_OBJECT_NAME_STRING );
 
   KODE::Code code;
   
@@ -637,7 +637,7 @@ void Creator::createListTypedefs()
 
 void Creator::createIndenter( KODE::File &file )
 {
-  KODE::Function indenter( "indent", "TQString" );
+  KODE::Function indenter( "indent", TQSTRING_OBJECT_NAME_STRING );
   indenter.addArgument( "int n = 0" );
   
   KODE::Code code;
@@ -724,7 +724,7 @@ void Creator::createFileParserCustom( Element *element )
   mParserClass.addInclude( "kdebug.h" );
 
   mParserClass.addMemberVariable( KODE::MemberVariable( "mBuffer",
-                                                        "TQString" ) );
+                                                        TQSTRING_OBJECT_NAME_STRING ) );
   mParserClass.addMemberVariable( KODE::MemberVariable( "mRunning",
                                                         "unsigned int" ) );
 
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 59392ca8..0d5ddf15 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -97,7 +97,7 @@ Element *Parser::parse( const TQDomElement &docElement )
       parseElement( e1, d, Pattern() );
       Element::List definitions;
       TQMap<TQString,Element::List >::ConstIterator it; 
-      it = mDefinitionMap.find( d->name );
+      it = mDefinitionMap.tqfind( d->name );
       if ( it != mDefinitionMap.end() ) definitions = *it;
       definitions.append( d );
       mDefinitionMap.tqreplace( d->name, definitions );
@@ -192,7 +192,7 @@ void Parser::substituteReferences( Element *s )
       r->substituted = true;
     }
     TQMap<TQString,Element::List >::ConstIterator it1;
-    it1 = mDefinitionMap.find( r->name );
+    it1 = mDefinitionMap.tqfind( r->name );
     if ( it1 != mDefinitionMap.end() ) {
       Element::List elements = *it1;
       Element::List::ConstIterator it4;
diff --git a/kode/license.cpp b/kode/license.cpp
index 12208f8c..1cec5cab 100644
--- a/kode/license.cpp
+++ b/kode/license.cpp
@@ -26,18 +26,18 @@
 using namespace KODE;
 
 License::License()
-  : mType( GPL ), mQtException( true )
+  : mType( GPL ), mTQtException( true )
 {
 }
 
 License::License( Type type )
-  : mType( type ), mQtException( true )
+  : mType( type ), mTQtException( true )
 {
 }
 
-void License::setQtException( bool v )
+void License::setTQtException( bool v )
 {
-  mQtException = v;
+  mTQtException = v;
 }
 
 TQString License::text()
@@ -60,12 +60,12 @@ TQString License::text()
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n" "USA.\n";
-      if ( mQtException ) {
+      if ( mTQtException ) {
         txt += "\n";
         txt +=
 "As a special exception, permission is given to link this program\n"
-"with any edition of Qt, and distribute the resulting executable,\n"
-"without including the source code for Qt in the source distribution.\n";
+"with any edition of TQt, and distribute the resulting executable,\n"
+"without including the source code for TQt in the source distribution.\n";
       }
       break;
     case LGPL:
diff --git a/kode/license.h b/kode/license.h
index d74a0b57..3cdeff1f 100644
--- a/kode/license.h
+++ b/kode/license.h
@@ -34,14 +34,14 @@ class KDE_EXPORT License
     License();
     License( Type );
 
-    void setQtException( bool );
+    void setTQtException( bool );
 
     TQString text();
 
   private:
     Type mType;
 
-    bool mQtException;
+    bool mTQtException;
 };
 
 }
diff --git a/kode/printer.cpp b/kode/printer.cpp
index 5fa8907c..ddb5e5c4 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -199,8 +199,8 @@ TQString Printer::classHeader( const Class &c )
   code += "{";
   code.indent();
 
-  if ( c.isQObject() ) {
-    code += "Q_OBJECT";
+  if ( c.isTQObject() ) {
+    code += "TQ_OBJECT";
     code.newLine();
   }
 
@@ -308,9 +308,9 @@ TQString Printer::classImplementation( const Class &c )
     code += "";
   }
 
-  if ( c.isQObject() ) {
+  if ( c.isTQObject() ) {
     code.newLine();
-    code += "#include \"" + c.name().lower() + ".moc\"";
+    code += "#include \"" + c.name().lower() + ".tqmoc\"";
   }
 
   return code.text();
@@ -346,7 +346,7 @@ void Printer::printHeader( const File &f )
     TQStringList includes = (*it).headerIncludes();
     TQStringList::ConstIterator it2;
     for( it2 = includes.begin(); it2 != includes.end(); ++it2 ) {
-      if ( processed.find( *it2 ) == processed.end() ) {
+      if ( processed.tqfind( *it2 ) == processed.end() ) {
         out += "#include <" + *it2 + ">";
         processed.append( *it2 );
       }
@@ -361,7 +361,7 @@ void Printer::printHeader( const File &f )
     TQStringList decls = (*it).forwardDeclarations();
     TQStringList::ConstIterator it2;
     for( it2 = decls.begin(); it2 != decls.end(); ++it2 ) {
-      if ( processed.find( *it2 ) == processed.end() ) {
+      if ( processed.tqfind( *it2 ) == processed.end() ) {
         out += "class " + *it2 + ";";
         processed.append( *it2 );
       }
@@ -395,7 +395,7 @@ void Printer::printHeader( const File &f )
 
   if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
 
-  KSaveFile::backupFile( filename, TQString::null, ".backup" );
+  KSaveFile::backupFile( filename, TQString(), ".backup" );
 
   TQFile header( filename );
   if ( !header.open( IO_WriteOnly ) ) {
@@ -441,7 +441,7 @@ void Printer::printImplementation( const File &f, bool createHeaderInclude )
     TQStringList includes = (*it).includes();
     TQStringList::ConstIterator it2;
     for( it2 = includes.begin(); it2 != includes.end(); ++it2 ) {
-      if ( processed.find( *it2 ) == processed.end() ) {
+      if ( processed.tqfind( *it2 ) == processed.end() ) {
         out += "#include <" + *it2 + ">";
         processed.append( *it2 );
       }
@@ -508,7 +508,7 @@ void Printer::printImplementation( const File &f, bool createHeaderInclude )
 
   if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
 
-  KSaveFile::backupFile( filename, TQString::null, ".backup" );
+  KSaveFile::backupFile( filename, TQString(), ".backup" );
 
   TQFile implementation( filename );
   if ( !implementation.open( IO_WriteOnly ) ) {
@@ -529,7 +529,7 @@ void Printer::printAutoMakefile( const AutoMakefile &am )
 
   if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
 
-  KSaveFile::backupFile( filename, TQString::null, ".backup" );
+  KSaveFile::backupFile( filename, TQString(), ".backup" );
 
   TQFile file( filename );
   if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kode/printer.h b/kode/printer.h
index ec50bec0..65cbddaa 100644
--- a/kode/printer.h
+++ b/kode/printer.h
@@ -49,7 +49,7 @@ class KDE_EXPORT Printer
     void printAutoMakefile( const AutoMakefile & );
 
     TQString functionSignature( const Function &f,
-      const TQString &className = TQString::null,
+      const TQString &className = TQString(),
       bool includeClassQualifier = false );
 
   protected:
diff --git a/konsolekalendar/COPYING b/konsolekalendar/COPYING
index 54754ab4..b55fa146 100644
--- a/konsolekalendar/COPYING
+++ b/konsolekalendar/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/konsolekalendar/ROADMAP b/konsolekalendar/ROADMAP
index 333366ec..6d8a4a27 100644
--- a/konsolekalendar/ROADMAP
+++ b/konsolekalendar/ROADMAP
@@ -8,7 +8,7 @@ Inner Version|                                       | From KDE version
 1.3.4        |  New remote calendar support          |   cvs
 1.3.5        |  Remove old input system..            |   cvs
 1.3.6        |  Test..test..test it baby             |   cvs
-1.4          |  Start creating outputs  try to find  |
+1.4          |  Start creating outputs  try to tqfind  |
              |  People who need these..              |   cvs
 1.5          |  Implement possibility to execute app |   cvs
 1.5.1        |  Do something;)
diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp
index 564adf53..f8c5fa99 100644
--- a/konsolekalendar/konsolekalendar.cpp
+++ b/konsolekalendar/konsolekalendar.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -271,20 +271,20 @@ bool KonsoleKalendar::showInstance()
         } else {
           if ( firstdate == lastdate ) {
             title = i18n( "Events: %1" )
-                    .arg(  firstdate.toString( Qt::TextDate ) );
+                    .arg(  firstdate.toString( TQt::TextDate ) );
           } else {
             title = i18n( "Events: %1 - %2" )
-                    .arg( firstdate.toString( Qt::TextDate ) )
-                    .arg( lastdate.toString( Qt::TextDate ) );
+                    .arg( firstdate.toString( TQt::TextDate ) )
+                    .arg( lastdate.toString( TQt::TextDate ) );
           }
           htmlSettings.setEventView( true );
         }
         htmlSettings.setEventTitle( title );
         htmlSettings.setEventAttendees( true );
 // Not supporting Todos yet
-//         title = "To-Do List for " + firstdate.toString(Qt::TextDate);
+//         title = "To-Do List for " + firstdate.toString(TQt::TextDate);
 //         if ( firstdate != lastdate ) {
-//           title += " - " + lastdate.toString(Qt::TextDate);
+//           title += " - " + lastdate.toString(TQt::TextDate);
 //         }
         htmlSettings.setTodoListTitle( title );
         htmlSettings.setTodoView( false );
@@ -438,11 +438,11 @@ void KonsoleKalendar::printSpecs()
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   if ( m_variables->getFloating() == true ) {
diff --git a/konsolekalendar/konsolekalendar.h b/konsolekalendar/konsolekalendar.h
index 71ded4f6..df09b69f 100644
--- a/konsolekalendar/konsolekalendar.h
+++ b/konsolekalendar/konsolekalendar.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp
index e1c80498..bd198073 100644
--- a/konsolekalendar/konsolekalendaradd.cpp
+++ b/konsolekalendar/konsolekalendaradd.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -146,11 +146,11 @@ void KonsoleKalendarAdd::printSpecs()
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   if ( m_variables->getFloating() == true ) {
diff --git a/konsolekalendar/konsolekalendaradd.h b/konsolekalendar/konsolekalendaradd.h
index d1c9a296..688cc9a9 100644
--- a/konsolekalendar/konsolekalendaradd.h
+++ b/konsolekalendar/konsolekalendaradd.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp
index fffd38cc..067c05e2 100644
--- a/konsolekalendar/konsolekalendarchange.cpp
+++ b/konsolekalendar/konsolekalendarchange.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -136,11 +136,11 @@ void KonsoleKalendarChange::printSpecs( Event *event )
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit()
+    arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit()
+    arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  Desc:  %1" ).
@@ -163,11 +163,11 @@ void KonsoleKalendarChange::printSpecs()
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit()
+    arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  Desc:  %1" ).
diff --git a/konsolekalendar/konsolekalendarchange.h b/konsolekalendar/konsolekalendarchange.h
index 80e8f8c2..9430394f 100644
--- a/konsolekalendar/konsolekalendarchange.h
+++ b/konsolekalendar/konsolekalendarchange.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp
index 02d67627..b3f27650 100644
--- a/konsolekalendar/konsolekalendardelete.cpp
+++ b/konsolekalendar/konsolekalendardelete.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -101,11 +101,11 @@ void KonsoleKalendarDelete::printSpecs( Event *event )
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit()
+    arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit()
+    arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit()
        << endl;
 
   cout << i18n( "  Desc:  %1" ).
diff --git a/konsolekalendar/konsolekalendardelete.h b/konsolekalendar/konsolekalendardelete.h
index 2a01990f..cf843e67 100644
--- a/konsolekalendar/konsolekalendardelete.h
+++ b/konsolekalendar/konsolekalendardelete.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp
index 59cd7e91..e314bde7 100644
--- a/konsolekalendar/konsolekalendarepoch.cpp
+++ b/konsolekalendar/konsolekalendarepoch.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -49,23 +49,23 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch()
 
 // By "epoch" we mean the number of seconds since 00:00:00 UTC on January 1 1970
 
-// Function to convert an epoch value into a QDateTime
+// Function to convert an epoch value into a TQDateTime
 TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch )
 {
   TQDateTime dt;
-  dt.setTime_t( epoch, Qt::UTC );
+  dt.setTime_t( epoch, TQt::UTC );
   return( dt );
 }
 
 // Function to convert a TQDateTime value into an epoch
-uint KonsoleKalendarEpoch::QDateTime2epoch( TQDateTime dt )
+uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt )
 {
   // THIS FUNCTION CAN BE OFF BY 1 HOUR DUE TO DAYLIGHT SAVINGS TIME.
   // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME.
 
   // Compute #seconds to subtract for local timezone difference from UTC.
-  int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t()
-             - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t();
+  int offset = TQDateTime::tqcurrentDateTime( TQt::UTC ).toTime_t()
+             - TQDateTime::tqcurrentDateTime( TQt::LocalTime ).toTime_t();
   return( dt.toTime_t() - offset );
 }
 
@@ -90,12 +90,12 @@ main()
   cout << "epoch="
        << epoch
        << " converts to "
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << endl;
 
-  epoch = KonsoleKalendarEpoch::QDateTime2epoch( dt );
+  epoch = KonsoleKalendarEpoch::TQDateTime2epoch( dt );
   cout << "date="
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << " converts to "
        << "epoch="
        << epoch
@@ -108,12 +108,12 @@ main()
   cout << "epoch="
        << epoch
        << " converts to "
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << endl;
 
-  epoch = KonsoleKalendarEpoch::QDateTime2epoch( dt );
+  epoch = KonsoleKalendarEpoch::TQDateTime2epoch( dt );
   cout << "date="
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << " converts to "
        << "epoch="
        << epoch
@@ -126,12 +126,12 @@ main()
   cout << "epoch="
        << epoch
        << " converts to "
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << endl;
 
-  epoch = KonsoleKalendarEpoch::QDateTime2epoch( dt );
+  epoch = KonsoleKalendarEpoch::TQDateTime2epoch( dt );
   cout << "date="
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << " converts to "
        << "epoch="
        << epoch
@@ -144,12 +144,12 @@ main()
   cout << "epoch="
        << epoch
        << " converts to "
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << endl;
 
-  epoch = KonsoleKalendarEpoch::QDateTime2epoch( dt );
+  epoch = KonsoleKalendarEpoch::TQDateTime2epoch( dt );
   cout << "date="
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << " converts to "
        << "epoch="
        << epoch
@@ -162,12 +162,12 @@ main()
   cout << "epoch="
        << epoch
        << " converts to "
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << endl;
 
-  epoch = KonsoleKalendarEpoch::QDateTime2epoch( dt );
+  epoch = KonsoleKalendarEpoch::TQDateTime2epoch( dt );
   cout << "date="
-       << dt.toString( Qt::TextDate )
+       << dt.toString( TQt::TextDate )
        << " converts to "
        << "epoch="
        << epoch
diff --git a/konsolekalendar/konsolekalendarepoch.h b/konsolekalendar/konsolekalendarepoch.h
index fedd392c..c73c087b 100644
--- a/konsolekalendar/konsolekalendarepoch.h
+++ b/konsolekalendar/konsolekalendarepoch.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
@@ -63,7 +63,7 @@ namespace KCal
      * Converts QT DateTime to epoch format.
      * @param dt is a TQDateTime to convert to an epoch.
      */
-    static uint QDateTime2epoch( TQDateTime dt );
+    static uint TQDateTime2epoch( TQDateTime dt );
 
   };
 
diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp
index 60441bd5..cc3edf87 100644
--- a/konsolekalendar/konsolekalendarexports.cpp
+++ b/konsolekalendar/konsolekalendarexports.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
diff --git a/konsolekalendar/konsolekalendarexports.h b/konsolekalendar/konsolekalendarexports.h
index 8db27c97..930426d4 100644
--- a/konsolekalendar/konsolekalendarexports.h
+++ b/konsolekalendar/konsolekalendarexports.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp
index a9327923..122b8525 100644
--- a/konsolekalendar/konsolekalendarvariables.cpp
+++ b/konsolekalendar/konsolekalendarvariables.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
diff --git a/konsolekalendar/konsolekalendarvariables.h b/konsolekalendar/konsolekalendarvariables.h
index 9b0c82d3..a3aa1040 100644
--- a/konsolekalendar/konsolekalendarvariables.h
+++ b/konsolekalendar/konsolekalendarvariables.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 42f5dd99..14b89205 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
  *                                                                             *
  * As a special exception, permission is given to link this program            *
- * with any edition of Qt, and distribute the resulting executable,            *
- * without including the source code for Qt in the source distribution.        *
+ * with any edition of TQt, and distribute the resulting executable,            *
+ * without including the source code for TQt in the source distribution.        *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -472,7 +472,7 @@ int main( int argc, char *argv[] )
               << "(" << option << ")"
               << endl;
 
-    startdate = TQDate::fromString( option, Qt::ISODate );
+    startdate = TQDate::fromString( option, TQt::ISODate );
     if ( !startdate.isValid() ) {
       cout << i18n( "Invalid Start Date Specified: %1" ).
         arg( option ).local8Bit()
@@ -497,7 +497,7 @@ int main( int argc, char *argv[] )
               << endl;
 
     if ( option.upper() != "FLOAT" ) {
-      starttime = TQTime::fromString( option, Qt::ISODate );
+      starttime = TQTime::fromString( option, TQt::ISODate );
       if ( !starttime.isValid() ) {
         cout << i18n( "Invalid Start Time Specified: %1" ).
           arg( option ).local8Bit()
@@ -527,7 +527,7 @@ int main( int argc, char *argv[] )
               << "(" << option << ")"
               << endl;
 
-    enddate = TQDate::fromString( option, Qt::ISODate );
+    enddate = TQDate::fromString( option, TQt::ISODate );
     if ( !enddate.isValid() ) {
       cout << i18n( "Invalid End Date Specified: %1" ).
         arg( option ).local8Bit()
@@ -579,7 +579,7 @@ int main( int argc, char *argv[] )
               << endl;
 
     if ( option.upper() != "FLOAT" ) {
-      endtime = TQTime::fromString( option, Qt::ISODate );
+      endtime = TQTime::fromString( option, TQt::ISODate );
       if ( !endtime.isValid() ) {
         cout << i18n( "Invalid End Time Specified: %1" ).
           arg( option ).local8Bit()
@@ -854,10 +854,10 @@ int main( int argc, char *argv[] )
 
   // Some more debug prints
   kdDebug() << "main | datetimestamp | StartDate="
-            << startdatetime.toString( Qt::TextDate )
+            << startdatetime.toString( TQt::TextDate )
             << endl;
   kdDebug() << "main | datetimestamp | EndDate="
-            << enddatetime.toString( Qt::TextDate )
+            << enddatetime.toString( TQt::TextDate )
             << endl;
 
   /***************************************************************************
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index f3b57598..4f7d1185 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -74,7 +74,7 @@ See e.g. kdepim/kaddressbook/kaddressbook.desktop
 
 Designing DCOP interfaces
 =========================
-Porting the kroupware signals/slots to DCOP requires some changes.
+Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes.
 For instance any non-const reference (such as those used for returning
 values to the caller) has to be changed. If there is more than one
 value to be returned, you need to
diff --git a/kontact/Thoughts b/kontact/Thoughts
index e1a07c1f..720836a7 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -203,7 +203,7 @@ Don:
 Don: And the same for all other loadX apps.
 
 
-Status Bar
+tqStatus Bar
 ----------
 
 d We need a more sophisticated handling (progressbar, etc)
@@ -285,7 +285,7 @@ s like that.
 d Yes, but of course one should always prefer in-process IPC if possible. DCOP
 d currently _works_ for Kontact, but that's all about it. It isn't exactly elegant.
 d The only advantange of the current approach is that we can allow the user to
-d run one of the parts standalone. I am not really sure we want that. I used to find
+d run one of the parts standalone. I am not really sure we want that. I used to tqfind
 d it desireable, but I am not sure anymore.
 
 MiB: But that's the whole idea behind Kontact---to be able to integrate apps
@@ -311,7 +311,7 @@ MiB: yes, not too much against DCOP. But for KNotes I thought about turning
 MiB: a note into a plugin that can be loaded by Kontact and KNotes independently.
 MiB: like this, there's no DCOP necessary anymore and makes it much more flexible.
 MiB: e.g. usage of different display configs, a note embedded somewhere and having
-MiB: a parent or standalone on the desktop.
+MiB: a tqparent or standalone on the desktop.
 
 # Communication with external applications is something which doesn't fit too
 # well with the 'integrated' approach of Kontact. Is this really necessary?
@@ -367,7 +367,7 @@ h: there is something else broken IMHO
 Summary View
 ------------
 h: How would one best integrate a summary view into kontact?
-h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent );
+h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* tqparent );
 h:    to get a summary widget for a day?
 h: b) use some sort of XML to UI to represent the summary informations
 h: c) have a stand a lone part which opens the PIM data seperately? ( How
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index e940a53c..b77fabd2 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -37,8 +37,8 @@ public:
   TQString lastErrorMessage;
 };
 
-Core::Core( TQWidget *parent, const char *name )
-  : KParts::MainWindow( parent, name )
+Core::Core( TQWidget *tqparent, const char *name )
+  : KParts::MainWindow( tqparent, name )
 {
   d = new Private;
   TQTimer* timer = new TQTimer( this );
@@ -57,7 +57,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
   kdDebug(5601) << "Core::createPart(): " << libname << endl;
 
   TQMap<TQCString,KParts::ReadOnlyPart *>::ConstIterator it;
-  it = mParts.find( libname );
+  it = mParts.tqfind( libname );
   if ( it != mParts.end() ) return it.data();
 
   kdDebug(5601) << "Creating new KPart" << endl;
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index e84b3b8d..b060cc8a 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -41,6 +41,7 @@ class Plugin;
 class KDE_EXPORT Core : public KParts::MainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     virtual ~Core();
 
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 6025664f..1d7a2a1a 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -53,8 +53,8 @@ class Plugin::Private
 };
 
 
-Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name )
-  : KXMLGUIClient(  core ), TQObject(  parent, name ), d(  new Private )
+Plugin::Plugin( Kontact::Core *core, TQObject *tqparent, const char *name )
+  : KXMLGUIClient(  core ), TQObject(  tqparent, name ), d(  new Private )
 {
   core->factory()->addClient( this );
   KGlobal::locale()->insertCatalogue(name);
@@ -156,7 +156,7 @@ KParts::ReadOnlyPart *Plugin::part()
 
 TQString Plugin::tipFile() const
 {
-  return TQString::null;
+  return TQString();
 }
 
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 5a62beea..f0fcc154 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -58,6 +58,7 @@ class Summary;
 class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -68,7 +69,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       provides the part! This is the name used for DCOP registration.
       It's ok to have several plugins using the same application name.
     */
-    Plugin( Core *core, TQObject *parent, const char *name );
+    Plugin( Core *core, TQObject *tqparent, const char *name );
 
     ~Plugin();
 
@@ -114,7 +115,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     TQString executableName() const;
 
     /**
-      Set name of library which tqcontains the KPart used by this plugin.
+      Set name of library which contains the KPart used by this plugin.
     */
     void setPartLibraryName( const TQCString & );
 
@@ -171,7 +172,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       Reimplement this method if you want to add a widget for your application
       to Kontact's summary page.
     */
-    virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
+    virtual Summary *createSummaryWidget( TQWidget * /*tqparent*/ ) { return 0; }
 
     /**
       Returns whether the plugin provides a part that should be shown in the sidebar.
@@ -196,7 +197,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       The clients name is taken from the name argument in the constructor.
       @note: The DCOPClient object will only be created when this method is
       called for the first time. Make sure that the part has been loaded
-      before calling this method, if it's the one that tqcontains the DCOP
+      before calling this method, if it's the one that contains the DCOP
       interface that other parts might use.
     */
     DCOPClient *dcopClient() const;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 86902ca0..0f4c048c 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -34,8 +34,8 @@
 
 using namespace Kontact;
 
-Summary::Summary( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+Summary::Summary( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   setAcceptDrops( true );
 }
@@ -44,9 +44,9 @@ Summary::~Summary()
 {
 }
 
-TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading)
+TQWidget* Summary::createHeader(TQWidget *tqparent, const TQPixmap& icon, const TQString& heading)
 {
-  TQHBox* hbox = new TQHBox( parent );
+  TQHBox* hbox = new TQHBox( tqparent );
   hbox->setMargin( 2 );
 
   TQFont boldFont;
@@ -93,7 +93,7 @@ void Summary::mouseMoveEvent( TQMouseEvent *event )
 
     TQPainter painter;
     painter.begin( &pm );
-    painter.setPen( Qt::gray );
+    painter.setPen( TQt::gray );
     painter.drawRect( 0, 0, pm.width(), pm.height() );
     painter.end();
     drag->setPixmap( pm );
@@ -109,7 +109,7 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
 
 void Summary::dropEvent( TQDropEvent *event )
 {
-  int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
+  int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
   emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 29a89019..a845401f 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -33,12 +33,13 @@ namespace Kontact
 /**
   Summary widget for display in the Summary View plugin.
  */
-class KDE_EXPORT Summary : public QWidget
+class KDE_EXPORT Summary : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    Summary( TQWidget *parent, const char *name = 0 );
+    Summary( TQWidget *tqparent, const char *name = 0 );
 
     virtual ~Summary();
 
@@ -52,7 +53,7 @@ class KDE_EXPORT Summary : public QWidget
     /**
       Creates a heading for a typical summary view with an icon and a heading.
      */
-    TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon,
+    TQWidget *createHeader( TQWidget* tqparent, const TQPixmap &icon,
                            const TQString& heading );
 
     /**
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 62886cc1..b93b5965 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KONTACT_UNIQUEAPPHANDLER_H
-#define KONTACT_UNIQUEAPPHANDLER_H
+#ifndef KONTACT_UNITQUEAPPHANDLER_H
+#define KONTACT_UNITQUEAPPHANDLER_H
 
 #include <dcopobject.h>
 #include <plugin.h>
@@ -89,9 +89,10 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
  * Kontact takes over from there.
  *
  */
-class KDE_EXPORT UniqueAppWatcher : public QObject
+class KDE_EXPORT UniqueAppWatcher : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -120,4 +121,4 @@ class KDE_EXPORT UniqueAppWatcher : public QObject
 
 } // namespace
 
-#endif /* KONTACT_UNIQUEAPPHANDLER_H */
+#endif /* KONTACT_UNITQUEAPPHANDLER_H */
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 16f80e80..d0ef181f 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 6689a5a3..207fa894 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_PLUGIN_H
@@ -51,6 +51,7 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
 class Plugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Plugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index d0493f1d..8fafeb98 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index 85107d0b..8302dee7 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOK_PLUGIN_H
@@ -45,6 +45,7 @@ public:
 class KAddressbookPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index c79bdab2..0f3fa946 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kgenericfactory.h>
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index f4cb04bd..0996f399 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KARM_PLUGIN_H
@@ -37,6 +37,7 @@ class KAboutData;
 class KarmPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KarmPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 343d724b..90ce22db 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
index f3b8c62a..efb218c1 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KITCHENSYNC_PLUGIN_H
@@ -35,6 +35,7 @@ class KAboutData;
 class KitchenSyncPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KitchenSyncPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e27254e3..ae776555 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kmailsummary( TQWidget *tqparent, const char * )
   {
-    return new KCMKMailSummary( parent, "kcmkmailsummary" );
+    return new KCMKMailSummary( tqparent, "kcmkmailsummary" );
   }
 }
 
-KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKMailSummary::KCMKMailSummary( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
@@ -109,14 +109,14 @@ void KCMKMailSummary::initFolders()
       folderRef.call( "displayName()" ).get( displayName );
     }
     if ( (*it).tqcontains( '/' ) == 1 ) {
-      if ( mFolderMap.find( *it ) == mFolderMap.end() )
+      if ( mFolderMap.tqfind( *it ) == mFolderMap.end() )
         mFolderMap.insert( *it, new TQListViewItem( mFolderView,
                                                    displayName ) );
     } else {
       const int pos = (*it).findRev( '/' );
-      const TQString parentFolder = (*it).left( pos );
+      const TQString tqparentFolder = (*it).left( pos );
       mFolderMap.insert( *it,
-                         new TQCheckListItem( mFolderMap[ parentFolder ],
+                         new TQCheckListItem( mFolderMap[ tqparentFolder ],
                                              displayName,
                                              TQCheckListItem::CheckBox ) );
     }
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 4ef16a96..068fa4a8 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKMAILSUMMARY_H
@@ -36,9 +36,10 @@ class TQCheckListItem;
 class KCMKMailSummary : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 );
+    KCMKMailSummary( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index c2aff819..55a192e3 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
@@ -125,7 +125,7 @@ void KMailPlugin::openComposer( const TQString& to )
 
 void KMailPlugin::slotNewMail()
 {
-  openComposer( TQString::null );
+  openComposer( TQString() );
 }
 
 void KMailPlugin::slotSyncFolders()
@@ -174,9 +174,9 @@ bool KMailPlugin::isRunningStandalone()
   return mUniqueAppWatcher->isRunningStandalone();
 }
 
-Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *tqparent )
 {
-  return new SummaryWidget( this, parent );
+  return new SummaryWidget( this, tqparent );
 }
 
 ////
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 0077182b..46998d80 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KMAIL_PLUGIN_H
@@ -46,6 +46,7 @@ public:
 class KMailPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
@@ -53,7 +54,7 @@ class KMailPlugin : public Kontact::Plugin
 
     virtual bool isRunningStandalone();
     virtual bool createDCOPInterface( const TQString& serviceType );
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
     virtual TQString tipFile() const;
     int weight() const { return 200; }
 
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 92023570..b7228342 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -41,8 +41,8 @@
 
 #include <time.h>
 
-SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( TQCString("MailSummary") ),
     mPlugin( plugin )
 {
@@ -168,7 +168,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index bd875565..575aceae 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -41,10 +41,11 @@ class TQString;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   public:
-    SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 );
+    SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 );
 
     int summaryHeight() const { return 1; }
     TQStringList configModules() const;
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 131c8bdf..d78e1e29 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "knode_plugin.h"
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 3701dc7b..c8d1d637 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KNODE_PLUGIN_H
@@ -43,6 +43,7 @@ public:
 class KNodePlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index ef70e8f5..a7864c42 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -38,8 +38,8 @@
 #include "knotetip.h"
 
 
-KNotesPart::KNotesPart( TQObject *parent, const char *name )
-  : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ),
+KNotesPart::KNotesPart( TQObject *tqparent, const char *name )
+  : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( tqparent, name ),
     mNotesView( new KNotesIconView() ),
     mNoteTip( new KNoteTip( mNotesView ) ),
     mNoteEditDlg( 0 ),
@@ -233,7 +233,7 @@ TQString KNotesPart::name( const TQString& id ) const
   if ( note )
     return note->text();
   else
-    return TQString::null;
+    return TQString();
 }
 
 TQString KNotesPart::text( const TQString& id ) const
@@ -242,7 +242,7 @@ TQString KNotesPart::text( const TQString& id ) const
   if ( note )
     return note->journal()->description();
   else
-    return TQString::null;
+    return TQString();
 }
 
 void KNotesPart::setName( const TQString& id, const TQString& newName )
@@ -328,7 +328,7 @@ void KNotesPart::popupRMB( TQIconViewItem *item, const TQPoint& pos )
 
 void KNotesPart::slotOnItem( TQIconViewItem *i )
 {
-  // TODO: disable (i.e. setNote( TQString::null )) when mouse button pressed
+  // TODO: disable (i.e. setNote( TQString() )) when mouse button pressed
 
   KNotesIconViewItem *item = static_cast<KNotesIconViewItem *>( i );
   mNoteTip->setNote( item );
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index 764bb484..9bc4e847 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -47,17 +47,18 @@ class Journal;
 class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNotesPart( TQObject *parent = 0, const char *name = 0 );
+    KNotesPart( TQObject *tqparent = 0, const char *name = 0 );
    ~KNotesPart();
 
     bool openFile();
 
   public slots:
-    TQString newNote( const TQString& name = TQString::null,
-                     const TQString& text = TQString::null );
-    TQString newNoteFromClipboard( const TQString& name = TQString::null );
+    TQString newNote( const TQString& name = TQString(),
+                     const TQString& text = TQString() );
+    TQString newNoteFromClipboard( const TQString& name = TQString() );
 
   public:
     void killNote( const TQString& id );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 2c96235f..7665426c 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -19,11 +19,11 @@
 
    In addition, as a special exception, the copyright holders give
    permission to link the code of this program with any edition of
-   the Qt library by Trolltech AS, Norway (or with modified versions
-   of Qt that use the same license as Qt), and distribute linked
+   the TQt library by Trolltech AS, Norway (or with modified versions
+   of TQt that use the same license as TQt), and distribute linked
    combinations including the two.  You must obey the GNU General
    Public License in all respects for all of the code used other than
-   Qt.  If you modify this file, you may extend this exception to
+   TQt.  If you modify this file, you may extend this exception to
    your version of the file, but you are not obligated to do so.  If
    you do not wish to do so, delete this exception statement from
    your version.
@@ -60,8 +60,8 @@
 class KNotesIconViewItem : public KIconViewItem
 {
   public:
-    KNotesIconViewItem( KIconView *parent, KCal::Journal *journal )
-      : KIconViewItem( parent ),
+    KNotesIconViewItem( KIconView *tqparent, KCal::Journal *journal )
+      : KIconViewItem( tqparent ),
         mJournal( journal )
     {
       setRenameEnabled( true );
@@ -115,11 +115,12 @@ class KNotesIconView : public KIconView
 class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 )
+    KNoteEditDlg( TQWidget *tqparent = 0, const char *name = 0 )
       : KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok,
-                     parent, name, true, true )
+                     tqparent, name, true, true )
     {
       // this dialog is modal to prevent one from editing the same note twice in two
       // different windows
@@ -136,7 +137,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       label->setText( i18n( "Name:" ) );
       hbl->addWidget( label,0 );
       mTitleEdit= new KLineEdit( page, "name" );
-      hbl->addWidget( mTitleEdit, 1,Qt::AlignVCenter  );
+      hbl->addWidget( mTitleEdit, 1,TQt::AlignVCenter  );
 
       mNoteEdit = new KNoteEdit( actionCollection(), page );
       mNoteEdit->setTextFormat( RichText );
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index 65e6450d..680eb7f5 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -32,6 +32,7 @@ class SummaryWidget;
 class KNotesPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 3ba9a9ab..afa21fb4 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -19,11 +19,11 @@
 
    In addition, as a special exception, the copyright holders give
    permission to link the code of this program with any edition of
-   the Qt library by Trolltech AS, Norway (or with modified versions
-   of Qt that use the same license as Qt), and distribute linked
+   the TQt library by Trolltech AS, Norway (or with modified versions
+   of TQt that use the same license as TQt), and distribute linked
    combinations including the two.  You must obey the GNU General
    Public License in all respects for all of the code used other than
-   Qt.  If you modify this file, you may extend this exception to
+   TQt.  If you modify this file, you may extend this exception to
    your version of the file, but you are not obligated to do so.  If
    you do not wish to do so, delete this exception statement from
    your version.
@@ -40,11 +40,11 @@
 #include "knotes_part_p.h"
 
 
-KNoteTip::KNoteTip( KIconView *parent )
+KNoteTip::KNoteTip( KIconView *tqparent )
   : TQFrame( 0, 0, WX11BypassWM |   // this will make Seli happy >:-P
             WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ),
     mFilter( false ),
-    mView( parent ),
+    mView( tqparent ),
     mNoteIVI( 0 ),
     mPreview( new TQTextEdit( this ) )
 {
@@ -83,9 +83,9 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
   } else {
     KCal::Journal *journal = item->journal();
     if ( journal->customProperty( "KNotes", "RichText" ) == "true" )
-      mPreview->setTextFormat( Qt::RichText );
+      mPreview->setTextFormat( TQt::RichText );
     else
-      mPreview->setTextFormat( Qt::PlainText );
+      mPreview->setTextFormat( TQt::PlainText );
 
     TQColor fg( journal->customProperty( "KNotes", "FgColor" ) );
     TQColor bg( journal->customProperty( "KNotes", "BgColor" ) );
@@ -101,7 +101,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
         w -= 20;
 
     TQRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() );
-    resize( w, QMIN( h, desk.height() / 2 - 20 ) );
+    resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
 
     hide();
     killTimers();
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index c19244fa..ca342fa4 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -19,11 +19,11 @@
 
    In addition, as a special exception, the copyright holders give
    permission to link the code of this program with any edition of
-   the Qt library by Trolltech AS, Norway (or with modified versions
-   of Qt that use the same license as Qt), and distribute linked
+   the TQt library by Trolltech AS, Norway (or with modified versions
+   of TQt that use the same license as TQt), and distribute linked
    combinations including the two.  You must obey the GNU General
    Public License in all respects for all of the code used other than
-   Qt.  If you modify this file, you may extend this exception to
+   TQt.  If you modify this file, you may extend this exception to
    your version of the file, but you are not obligated to do so.  If
    you do not wish to do so, delete this exception statement from
    your version.
@@ -38,10 +38,10 @@ class TQTextEdit;
 class KIconView;
 class KNotesIconViewItem;
 
-class KNoteTip : public QFrame
+class KNoteTip : public TQFrame
 {
   public:
-    KNoteTip( KIconView *parent );
+    KNoteTip( KIconView *tqparent );
     ~KNoteTip();
 
     void setNote( KNotesIconViewItem *item );
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index b714ff19..611425b9 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqobject.h>
@@ -45,8 +45,8 @@
 #include "summarywidget.h"
 
 KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
-                                          TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin )
+                                          TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ), mLayout( 0 ), mPlugin( plugin )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
       KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
       urlLabel->installEventFilter( this );
       urlLabel->setTextFormat(RichText);
-      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 1 );
       mLabels.append( urlLabel );
 
@@ -142,7 +142,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index cc71f472..97ccd094 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -43,9 +43,10 @@ namespace Kontact {
 class KNotesSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 );
+    KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 );
 
     void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); }
 
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 789762d5..a14785a7 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index beb4c2e9..af76b782 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONTACT_JOURNALPLUGIN_H
 #define KONTACT_JOURNALPLUGIN_H
@@ -34,6 +34,7 @@
 class JournalPlugin : public Kontact::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~JournalPlugin();
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index ba431eb3..e07bd441 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_korgsummary( TQWidget *tqparent, const char * )
   {
-    return new KCMKOrgSummary( parent, "kcmkorgsummary" );
+    return new KCMKOrgSummary( tqparent, "kcmkorgsummary" );
   }
 }
 
-KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKOrgSummary::KCMKOrgSummary( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 60a876d1..6d19f30f 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKORGSUMMARY_H
@@ -26,15 +26,16 @@
 
 #include <kcmodule.h>
 
-class QSpinxBox;
+class TQSpinxBox;
 class TQButtonGroup;
 
 class KCMKOrgSummary : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 );
+    KCMKOrgSummary( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.h b/kontact/plugins/korganizer/korg_uniqueapp.h
index d21f8c52..068fd35f 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.h
+++ b/kontact/plugins/korganizer/korg_uniqueapp.h
@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KORG_UNIQUEAPP_H
-#define KORG_UNIQUEAPP_H
+#ifndef KORG_UNITQUEAPP_H
+#define KORG_UNITQUEAPP_H
 
 #include <uniqueapphandler.h>
 
@@ -33,5 +33,5 @@ public:
 };
 
 
-#endif /* KORG_UNIQUEAPP_H */
+#endif /* KORG_UNITQUEAPP_H */
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index d740721c..2a712c8c 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -80,14 +80,14 @@ KOrganizerPlugin::~KOrganizerPlugin()
 {
 }
 
-Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *tqparent )
 {
   // korg part must be loaded, otherwise when starting kontact on summary view
   // it won't display our stuff.
   // If the part is already loaded loadPart() is harmless and just returns
   loadPart();
 
-  return new SummaryWidget( this, parent );
+  return new SummaryWidget( this, tqparent );
 }
 
 KParts::ReadOnlyPart *KOrganizerPlugin::createPart()
@@ -181,7 +181,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
         attendees.append( email );
       }
     }
-    interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+    interface()->openEventEditor( i18n( "Meeting" ), TQString(), TQString(),
                                   attendees );
     return;
   }
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 1343464e..4aaa4a0b 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORGANIZER_PLUGIN_H
@@ -36,6 +36,7 @@
 class KOrganizerPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
@@ -50,7 +51,7 @@ class KOrganizerPlugin : public Kontact::Plugin
     bool canDecodeDrag( TQMimeSource * );
     void processDropEvent( TQDropEvent * );
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
 
     virtual TQString tipFile() const;
     virtual TQStringList invisibleToolbarActions() const;
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 06a4694c..1409c37b 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -50,9 +50,9 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
                               const char *name )
-  : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 )
+  : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -290,7 +290,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 2f018a50..9e2350ea 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class KOrganizerPlugin;
 class SummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+    SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
                    const char *name = 0 );
     ~SummaryWidget();
 
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 3b553ee0..cefd8bbe 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
@@ -77,9 +77,9 @@ TodoPlugin::~TodoPlugin()
 {
 }
 
-Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *tqparent )
 {
-  return new TodoSummaryWidget( this, parent );
+  return new TodoSummaryWidget( this, tqparent );
 }
 
 KParts::ReadOnlyPart *TodoPlugin::createPart()
@@ -173,7 +173,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
         attendees.append( email );
       }
     }
-    interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+    interface()->openTodoEditor( i18n( "Meeting" ), TQString(), TQString(),
                                  attendees );
     return;
   }
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 5fc13316..9bff00d0 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONTACT_TODOPLUGIN_H
 #define KONTACT_TODOPLUGIN_H
@@ -34,6 +34,7 @@
 class TodoPlugin : public Kontact::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~TodoPlugin();
@@ -47,7 +48,7 @@ class TodoPlugin : public Kontact::Plugin
 
     virtual TQStringList invisibleToolbarActions() const;
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
 
     void select();
 
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 05e9ea55..7bd1be11 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -53,8 +53,8 @@
 #include "todosummarywidget.h"
 
 TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
-                                      TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ), mPlugin( plugin )
+                                      TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ), mPlugin( plugin )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
@@ -152,14 +152,14 @@ void TodoSummaryWidget::updateView()
       mLabels.append( label );
 
       TQString sSummary = todo->summary();
-      if ( todo->relatedTo() ) { // show parent only, not entire ancestry
+      if ( todo->relatedTo() ) { // show tqparent only, not entire ancestry
         sSummary = todo->relatedTo()->summary() + ":" + todo->summary();
       }
       KURLLabel *urlLabel = new KURLLabel( this );
       urlLabel->setText( sSummary );
       urlLabel->setURL( todo->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setTextFormat( Qt::RichText );
+      urlLabel->setTextFormat( TQt::RichText );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -255,7 +255,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index c5286e19..974a45b3 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef TODO_SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class TodoPlugin;
 class TodoSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent,
+    TodoSummaryWidget( TodoPlugin *plugin, TQWidget *tqparent,
                        const char *name = 0 );
     ~TodoSummaryWidget();
 
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ba11d9b5..3e757713 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqimage.h>
@@ -49,8 +49,8 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( "KPilotSummaryWidget" ),
     mDCOPSuccess( false ),
     mStartedDaemon( false ),
@@ -88,9 +88,9 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this );
   mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 );
 
-  // Status
+  // tqStatus
   row++;
-  mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this);
+  mDaemonStatusTextLabel = new TQLabel( i18n( "<i>tqStatus:</i>" ), this);
   mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
   mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this );
   mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 );
@@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
@@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString
 {
   mDCOPSuccess = true;
   mLastSyncTime = lastSyncTime;
-  mDaemonStatus = status;
+  mDaemontqStatus = status;
   mConduits = conduits;
   mSyncLog = logFileName;
   mUserName = userName;
@@ -154,7 +154,7 @@ void SummaryWidget::updateView()
 {
   if ( mDCOPSuccess ) {
     if ( mLastSyncTime.isValid() ) {
-      mSyncTimeLabel->setText( mLastSyncTime.toString(Qt::LocalDate) );
+      mSyncTimeLabel->setText( mLastSyncTime.toString(TQt::LocalDate) );
     } else {
       mSyncTimeLabel->setText( i18n( "No information available" ) );
     }
@@ -166,7 +166,7 @@ void SummaryWidget::updateView()
     }
     mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName );
     mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice );
-    mDaemonStatusLabel->setText( mDaemonStatus );
+    mDaemonStatusLabel->setText( mDaemontqStatus );
     mConduitsLabel->setText( mConduits.join( ", " ) );
   } else {
     mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) );
@@ -194,7 +194,7 @@ void SummaryWidget::updateView()
 
 void SummaryWidget::showSyncLog( const TQString &filename )
 {
-  KDialogBase dlg( this, 0, true, TQString::null, KDialogBase::Ok, KDialogBase::Ok );
+  KDialogBase dlg( this, 0, true, TQString(), KDialogBase::Ok, KDialogBase::Ok );
   dlg.setCaption( i18n( "KPilot HotSync Log" ) );
 
   TQTextEdit *edit = new TQTextEdit( dlg.makeVBoxMainWidget() );
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 09b3e77d..cfb87ae5 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -45,10 +45,11 @@ class KURLLabel;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
-    SummaryWidget( TQWidget *parent, const char *name = 0 );
+    SummaryWidget( TQWidget *tqparent, const char *name = 0 );
     virtual ~SummaryWidget();
 
     int summaryHeight() const { return 1; }
@@ -84,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     TQGridLayout *mLayout;
 
     TQDateTime mLastSyncTime;
-    TQString mDaemonStatus;
+    TQString mDaemontqStatus;
     TQStringList mConduits;
     TQString mSyncLog;
     TQString mUserName;
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0b0a98a3..07a8aebd 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqgroupbox.h>
@@ -49,15 +49,15 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kontactknt( TQWidget *tqparent, const char * )
   {
-    return new KCMKontactKNT( parent, "kcmkontactknt" );
+    return new KCMKontactKNT( tqparent, "kcmkontactknt" );
   }
 }
 
-NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent )
+NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *tqparent )
   : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel,
-                 Ok, parent, 0, true, true )
+                 Ok, tqparent, 0, true, true )
 {
   TQWidget *page = plainPage();
   TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
@@ -103,17 +103,17 @@ TQString NewsEditDialog::url() const
   return mURL->text();
 }
 
-class NewsItem : public QListViewItem
+class NewsItem : public TQListViewItem
 {
   public:
-    NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom )
-      : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+    NewsItem( TQListView *tqparent, const TQString& title, const TQString& url, bool custom )
+      : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
     {
       setText( 0, mTitle );
     }
 
-    NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom )
-      : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+    NewsItem( TQListViewItem *tqparent, const TQString& title, const TQString& url, bool custom )
+      : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
     {
       setText( 0, mTitle );
     }
@@ -128,8 +128,8 @@ class NewsItem : public QListViewItem
     bool mCustom;
 };
 
-KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
@@ -153,22 +153,22 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
 
 void KCMKontactKNT::loadNews()
 {
-  TQValueVector<TQListViewItem*> parents;
+  TQValueVector<TQListViewItem*> tqparents;
   TQValueVector<TQListViewItem*>::Iterator it;
 
-  parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
 
-  for ( it = parents.begin(); it != parents.end(); ++it )
+  for ( it = tqparents.begin(); it != tqparents.end(); ++it )
     (*it)->setSelectable( false );
 
   for ( int i = 0; i < DEFAULT_NEWSSOURCES; ++i ) {
     NewsSourceData data = NewsSourceDefault[ i ];
-    new NewsItem( parents[ data.category() ], data.name(), data.url(), false );
+    new NewsItem( tqparents[ data.category() ], data.name(), data.url(), false );
     mFeedMap.insert( data.url(), data.name() );
   }
 }
@@ -271,7 +271,7 @@ void KCMKontactKNT::deleteFeed()
   if ( !item )
     return;
 
-  if ( mCustomFeeds.find( item ) == mCustomFeeds.end() )
+  if ( mCustomFeeds.tqfind( item ) == mCustomFeeds.end() )
     return;
 
   mCustomFeeds.remove( item );
@@ -317,7 +317,7 @@ void KCMKontactKNT::allCurrentChanged( TQListViewItem *item )
   bool delState = false;
   if ( newsItem && newsItem->isSelected() ) {
     addState = true;
-    delState = (mCustomFeeds.find( newsItem ) != mCustomFeeds.end());
+    delState = (mCustomFeeds.tqfind( newsItem ) != mCustomFeeds.end());
   }
 
   mAddButton->setEnabled( addState );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
   mSelectedNews->setFullWidth( true );
   tqlayout->addWidget( mSelectedNews, 0, 2 );
 
-  TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+  TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
   TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a8572b8e..2ec21f86 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKONTACTKNT_H
@@ -27,7 +27,7 @@
 #include <kcmodule.h>
 
 class TQListViewItem;
-class QSpinxBox;
+class TQSpinxBox;
 
 class KAboutData;
 class KListView;
@@ -38,9 +38,10 @@ class NewsItem;
 class KCMKontactKNT : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 );
+    KCMKontactKNT( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
@@ -85,9 +86,10 @@ class KCMKontactKNT : public KCModule
 class NewsEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NewsEditDialog( const TQString&, const TQString&, TQWidget *parent );
+    NewsEditDialog( const TQString&, const TQString&, TQWidget *tqparent );
     TQString title() const;
     TQString url() const;
 
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 6f8e7fa4..b092469a 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef NEWSFEEDS_H
@@ -37,8 +37,8 @@ class NewsSourceData
                     Recreation, Society };
 
     NewsSourceData( const TQString &name = I18N_NOOP( "Unknown" ),
-                    const TQString &url = TQString::null,
-                    const TQString &icon = TQString::null,
+                    const TQString &url = TQString(),
+                    const TQString &icon = TQString(),
                     const Category category= Computers )
       : mName( name ), mURL( url ), mIcon( icon ), mCategory( category )
     {
@@ -71,12 +71,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Internet.com Business"),
     TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Business ),
     NewsSourceData(
     TQString::tqfromLatin1("TradeSims"),
     TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
@@ -87,7 +87,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("KDE France"),
     TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("FreeBSD Project News"),
@@ -119,7 +119,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("GNOME News"),
     TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Slashdot"),
@@ -149,7 +149,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Jabber News"),
     TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Freshmeat"),
@@ -194,7 +194,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Linux Game Tome"),
     TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Mozilla"),
@@ -209,12 +209,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Daemon News"),
     TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("use Perl;"),
     TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Root prompt"),
@@ -249,7 +249,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("zez.org - about code "),
     TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("BSDatwork.com"),
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 5283d84d..adfc65fb 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqclipboard.h>
@@ -41,8 +41,8 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
@@ -60,7 +60,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
     if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
-      vlay->addWidget( label, Qt::AlignHCenter );
+      vlay->addWidget( label, TQt::AlignHCenter );
       dcopAvailable = false;
     }
   }
@@ -175,7 +175,7 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef )
     artRef.call( "title()" ).get( title );
     artRef.call( "link()" ).get( url );
 
-    QPair<TQString, KURL> article(title, KURL( url ));
+    TQPair<TQString, KURL> article(title, KURL( url ));
     map.append( article );
   }
 
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
   menu.insertItem( i18n( "Copy URL to Clipboard" ) );
   int id = menu.exec( TQCursor::pos() );
   if ( id != -1 )
-    kapp->clipboard()->setText( url, QClipboard::Clipboard );
+    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
@@ -310,7 +310,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( label->url() );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index bfea340e..7f30ca26 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -41,7 +41,7 @@ class TQLabel;
 class DCOPRef;
 class KURLLabel;
 
-typedef TQValueList< QPair<TQString, KURL> > ArticleMap;
+typedef TQValueList< TQPair<TQString, KURL> > ArticleMap;
 
 typedef struct {
   DCOPRef ref;
@@ -56,10 +56,11 @@ typedef TQValueList<Feed> FeedList;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   public:
-    SummaryWidget( TQWidget *parent, const char *name = 0 );
+    SummaryWidget( TQWidget *tqparent, const char *name = 0 );
 
     int summaryHeight() const;
     TQStringList configModules() const;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 183a2e12..b3a67127 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -43,14 +43,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_sdsummary( TQWidget *tqparent, const char * )
   {
-    return new KCMSDSummary( parent, "kcmsdsummary" );
+    return new KCMSDSummary( tqparent, "kcmsdsummary" );
   }
 }
 
-KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMSDSummary::KCMSDSummary( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 6fbb8aee..4369797f 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMSDSUMMARY_H
@@ -36,9 +36,10 @@ class KAboutData;
 class KCMSDSummary : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMSDSummary( TQWidget *parent = 0, const char *name = 0 );
+    KCMSDSummary( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index bd1fa73b..cd4e40d7 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -77,9 +77,9 @@ class SDEntry
     }
 };
 
-SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
+SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent,
                                     const char *name )
-  : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 )
+  : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 )
 {
   // Create the Summary Layout
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
@@ -250,7 +250,7 @@ void SDSummaryWidget::updateView()
     TQString anniversaryAsString =
       (*it).custom( "KADDRESSBOOK" , "X-Anniversary" );
     if ( !anniversaryAsString.isEmpty() ) {
-      TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate );
+      TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate );
       if ( anniversary.isValid() && mShowAnniversariesFromKAB ) {
         SDEntry entry;
         entry.type = IncidenceTypeContact;
@@ -502,7 +502,7 @@ void SDSummaryWidget::updateView()
         urlLabel->installEventFilter( this );
         urlLabel->setURL( (*addrIt).addressee.uid() );
         urlLabel->setText( (*addrIt).addressee.realName() );
-        urlLabel->setTextFormat( Qt::RichText );
+        urlLabel->setTextFormat( TQt::RichText );
         mLayout->addWidget( urlLabel, counter, 4 );
         mLabels.append( urlLabel );
 
@@ -513,7 +513,7 @@ void SDSummaryWidget::updateView()
       } else {
         label = new TQLabel( this );
         label->setText( (*addrIt).summary );
-        label->setTextFormat( Qt::RichText );
+        label->setTextFormat( TQt::RichText );
         mLayout->addWidget( label, counter, 4 );
         mLabels.append( label );
         if ( !(*addrIt).desc.isEmpty() ) {
@@ -556,9 +556,9 @@ void SDSummaryWidget::updateView()
 void SDSummaryWidget::mailContact( const TQString &uid )
 {
   KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
-  TQString email = ab->tqfindByUid( uid ).fullEmail();
+  TQString email = ab->findByUid( uid ).fullEmail();
 
-  kapp->invokeMailer( email, TQString::null );
+  kapp->invokeMailer( email, TQString() );
 }
 
 void SDSummaryWidget::viewContact( const TQString &uid )
@@ -597,7 +597,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 5c52c77c..939ca5bb 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SDSUMMARYWIDGET_H
@@ -43,9 +43,10 @@ class TQLabel;
 class SDSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
+    SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent,
                      const char *name = 0 );
 
     TQStringList configModules() const;
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 70cfa521..9d0b60cf 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kaboutdata.h>
diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h
index eb3a514f..fc359802 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.h
+++ b/kontact/plugins/specialdates/specialdates_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SPECIALDATES_PLUGIN_H
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 5b603982..300d7993 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -23,8 +23,8 @@
 
 #include "dropwidget.h"
 
-DropWidget::DropWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+DropWidget::DropWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   setAcceptDrops( true );
 }
@@ -36,8 +36,8 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int tqalignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
-  tqalignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
+  int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+  tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
   emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index 41c892ea..ee430d90 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -24,12 +24,13 @@
 
 #include <tqwidget.h>
 
-class DropWidget : public QWidget
+class DropWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DropWidget( TQWidget *parent, const char *name = 0 );
+    DropWidget( TQWidget *tqparent, const char *name = 0 );
 
   signals:
     void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 22d27f47..ba78c226 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kaboutdata.h>
@@ -43,16 +43,16 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) {
-    return new KCMKontactSummary( parent, "kcmkontactsummary" );
+  KDE_EXPORT KCModule *create_kontactsummary( TQWidget *tqparent, const char * ) {
+    return new KCMKontactSummary( tqparent, "kcmkontactsummary" );
   }
 }
 
-class PluginItem : public QCheckListItem
+class PluginItem : public TQCheckListItem
 {
   public:
-    PluginItem( KPluginInfo *info, KListView *parent )
-      : TQCheckListItem( parent, TQString::null, TQCheckListItem::CheckBox ),
+    PluginItem( KPluginInfo *info, KListView *tqparent )
+      : TQCheckListItem( tqparent, TQString(), TQCheckListItem::CheckBox ),
         mInfo( info )
     {
       TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
@@ -71,15 +71,15 @@ class PluginItem : public QCheckListItem
       else if ( column == 1 )
         return mInfo->comment();
       else
-        return TQString::null;
+        return TQString();
     }
 
   private:
     KPluginInfo *mInfo;
 };
 
-PluginView::PluginView( TQWidget *parent, const char *name )
-  : KListView( parent, name )
+PluginView::PluginView( TQWidget *tqparent, const char *name )
+  : KListView( tqparent, name )
 {
   addColumn( i18n( "Name" ) );
   setAllColumnsShowFocus( true );
@@ -90,8 +90,8 @@ PluginView::~PluginView()
 {
 }
 
-KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKontactSummary::KCMKontactSummary( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -157,7 +157,7 @@ void KCMKontactSummary::load()
     if ( var.toBool() == true ) {
       PluginItem *item = new PluginItem( *it, mPluginView );
 
-      if ( activeSummaries.find( (*it)->pluginName() ) != activeSummaries.end() )
+      if ( activeSummaries.tqfind( (*it)->pluginName() ) != activeSummaries.end() )
         item->setOn( true );
     }
   }
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index fd1f983d..4545f16d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKONTACTSUMMARY_H
@@ -33,18 +33,20 @@ class KPluginInfo;
 class PluginView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PluginView( TQWidget *parent, const char *name = 0 );
+    PluginView( TQWidget *tqparent, const char *name = 0 );
     ~PluginView();
 };
 
 class KCMKontactSummary : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 );
+    KCMKontactSummary( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index e7c161ea..f28ce79e 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -58,7 +58,7 @@
 #include "summaryview_part.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 
 namespace Kontact
 {
@@ -67,8 +67,8 @@ namespace Kontact
 
 SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
                                   const KAboutData *aboutData,
-                                  TQObject *parent, const char *name )
-  : KParts::ReadOnlyPart( parent, name ),
+                                  TQObject *tqparent, const char *name )
+  : KParts::ReadOnlyPart( tqparent, name ),
     mCore( core ), mFrame( 0 ), mConfigAction( 0 )
 {
   setInstance( new KInstance( aboutData ) );
@@ -168,7 +168,7 @@ void SummaryViewPart::updateWidgets()
   TQValueList<Kontact::Plugin*>::ConstIterator it = plugins.begin();
   for ( ; it != end; ++it ) {
     Kontact::Plugin *plugin = *it;
-    if ( activeSummaries.find( plugin->identifier() ) == activeSummaries.end() )
+    if ( activeSummaries.tqfind( plugin->identifier() ) == activeSummaries.end() )
       continue;
 
     Kontact::Summary *summary = plugin->createSummaryWidget( mFrame );
@@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets()
         mSummaries.insert( plugin->identifier(), summary );
 
         connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                 BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
         connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
                  this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
@@ -197,13 +197,13 @@ void SummaryViewPart::updateWidgets()
   {
     TQStringList::Iterator strIt;
     for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
-      if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
+      if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
         strIt = mLeftColumnSummaries.remove( strIt );
         --strIt;
       }
     }
     for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
-      if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
+      if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
         strIt = mRightColumnSummaries.remove( strIt );
         --strIt;
       }
@@ -223,12 +223,12 @@ void SummaryViewPart::updateWidgets()
 
   TQStringList::Iterator strIt;
   for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
-    if ( mSummaries.find( *strIt ) != mSummaries.end() )
+    if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
       mLeftColumn->addWidget( mSummaries[ *strIt ] );
   }
 
   for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
-    if ( mSummaries.find( *strIt ) != mSummaries.end() )
+    if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
       mRightColumn->addWidget( mSummaries[ *strIt ] );
   }
 
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( tqalignment & Qt::AlignTop )
+    if ( tqalignment & TQt::AlignTop )
       pos = 0;
 
-    if ( tqalignment & Qt::AlignLeft ) {
-      if ( tqalignment & Qt::AlignBottom )
+    if ( tqalignment & TQt::AlignLeft ) {
+      if ( tqalignment & TQt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( tqalignment & Qt::AlignBottom )
+      if ( tqalignment & TQt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( tqalignment == Qt::AlignBottom )
+    if ( tqalignment == TQt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( tqalignment == Qt::AlignBottom )
+    if ( tqalignment == TQt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -428,7 +428,7 @@ TQString SummaryViewPart::widgetName( TQWidget *widget ) const
       return it.key();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 #include "summaryview_part.moc"
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 38e68b15..b04b944a 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -52,11 +52,12 @@ class KCMultiDialog;
 class SummaryViewPart : public KParts::ReadOnlyPart
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     SummaryViewPart( Kontact::Core *core, const char *widgetName,
                      const KAboutData *aboutData,
-                     TQObject *parent = 0, const char *name = 0 );
+                     TQObject *tqparent = 0, const char *name = 0 );
     ~SummaryViewPart();
 
   public slots:
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 82e3db96..44d7c6d8 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -35,6 +35,7 @@ class SummaryViewPart;
 class SummaryView : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     SummaryView( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index b921d025..d8cfe9e6 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "test_part.h"
@@ -41,8 +41,8 @@
 #include <kservice.h>
 
 
-TestPart::TestPart(TQObject *parent, const char *name) // ## tqparentWidget
-  : KParts::ReadOnlyPart(parent, name)
+TestPart::TestPart(TQObject *tqparent, const char *name) // ## tqparentWidget
+  : KParts::ReadOnlyPart(tqparent, name)
 {
   setInstance( new KInstance("testpart") ); // ## memleak
   m_edit = new TQTextEdit;
@@ -85,7 +85,7 @@ bool TestPart::connectToAddressBook()
   {
     TQString error;
     TQCString dcopService;
-    int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString::null, TQString::null, &error, &dcopService );
+    int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString(), TQString(), &error, &dcopService );
     if ( result != 0 ) {
       // You might want to show "error" (if not empty) here, using e.g. KMessageBox
       return false;
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index 8a80dcb4..7f14aed2 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TEST_PART_H
 #define TEST_PART_H
@@ -34,10 +34,11 @@ class KAddressBookIface_stub;
 class TestPart : public KParts::ReadOnlyPart
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  TestPart(TQObject *parent=0, const char *name=0);
+  TestPart(TQObject *tqparent=0, const char *name=0);
     ~TestPart();
 
 protected:
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 93001d2f..4e033fcd 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <kmessagebox.h>
 #include <kaction.h>
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 9d1a0e8e..8a22b33a 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TEST_PLUGIN_H
 #define TEST_PLUGIN_H
@@ -34,6 +34,7 @@ class TestPart;
 class TestPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index abe11764..bc468e84 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <tqimage.h>
 #include <tqlabel.h>
@@ -38,12 +38,12 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
 {
   mLayout = new TQVBoxLayout( this, 3, 3 );
-  mLayout->tqsetAlignment( Qt::AlignTop );
+  mLayout->tqsetAlignment( TQt::AlignTop );
 
   TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -55,7 +55,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
     if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this );
-      mLayout->addWidget( label, Qt::AlignHCenter | AlignVCenter );
+      mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter );
       serviceAvailable = false;
     }
   }
@@ -191,7 +191,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
       emit message(
         i18n( "View Weather Report for Station" ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 0baeefc0..be1c5b9c 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -87,9 +87,10 @@ class WeatherData
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
   public:
-    SummaryWidget( TQWidget *parent, const char *name = 0 );
+    SummaryWidget( TQWidget *tqparent, const char *name = 0 );
 
     TQStringList configModules() const;
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index e671ddeb..e7fef654 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "aboutdialog.h"
@@ -68,7 +68,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
   TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
                                                     KIcon::Desktop, 48 );
 
-  TQFrame *topFrame = addPage( title, TQString::null, pixmap );
+  TQFrame *topFrame = addPage( title, TQString(), pixmap );
 
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
@@ -165,7 +165,7 @@ void AboutDialog::addLicenseText( const KAboutData *about )
 
   TQString title = i18n( "%1 License" ).arg( about->programName() );
 
-  TQFrame *topFrame = addPage( title, TQString::null, pixmap );
+  TQFrame *topFrame = addPage( title, TQString(), pixmap );
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
   KTextBrowser *textBrowser = new KTextBrowser( topFrame );
diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h
index ab8ab1a8..c5faa503 100644
--- a/kontact/src/aboutdialog.h
+++ b/kontact/src/aboutdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONTACT_ABOUTDIALOG_H
 #define KONTACT_ABOUTDIALOG_H
@@ -34,6 +34,7 @@ class Plugin;
 class AboutDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AboutDialog( Kontact::Core *core, const char *name = 0 );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index b54454e1..7e4d027e 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -92,8 +92,8 @@ class PluginProxy
 
 using namespace Kontact;
 
-EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin )
-  : TQListBoxItem( parent ),
+EntryItem::EntryItem( Navigator *tqparent, Kontact::Plugin *plugin )
+  : TQListBoxItem( tqparent ),
     mPlugin( plugin ),
     mHasHover( false ),
     mPaintActive( false )
@@ -137,7 +137,7 @@ int EntryItem::width( const TQListBox *listbox ) const
     if ( navigator()->viewMode() == SmallIcons )
       w += listbox->fontMetrics().width( text() );
     else
-      w = QMAX( w, listbox->fontMetrics().width( text() ) );
+      w = TQMAX( w, listbox->fontMetrics().width( text() ) );
   }
   return w + ( KDialog::marginHint() * 2 );
 }
@@ -149,7 +149,7 @@ int EntryItem::height( const TQListBox *listbox ) const
     h = (int)navigator()->viewMode() + 4;
   if ( navigator()->showText() ) {
     if ( navigator()->viewMode() == SmallIcons || !navigator()->showIcons() )
-      h = QMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2;
+      h = TQMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2;
     else
       h = (int)navigator()->viewMode() + listbox->fontMetrics().lineSpacing() + 4;
   }
@@ -250,8 +250,8 @@ void EntryItem::setPaintActive( bool paintActive )
   mPaintActive = paintActive;
 }
 
-Navigator::Navigator( IconSidePane *parent, const char *name )
-  : KListBox( parent, name ), mSidePane( parent ),
+Navigator::Navigator( IconSidePane *tqparent, const char *name )
+  : KListBox( tqparent, name ), mSidePane( tqparent ),
     mShowIcons( true ), mShowText( true )
 {
   mMouseOn = 0;
@@ -399,7 +399,7 @@ void Navigator::resizeEvent( TQResizeEvent *event )
 
 void Navigator::enterEvent( TQEvent *event )
 {
-  // work around Qt behaviour: onItem is not emmitted in enterEvent()
+  // work around TQt behaviour: onItem is not emmitted in enterEvent()
   KListBox::enterEvent( event );
   emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) );
 }
@@ -535,8 +535,8 @@ void Navigator::slotMouseOff()
   slotMouseOn( 0 );
 }
 
-IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name )
-  : SidePaneBase( core, parent, name )
+IconSidePane::IconSidePane( Core *core, TQWidget *tqparent, const char *name )
+  : SidePaneBase( core, tqparent, name )
 {
   mNavigator = new Navigator( this );
   connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index a5aad36a..d7cc532d 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -48,7 +48,7 @@ enum IconViewMode { LargeIcons = 48, NormalIcons = 32, SmallIcons = 22, ShowText
   A TQListBoxPixmap Square Box with an optional icon and a text
   underneath.
 */
-class EntryItem : public QListBoxItem
+class EntryItem : public TQListBoxItem
 {
   public:
     EntryItem( Navigator *, Kontact::Plugin * );
@@ -86,13 +86,13 @@ class EntryItem : public QListBoxItem
 
 /**
  * Tooltip that changes text depending on the item it is above.
- * Compliments of "Practical Qt" by Dalheimer, Petersen et al.
+ * Compliments of "Practical TQt" by Dalheimer, Petersen et al.
  */
-class EntryItemToolTip : public QToolTip
+class EntryItemToolTip : public TQToolTip
 {
   public:
-    EntryItemToolTip( TQListBox* parent )
-      : TQToolTip( parent->viewport() ), mListBox( parent )
+    EntryItemToolTip( TQListBox* tqparent )
+      : TQToolTip( tqparent->viewport() ), mListBox( tqparent )
       {}
   protected:
     void maybeTip( const TQPoint& p ) {
@@ -118,8 +118,9 @@ class EntryItemToolTip : public QToolTip
 class Navigator : public KListBox
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    Navigator( IconSidePane *parent = 0, const char *name = 0 );
+    Navigator( IconSidePane *tqparent = 0, const char *name = 0 );
 
     virtual void setSelected( TQListBoxItem *, bool );
 
@@ -173,8 +174,9 @@ class Navigator : public KListBox
 class IconSidePane : public SidePaneBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    IconSidePane( Core *core, TQWidget *parent, const char *name = 0 );
+    IconSidePane( Core *core, TQWidget *tqparent, const char *name = 0 );
     ~IconSidePane();
 
     virtual void indicateForegrunding( Kontact::Plugin* );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2162ffa0..2e7c61f8 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kcmkontact.h"
@@ -42,16 +42,16 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
-    return new KcmKontact( parent, "kcmkontact" );
+  KDE_EXPORT KCModule *create_kontactconfig( TQWidget *tqparent, const char * ) {
+    return new KcmKontact( tqparent, "kcmkontact" );
   }
 }
 
-class PluginItem : public QListViewItem
+class PluginItem : public TQListViewItem
 {
   public:
-    PluginItem( TQListView *parent, const KService::Ptr &ptr )
-      : TQListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ),
+    PluginItem( TQListView *tqparent, const KService::Ptr &ptr )
+      : TQListViewItem( tqparent, ptr->name(), ptr->comment(), ptr->library() ),
         mPtr( ptr )
     {
     }
@@ -65,8 +65,8 @@ class PluginItem : public QListViewItem
     KService::Ptr mPtr;
 };
 
-KcmKontact::KcmKontact( TQWidget *parent, const char *name )
-  : KPrefsModule( Kontact::Prefs::self(), parent, name )
+KcmKontact::KcmKontact( TQWidget *tqparent, const char *name )
+  : KPrefsModule( Kontact::Prefs::self(), tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   TQBoxLayout *pluginStartupLayout = new TQHBoxLayout( topLayout );
@@ -100,10 +100,10 @@ const KAboutData* KcmKontact::aboutData() const
 }
 
 
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent )
 {
   mItem = item;
-  mPluginCombo = new TQComboBox( parent );
+  mPluginCombo = new TQComboBox( tqparent );
   connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
 }
 
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index ed926db4..1d3f04a6 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKONTACT_H
@@ -39,9 +39,10 @@ class KListView;
 class KcmKontact : public KPrefsModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KcmKontact( TQWidget *parent = 0, const char *name = 0 );
+    KcmKontact( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual const KAboutData* aboutData() const;
 };
@@ -49,9 +50,10 @@ class KcmKontact : public KPrefsModule
 class PluginSelection : public KPrefsWid
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
+    PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent );
     ~PluginSelection();
 
     void readConfig();
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index ab613466..0e56f918 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -87,8 +87,8 @@ using namespace Kontact;
 class SettingsDialogWrapper : public KSettings::Dialog
 {
   public:
-    SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 )
-      : KSettings::Dialog( content, parent, 0 )
+    SettingsDialogWrapper( ContentInListView content, TQWidget * tqparent = 0 )
+      : KSettings::Dialog( content, tqparent, 0 )
     {
     }
 
@@ -185,9 +185,9 @@ void MainWindow::initObject()
   showTip( false );
 
   // done initializing
-  slotShowStatusMsg( TQString::null );
+  slotShowStatusMsg( TQString() );
 
-  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
@@ -787,7 +787,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     return;
   }
 
-  KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   KParts::Part *part = plugin->part();
 
@@ -805,12 +805,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   TQWidget *tqfocusWidget = kapp->tqfocusWidget();
   if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = tqfocusWidget->tqparentWidget();
-    while ( parent ) {
-      if ( parent == mCurrentPlugin->part()->widget() )
+    TQWidget *tqparent = tqfocusWidget->tqparentWidget();
+    while ( tqparent ) {
+      if ( tqparent == mCurrentPlugin->part()->widget() )
         mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
 
-      parent = parent->tqparentWidget();
+      tqparent = tqparent->tqparentWidget();
     }
   }
 
@@ -1027,7 +1027,7 @@ void MainWindow::updateConfig()
 
 void MainWindow::showAboutDialog()
 {
-  KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   if ( !mAboutDialog )
     mAboutDialog = new AboutDialog( this );
@@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
       if ( !url.query().isEmpty() ) {
         app = url.query().mid( 1 );
       }
-      kapp->invokeHelp( TQString::null, app );
+      kapp->invokeHelp( TQString(), app );
     }
   } else {
     new KRun( url, this );
@@ -1101,7 +1101,7 @@ void MainWindow::readProperties( KConfig *config )
   for ( ; it != end; ++it ) {
     Plugin *plugin = *it;
     if ( !plugin->isRunningStandalone() ) {
-      TQStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() );
+      TQStringList::ConstIterator activePlugin = activePlugins.tqfind( plugin->identifier() );
       if ( activePlugin != activePlugins.end() ) {
         plugin->readProperties( config );
       }
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 5d5945b6..6732ed27 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -67,6 +67,7 @@ typedef TQPtrList<KAction> ActionPluginList;
 class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     MainWindow();
@@ -74,8 +75,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
 
     // KDCOPServiceStarter interface
     virtual int startServiceFor( const TQString& serviceType,
-                                 const TQString& constraint = TQString::null,
-                                 const TQString& preferences = TQString::null,
+                                 const TQString& constraint = TQString(),
+                                 const TQString& preferences = TQString(),
                                  TQString *error = 0, TQCString* dcopService = 0,
                                  int flags = 0 );
 
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 5d440e5f..cb28d119 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "profiledialog.h"
@@ -34,7 +34,7 @@
 #include <tqpushbutton.h>
 #include <tqstring.h>
 
-Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close )
+Kontact::ProfileDialog::ProfileDialog( TQWidget* tqparent, WFlags flags ) : KDialogBase( tqparent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close )
 {
     setWFlags( flags );
     setCaption( i18n("Configure Profiles") );
diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h
index b20a8698..fc9559b5 100644
--- a/kontact/src/profiledialog.h
+++ b/kontact/src/profiledialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KONTACT_PROFILEDIALOG_H
@@ -40,9 +40,10 @@ namespace Kontact {
 class ProfileDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 );
+    explicit ProfileDialog( TQWidget* tqparent = 0, WFlags f = 0 );
 
 private:
     enum ListColumn {
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 804f65e3..deed6f37 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "profilemanager.h"
@@ -131,7 +131,7 @@ Kontact::ProfileManager* Kontact::ProfileManager::self()
     return m_self;
 }
 
-Kontact::ProfileManager::ProfileManager( TQObject* parent ) : TQObject( parent )
+Kontact::ProfileManager::ProfileManager( TQObject* tqparent ) : TQObject( tqparent )
 {
 }
 
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 0b335b95..b7abdcb3 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KONTACT_PROFILEMANAGER_H
@@ -86,9 +86,10 @@ private:
     TQString m_originalLocation;
 };
 
-class ProfileManager : public QObject
+class ProfileManager : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     enum ImportError {
         SuccessfulImport=0,
@@ -145,7 +146,7 @@ private:
 
     static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal );
 
-    explicit ProfileManager( TQObject* parent = 0 );
+    explicit ProfileManager( TQObject* tqparent = 0 );
 
     void readConfig();
 
diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp
index 92a3ce51..486e273b 100644
--- a/kontact/src/sidepanebase.cpp
+++ b/kontact/src/sidepanebase.cpp
@@ -25,8 +25,8 @@
 
 using namespace Kontact;
 
-SidePaneBase::SidePaneBase( Core *core, TQWidget *parent, const char *name )
-  : TQVBox( parent, name ), mCore( core )
+SidePaneBase::SidePaneBase( Core *core, TQWidget *tqparent, const char *name )
+  : TQVBox( tqparent, name ), mCore( core )
 {
 }
 
diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h
index 0b4a7a54..77acc66f 100644
--- a/kontact/src/sidepanebase.h
+++ b/kontact/src/sidepanebase.h
@@ -31,11 +31,12 @@ namespace Kontact
 class Core;
 class Plugin;
 
-class SidePaneBase : public QVBox
+class SidePaneBase : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 );
+    SidePaneBase( Core *core, TQWidget *tqparent, const char *name = 0 );
     virtual ~SidePaneBase();
 
   signals:
diff --git a/korganizer/COPYING b/korganizer/COPYING
index 54754ab4..b55fa146 100644
--- a/korganizer/COPYING
+++ b/korganizer/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp
index b5fb98c3..44ff41fe 100644
--- a/korganizer/aboutdata.cpp
+++ b/korganizer/aboutdata.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "aboutdata.h"
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 7edfc615..73a9b98e 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_ABOUTDATA_H
 #define KORG_ABOUTDATA_H
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 8b938986..09b5c6f4 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -21,8 +21,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
   As a special exception, permission is given to link this program
-  with any edition of Qt, and distribute the resulting executable,
-  without including the source code for Qt in the source distribution.
+  with any edition of TQt, and distribute the resulting executable,
+  without including the source code for TQt in the source distribution.
 */
 
 #include "actionmanager.h"
@@ -81,9 +81,9 @@
 KOWindowList *ActionManager::mWindowList = 0;
 
 ActionManager::ActionManager( KXMLGUIClient *client, CalendarView *widget,
-                              TQObject *parent, KOrg::MainWindow *mainWindow,
+                              TQObject *tqparent, KOrg::MainWindow *mainWindow,
                               bool isPart )
-  : TQObject( parent ), KCalendarIface(), mRecent( 0 ),
+  : TQObject( tqparent ), KCalendarIface(), mRecent( 0 ),
     mResourceButtonsAction( 0 ), mResourceViewShowAction( 0 ), mCalendar( 0 ),
     mCalendarResources( 0 ), mResourceView( 0 ), mIsClosing( false )
 {
@@ -130,7 +130,7 @@ void ActionManager::init()
       TQTimer::singleShot( 0, this, TQT_SLOT( showTipOnStart() ) );
   }
   // Note: We need this ActionManager to be fully constructed, and
-  // parent() to have a valid reference to it before the following
+  // tqparent() to have a valid reference to it before the following
   // addWindow is called.
   mWindowList->addWindow( mMainWindow );
 
@@ -313,10 +313,10 @@ void ActionManager::initActions()
                                mCalendarView, TQT_SLOT( appointment_delete() ),
                                mACollection, "edit_delete" );
   if ( mIsPart ) {
-    KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
-                      mACollection, "korganizer_find" );
+    KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+                      mACollection, "korganizer_tqfind" );
   } else {
-    KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+    KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
                       mACollection );
   }
   pasteAction->setEnabled( false );
@@ -402,7 +402,7 @@ void ActionManager::initActions()
 
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  // TODO: try to find / create better icons for the following 4 actions
+  // TODO: try to tqfind / create better icons for the following 4 actions
   new KAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ),
                     mACollection, "zoom_in_horizontally" );
@@ -522,7 +522,7 @@ void ActionManager::initActions()
   connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
            mSendCancel, TQT_SLOT(setEnabled(bool)) );
 
-  mSendStatusUpdate = new KAction( i18n( "Send Status &Update" ),
+  mSendStatusUpdate = new KAction( i18n( "Send tqStatus &Update" ),
                                    "mail_reply", 0,
                                    mCalendarView,TQT_SLOT(schedule_reply()),
                                    mACollection, "schedule_reply" );
@@ -1162,7 +1162,7 @@ bool ActionManager::saveModifiedURL()
     int result = KMessageBox::warningYesNoCancel(
         dialogParent(),
         i18n("The calendar has been modified.\nDo you want to save it?"),
-        TQString::null,
+        TQString(),
         KStdGuiItem::save(), KStdGuiItem::discard() );
     switch( result ) {
       case KMessageBox::Yes:
@@ -1305,7 +1305,7 @@ void ActionManager::configureDateTime()
 
 void ActionManager::showTip()
 {
-  KTipDialog::showTip( dialogParent(),TQString::null,true );
+  KTipDialog::showTip( dialogParent(),TQString(),true );
 }
 
 void ActionManager::showTipOnStart()
@@ -1534,7 +1534,7 @@ void ActionManager::setTitle()
   mMainWindow->setTitle();
 }
 
-KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQValueList<QPair<TQDateTime, TQDateTime> >&,
+KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQValueList<TQPair<TQDateTime, TQDateTime> >&,
  const TQCString& resource,
  const TQString& vCalIn )
 {
@@ -1544,9 +1544,9 @@ KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQVal
     return reply;
 }
 
-QPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
+TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
 {
-  QPair<ResourceCalendar *, TQString> p( 0, TQString() );
+  TQPair<ResourceCalendar *, TQString> p( 0, TQString() );
 
   // return now if we are running as a part and we aren't the currently active part
   if ( mIsPart && !mMainWindow->isCurrentlyActivePart() ) {
@@ -1634,7 +1634,7 @@ bool ActionManager::isWritable( ResourceCalendar *res, const TQString &subRes,
 
 void ActionManager::openEventEditor( const TQString& text )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   if ( isWritable( p.first, p.second, "event" ) ) {
     mCalendarView->newEvent( p.first, p.second, text );
   }
@@ -1644,7 +1644,7 @@ void ActionManager::openEventEditor( const TQString& summary,
                                      const TQString& description,
                                      const TQString& attachment )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newEvent( p.first, p.second, summary, description, attachment );
 }
 
@@ -1708,11 +1708,11 @@ void ActionManager::openEventEditor( const TQString & summary,
           return;
         // due to kmime shortcomings in KDE3, we need to assemble the result manually
         int begin = 0;
-        int end = head.find( '\n' );
+        int end = head.tqfind( '\n' );
         bool skipFolded = false;
         while ( end >= 0 && end > begin ) {
-          if ( head.find( "Content-Type:", begin, false ) != begin &&
-                head.find( "Content-Transfer-Encoding:", begin, false ) != begin &&
+          if ( head.tqfind( "Content-Type:", begin, false ) != begin &&
+                head.tqfind( "Content-Transfer-Encoding:", begin, false ) != begin &&
                 !(skipFolded && (head[begin] == ' ' || head[end] == '\t')) ) {
             TQCString line = head.mid( begin, end - begin );
             tf.file()->writeBlock( line.data(), line.length() );
@@ -1723,7 +1723,7 @@ void ActionManager::openEventEditor( const TQString & summary,
           }
 
           begin = end + 1;
-          end = head.find( '\n', begin );
+          end = head.tqfind( '\n', begin );
           if ( end < 0 && begin < (int)head.length() )
             end = head.length() - 1;
         }
@@ -1748,14 +1748,14 @@ void ActionManager::openEventEditor( const TQString & summary,
       return;
   }
 
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newEvent( p.first, p.second, summary, description, attData,
                            attendees, attachmentMimetype, action != KOPrefs::Link );
 }
 
 void ActionManager::openTodoEditor( const TQString& text )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   if ( isWritable( p.first, p.second, "todo" ) ) {
     mCalendarView->newTodo( p.first, p.second, text );
   }
@@ -1765,7 +1765,7 @@ void ActionManager::openTodoEditor( const TQString& summary,
                                     const TQString& description,
                                     const TQString& attachment )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newTodo( p.first, p.second, summary, description, attachment );
 }
 
@@ -1774,7 +1774,7 @@ void ActionManager::openTodoEditor( const TQString& summary,
                                     const TQString& attachment,
                                     const TQStringList& attendees )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newTodo( p.first, p.second, summary, description, attachment, attendees );
 }
 
@@ -1814,7 +1814,7 @@ void ActionManager::openTodoEditor(const TQString & summary,
       return;
   }
 
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newTodo( p.first, p.second,
                           summary, description,
                           attData, attendees,
@@ -1825,19 +1825,19 @@ void ActionManager::openTodoEditor(const TQString & summary,
 
 void ActionManager::openJournalEditor( const TQDate& date )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newJournal( p.first, p.second, date );
 }
 
 void ActionManager::openJournalEditor( const TQString& text, const TQDate& date )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   mCalendarView->newJournal( p.first, p.second, text, date );
 }
 
 void ActionManager::openJournalEditor( const TQString& text )
 {
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
   if ( isWritable( p.first, p.second, "journal" ) ) {
     mCalendarView->newJournal( p.first, p.second, text );
   }
@@ -1848,7 +1848,7 @@ void ActionManager::openJournalEditor( const TQString& text )
 //                                        const TQString& description,
 //                                        const TQString& attachment )
 // {
-//   QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+//   TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
 //   mCalendarView->newJournal( p.first, p.second, summary, description, attachment );
 // }
 
@@ -1916,12 +1916,12 @@ bool ActionManager::queryClose()
 
   if ( mCalendar && mCalendar->isModified() ) {
     int res = KMessageBox::questionYesNoCancel( dialogParent(),
-      i18n("The calendar tqcontains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+      i18n("The calendar contains unsaved changes. Do you want to save them before exiting?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
     // Exit on yes and no, don't exit on cancel. If saving fails, ask for exiting.
     if ( res == KMessageBox::Yes ) {
       close = saveModifiedURL();
       if ( !close ) {
-        int res1 = KMessageBox::questionYesNo( dialogParent(), i18n("Unable to save the calendar. Do you still want to close this window?"), TQString::null, KStdGuiItem::close(), KStdGuiItem::cancel() );
+        int res1 = KMessageBox::questionYesNo( dialogParent(), i18n("Unable to save the calendar. Do you still want to close this window?"), TQString(), KStdGuiItem::close(), KStdGuiItem::cancel() );
         close = ( res1 == KMessageBox::Yes );
       }
     } else {
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 555d4e7d..0a53255f 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -21,8 +21,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_ACTIONMANAGER_H
 #define KORG_ACTIONMANAGER_H
@@ -73,9 +73,10 @@ using namespace KCal;
 class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ActionManager( KXMLGUIClient *client, CalendarView *widget,
-                   TQObject *parent, KOrg::MainWindow *mainWindow,
+                   TQObject *tqparent, KOrg::MainWindow *mainWindow,
                    bool isPart );
     virtual ~ActionManager();
 
@@ -162,7 +163,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     bool addIncidence( const TQString& ical );
 
     //// Implementation of the DCOP interface
-    virtual ResourceRequestReply resourceRequest( const TQValueList<QPair<TQDateTime, TQDateTime> >& busy,
+    virtual ResourceRequestReply resourceRequest( const TQValueList<TQPair<TQDateTime, TQDateTime> >& busy,
                                                   const TQCString& resource,
                                                   const TQString& vCalIn );
 
@@ -356,7 +357,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void initCalendar( Calendar *cal );
 
     /**
-      Return widget used as parent for dialogs and message boxes.
+      Return widget used as tqparent for dialogs and message boxes.
     */
     TQWidget *dialogParent();
 
@@ -370,7 +371,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void initActions();
     void enableIncidenceActions( bool enable );
 
-    QPair<ResourceCalendar *, TQString> viewSubResourceCalendar();
+    TQPair<ResourceCalendar *, TQString> viewSubResourceCalendar();
     bool isWritable( ResourceCalendar *res, const TQString &subRes, const TQString &contentsType );
 
     KOrg::Part::List mParts; // List of parts loaded
diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp
index df141789..f2d7f987 100644
--- a/korganizer/agendaview.cpp
+++ b/korganizer/agendaview.cpp
@@ -22,8 +22,8 @@
 
 using namespace KOrg;
 
-AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) :
-    KOEventView( cal, parent, name )
+AgendaView::AgendaView(Calendar * cal, TQWidget * tqparent, const char * name) :
+    KOEventView( cal, tqparent, name )
 {
   KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal );
   if ( calres ) {
diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h
index cf262dac..83ef5e6a 100644
--- a/korganizer/agendaview.h
+++ b/korganizer/agendaview.h
@@ -27,8 +27,9 @@ namespace KOrg {
 class AgendaView : public KOEventView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 );
+    AgendaView( Calendar *cal,TQWidget *tqparent=0,const char *name=0 );
 
     virtual void setTypeAheadReceiver( TQObject * ) = 0;
 
diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp
index 48c299e0..f9676161 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 // ArchiveDialog -- archive/delete past events.
@@ -51,9 +51,9 @@
 #include <tqradiobutton.h>
 #include "archivedialog.moc"
 
-ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name)
+ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *tqparent, const char *name)
   : KDialogBase (Plain,i18n("Archive/Delete Past Events and To-dos"),
-                 User1|Cancel,User1,parent,name,false,true,
+                 User1|Cancel,User1,tqparent,name,false,true,
                  i18n("&Archive"))
 {
   mCalendar = cal;
diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h
index 011e213f..c6319409 100644
--- a/korganizer/archivedialog.h
+++ b/korganizer/archivedialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _ARCHIVE_DLG
 #define _ARCHIVE_DLG
@@ -41,8 +41,9 @@ using namespace KCal;
 class ArchiveDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0);
+    ArchiveDialog(Calendar *calendar,TQWidget *tqparent=0, const char *name=0);
     virtual ~ArchiveDialog();
 
   signals:
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 91b42b1e..84199bfe 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -26,8 +26,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "calendarview.h"
@@ -112,8 +112,8 @@
 
 using namespace KOrg;
 
-CalendarView::CalendarView( TQWidget *parent, const char *name )
-  : CalendarViewBase( parent, name ),
+CalendarView::CalendarView( TQWidget *tqparent, const char *name )
+  : CalendarViewBase( tqparent, name ),
     mHistory( 0 ),
     mCalendar( CalendarNull::self() ),
     mChanger( 0 )
@@ -349,9 +349,9 @@ Calendar *CalendarView::calendar()
   else return CalendarNull::self();
 }
 
-QPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
+TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
 {
-  QPair<ResourceCalendar *, TQString> p( 0, TQString() );
+  TQPair<ResourceCalendar *, TQString> p( 0, TQString() );
   KOrg::BaseView *cV = mViewManager->currentView();
   if ( cV && cV == mViewManager->multiAgendaView() ) {
     cV = mViewManager->multiAgendaView()->selectedAgendaView();
@@ -364,7 +364,7 @@ QPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
 
 KOIncidenceEditor *CalendarView::editorDialog( Incidence *incidence ) const
 {
-  if (mDialogList.find(incidence) != mDialogList.end ())
+  if (mDialogList.tqfind(incidence) != mDialogList.end ())
     return mDialogList[incidence];
   else return 0;
 }
@@ -456,13 +456,13 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge)
         i18n( "No calendars found, unable to merge the file into your calendar." ) );
       return false;
     }
-    // FIXME: This is a nasty hack, since we need to set a parent for the
+    // FIXME: This is a nasty hack, since we need to set a tqparent for the
     //        resource selection dialog. However, we don't have any UI methods
     //        in the calendar, only in the CalendarResources::DestinationPolicy
     //        So we need to type-cast it and extract it from the CalendarResources
-    TQWidget *tmpparent = 0;
+    TQWidget *tmptqparent = 0;
     if ( cl ) {
-      tmpparent = cl->dialogParentWidget();
+      tmptqparent = cl->dialogParentWidget();
       cl->setDialogParentWidget( this );
     }
 
@@ -660,7 +660,7 @@ void CalendarView::writeFilterSettings( KConfig *config )
   if ( mCurrentFilter ) {
     config->writeEntry( "Current Filter", mCurrentFilter->name() );
   } else {
-    config->writeEntry( "Current Filter", TQString::null );
+    config->writeEntry( "Current Filter", TQString() );
   }
 }
 
@@ -935,7 +935,7 @@ void CalendarView::edit_cut()
     incidences.append( incidence );
     makeChildrenIndependent( incidence );
   } else if ( km == KMessageBox::No ) { // all
-    // load incidence + children + grandchildren...
+    // load incidence + tqchildren + grandtqchildren...
     getIncidenceHierarchy( incidence, incidences );
   }
 
@@ -971,7 +971,7 @@ void CalendarView::edit_copy()
   if ( km == KMessageBox::Yes ) { // only one
     incidences.append( incidence );
   } else if ( km == KMessageBox::No ) { // all
-    // load incidence + children + grandchildren...
+    // load incidence + tqchildren + grandtqchildren...
     getIncidenceHierarchy( incidence, incidences );
   }
 
@@ -1075,7 +1075,7 @@ void CalendarView::edit_paste()
 
   Incidence::List::Iterator it;
   for ( it = pastedIncidences.begin(); it != pastedIncidences.end(); ++it ) {
-    QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+    TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
 
     // FIXME: use a visitor here
     if ( ( *it )->type() == "Event" ) {
@@ -1137,7 +1137,7 @@ KOEventEditor *CalendarView::newEventEditor( ResourceCalendar *res, const TQStri
   // let the current view change the default start/end datetime
   bool allDay = allDayParam;
   TQDateTime startDt( startDtParam ), endDt( endDtParam );
-  // Adjust the start/end date times (i.e. tqreplace invalid values by defaults,
+  // Adjust the start/end date times (i.e. replace invalid values by defaults,
   // and let the view adjust the type.
   dateTimesForNewEvent( startDt, endDt, allDay );
 
@@ -1283,13 +1283,13 @@ void CalendarView::newJournal()
 void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes )
 {
   kdDebug(5850) << "CalendarView::newJournal()" << endl;
-  newJournal( res, subRes, TQString::null, TQDate() );
+  newJournal( res, subRes, TQString(), TQDate() );
 }
 
 void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes,
                                const TQDate &date)
 {
-  newJournal( res, subRes, TQString::null, date );
+  newJournal( res, subRes, TQString(), date );
 }
 
 void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes,
@@ -1314,12 +1314,12 @@ void CalendarView::newSubTodo()
   if ( todo ) newSubTodo( todo );
 }
 
-void CalendarView::newSubTodo(Todo *parentEvent)
+void CalendarView::newSubTodo(Todo *tqparentEvent)
 {
   KOTodoEditor *todoEditor = mDialogManager->getTodoEditor();
   connectIncidenceEditor( todoEditor );
   todoEditor->newTodo();
-  todoEditor->setDates( TQDateTime(), false, parentEvent );
+  todoEditor->setDates( TQDateTime(), false, tqparentEvent );
   todoEditor->show();
 }
 
@@ -1494,7 +1494,7 @@ void CalendarView::dissociateOccurrence( Incidence *incidence, const TQDate &dat
     return;
   }
 
-  QPair<ResourceCalendar *, TQString>p =
+  TQPair<ResourceCalendar *, TQString>p =
     CalHelper::incSubResourceCalendar( calendar(), incidence );
 
   if ( !mChanger->beginChange( incidence, p.first, p.second ) ) {
@@ -1528,7 +1528,7 @@ void CalendarView::dissociateFutureOccurrence( Incidence *incidence, const TQDat
     return;
   }
 
-  QPair<ResourceCalendar *, TQString>p =
+  TQPair<ResourceCalendar *, TQString>p =
     CalHelper::incSubResourceCalendar( calendar(), incidence );
 
   if ( !mChanger->beginChange( incidence, p.first, p.second ) ) {
@@ -1976,7 +1976,7 @@ void CalendarView::updateFilter()
   TQStringList filters;
   CalFilter *filter;
 
-  int pos = mFilters.find( mCurrentFilter );
+  int pos = mFilters.tqfind( mCurrentFilter );
   if ( pos < 0 ) {
     mCurrentFilter = 0;
   }
@@ -2216,13 +2216,13 @@ bool CalendarView::editIncidence( Incidence *incidence, const TQDate &date, bool
     return false;
   }
 
-  // FIXME: This is a nasty hack, since we need to set a parent for the
+  // FIXME: This is a nasty hack, since we need to set a tqparent for the
   //        resource selection dialog. However, we don't have any UI methods
   //        in the calendar, only in the CalendarResources::DestinationPolicy
   //        So we need to type-cast it and extract it from the CalendarResources
-  TQWidget *tmpparent = 0;
+  TQWidget *tmptqparent = 0;
   if ( stdcal ) {
-    tmpparent = stdcal->dialogParentWidget();
+    tmptqparent = stdcal->dialogParentWidget();
     stdcal->setDialogParentWidget( this );
   }
 
@@ -2252,7 +2252,7 @@ bool CalendarView::editIncidence( Incidence *incidence, const TQDate &date, bool
     return true;
   }
 
-  QPair<ResourceCalendar *, TQString>p =
+  TQPair<ResourceCalendar *, TQString>p =
     CalHelper::incSubResourceCalendar( calendar(), incidence );
 
   Incidence *savedIncidence = incidence->clone();
@@ -2343,7 +2343,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force )
   // Delete only the father
   if( km == KMessageBox::Yes ) {
     // Instead of making a subto-do independent, why not relate
-    // it to it's dead father's parent?
+    // it to it's dead father's tqparent?
     makeChildrenIndependent ( todo );
     mChanger->deleteIncidence( todo, this );
   } else if ( km == KMessageBox::No ) {
@@ -2377,7 +2377,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
   CanDeleteIncidenceVisitor v;
 
   // Let the visitor do special things for special incidence types.
-  // e.g. todos with children cannot be deleted, so act(..) returns false
+  // e.g. todos with tqchildren cannot be deleted, so act(..) returns false
   if ( !v.act( incidence, this ) )
     return;
   //If it is a todo, there are specific delete function
@@ -2412,7 +2412,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
       }
     }
 
-    QPair<ResourceCalendar *, TQString>p =
+    TQPair<ResourceCalendar *, TQString>p =
       CalHelper::incSubResourceCalendar( calendar(), incidence );
 
     switch(km) {
@@ -2428,8 +2428,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
               // Moving the first in a series...don't bother with the nonstandard exclusion list
               Recurrence *recur = incidence->recurrence();
               Event* thisevent = static_cast<Event*>(incidence);
-              QDateTime newEnd;
-              QDateTime newRecurEnd;
+              TQDateTime newEnd;
+              TQDateTime newRecurEnd;
               newRecurEnd = recur->endDateTime();
               newEnd.setTime_t( incidence->dtEnd().toTime_t() + ( recur->getNextDateTime( recur->startDateTime() ).toTime_t() - recur->startDateTime().toTime_t()  ) );
               thisevent->setDtEnd( newEnd  );
@@ -2524,14 +2524,14 @@ void CalendarView::purgeCompleted()
       if ( aTodo && !aTodo->relatedTo() )
         rootTodos.append( aTodo );
     }
-    // now that we have a list of all root todos, check them and their children
+    // now that we have a list of all root todos, check them and their tqchildren
     for ( it = rootTodos.begin(); it != rootTodos.end(); ++it ) {
       purgeCompletedSubTodos( *it, allDeleted );
     }
     endMultiModify();
     if ( !allDeleted ) {
       KMessageBox::information( this, i18n("Unable to purge to-dos with "
-                                "uncompleted children."), i18n("Delete To-do"),
+                                "uncompleted tqchildren."), i18n("Delete To-do"),
                                 "UncompletedChildrenPurgeTodos" );
     }
   }
@@ -2563,7 +2563,7 @@ void CalendarView::updateCategories()
   allCats.sort();
   TQStringList categories( KOPrefs::instance()->mCustomCategories );
   for ( TQStringList::ConstIterator si = allCats.constBegin(); si != allCats.constEnd(); ++si ) {
-    if ( categories.find( *si ) == categories.end() ) {
+    if ( categories.tqfind( *si ) == categories.end() ) {
       categories.append( *si );
     }
   }
@@ -2609,7 +2609,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt )
     todo->setHasDueDate( true );
   }
 
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
 
   if ( !mChanger->addIncidence( incidence, p.first, p.second, this ) ) {
     KODialogManager::errorSaveIncidence( this, incidence );
@@ -2631,7 +2631,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt )
   }
 
   Incidence *oldIncidence = incidence->clone();
-  QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
 
   if ( !mChanger->beginChange( incidence, p.first, p.second ) ) {
     delete oldIncidence;
@@ -2774,7 +2774,7 @@ Incidence* CalendarView::singleOccurrenceOrAll( Incidence *inc,
   }
 
   if ( dissociationOccurred && commitToCalendar ) {
-    QPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
+    TQPair<ResourceCalendar *, TQString>p = viewSubResourceCalendar();
     mChanger->addIncidence( incToReturn, p.first, p.second, this );
     mChanger->changeIncidence( incSaved, inc, whatChanged, this );
   }
@@ -2794,16 +2794,16 @@ void CalendarView::selectWeek( const TQDate &date )
 }
 
 void CalendarView::getIncidenceHierarchy( Incidence *inc,
-                                          Incidence::List &children )
+                                          Incidence::List &tqchildren )
 {
   // protecion against looping hierarchies
-  if ( inc && !children.tqcontains( inc ) ) {
+  if ( inc && !tqchildren.tqcontains( inc ) ) {
     Incidence::List::ConstIterator it;
     Incidence::List immediateChildren = inc->relations();
     for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) {
-      getIncidenceHierarchy( *it, children );
+      getIncidenceHierarchy( *it, tqchildren );
     }
-    children.append( inc );
+    tqchildren.append( inc );
   }
 }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 6cdc3154..cd04ee98 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef CALENDARVIEW_H
 #define CALENDARVIEW_H
@@ -56,16 +56,16 @@ class HTMLExportSettings;
 using namespace KOrg;
 using namespace KCal;
 
-class CalendarViewExtension : public QWidget
+class CalendarViewExtension : public TQWidget
 {
   public:
-    CalendarViewExtension( TQWidget *parent, const char *name = 0 )
-      : TQWidget( parent, name ) {}
+    CalendarViewExtension( TQWidget *tqparent, const char *name = 0 )
+      : TQWidget( tqparent, name ) {}
 
     class Factory
     {
       public:
-        virtual CalendarViewExtension *create( TQWidget *parent ) = 0;
+        virtual CalendarViewExtension *create( TQWidget *tqparent ) = 0;
     };
 };
 
@@ -81,14 +81,15 @@ class CalendarViewExtension : public QWidget
 class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a new calendar view widget.
 
-      @param parent   parent window
-      @param name     Qt internal widget object name
+      @param tqparent   tqparent window
+      @param name     TQt internal widget object name
     */
-    CalendarView( TQWidget *parent = 0, const char *name = 0 );
+    CalendarView( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~CalendarView();
 
     class CalendarViewVisitor : public IncidenceBase::Visitor
@@ -115,7 +116,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     void setCalendar( Calendar * );
     Calendar *calendar();
 
-    QPair<ResourceCalendar *, TQString> viewSubResourceCalendar();
+    TQPair<ResourceCalendar *, TQString> viewSubResourceCalendar();
 
     KOrg::History *history() const { return mHistory; }
 
@@ -288,7 +289,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     */
     void newEvent( ResourceCalendar *res, const TQString &subRes,
                    const TQString &summary,
-                   const TQString &description = TQString::null,
+                   const TQString &description = TQString(),
                    const TQStringList &attachment = TQStringList(),
                    const TQStringList &attendees = TQStringList(),
                    const TQStringList &attachmentMimetypes = TQStringList(),
@@ -345,14 +346,14 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /** create new todo, due on date */
     void newTodo( ResourceCalendar *res, const TQString &subRes,
                   const TQDate &date );
-    /** create new todo with a parent todo */
+    /** create new todo with a tqparent todo */
     void newSubTodo();
-    /** create new todo with a parent todo */
+    /** create new todo with a tqparent todo */
     void newSubTodo( Todo * );
 
     void newTodo( ResourceCalendar *res, const TQString &subRes,
                   const TQString &summary,
-                  const TQString &description = TQString::null,
+                  const TQString &description = TQString(),
                   const TQStringList &attachments = TQStringList(),
                   const TQStringList &attendees = TQStringList(),
                   const TQStringList &attachmentMimetypes = TQStringList(),
@@ -371,7 +372,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
 
 
     /**
-      Check if clipboard tqcontains vCalendar event. The signal pasteEnabled() is
+      Check if clipboard contains vCalendar event. The signal pasteEnabled() is
       emitted as result.
     */
     void checkClipboard();
@@ -453,10 +454,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
      */
     void appointment_delete();
 
-    /* frees the selected to-do's children from it's relation, update the view */
+    /* frees the selected to-do's tqchildren from it's relation, update the view */
     void todo_unsub();
 
-    /* frees an incidence's children from it's relation, without update the view
+    /* frees an incidence's tqchildren from it's relation, without update the view
        Works with any incidence type, although currently we only pass to-dos
     */
     bool incidence_unsub( Incidence *inc );
@@ -464,7 +465,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /** Make all sub-to-dos of the selected todo independent, update the view */
     bool makeSubTodosIndependent ( );
 
-    /** Make all children of incidence independent, not update the view
+    /** Make all tqchildren of incidence independent, not update the view
         Works with any incidence type, although currently we only pass to-dos
     */
     bool makeChildrenIndependent( Incidence *inc );
@@ -657,7 +658,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     // uncompleted subitems), notAllPurged is set to true.
     bool purgeCompletedSubTodos( Todo* todo, bool &notAllPurged );
 
-    /** Returns all incidences having inc has their parent (or grand parent, etc.)
+    /** Returns all incidences having inc has their tqparent (or grand tqparent, etc.)
         inc is included in the list too.
      */
     void getIncidenceHierarchy( Incidence *inc, Incidence::List &incidences );
diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h
index c25d780d..48530155 100644
--- a/korganizer/customlistviewitem.h
+++ b/korganizer/customlistviewitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef CUSTOMLISTVIEWITEM_H
 #define CUSTOMLISTVIEWITEM_H
@@ -32,10 +32,10 @@ template<class T>
 class CustomListViewItem : public KListViewItem
 {
   public:
-    CustomListViewItem( T data, KListView *parent ) :
-      KListViewItem( parent ), mData( data ) { updateItem(); };
-    CustomListViewItem( T data, KListView *parent, KListViewItem* after ) :
-      KListViewItem( parent, after ), mData( data ) { updateItem(); };
+    CustomListViewItem( T data, KListView *tqparent ) :
+      KListViewItem( tqparent ), mData( data ) { updateItem(); };
+    CustomListViewItem( T data, KListView *tqparent, KListViewItem* after ) :
+      KListViewItem( tqparent, after ), mData( data ) { updateItem(); };
     ~CustomListViewItem() {};
     
     void updateItem() {};
@@ -44,7 +44,7 @@ class CustomListViewItem : public KListViewItem
 
     TQString key(int column, bool) const
     {
-      TQMap<int,TQString>::ConstIterator it = mKeyMap.find(column);
+      TQMap<int,TQString>::ConstIterator it = mKeyMap.tqfind(column);
       if (it == mKeyMap.end()) return text(column);
       else return *it;
     }
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index 0fdcb302..0862a860 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtimer.h>
@@ -31,8 +31,8 @@
 
 #include "datechecker.h"
 
-DateChecker::DateChecker( TQObject *parent, const char *name )
-  : TQObject( parent, name ), mUpdateTimer( 0 )
+DateChecker::DateChecker( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mUpdateTimer( 0 )
 {
   enableRollover( FollowMonth );
 }
@@ -87,7 +87,7 @@ void DateChecker::possiblyPastMidnight()
   if ( mUpdateTimer ) {
     TQTime now = TQTime::currentTime();
     TQTime midnight = TQTime( 23, 59, 59 );
-    int msecsWait = QMIN( 480000, now.msecsTo( midnight ) + 2000 );
+    int msecsWait = TQMIN( 480000, now.msecsTo( midnight ) + 2000 );
 
     mUpdateTimer->stop();
     mUpdateTimer->start( msecsWait, true );
diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h
index 28ae2954..dc70d01c 100644
--- a/korganizer/datechecker.h
+++ b/korganizer/datechecker.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DATECHECKER_H
 #define DATECHECKER_H
@@ -34,11 +34,12 @@ class KCalendarSystem;
 
 class NavigatorBar;
 
-class DateChecker: public QObject
+class DateChecker: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    DateChecker( TQObject *parent = 0, const char *name = 0 );
+    DateChecker( TQObject *tqparent = 0, const char *name = 0 );
     ~DateChecker();
 
     /**
@@ -66,7 +67,7 @@ class DateChecker: public QObject
        wrt. the today box and the month box. Only important
        if you leave KOrganizer idle for long periods of time.
      
-       Until we have a reliable way of setting QTimers to go
+       Until we have a reliable way of setting TQTimers to go
        off at a particular wall-clock time, we need this,
        which calls passedMidnight() at the right moments.
      */
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index e03e3c89..4baaf9b8 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "datenavigator.h"
@@ -34,8 +34,8 @@
 
 using namespace KCal;
 
-DateNavigator::DateNavigator( TQObject *parent, const char *name )
-  : TQObject( parent, name )
+DateNavigator::DateNavigator( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name )
 {
   mSelectedDates.append( TQDate::tqcurrentDate() );
 }
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index ddb6cf2c..d2a28bb6 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DATENAVIGATOR_H
 #define DATENAVIGATOR_H
@@ -33,11 +33,12 @@
   date are sent to the DateNavigator. The DateNavigator processes the new
   selection of dates and emits the required signals for the views.
 */
-class DateNavigator : public QObject
+class DateNavigator : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    DateNavigator( TQObject *parent = 0, const char *name = 0 );
+    DateNavigator( TQObject *tqparent = 0, const char *name = 0 );
     ~DateNavigator();
 
     KCal::DateList selectedDates();
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index e1e3223a..462920c5 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kdebug.h>
@@ -39,9 +39,9 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-DateNavigatorContainer::DateNavigatorContainer( TQWidget *parent,
+DateNavigatorContainer::DateNavigatorContainer( TQWidget *tqparent,
                                                 const char *name )
-  : TQFrame( parent, name ), mCalendar( 0 ),
+  : TQFrame( tqparent, name ), mCalendar( 0 ),
     mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
   mExtraViews.setAutoDelete( true );
@@ -300,7 +300,7 @@ TQSize DateNavigatorContainer::tqsizeHint() const
 
 void DateNavigatorContainer::goNextMonth()
 {
-  const QPair<TQDate,TQDate> p = dateLimits( 1 );
+  const TQPair<TQDate,TQDate> p = dateLimits( 1 );
 
   emit nextMonthClicked( mNavigatorView->month(),
                          p.first,
@@ -309,14 +309,14 @@ void DateNavigatorContainer::goNextMonth()
 
 void DateNavigatorContainer::goPrevMonth()
 {
-  const QPair<TQDate,TQDate> p = dateLimits( -1 );
+  const TQPair<TQDate,TQDate> p = dateLimits( -1 );
 
   emit prevMonthClicked( mNavigatorView->month(),
                          p.first,
                          p.second );
 }
 
-QPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
+TQPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
 {
   const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
   TQDate firstMonth, lastMonth;
@@ -329,8 +329,8 @@ QPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
   firstMonth = calSys->addMonths( mNavigatorView->month(), offset );
   lastMonth = calSys->addMonths( lastMonth, offset );
 
-  QPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth );
-  QPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth );
+  TQPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth );
+  TQPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth );
 
   return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
 }
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index b797427c..f61a1d36 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DATENAVIGATORCONTAINER_H
 #define DATENAVIGATORCONTAINER_H
@@ -29,11 +29,12 @@
 
 class KDateNavigator;
 
-class DateNavigatorContainer: public QFrame
+class DateNavigatorContainer: public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 );
+    DateNavigatorContainer( TQWidget *tqparent = 0, const char *name = 0 );
     ~DateNavigatorContainer();
 
     /**
@@ -110,7 +111,7 @@ class DateNavigatorContainer: public QFrame
        and want to know the boundaries of, for e.g. displaying February and March,
        use monthOffset = 1.
     */
-    QPair<TQDate,TQDate> dateLimits( int monthOffset = 0 );
+    TQPair<TQDate,TQDate> dateLimits( int monthOffset = 0 );
 
     KDateNavigator *mNavigatorView;
 
diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp
index 498886be..8981255f 100644
--- a/korganizer/docprefs.cpp
+++ b/korganizer/docprefs.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <ksimpleconfig.h>
diff --git a/korganizer/docprefs.h b/korganizer/docprefs.h
index 70d1cac9..7e6597e4 100644
--- a/korganizer/docprefs.h
+++ b/korganizer/docprefs.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DOCPREFS_H
 #define DOCPREFS_H
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 1cd613e6..300b975e 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "eventarchiver.h"
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 #include "koprefs.h"
 
-EventArchiver::EventArchiver( TQObject* parent, const char* name )
- : TQObject( parent, name )
+EventArchiver::EventArchiver( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
 {
 }
 
@@ -246,7 +246,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate
     return false;
   }
 
-  // This QList is only to prevent infinit recursion
+  // This TQList is only to prevent infinit recursion
   if ( checkedUids.tqcontains( todo->uid() ) ) {
     // Probably will never happen, calendar.cpp checks for this
     kdWarning() << "To-do hierarchy loop detected!";
diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h
index 01897b7e..8da86deb 100644
--- a/korganizer/eventarchiver.h
+++ b/korganizer/eventarchiver.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef EVENTARCHIVER_H
 #define EVENTARCHIVER_H
@@ -44,19 +44,20 @@ using namespace KCal;
  * Be sure to set mArchiveAction and mArchiveFile before a manual archiving
  * mAutoArchive is used for auto archiving.
  */
-class EventArchiver : public QObject
+class EventArchiver : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EventArchiver( TQObject* parent = 0, const char* name = 0 );
+    EventArchiver( TQObject* tqparent = 0, const char* name = 0 );
     virtual ~EventArchiver();
 
     /**
      * Delete or archive events once
      * @param calendar the calendar to archive
      * @param limitDate all events *before* the limitDate (not included) will be deleted/archived.
-     * @param widget parent widget for message boxes
+     * @param widget tqparent widget for message boxes
      * Confirmation and "no events to process" dialogs will be shown
      */
     void runOnce( Calendar* calendar, const TQDate& limitDate, TQWidget* widget  );
@@ -64,7 +65,7 @@ class EventArchiver : public QObject
     /**
      * Delete or archive events. This is called regularly, when auto-archiving is enabled
      * @param calendar the calendar to archive
-     * @param widget parent widget for message boxes
+     * @param widget tqparent widget for message boxes
      * @param withGUI whether this is called from the dialog, so message boxes should be shown.
      * Note that error dialogs like "cannot save" are shown even if from this method, so widget
      * should be set in all cases.
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index 869c5b96..0e514abd 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -68,9 +68,9 @@
 //        because we want custom buttons, a Tabbed dialog, and a different
 //        headline... Maybe we should try to achieve the same without code
 //        duplication.
-ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent,
+ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent,
                                   const char *name)
-  : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, parent, name, false, false, i18n("Export") ),
+  : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, tqparent, name, false, false, i18n("Export") ),
     KPrefsWidManager( settings ), mSettings( settings )
 {
   setupGeneralPage();
diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h
index 27a0a986..53b8f09c 100644
--- a/korganizer/exportwebdialog.h
+++ b/korganizer/exportwebdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _EXPORTWEBDIALOG_H
 #define _EXPORTWEBDIALOG_H
@@ -38,8 +38,9 @@ using namespace KCal;
 class ExportWebDialog : public KDialogBase, public KPrefsWidManager
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0,
+    ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent = 0,
                      const char *name = 0 );
     virtual ~ExportWebDialog();
 
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index 86f95679..59e2b5bb 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FilterEdit_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FilterEdit_base</cstring>
     </property>
@@ -16,12 +16,12 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>mRulesList</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>mNewButton</cstring>
             </property>
@@ -29,7 +29,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>mDeleteButton</cstring>
             </property>
@@ -37,7 +37,7 @@
                 <string>&amp;Delete</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="0" column="2" rowspan="2" colspan="1">
+        <widget class="TQButtonGroup" row="0" column="2" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>mDetailsFrame</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
                         <cstring>tqlayout3</cstring>
                     </property>
@@ -56,7 +56,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -64,14 +64,14 @@
                                 <string>Name:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>mNameLineEdit</cstring>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>mRecurringCheck</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <string>Select this option if you do not want to show recurring events and to-dos in your views. Daily and weekly recurring items may take a lot of space, so it might be handy to hide them.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>mCompletedCheck</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <string>If this box is checked, the filter will hide all to-do items from the list, that have been completed. Optionally, only items that have been completed a given number of days are hidden.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="3" column="0">
+                <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
                         <cstring>tqlayout1</cstring>
                     </property>
@@ -118,7 +118,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mCompletedTimeSpanLabel</cstring>
                             </property>
@@ -174,7 +174,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0">
+                <widget class="TQCheckBox" row="4" column="0">
                     <property name="name">
                         <cstring>mHideInactiveTodosCheck</cstring>
                     </property>
@@ -185,7 +185,7 @@
                         <string>This option hides all to-dos from your list, where the start date has not been reached. (Note that the start date is not the due date of the to-do item.)</string>
                     </property>
                 </widget>
-                <widget class="QButtonGroup" row="6" column="0">
+                <widget class="TQButtonGroup" row="6" column="0">
                     <property name="name">
                         <cstring>mCategoriesButtonGroup</cstring>
                     </property>
@@ -202,7 +202,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QListBox" row="2" column="0" rowspan="2" colspan="1">
+                        <widget class="TQListBox" row="2" column="0" rowspan="2" colspan="1">
                             <property name="name">
                                 <cstring>mCatList</cstring>
                             </property>
@@ -227,7 +227,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>mCatHideCheck</cstring>
                             </property>
@@ -244,7 +244,7 @@
                                 <string>When this option is enabled, this filter will show all items which do &lt;i&gt;not&lt;/i&gt; contain the selected categories.</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>mCatShowCheck</cstring>
                             </property>
@@ -261,7 +261,7 @@
                                 <string>When this option is enabled, this filter will show all items containing at least the selected items.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="2" column="1">
+                        <widget class="TQPushButton" row="2" column="1">
                             <property name="name">
                                 <cstring>mCatEditButton</cstring>
                             </property>
@@ -274,7 +274,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0">
+                <widget class="TQCheckBox" row="5" column="0">
                     <property name="name">
                         <cstring>mHideTodosNotAssignedToMeCheck</cstring>
                     </property>
@@ -309,9 +309,9 @@ Only to-dos which have least one attendee will be checked.  If you are not in th
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>updateFilter()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index 32138bff..cf6bf2ff 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpushbutton.h>
@@ -47,8 +47,8 @@
 #include "filtereditdialog.moc"
 
 FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters,
-                                    TQWidget *parent, const char *name)
-  : KDialogBase( parent, name, false, i18n("Edit Calendar Filters"),
+                                    TQWidget *tqparent, const char *name)
+  : KDialogBase( tqparent, name, false, i18n("Edit Calendar Filters"),
                  Ok | Apply | Cancel )
 {
   setMainWidget( mFilterEdit = new FilterEdit(filters, this));
@@ -92,8 +92,8 @@ void FilterEditDialog::setDialogConsistent(bool consistent) {
     enableButtonApply( consistent );
 }
 
-FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent)
-  : FilterEdit_base( parent), current(0), mCategorySelectDialog( 0 )
+FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *tqparent)
+  : FilterEdit_base( tqparent), current(0), mCategorySelectDialog( 0 )
 {
   mFilters = filters;
   TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) );
@@ -207,7 +207,7 @@ void FilterEdit::bDeletePressed() {
   mFilters->remove( selected );
   current = 0L;
   updateFilterList();
-  mRulesList->setSelected(QMIN(mRulesList->count()-1, selected), true);
+  mRulesList->setSelected(TQMIN(mRulesList->count()-1, selected), true);
   emit filterChanged();
 }
 
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index 8527fd0b..76d3c724 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _FILTEREDITDIALOG_H
 #define _FILTEREDITDIALOG_H
@@ -45,8 +45,9 @@ using namespace KCal;
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0);
+    FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *tqparent=0, const char *name=0);
     virtual ~FilterEditDialog();
 
   signals:
@@ -69,8 +70,9 @@ class FilterEditDialog : public KDialogBase
 class FilterEdit : public FilterEdit_base
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent);
+    FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *tqparent);
     ~FilterEdit();
 
     void updateFilterList();
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 187e1082..54695217 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -1,7 +1,7 @@
 /*
   This file is part of the Groupware/KOrganizer integration.
 
-  Requires the Qt and KDE widget libraries, available at no cost at
+  Requires the TQt and KDE widget libraries, available at no cost at
   http://www.trolltech.com and http://www.kde.org respectively
 
   Copyright (c) 2002-2004 Klar�vdalens Datakonsult AB
@@ -25,11 +25,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -123,8 +123,8 @@ void FreeBusyDownloadJob::slotResult( KIO::Job *job )
 
 ////
 
-FreeBusyManager::FreeBusyManager( TQObject *parent, const char *name )
-  : TQObject( parent, name ),
+FreeBusyManager::FreeBusyManager( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ),
     mCalendar( 0 ), mTimerID( 0 ), mUploadingFreeBusy( false ),
     mBrokenUrl( false )
 {
@@ -252,7 +252,7 @@ void FreeBusyManager::publishFreeBusy()
 
 //   // Substitute %u and %d [FIXME]
 //   TQString defaultEmail = KOCore()::self()->email();
-//   int emailpos = defaultEmail.find( '@' );
+//   int emailpos = defaultEmail.tqfind( '@' );
 //   if (emailpos != -1) {
 //     const TQString emailName = defaultEmail.left( emailpos );
 //     const TQString emailHost = defaultEmail.mid( emailpos + 1 );
@@ -292,7 +292,7 @@ void FreeBusyManager::publishFreeBusy()
 
 #if 0
     TQString defaultEmail = KOCore()::self()->email();
-    TQString emailHost = defaultEmail.mid( defaultEmail.find( '@' ) + 1 );
+    TQString emailHost = defaultEmail.mid( defaultEmail.tqfind( '@' ) + 1 );
 
     // Put target string together
     KURL targetURL;
@@ -309,7 +309,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setHost( server );
 
       TQString fbname = KOPrefs::instance()->mPublishUserName;
-      int at = fbname.find('@');
+      int at = fbname.tqfind('@');
       if( at > 1 && fbname.length() > (uint)at ) {
 	fbname = fbname.left(at);
       }
@@ -438,10 +438,10 @@ void FreeBusyManager::cancelRetrieval()
   mRetrieveQueue.clear();
 }
 
-KURL tqreplaceVariablesURL( const KURL &url, const TQString &email )
+KURL replaceVariablesURL( const KURL &url, const TQString &email )
 {
   TQString emailName, emailHost;
-  int emailpos = email.find( '@' );
+  int emailpos = email.tqfind( '@' );
   if( emailpos >= 0 ) {
     emailName = email.left( emailpos );
     emailHost = email.mid( emailpos + 1 );
@@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser );
       cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword );
     }
-    return tqreplaceVariablesURL( cachedURL, email );
+    return replaceVariablesURL( cachedURL, email );
   }
 
   // Try with the url configurated by preferred email in kaddressbook
-  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email );
+  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email );
   KABC::Addressee::List::Iterator it;
   TQString pref;
   for ( it = list.begin(); it != list.end(); ++it ) {
@@ -509,7 +509,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       if ( !url.isEmpty() ) {
         kdDebug(5850) << "FreeBusyManager::freeBusyUrl():"
                       << "Taken url from preferred email:" << url << endl;
-        return tqreplaceVariablesURL( KURL( url ), email );
+        return replaceVariablesURL( KURL( url ), email );
       }
     }
   }
@@ -522,7 +522,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
 
   // Sanity check: Don't download if it's not a correct email
   // address (this also avoids downloading for "(empty email)").
-  int emailpos = email.find( '@' );
+  int emailpos = email.tqfind( '@' );
   if( emailpos == -1 ) {
     return KURL();
   }
@@ -549,8 +549,8 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
   }
 
   if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
-    // do variable string tqreplacements to the URL (MS Outlook style)
-    KURL fullpathURL = tqreplaceVariablesURL( sourceURL, email );
+    // do variable string replacements to the URL (MS Outlook style)
+    KURL fullpathURL = replaceVariablesURL( sourceURL, email );
 
     // This should work with anything thrown at it, not just Kolab
     // Notice that Kolab URLs are just entered as the base address, e.g. http://server.com/mykolab/
@@ -584,7 +584,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
   for ( ext = extensions.constBegin(); ext != extensions.constEnd(); ++ext ) {
     // build a url for this extension
     sourceURL = KOPrefs::instance()->mFreeBusyRetrieveUrl;
-    KURL dirURL = tqreplaceVariablesURL( sourceURL, email );
+    KURL dirURL = replaceVariablesURL( sourceURL, email );
     if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) {
       dirURL.addPath( email + '.' + (*ext) );
     } else {
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index 4be671e4..8babe454 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -1,7 +1,7 @@
 /*
   This file is part of the Groupware/KOrganizer integration.
 
-  Requires the Qt and KDE widget libraries, available at no cost at
+  Requires the TQt and KDE widget libraries, available at no cost at
   http://www.trolltech.com and http://www.kde.org respectively
 
   Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB
@@ -24,11 +24,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -52,9 +52,10 @@ class FreeBusyManager;
 /**
  * Class for downloading FreeBusy Lists
  */
-class FreeBusyDownloadJob : public QObject
+class FreeBusyDownloadJob : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     FreeBusyDownloadJob( const TQString &email, const KURL &url,
                    FreeBusyManager *manager, const char *name = 0 );
@@ -79,8 +80,9 @@ class FreeBusyDownloadJob : public QObject
 class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FreeBusyManager( TQObject *parent, const char *name );
+    FreeBusyManager( TQObject *tqparent, const char *name );
 
     void setCalendar( KCal::Calendar * );
 
diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp
index 61165545..b9833581 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "freebusyurldialog.h"
@@ -35,9 +35,9 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *parent,
+FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *tqparent,
                                       const char *name )
-  : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, parent,
+  : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, tqparent,
                  name, true, false )
 {
   TQFrame *topFrame = plainPage();
@@ -57,9 +57,9 @@ void FreeBusyUrlDialog::slotOk()
 }
 
 
-FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent,
+FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *tqparent,
                                       const char *name )
-  : TQWidget( parent, name ), mAttendee( attendee )
+  : TQWidget( tqparent, name ), mAttendee( attendee )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h
index 49c77f3f..e3a6d5cb 100644
--- a/korganizer/freebusyurldialog.h
+++ b/korganizer/freebusyurldialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef FREEBUSYURLCONFIG_H
 #define FREEBUSYURLCONFIG_H
@@ -36,8 +36,9 @@ class Attendee;
 class FreeBusyUrlDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0,
+    FreeBusyUrlDialog( KCal::Attendee *, TQWidget *tqparent = 0,
                        const char *name = 0 );
 
   public slots:
@@ -47,11 +48,12 @@ class FreeBusyUrlDialog : public KDialogBase
     FreeBusyUrlWidget *mWidget;
 };
 
-class FreeBusyUrlWidget : public QWidget
+class FreeBusyUrlWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0,
+    FreeBusyUrlWidget( KCal::Attendee *, TQWidget *tqparent = 0,
                        const char *name = 0 );
     ~FreeBusyUrlWidget();
 
diff --git a/korganizer/history.cpp b/korganizer/history.cpp
index 6207ebec..c01aed91 100644
--- a/korganizer/history.cpp
+++ b/korganizer/history.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "history.h"
@@ -57,7 +57,7 @@ void History::undo()
 
   entry = mUndoEntry.current();
   if ( entry ) emit undoAvailable( entry->text() );
-  else emit undoAvailable( TQString::null );
+  else emit undoAvailable( TQString() );
 }
 
 void History::redo()
@@ -76,7 +76,7 @@ void History::redo()
 
   entry = mRedoEntry.current();
   if ( entry ) emit redoAvailable( entry->text() );
-  else emit redoAvailable( TQString::null );
+  else emit redoAvailable( TQString() );
 }
 
 void History::truncate()
@@ -85,7 +85,7 @@ void History::truncate()
     mEntries.removeLast();
   }
   mRedoEntry = TQPtrList<Entry>( mEntries );
-  emit redoAvailable( TQString::null );
+  emit redoAvailable( TQString() );
 }
 
 void History::recordDelete( Incidence *incidence )
diff --git a/korganizer/history.h b/korganizer/history.h
index 4e71dea1..4b87db8c 100644
--- a/korganizer/history.h
+++ b/korganizer/history.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_HISTORY_H
 #define KORG_HISTORY_H
@@ -36,9 +36,10 @@ class Incidence;
 
 namespace KOrg {
 
-class History : public QObject
+class History : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     History( KCal::Calendar * );
 
diff --git a/korganizer/ical2vcal.in b/korganizer/ical2vcal.in
index c83f6010..3bdbdb72 100755
--- a/korganizer/ical2vcal.in
+++ b/korganizer/ical2vcal.in
@@ -75,7 +75,7 @@ sub process_appointment
 {
     undef(%curappt);
 
-    # this is a count of the total # of parentheses.
+    # this is a count of the total # of tqparentheses.
     while ($pcount) {
 	$line = &getLine;
 	
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index 5f4dce6a..9d573510 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "importdialog.h"
@@ -37,8 +37,8 @@
 
 using namespace KCal;
 
-ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart )
-  : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, parent,
+ImportDialog::ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart )
+  : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, tqparent,
                  0, true, true ),
     mUrl( url )
 {
diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h
index 75d5cb1a..1ee42a15 100644
--- a/korganizer/importdialog.h
+++ b/korganizer/importdialog.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef IMPORTDIALOG_H
 #define IMPORTDIALOG_H
@@ -35,8 +35,9 @@ class TQRadioButton;
 class ImportDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ImportDialog( const KURL &url, TQWidget *parent, bool isPart );
+    ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart );
     ~ImportDialog();
 
   public slots:
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index 1ffcc628..8b922034 100644
--- a/korganizer/incidencechanger.cpp
+++ b/korganizer/incidencechanger.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "incidencechanger.h"
@@ -55,7 +55,7 @@ bool IncidenceChanger::beginChange( Incidence *incidence,
 bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence,
                                              KCal::Scheduler::Method method,
                                              KOGlobals::HowChanged action,
-                                             TQWidget *parent )
+                                             TQWidget *tqparent )
 {
   if ( KOPrefs::instance()->thatIsMe( incidence->organizer().email() ) && incidence->attendeeCount()>0
       && !KOPrefs::instance()->mUseGroupwareCommunication ) {
@@ -63,7 +63,7 @@ bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence,
     return true;
   } else if( KOPrefs::instance()->mUseGroupwareCommunication ) {
     return
-      KOGroupware::instance()->sendICalMessage( parent, method, incidence, action, false );
+      KOGroupware::instance()->sendICalMessage( tqparent, method, incidence, action, false );
   }
   return true;
 }
@@ -111,12 +111,12 @@ bool IncidenceChanger::endChange( Incidence *incidence,
   return calRes->endChange( incidence, res, subRes );
 }
 
-bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *parent )
+bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *tqparent )
 {
   if ( !incidence ) return true;
 kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->summary()<<"\""<<endl;
   bool doDelete = sendGroupwareMessage( incidence, KCal::Scheduler::Cancel,
-                                        KOGlobals::INCIDENCEDELETED, parent );
+                                        KOGlobals::INCIDENCEDELETED, tqparent );
   if( doDelete ) {
     // @TODO: let Calendar::deleteIncidence do the locking...
     Incidence* tmp = incidence->clone();
@@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->
           if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated )
             notifyOrganizer = true;
           Attendee *newMe = new Attendee( *me );
-          newMe->seStatus( KCal::Attendee::Declined );
+          newMe->setqStatus( KCal::Attendee::Declined );
           tmp->clearAttendees();
           tmp->addAttendee( newMe );
           break;
@@ -152,7 +152,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->
 }
 
 bool IncidenceChanger::cutIncidences( const Incidence::List &incidences,
-                                      TQWidget *parent )
+                                      TQWidget *tqparent )
 {
   Incidence::List::ConstIterator it;
   bool doDelete = true;
@@ -160,7 +160,7 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences,
   for ( it = incidences.constBegin(); it != incidences.constEnd(); ++it ) {
     if ( *it ) {
       doDelete = sendGroupwareMessage( *it, KCal::Scheduler::Cancel,
-                                       KOGlobals::INCIDENCEDELETED, parent );
+                                       KOGlobals::INCIDENCEDELETED, tqparent );
       if ( doDelete ) {
         emit incidenceToBeDeleted( *it );
         incsToCut.append( *it );
@@ -180,11 +180,11 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences,
   }
 }
 
-bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *parent )
+bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *tqparent )
 {
   Incidence::List incidences;
   incidences.append( incidence );
-  return cutIncidences( incidences, parent );
+  return cutIncidences( incidences, tqparent );
 }
 
 class IncidenceChanger::ComparisonVisitor : public IncidenceBase::Visitor
@@ -327,14 +327,14 @@ bool IncidenceChanger::myAttendeeStatusChanged( Incidence *oldInc, Incidence *ne
 
 bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc,
                                         KOGlobals::WhatChanged action,
-                                        TQWidget *parent )
+                                        TQWidget *tqparent )
 {
-  return changeIncidence( oldinc, newinc, action, parent, 0 );
+  return changeIncidence( oldinc, newinc, action, tqparent, 0 );
 }
 
 bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc,
                                         KOGlobals::WhatChanged action,
-                                        TQWidget *parent,
+                                        TQWidget *tqparent,
                                         int dontAskForGroupware )
 {
 kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->summary()<<"\" ( old one was \""<<oldinc->summary()<<"\")"<<endl;
@@ -353,7 +353,7 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum
     bool success = true;
     if ( KOPrefs::instance()->mUseGroupwareCommunication ) {
       success = KOGroupware::instance()->sendICalMessage(
-        parent,
+        tqparent,
         KCal::Scheduler::Request,
         newinc, KOGlobals::INCIDENCEEDITED, attendeeStatusChanged, dontAskForGroupware );
     }
@@ -372,19 +372,19 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum
 
 bool IncidenceChanger::addIncidence( Incidence *incidence,
                                      ResourceCalendar *res, const TQString &subRes,
-                                     TQWidget *parent )
+                                     TQWidget *tqparent )
 {
-  return addIncidence( incidence, res, subRes, parent, 0 );
+  return addIncidence( incidence, res, subRes, tqparent, 0 );
 }
 
 bool IncidenceChanger::addIncidence( Incidence *incidence,
                                      ResourceCalendar *res, const TQString &subRes,
-                                     TQWidget *parent, int dontAskForGroupware )
+                                     TQWidget *tqparent, int dontAskForGroupware )
 {
   CalendarResources *stdcal = dynamic_cast<CalendarResources *>( mCalendar );
   if( stdcal && !stdcal->hasCalendarResources() ) {
     KMessageBox::sorry(
-      parent,
+      tqparent,
       i18n( "No calendars found, unable to save %1 \"%2\"." ).
       arg( i18n( incidence->type() ) ).
       arg( incidence->summary() ) );
@@ -392,14 +392,14 @@ bool IncidenceChanger::addIncidence( Incidence *incidence,
     return false;
   }
 
-  // FIXME: This is a nasty hack, since we need to set a parent for the
+  // FIXME: This is a nasty hack, since we need to set a tqparent for the
   //        resource selection dialog. However, we don't have any UI methods
   //        in the calendar, only in the CalendarResources::DestinationPolicy
   //        So we need to type-cast it and extract it from the CalendarResources
-  TQWidget *tmpparent = 0;
+  TQWidget *tmptqparent = 0;
   if ( stdcal ) {
-    tmpparent = stdcal->dialogParentWidget();
-    stdcal->setDialogParentWidget( parent );
+    tmptqparent = stdcal->dialogParentWidget();
+    stdcal->setDialogParentWidget( tqparent );
   }
 
   // If a ResourceCalendar isn't provided, then try to compute one
@@ -445,7 +445,7 @@ bool IncidenceChanger::addIncidence( Incidence *incidence,
                      arg( incidence->summary() ).
                      arg( pResName );
       }
-      KMessageBox::sorry( parent, errMessage );
+      KMessageBox::sorry( tqparent, errMessage );
     }
     kdDebug(5850) << "IncidenceChanger: Can't add incidence" << endl;
     return false;
@@ -453,11 +453,11 @@ bool IncidenceChanger::addIncidence( Incidence *incidence,
 
   if ( KOPrefs::instance()->mUseGroupwareCommunication ) {
     if ( !KOGroupware::instance()->sendICalMessage(
-           parent,
+           tqparent,
            KCal::Scheduler::Request,
            incidence, KOGlobals::INCIDENCEADDED, false, dontAskForGroupware ) ) {
       KMessageBox::sorry(
-        parent,
+        tqparent,
         i18n( "Attempt to send the scheduling message failed. "
               "Please check your Group Scheduling settings. "
               "Contact your system administrator for more help.") );
diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h
index 5e559509..09a2bda6 100644
--- a/korganizer/incidencechanger.h
+++ b/korganizer/incidencechanger.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef INCIDENCECHANGER_H
 #define INCIDENCECHANGER_H
@@ -33,9 +33,10 @@ namespace KCal {
 class IncidenceChanger : public KOrg::IncidenceChangerBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    IncidenceChanger( Calendar *cal, TQObject *parent )
-      : IncidenceChangerBase( cal, parent ) {}
+    IncidenceChanger( Calendar *cal, TQObject *tqparent )
+      : IncidenceChangerBase( cal, tqparent ) {}
     ~IncidenceChanger() {}
 
     bool beginChange( Incidence *incidence,
@@ -44,27 +45,27 @@ class IncidenceChanger : public KOrg::IncidenceChangerBase
     bool sendGroupwareMessage( Incidence *incidence,
                                KCal::Scheduler::Method method,
                                KOGlobals::HowChanged action,
-                               TQWidget *parent );
+                               TQWidget *tqparent );
 
     bool endChange( Incidence *incidence,
                     ResourceCalendar *res, const TQString &subRes );
 
     bool addIncidence( Incidence *incidence,
                        ResourceCalendar *res, const TQString &subRes,
-                       TQWidget *parent );
+                       TQWidget *tqparent );
     bool addIncidence( Incidence *incidence,
                        ResourceCalendar *res, const TQString &subRes,
-                       TQWidget *parent, int dontAskForGroupware );
+                       TQWidget *tqparent, int dontAskForGroupware );
 
     bool changeIncidence( Incidence *oldinc, Incidence *newinc,
-                          KOGlobals::WhatChanged, TQWidget *parent );
+                          KOGlobals::WhatChanged, TQWidget *tqparent );
     bool changeIncidence( Incidence *oldinc, Incidence *newinc,
-                          KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware );
+                          KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware );
 
-    bool deleteIncidence( Incidence *incidence, TQWidget *parent );
+    bool deleteIncidence( Incidence *incidence, TQWidget *tqparent );
 
-    bool cutIncidences( const Incidence::List &incidences, TQWidget *parent );
-    bool cutIncidence( Incidence *incidence, TQWidget *parent );
+    bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent );
+    bool cutIncidence( Incidence *incidence, TQWidget *tqparent );
 
     static bool incidencesEqual( Incidence *inc1, Incidence *inc2 );
     static bool assignIncidence( Incidence *inc1, Incidence *inc2 );
diff --git a/korganizer/interfaces/calendar/calendardecoration.h b/korganizer/interfaces/calendar/calendardecoration.h
index 1653edb4..cd79f233 100644
--- a/korganizer/interfaces/calendar/calendardecoration.h
+++ b/korganizer/interfaces/calendar/calendardecoration.h
@@ -51,12 +51,12 @@ class CalendarDecoration : public Plugin
     /**
       Return a short text for a given date, ususally only a few words.
     */
-    virtual TQString shortText( const TQDate & ) { return TQString::null; }
+    virtual TQString shortText( const TQDate & ) { return TQString(); }
     /**
       Return along text for a given date. This text can be of any length, but
       usually it will have one or a few paragraphs.
     */
-    virtual TQString longText( const TQDate & ) { return TQString::null; }
+    virtual TQString longText( const TQDate & ) { return TQString(); }
 
     /**
       Return a small pixmap. The size should be something like 30x30 pixels.
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 920559da..31a3edbc 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -56,20 +56,21 @@ namespace KOrg {
   @author Preston Brown, Cornelius Schumacher
   @see KOTodoView, KOEventView, KOListView, KOAgendaView, KOMonthView
 */
-class KDE_EXPORT BaseView : public QWidget
+class KDE_EXPORT BaseView : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a view.
 
       @param cal    Pointer to the calendar object from which events
                     will be retrieved for display.
-      @param parent parent widget.
+      @param tqparent tqparent widget.
       @param name   name of this widget.
     */
-    BaseView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 )
-      : TQWidget( parent, name ),
+    BaseView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 )
+      : TQWidget( tqparent, name ),
         mReadOnly( false ), mCalendar( cal ), mResource( 0 ), mChanger( 0 ) {}
 
     /**
diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h
index 02c2459b..8afefdd8 100644
--- a/korganizer/interfaces/korganizer/calendarviewbase.h
+++ b/korganizer/interfaces/korganizer/calendarviewbase.h
@@ -34,11 +34,11 @@ namespace KOrg {
   @short interface for main calendar view widget
   @author Cornelius Schumacher
 */
-class CalendarViewBase : public QWidget
+class CalendarViewBase : public TQWidget
 {
   public:
-    CalendarViewBase( TQWidget *parent, const char *name )
-      : TQWidget( parent, name ) {}
+    CalendarViewBase( TQWidget *tqparent, const char *name )
+      : TQWidget( tqparent, name ) {}
     virtual ~CalendarViewBase() {}
   
     virtual KCal::Calendar *calendar() = 0;
diff --git a/korganizer/interfaces/korganizer/corehelper.h b/korganizer/interfaces/korganizer/corehelper.h
index 8c69a1ad..36a89f65 100644
--- a/korganizer/interfaces/korganizer/corehelper.h
+++ b/korganizer/interfaces/korganizer/corehelper.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_COREHELPER_H
 #define KORG_COREHELPER_H
diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h
index ec0288aa..ba4faf06 100644
--- a/korganizer/interfaces/korganizer/incidencechangerbase.h
+++ b/korganizer/interfaces/korganizer/incidencechangerbase.h
@@ -36,18 +36,19 @@ using namespace KCal;
 
 namespace KOrg {
 
-class IncidenceChangerBase : public QObject
+class IncidenceChangerBase : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) :
-        TQObject( parent ), mCalendar( cal ) {}
+  IncidenceChangerBase( Calendar*cal, TQObject *tqparent = 0 ) :
+        TQObject( tqparent ), mCalendar( cal ) {}
   virtual ~IncidenceChangerBase() {}
 
   virtual bool sendGroupwareMessage( Incidence *incidence,
                                      KCal::Scheduler::Method method,
                                      KOGlobals::HowChanged action,
-                                     TQWidget *parent ) = 0;
+                                     TQWidget *tqparent ) = 0;
 
   virtual bool beginChange( Incidence *incidence,
                             ResourceCalendar *res, const TQString &subRes ) = 0;
@@ -56,20 +57,20 @@ public:
 
   virtual bool addIncidence( Incidence *incidence,
                              ResourceCalendar *res, const TQString &subRes,
-                             TQWidget *parent ) = 0;
+                             TQWidget *tqparent ) = 0;
   virtual bool addIncidence( Incidence *incidence,
                              ResourceCalendar *res, const TQString &subRes,
-                             TQWidget *parent, int dontAskForGroupware) = 0;
+                             TQWidget *tqparent, int dontAskForGroupware) = 0;
 
   virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc,
-                                KOGlobals::WhatChanged, TQWidget *parent ) = 0;
+                                KOGlobals::WhatChanged, TQWidget *tqparent ) = 0;
   virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc,
-                                KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ) = 0;
+                                KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware ) = 0;
 
-  virtual bool deleteIncidence( Incidence *incidence, TQWidget *parent ) = 0;
+  virtual bool deleteIncidence( Incidence *incidence, TQWidget *tqparent ) = 0;
 
-  virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ) = 0;
-  virtual bool cutIncidence( Incidence *incidence, TQWidget *parent ) = 0;
+  virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent ) = 0;
+  virtual bool cutIncidence( Incidence *incidence, TQWidget *tqparent ) = 0;
 
 signals:
   void incidenceAdded( Incidence * );
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index e75e9085..a7093e28 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -38,8 +38,8 @@ class Part : public KParts::Part
 
     typedef TQPtrList<Part> List;
 
-    Part( MainWindow *parent, const char *name )
-      : KParts::Part( parent?(parent->tqtopLevelWidget()):0, name ), mMainWindow( parent ) {}
+    Part( MainWindow *tqparent, const char *name )
+      : KParts::Part( tqparent?(tqparent->tqtopLevelWidget()):0, name ), mMainWindow( tqparent ) {}
 
     virtual ~Part() {}
 
@@ -56,7 +56,7 @@ class Part : public KParts::Part
 class PartFactory : public KLibFactory
 {
   public:
-    virtual Part *create( MainWindow *parent, const char *name = 0 ) = 0;
+    virtual Part *create( MainWindow *tqparent, const char *name = 0 ) = 0;
 
   protected:
     virtual TQObject *createObject( TQObject *, const char *,const char *,
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 459b25d4..5af3a320 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 //
@@ -60,16 +60,16 @@
 class JournalTitleLable : public KActiveLabel
 {
 public:
-  JournalTitleLable( TQWidget *parent, const char *name=0 ) : KActiveLabel( parent, name ) {}
+  JournalTitleLable( TQWidget *tqparent, const char *name=0 ) : KActiveLabel( tqparent, name ) {}
 
   void openLink( const TQString &/*link*/ ) {}
 };
 
 
-JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
-  TQVBox( parent ), mCalendar( calendar )
+JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *tqparent ) :
+  TQVBox( tqparent ), mCalendar( calendar )
 {
-//kdDebug(5850)<<"JournalEntry::JournalEntry, parent="<<parent<<endl;
+//kdDebug(5850)<<"JournalEntry::JournalEntry, tqparent="<<tqparent<<endl;
   mChanger = 0;
 
   mTitle = new JournalTitleLable( this );
@@ -111,7 +111,7 @@ void JournalDateEntry::clear()
 // should only be called by the KOJournalView now.
 void JournalDateEntry::addJournal( Journal *j )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( j );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( j );
   if ( pos != mEntries.end() ) return;
 
   JournalEntry *entry = new JournalEntry( j, this );
@@ -156,7 +156,7 @@ void JournalDateEntry::emitNewJournal()
 
 void JournalDateEntry::journalEdited( Journal *journal )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( journal );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( journal );
   if ( pos == mEntries.end() ) return;
 
   pos.data()->setJournal( journal );
@@ -165,7 +165,7 @@ void JournalDateEntry::journalEdited( Journal *journal )
 
 void JournalDateEntry::journalDeleted( Journal *journal )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( journal );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( journal );
   if ( pos == mEntries.end() ) return;
 
   delete pos.data();
@@ -175,10 +175,10 @@ void JournalDateEntry::journalDeleted( Journal *journal )
 
 
 
-JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
-  TQWidget( parent ), mJournal( j )
+JournalEntry::JournalEntry( Journal* j, TQWidget *tqparent ) :
+  TQWidget( tqparent ), mJournal( j )
 {
-//kdDebug(5850)<<"JournalEntry::JournalEntry, parent="<<parent<<endl;
+//kdDebug(5850)<<"JournalEntry::JournalEntry, tqparent="<<tqparent<<endl;
   mDirty = false;
   mWriteInProgress = false;
   mChanger = 0;
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 9350d5ea..3ea74f3d 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef JOURNALENTRY_H
 #define JOURNALENTRY_H
@@ -49,10 +49,11 @@ using namespace KCal;
 
 class JournalEntry : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
     typedef ListBase<JournalEntry> List;
 
-    JournalEntry( Journal* j, TQWidget *parent );
+    JournalEntry( Journal* j, TQWidget *tqparent );
     virtual ~JournalEntry();
 
     void setJournal(Journal *);
@@ -113,10 +114,11 @@ class JournalEntry : public TQWidget {
 
 class JournalDateEntry : public TQVBox {
     Q_OBJECT
+  TQ_OBJECT
   public:
     typedef ListBase<JournalDateEntry> List;
 
-    JournalDateEntry( Calendar *, TQWidget *parent );
+    JournalDateEntry( Calendar *, TQWidget *tqparent );
     virtual ~JournalDateEntry();
 
     void addJournal( Journal * );
diff --git a/korganizer/kcalendariface.h b/korganizer/kcalendariface.h
index f4a20d7a..66956514 100644
--- a/korganizer/kcalendariface.h
+++ b/korganizer/kcalendariface.h
@@ -33,7 +33,7 @@
 // in _stub.cpp and _skel.cpp files, to get the definition of the structs.
 #include "kcalendariface.h"
 
-typedef QPair<TQDateTime, TQDateTime> QDateTimePair;
+typedef TQPair<TQDateTime, TQDateTime> TQDateTimePair;
 
 /** Interface class for calendar requests. */
 class KCalendarIface : public DCOPObject
@@ -54,7 +54,7 @@ class KCalendarIface : public DCOPObject
         TQDateTime start; TQDateTime end;
     };
     virtual KCalendarIface::ResourceRequestReply resourceRequest(
-                         const TQValueList< QDateTimePair >& busy,
+                         const TQValueList< TQDateTimePair >& busy,
                          const TQCString& resource,
                          const TQString& vCalIn ) = 0;
 
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index b56c6015..abdd8acd 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -45,8 +45,8 @@
 
 #include "kdatenavigator.h"
 
-KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
-  : TQFrame( parent, name ), mBaseDate( 1970, 1, 1 )
+KDateNavigator::KDateNavigator( TQWidget *tqparent, const char *name )
+  : TQFrame( tqparent, name ), mBaseDate( 1970, 1, 1 )
 {
   TQGridLayout* topLayout = new TQGridLayout( this, 8, 8 );
 
@@ -179,7 +179,7 @@ void KDateNavigator::updateDates()
 
   // set the week numbers.
   for( int i = 0; i < 6; i++ ) {
-    // Use QDate's weekNumber method to determine the week number!
+    // Use TQDate's weekNumber method to determine the week number!
     TQDate dtStart = mDayMatrix->getDate( i * 7 );
     TQDate dtEnd = mDayMatrix->getDate( ( i + 1 ) * 7 - 1 );
     int weeknumstart = calsys->weekNumber( dtStart );
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 682a9358..98bf81d7 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KDATENAVIGATOR_H
 #define KDATENAVIGATOR_H
@@ -42,11 +42,12 @@ using namespace KCal;
 
 class KODayMatrix;
 
-class KDateNavigator: public QFrame
+class KDateNavigator: public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KDateNavigator( TQWidget *parent = 0, const char *name = 0 );
+    KDateNavigator( TQWidget *tqparent = 0, const char *name = 0 );
     ~KDateNavigator();
 
     /**
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index a0aaddbc..bf25165b 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -21,8 +21,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <assert.h>
 
@@ -67,15 +67,15 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
 {
   setLineWidth(0);
   setMargin(0);
-  setBackgroundColor(Qt::red);
+  setBackgroundColor(TQt::red);
   minutes = new TQTimer(this);
   connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation()));
   minutes->start(0, true);
 
   mTimeBox = new TQLabel(this);
-  mTimeBox->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom);
+  mTimeBox->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
   TQPalette pal = mTimeBox->palette();
-  pal.setColor(TQColorGroup::Foreground, Qt::red);
+  pal.setColor(TQColorGroup::Foreground, TQt::red);
   mTimeBox->setPalette(pal);
   mTimeBox->setAutoMask(true);
 
@@ -172,8 +172,8 @@ void MarcusBains::updateLocationRecalc( bool recalculate )
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarView,
-                    TQWidget *parent, const char *name, WFlags f )
-  : TQScrollView( parent, name, f ), mChanger( 0 )
+                    TQWidget *tqparent, const char *name, WFlags f )
+  : TQScrollView( tqparent, name, f ), mChanger( 0 )
 {
   mColumns = columns;
   mRows = rows;
@@ -195,8 +195,8 @@ KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarVi
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
-KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *parent,
-                    const char *name, WFlags f ) : TQScrollView( parent, name, f )
+KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *tqparent,
+                    const char *name, WFlags f ) : TQScrollView( tqparent, name, f )
 {
   mColumns = columns;
   mRows = 1;
@@ -279,7 +279,7 @@ void KOAgenda::init()
   mItemMoved = false;
 
   mSelectedItem = 0;
-  mSelectedUid = TQString::null;
+  mSelectedUid = TQString();
 
   setAcceptDrops( true );
   installEventFilter( this );
@@ -385,7 +385,7 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
     case TQEvent::MouseButtonRelease:
     case TQEvent::MouseMove:
       return eventFilter_mouse( object, static_cast<TQMouseEvent *>( event ) );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     case TQEvent::Wheel:
       return eventFilter_wheel( object, static_cast<TQWheelEvent *>( event ) );
 #endif
@@ -542,7 +542,7 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke )
 
 void KOAgenda::emitNewEventForSelection()
 {
-  QPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
+  TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
   emit newEventSignal( p.first, p.second );
 }
 
@@ -559,7 +559,7 @@ void KOAgenda::finishTypeAhead()
   mTypeAheadEvents.clear();
   mTypeAhead = false;
 }
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
 {
   TQPoint viewportPos;
@@ -574,7 +574,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
     //  e->type()<<" delta: "<< e->delta()<< endl;
     emit zoomView( -e->delta() ,
       contentsToGrid( viewportToContents( viewportPos ) ),
-      Qt::Horizontal );
+      TQt::Horizontal );
     accepted=true;
   }
 
@@ -586,7 +586,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
     }
     emit zoomView( -e->delta() ,
       contentsToGrid( viewportToContents( viewportPos ) ),
-      Qt::Vertical );
+      TQt::Vertical );
     emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos ))));
     accepted=true;
   }
@@ -724,7 +724,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
     case TQEvent::MouseButtonDblClick:
       if (object == viewport()) {
         selectItem(0);
-        QPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
+        TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
         emit newEventSignal( p.first, p.second );
       } else {
         KOAgendaItem *doubleClickedItem = dynamic_cast<KOAgendaItem *>( object );
@@ -1002,7 +1002,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
             // erase current item (i.e. remove it from the multiItem list)
             firstItem = moveItem->nextMultiItem();
             moveItem->hide();
-            mItems.take( mItems.find( moveItem ) );
+            mItems.take( mItems.tqfind( moveItem ) );
             removeChild( moveItem );
             mActionItem->removeMoveItem(moveItem);
             moveItem=firstItem;
@@ -1019,7 +1019,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
             // erase current item
             lastItem = moveItem->prevMultiItem();
             moveItem->hide();
-            mItems.take( mItems.find(moveItem) );
+            mItems.take( mItems.tqfind(moveItem) );
             removeChild( moveItem );
             moveItem->removeMoveItem( moveItem );
             moveItem = lastItem;
@@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem )
 
   agendaItem->hide();
   addChild( agendaItem );
-  if ( !mItems.tqcontainsRef( agendaItem ) ) {
+  if ( !mItems.containsRef( agendaItem ) ) {
     mItems.append( agendaItem );
   }
   placeSubCells( agendaItem );
@@ -1785,7 +1785,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item )
   TQPtrList<KOAgendaItem> conflictItems = thisItem->conflictItems();
   removeChild( thisItem );
 
-  int pos = mItems.find( thisItem );
+  int pos = mItems.tqfind( thisItem );
   if ( pos >= 0 ) {
     mItems.take( pos );
     taken = true;
@@ -1811,7 +1811,7 @@ void KOAgenda::deleteItemsToDelete()
 /*TQSizePolicy KOAgenda::sizePolicy() const
 {
   // Thought this would make the all-day event agenda minimum size and the
-  // normal agenda take the remaining space. But it doesnt work. The QSplitter
+  // normal agenda take the remaining space. But it doesnt work. The TQSplitter
   // dont seem to think that an Expanding widget needs more space than a
   // Preferred one.
   // But it doesnt hurt, so it stays.
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 223ea1aa..2dfb4551 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOAGENDA_H
 #define KOAGENDA_H
@@ -53,6 +53,7 @@ using namespace KCal;
 class MarcusBains : public TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     MarcusBains( KOAgenda *agenda = 0, const char *name = 0 );
     void updateLocationRecalc( bool recalculate = false );
@@ -73,11 +74,12 @@ class MarcusBains : public TQFrame
 class KOAgenda : public TQScrollView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView,
-               TQWidget *parent=0, const char *name = 0, WFlags f = 0 );
+               TQWidget *tqparent=0, const char *name = 0, WFlags f = 0 );
 
-    KOAgenda ( int columns, CalendarView *calendarView, TQWidget *parent = 0,
+    KOAgenda ( int columns, CalendarView *calendarView, TQWidget *tqparent = 0,
                const char *name = 0, WFlags f = 0 );
     virtual ~KOAgenda();
 
@@ -215,7 +217,7 @@ class KOAgenda : public TQScrollView
 
     /** Handles mouse events. Called from eventFilter */
     virtual bool eventFilter_mouse ( TQObject *, TQMouseEvent * );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     /** Handles mousewheel events. Called from eventFilter */
     virtual bool eventFilter_wheel ( TQObject *, TQWheelEvent * );
 #endif
@@ -287,7 +289,7 @@ class KOAgenda : public TQScrollView
     /** delete the items that are queued for deletion */
     void deleteItemsToDelete();
     /** Resizes all the child elements after the size of the agenda
-        changed. This is needed because Qt seems to have a bug when
+        changed. This is needed because TQt seems to have a bug when
         the resizeEvent of one of the widgets in a splitter takes a
         lot of time / does a lot of resizes.... see bug 80114 */
     void resizeAllContents();
@@ -346,7 +348,7 @@ class KOAgenda : public TQScrollView
 
     // The KOAgendaItem, which is being moved/resized
     TQGuardedPtr<KOAgendaItem> mActionItem;
-    QPair<ResourceCalendar *, TQString> mResPair;
+    TQPair<ResourceCalendar *, TQString> mResPair;
 
     // Currently selected item
     TQGuardedPtr<KOAgendaItem> mSelectedItem;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 21eea0e1..a7ba07d0 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -64,10 +64,10 @@ TQPixmap *KOAgendaItem::organizerPxmp = 0;
 //--------------------------------------------------------------------------
 
 KOAgendaItem::KOAgendaItem( Calendar *calendar, Incidence *incidence,
-                            const TQDate &qd, TQWidget *parent,
+                            const TQDate &qd, TQWidget *tqparent,
                             int itemPos, int itemCount,
                             const char *name, WFlags f ) :
-  TQWidget( parent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ),
+  TQWidget( tqparent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ),
   mLabelText( mIncidence->summary() ), mIconAlarm( false ),
   mIconRecur( false ), mIconReadonly( false ), mIconReply( false ),
   mIconGroup( false ), mIconGroupTentative( false ), mIconOrganizer( false ),
@@ -75,7 +75,7 @@ KOAgendaItem::KOAgendaItem( Calendar *calendar, Incidence *incidence,
   mItemPos( itemPos ), mItemCount( itemCount ),
   mMultiItemInfo( 0 ), mStartMoveInfo( 0 )
 {
-  setBackgroundMode( Qt::NoBackground );
+  setBackgroundMode( TQt::NoBackground );
 
   setCellXY( 0, 0, 1 );
   setCellXRight( 0 );
@@ -624,7 +624,7 @@ void KOAgendaItem::setConflictItems( TQPtrList<KOAgendaItem> ci )
 
 void KOAgendaItem::addConflictItem( KOAgendaItem *ci )
 {
-  if ( mConflictItems.find( ci ) < 0 ) mConflictItems.append( ci );
+  if ( mConflictItems.tqfind( ci ) < 0 ) mConflictItems.append( ci );
 }
 
 TQString KOAgendaItem::label() const
@@ -857,10 +857,10 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   int th = ww->boundingRect().height();
   delete ww;
 
-  int hlHeight = QMAX(fm.boundingRect(longH).height(),
-     QMAX(alarmPxmp->height(), QMAX(recurPxmp->height(),
-     QMAX(readonlyPxmp->height(), QMAX(replyPxmp->height(),
-     QMAX(groupPxmp->height(), organizerPxmp->height()))))));
+  int hlHeight = TQMAX(fm.boundingRect(longH).height(),
+     TQMAX(alarmPxmp->height(), TQMAX(recurPxmp->height(),
+     TQMAX(readonlyPxmp->height(), TQMAX(replyPxmp->height(),
+     TQMAX(groupPxmp->height(), organizerPxmp->height()))))));
 
   bool completelyRenderable = th < (height() - 2 * ft - 2 - hlHeight);
 
@@ -917,7 +917,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
                                 mLabelText );
 
     //kdDebug() << "SIZES for " << mLabelText <<  ": " << width() << " :: " << txtWidth << endl;
-    ww->drawText( &p, x, margin, Qt::AlignHCenter | KWordWrap::FadeOut );
+    ww->drawText( &p, x, margin, TQt::AlignHCenter | KWordWrap::FadeOut );
     delete ww;
     return;
   }
@@ -986,12 +986,12 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   p.setBackgroundColor( bgColor );
   p.setPen( textColor );
   TQString ws = ww->wrappedString();
-  if ( ws.left( ws.length()-1 ).find( '\n' ) >= 0 )
+  if ( ws.left( ws.length()-1 ).tqfind( '\n' ) >= 0 )
     ww->drawText( &p, eventX, y,
-                  Qt::AlignAuto | KWordWrap::FadeOut );
+                  TQt::AlignAuto | KWordWrap::FadeOut );
   else
     ww->drawText( &p, eventX + (txtWidth-ww->boundingRect().width()-2*margin)/2,
-                  y, Qt::AlignHCenter | KWordWrap::FadeOut );
+                  y, TQt::AlignHCenter | KWordWrap::FadeOut );
   delete ww;
 }
 
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index f1559442..fa4b7c43 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOAGENDAITEM_H
 #define KOAGENDAITEM_H
@@ -53,7 +53,7 @@ struct MultiItemInfo
 /*
   The KOAgendaItem has to make sure that it receives all mouse events, which are
   to be used for dragging and resizing. That means it has to be installed as
-  eventfiler for its children, if it has children, and it has to pass mouse
+  eventfiler for its tqchildren, if it has tqchildren, and it has to pass mouse
   events from the cildren to itself. See eventFilter().
 
 
@@ -75,9 +75,10 @@ struct MultiItemInfo
 class KOAgendaItem : public TQWidget, public KOrg::CellItem
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd,
-                  TQWidget *parent,
+                  TQWidget *tqparent,
                   int itemPos, int itemCount,
                   const char *name = 0, WFlags f = 0 );
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8cc7c561..49a21acf 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqhbox.h>
@@ -76,8 +76,8 @@
 using namespace KOrg;
 
 
-EventIndicator::EventIndicator(Location loc,TQWidget *parent,const char *name)
-  : TQFrame(parent,name)
+EventIndicator::EventIndicator(Location loc,TQWidget *tqparent,const char *name)
+  : TQFrame(tqparent,name)
 {
   mColumns = 1;
   mEnabled.resize( mColumns );
@@ -133,8 +133,8 @@ void EventIndicator::enableColumn(int column, bool enable)
 
 
 KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &longlabel,
-    const TQString &extensivelabel, TQWidget *parent, const char *name )
-  : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel),
+    const TQString &extensivelabel, TQWidget *tqparent, const char *name )
+  : TQLabel(tqparent, name), mTextTypeFixed(false), mShortText(shortlabel),
     mLongText(longlabel), mExtensiveText(extensivelabel)
 {
   tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
@@ -248,10 +248,10 @@ TQSize KOAlternateLabel::tqminimumSizeHint() const
 
 KOAgendaView::KOAgendaView( Calendar *cal,
                             CalendarView *calendarView,
-                            TQWidget *parent,
+                            TQWidget *tqparent,
                             const char *name,
                             bool isSideBySide ) :
-  KOrg::AgendaView (cal, parent,name), mExpandButton( 0 ),
+  KOrg::AgendaView (cal, tqparent,name), mExpandButton( 0 ),
   mAllowAgendaUpdate( true ),
   mUpdateItem( 0 ),
   mIsSideBySide( isSideBySide ),
@@ -318,7 +318,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
     connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
   } else {
     TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
-    label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+    label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   }
 
   mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame );
@@ -569,7 +569,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
 
   //Zoom to the selected incidence, on the other way
   // zoom to the date on screen after the first mousewheel move.
-  if ( orient == Qt::Horizontal ) {
+  if ( orient == TQt::Horizontal ) {
     TQDate date=mAgenda->selectedIncidenceDate();
     if ( date.isValid() )
       zoomDate=date;
@@ -649,7 +649,7 @@ void KOAgendaView::createDayLabels( bool force )
     TQStringList::ConstIterator textit = texts.begin();
     for ( ; textit != texts.end(); ++textit ) {
       // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
-      KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString::null, mDayLabels );
+      KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels );
       label->setMinimumWidth(1);
       label->tqsetAlignment(AlignCenter);
       dayLayout->addWidget(label);
@@ -662,7 +662,7 @@ void KOAgendaView::createDayLabels( bool force )
       TQString text = it->shortText( date );
       if ( !text.isEmpty() ) {
         // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
-        KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString::null, mDayLabels );
+        KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels );
         label->setMinimumWidth(1);
         label->tqsetAlignment(AlignCenter);
         dayLayout->addWidget(label);
@@ -783,7 +783,7 @@ void KOAgendaView::updateConfig()
 {
 //  kdDebug(5850) << "KOAgendaView::updateConfig()" << endl;
 
-  // update config for children
+  // update config for tqchildren
   mTimeLabels->updateConfig();
   mAgenda->updateConfig();
   mAllDayAgenda->updateConfig();
@@ -813,7 +813,7 @@ void KOAgendaView::updateTimeBarWidth()
   int width;
 
   width = mDummyAllDayLeft->fontMetrics().width( i18n("All Day") );
-  width = QMAX( width, mTimeLabels->width() );
+  width = TQMAX( width, mTimeLabels->width() );
 
   mDummyAllDayLeft->setFixedWidth( width );
   mTimeLabels->setFixedWidth( width );
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index c44c2508..25c1dd15 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOAGENDAVIEW_H
 #define KOAGENDAVIEW_H
@@ -48,12 +48,13 @@ namespace KOrg {
   class IncidenceChangerBase;
 }
 
-class EventIndicator : public QFrame
+class EventIndicator : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum Location { Top, Bottom };
-    EventIndicator( Location loc = Top, TQWidget *parent = 0,
+    EventIndicator( Location loc = Top, TQWidget *tqparent = 0,
                     const char *name = 0 );
     virtual ~EventIndicator();
 
@@ -71,13 +72,14 @@ class EventIndicator : public QFrame
     TQMemArray<bool> mEnabled;
 };
 
-class KOAlternateLabel : public QLabel
+class KOAlternateLabel : public TQLabel
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel,
-                      const TQString &extensivelabel = TQString::null,
-                      TQWidget *parent = 0, const char *name = 0 );
+                      const TQString &extensivelabel = TQString(),
+                      TQWidget *tqparent = 0, const char *name = 0 );
     ~KOAlternateLabel();
 
     virtual TQSize tqminimumSizeHint() const;
@@ -106,10 +108,11 @@ class KOAlternateLabel : public QLabel
 class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOAgendaView( Calendar *cal,
                   CalendarView *calendarView,
-                  TQWidget *parent = 0,
+                  TQWidget *tqparent = 0,
                   const char *name = 0,
                   bool isSideBySide = false );
     virtual ~KOAgendaView();
@@ -193,7 +196,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     void zoomOutVertically( );
 
     void zoomView( const int delta, const TQPoint &pos,
-      const Qt::Orientation orient=Qt::Horizontal );
+      const Qt::Orientation orient=TQt::Horizontal );
 
     void clearTimeSpanSelection();
 
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index ff533841..ffa9e4c0 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <stdlib.h>
@@ -149,7 +149,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
   }
 
   // Handle window activation
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
   KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() );
 #endif
 }
diff --git a/korganizer/koapp.h b/korganizer/koapp.h
index 776f1572..80b3d2d6 100644
--- a/korganizer/koapp.h
+++ b/korganizer/koapp.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORGANIZERAPP_H
 #define KORGANIZERAPP_H
@@ -30,6 +30,7 @@
 class KOrganizerApp : public KUniqueApplication
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOrganizerApp();
     ~KOrganizerApp();
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 548e6acb..d24a8812 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -55,15 +55,15 @@
 
 using namespace KCal;
 
-KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) :
-    TQWidget( parent, name ),
+KOAttendeeEditor::KOAttendeeEditor( TQWidget * tqparent, const char *name ) :
+    TQWidget( tqparent, name ),
     mDisableItemUpdate( true )
 {
 }
 
-void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initOrganizerWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout)
 {
-  mOrganizerHBox = new TQHBox( parent );
+  mOrganizerHBox = new TQHBox( tqparent );
   tqlayout->addWidget( mOrganizerHBox );
   // If creating a new event, then the user is the organizer -> show the
   // identity combo
@@ -91,7 +91,7 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql
   mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 );
 }
 
-void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout)
 {
   TQGridLayout *topLayout = new TQGridLayout();
   tqlayout->addLayout( topLayout );
@@ -99,12 +99,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout
   TQString whatsThis = i18n("Edits the name of the attendee selected in the list "
                            "above, or adds a new attendee if there are no attendees"
                            "in the list.");
-  TQLabel *attendeeLabel = new TQLabel( parent );
+  TQLabel *attendeeLabel = new TQLabel( tqparent );
   TQWhatsThis::add( attendeeLabel, whatsThis );
   attendeeLabel->setText( i18n("Na&me:") );
   topLayout->addWidget( attendeeLabel, 0, 0 );
 
-  mNameEdit = new KPIM::AddresseeLineEdit( parent );
+  mNameEdit = new KPIM::AddresseeLineEdit( tqparent );
   TQWhatsThis::add( mNameEdit, whatsThis );
   mNameEdit->setClickMessage( i18n("Click to add a new attendee") );
   attendeeLabel->setBuddy( mNameEdit );
@@ -116,12 +116,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout
 
   whatsThis = i18n("Edits the role of the attendee selected "
                    "in the list above.");
-  TQLabel *attendeeRoleLabel = new TQLabel( parent );
+  TQLabel *attendeeRoleLabel = new TQLabel( tqparent );
   TQWhatsThis::add( attendeeRoleLabel, whatsThis );
   attendeeRoleLabel->setText( i18n("Ro&le:") );
   topLayout->addWidget( attendeeRoleLabel, 1, 0 );
 
-  mRoleCombo = new TQComboBox( false, parent );
+  mRoleCombo = new TQComboBox( false, tqparent );
   TQWhatsThis::add( mRoleCombo, whatsThis );
   mRoleCombo->insertStringList( Attendee::roleList() );
   attendeeRoleLabel->setBuddy( mRoleCombo );
@@ -129,17 +129,17 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout
            TQT_SLOT( updateAttendee() ) );
   topLayout->addWidget( mRoleCombo, 1, 1 );
 
-  mDelegateLabel = new TQLabel( parent );
+  mDelegateLabel = new TQLabel( tqparent );
   topLayout->addWidget( mDelegateLabel, 1, 2 );
 
   whatsThis = i18n("Edits the current attendance status of the attendee "
                    "selected in the list above.");
-  TQLabel *statusLabel = new TQLabel( parent );
+  TQLabel *statusLabel = new TQLabel( tqparent );
   TQWhatsThis::add( statusLabel, whatsThis );
   statusLabel->setText( i18n("Stat&us:") );
   topLayout->addWidget( statusLabel, 2, 0 );
 
-  mStatusCombo = new TQComboBox( false, parent );
+  mStatusCombo = new TQComboBox( false, tqparent );
   TQWhatsThis::add( mStatusCombo, whatsThis );
 //   mStatusCombo->insertStringList( Attendee::statusList() );
   mStatusCombo->insertItem( SmallIcon( "help" ), Attendee::statusName( Attendee::NeedsAction ) );
@@ -157,7 +157,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout
 
   topLayout->setColStretch( 2, 1 );
 
-  mRsvpButton = new TQCheckBox( parent );
+  mRsvpButton = new TQCheckBox( tqparent );
   TQWhatsThis::add( mRsvpButton,
 		   i18n("Edits whether to send an email to the attendee "
 			"selected in the list above to request "
@@ -166,7 +166,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout
   connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) );
   topLayout->addWidget( mRsvpButton, 2, 2 );
 
-  TQWidget *buttonBox = new TQWidget( parent );
+  TQWidget *buttonBox = new TQWidget( tqparent );
   TQVBoxLayout *buttonLayout = new TQVBoxLayout( buttonBox );
 
   mAddButton = new TQPushButton( i18n("&New"), buttonBox );
@@ -250,7 +250,7 @@ void KOAttendeeEditor::fillOrganizerCombo()
   const TQStringList lst = KOPrefs::instance()->fullEmails();
   TQStringList uniqueList;
   for( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-    if ( uniqueList.find( *it ) == uniqueList.end() )
+    if ( uniqueList.tqfind( *it ) == uniqueList.end() )
       uniqueList << *it;
   }
   mOrganizerCombo->insertStringList( uniqueList );
@@ -262,7 +262,7 @@ void KOAttendeeEditor::addNewAttendee()
   // suggest to edit that first
   if ( TQListViewItem* item = hasExampleAttendee() ) {
       KMessageBox::information( this,
-          i18n( "Please edit the example attendee, before adding more." ), TQString::null,
+          i18n( "Please edit the example attendee, before adding more." ), TQString(),
           "EditExistingExampleAttendeeFirst" );
       // make sure the example attendee is selected
       item->setSelected( true );
@@ -367,7 +367,7 @@ void KOAttendeeEditor::setEnableAttendeeInput(bool enabled)
 void KOAttendeeEditor::clearAttendeeInput()
 {
   mNameEdit->setText("");
-  mUid = TQString::null;
+  mUid = TQString();
   mRoleCombo->setCurrentItem(0);
   mStatusCombo->setCurrentItem(0);
   mRsvpButton->setChecked(true);
@@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee()
   a->setUid( mUid );
   a->setEmail( email );
   a->setRole( Attendee::Role( mRoleCombo->currentItem() ) );
-  a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
+  a->setqStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
   a->setRSVP( mRsvpButton->isChecked() );
 
   updateCurrentItem();
@@ -566,7 +566,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text )
   TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit;
   for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
     KABC::Addressee a = (*eit).addressee;
-    if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+    if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
       aList.append( a ) ;
     }
   }
@@ -581,7 +581,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text )
       TQValueList<KABC::DistributionList::Entry>::ConstIterator eit;
       for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
         KABC::Addressee a = (*eit).addressee;
-        if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+        if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
           aList.append( a ) ;
         }
       }
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 42728a97..85c15e8e 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -44,11 +44,12 @@ namespace KCal {
 /**
   Common base class for attendee editor and free busy view.
 */
-class KOAttendeeEditor : public QWidget
+class KOAttendeeEditor : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KOAttendeeEditor( TQWidget *parent, const char *name = 0 );
+    KOAttendeeEditor( TQWidget *tqparent, const char *name = 0 );
 
     virtual void insertAttendee( KCal::Attendee *attendee, bool fetchFB = true ) = 0;
     virtual void removeAttendee( KCal::Attendee *attendee ) = 0;
@@ -67,8 +68,8 @@ class KOAttendeeEditor : public QWidget
     void updateAttendeeSummary( int count );
 
   protected:
-    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
-    void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
+    void initOrganizerWidgets( TQWidget *tqparent, TQBoxLayout *tqlayout );
+    void initEditWidgets( TQWidget *tqparent, TQBoxLayout *tqlayout );
 
     /** Reads values from a KABC::Addressee and inserts a new Attendee
      * item into the listview with those items. Used when adding attendees
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index d4829559..6313dd2f 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kocore.h"
@@ -170,7 +170,7 @@ KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name )
   return 0;
 }
 
-KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *parent )
+KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *tqparent )
 {
   kdDebug(5850) << "loadPart: library: " << service->library() << endl;
 
@@ -194,7 +194,7 @@ KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *parent )
     return 0;
   }
 
-  return pluginFactory->create( parent );
+  return pluginFactory->create( tqparent );
 }
 
 KOrg::PrintPlugin *KOCore::loadPrintPlugin( KService::Ptr service )
@@ -237,20 +237,20 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg )
 KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 {
   TQWidget *topLevel = wdg->tqtopLevelWidget();
-  TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel );
+  TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.tqfind( topLevel );
   if ( it != mXMLGUIClients.end() )
     return it.data();
 
   return 0;
 }
 
-KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent )
+KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *tqparent )
 {
   KTrader::OfferList list = availableParts();
   KTrader::OfferList::ConstIterator it;
   for( it = list.begin(); it != list.end(); ++it ) {
     if ( (*it)->desktopEntryName() == name ) {
-      return loadPart( *it, parent );
+      return loadPart( *it, tqparent );
     }
   }
   return 0;
@@ -279,7 +279,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations()
     for( it = plugins.begin(); it != plugins.end(); ++it ) {
       if ( (*it)->hasServiceType("Calendar/Decoration") ) {
         TQString name = (*it)->desktopEntryName();
-        if ( selectedPlugins.find( name ) != selectedPlugins.end() ) {
+        if ( selectedPlugins.tqfind( name ) != selectedPlugins.end() ) {
           KOrg::CalendarDecoration *d = loadCalendarDecoration(*it);
           mCalendarDecorations.append( d );
         }
@@ -291,7 +291,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations()
   return mCalendarDecorations;
 }
 
-KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent )
+KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *tqparent )
 {
   KOrg::Part::List parts;
 
@@ -300,15 +300,15 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent )
   KTrader::OfferList plugins = availableParts();
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
-    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
-      KOrg::Part *part = loadPart( *it, parent );
+      KOrg::Part *part = loadPart( *it, tqparent );
       if ( part ) {
-        if ( !parent->mainGuiClient() ) {
-          kdError() << "KOCore::loadParts(): parent has no mainGuiClient."
+        if ( !tqparent->mainGuiClient() ) {
+          kdError() << "KOCore::loadParts(): tqparent has no mainGuiClient."
                     << endl;
         } else {
-          parent->mainGuiClient()->insertChildClient( part );
+          tqparent->mainGuiClient()->insertChildClient( part );
           parts.append( part );
         }
       }
@@ -326,7 +326,7 @@ KOrg::PrintPlugin::List KOCore::loadPrintPlugins()
   KTrader::OfferList plugins = availablePrintPlugins();
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
-    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
       KOrg::PrintPlugin *part = loadPrintPlugin( *it );
       if ( part ) loadedPlugins.append( part );
@@ -346,26 +346,26 @@ void KOCore::unloadPlugins()
   mCalendarDecorationsLoaded = false;
 }
 
-void KOCore::unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts )
+void KOCore::unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts )
 {
   KOrg::Part *part;
   for( part = parts.first(); part; part = parts.next() ) {
-    parent->mainGuiClient()->removeChildClient( part );
+    tqparent->mainGuiClient()->removeChildClient( part );
     delete part;
   }
   parts.clear();
 }
 
-KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *parent,
+KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *tqparent,
                                       KOrg::Part::List &parts )
 {
-  KXMLGUIFactory *factory = parent->mainGuiClient()->factory();
-  factory->removeClient( parent->mainGuiClient() );
+  KXMLGUIFactory *factory = tqparent->mainGuiClient()->factory();
+  factory->removeClient( tqparent->mainGuiClient() );
 
-  unloadParts( parent, parts );
-  KOrg::Part::List list = loadParts( parent );
+  unloadParts( tqparent, parts );
+  KOrg::Part::List list = loadParts( tqparent );
 
-  factory->addClient( parent->mainGuiClient() );
+  factory->addClient( tqparent->mainGuiClient() );
 
   return list;
 }
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index f2838263..9feaaf0a 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOCORE_H
 #define KOCORE_H
@@ -52,15 +52,15 @@ class KDE_EXPORT KOCore
     KOrg::CalendarDecoration *loadCalendarDecoration( KService::Ptr service );
     KOrg::CalendarDecoration *loadCalendarDecoration( const TQString & );
 
-    KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *parent );
-    KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *parent );
+    KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *tqparent );
+    KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *tqparent );
     
     KOrg::PrintPlugin *loadPrintPlugin( KService::Ptr service );
     KOrg::PrintPlugin *loadPrintPlugin( const TQString & );
 
     KOrg::CalendarDecoration::List calendarDecorations();
     KOrg::PrintPlugin::List loadPrintPlugins();
-    KOrg::Part::List loadParts( KOrg::MainWindow *parent );
+    KOrg::Part::List loadParts( KOrg::MainWindow *tqparent );
 
     void addXMLGUIClient( TQWidget*, KXMLGUIClient *guiclient );
     void removeXMLGUIClient( TQWidget* );
@@ -70,7 +70,7 @@ class KDE_EXPORT KOCore
       Unload the parts in &p parts for this main window. Clears
       parts.
     */
-    void unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts );
+    void unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts );
     void unloadPlugins();
 
     void reloadPlugins();
@@ -79,7 +79,7 @@ class KDE_EXPORT KOCore
       Unloads the parts from the main window. Loads the parts that
       are listed in KOPrefs and returns a list of these parts.
     */
-    KOrg::Part::List reloadParts( KOrg::MainWindow *parent,
+    KOrg::Part::List reloadParts( KOrg::MainWindow *tqparent,
                                   KOrg::Part::List &parts );
 
     KPIM::IdentityManager* identityManager();
diff --git a/korganizer/kocorehelper.cpp b/korganizer/kocorehelper.cpp
index 5538d9c3..3b69fb7d 100644
--- a/korganizer/kocorehelper.cpp
+++ b/korganizer/kocorehelper.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kocorehelper.h"
diff --git a/korganizer/kocorehelper.h b/korganizer/kocorehelper.h
index ff3c55a3..b140f78e 100644
--- a/korganizer/kocorehelper.h
+++ b/korganizer/kocorehelper.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOCOREHELPER_H
 #define _KOCOREHELPER_H
diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp
index a8a581d0..1490b804 100644
--- a/korganizer/kocounterdialog.cpp
+++ b/korganizer/kocounterdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -32,8 +32,8 @@
 #include "kocounterdialog.h"
 #include "kocounterdialog.moc"
 
-KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const char *name )
-  : KDialogBase( parent, name, false, i18n("Counter-Event Viewer"),
+KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *tqparent, const char *name )
+  : KDialogBase( tqparent, name, false, i18n("Counter-Event Viewer"),
                  User1 | User2, User1, false, i18n("Decline"), i18n("Accept") )
 {
   mEventViewer = new KOEventViewer( calendar, this );
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index 64757e98..c18f9153 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOCOUNTERDIALOG_H
 #define KOCOUNTERDIALOG_H
@@ -39,8 +39,9 @@ class KOEventViewer;
 class KOCounterDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
+    KOCounterDialog(Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~KOCounterDialog();
 
     void setIncidence( Incidence *incidence );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 93fb8740..cb172e9c 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -22,8 +22,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqevent.h>
@@ -57,17 +57,17 @@
 #undef FocusIn
 #undef KeyPress
 #undef None
-#undef Status
+#undef tqStatus
 #endif
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
-DynamicTip::DynamicTip( TQWidget * parent )
-    : TQToolTip( parent )
+DynamicTip::DynamicTip( TQWidget * tqparent )
+    : TQToolTip( tqparent )
 {
-  mMatrix = static_cast<KODayMatrix *>( parent );
+  mMatrix = static_cast<KODayMatrix *>( tqparent );
 }
 
 
@@ -99,12 +99,12 @@ void DynamicTip::maybeTip( const TQPoint &pos )
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
-KODayMatrix::KODayMatrix( TQWidget *parent, const char *name )
-  : TQFrame( parent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false )
+KODayMatrix::KODayMatrix( TQWidget *tqparent, const char *name )
+  : TQFrame( tqparent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false )
 {
   // initialize dynamic arrays
-  mDays = new QDate[ NUMDAYS ];
-  mDayLabels = new QString[ NUMDAYS ];
+  mDays = new TQDate[ NUMDAYS ];
+  mDayLabels = new TQString[ NUMDAYS ];
   mEvents = new int[ NUMDAYS ];
   mToolTip = new DynamicTip( this );
 
@@ -279,7 +279,7 @@ void KODayMatrix::updateView( const TQDate &actdate )
   for( int i = 0; i < NUMDAYS; i++ ) {
     //if it is a holy day then draw it red. Sundays are consider holidays, too
     TQStringList holidays = KOGlobals::self()->holiday( mDays[ i ] );
-    TQString holiStr = TQString::null;
+    TQString holiStr = TQString();
 
     if ( ( KOGlobals::self()->calendarSystem()->dayOfWeek( mDays[ i ] ) ==
            KOGlobals::self()->calendarSystem()->weekDayOfPray() ) ||
@@ -681,7 +681,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * )
     }
 
     p.drawText(col*dwidth, row*dheight, dwidth, dheight,
-              Qt::AlignHCenter | Qt::AlignVCenter,  mDayLabels[i]);
+              TQt::AlignHCenter | TQt::AlignVCenter,  mDayLabels[i]);
 
     // reset color to actual color
     if ( holiday ) {
@@ -710,7 +710,7 @@ void KODayMatrix::resizeEvent( TQResizeEvent * )
 }
 
 /* static */
-QPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
+TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
 {
   const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
   TQDate d = month;
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 3752d52f..443ecc0e 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KODAYMATRIX_H
 #define KODAYMATRIX_H
@@ -53,19 +53,19 @@ using namespace KCal;
  *  This class asks the day matrix object for a appropriate label which
  *  is in our special case the name of the holiday or null if this day is no holiday.
  */
-class DynamicTip : public QToolTip
+class DynamicTip : public TQToolTip
 {
   public:
     /**
-     * Constructor that expects a KODayMatrix object as parent.
+     * Constructor that expects a KODayMatrix object as tqparent.
      *
-     * @param parent the parent KODayMatrix control.
+     * @param tqparent the tqparent KODayMatrix control.
      */
-    DynamicTip( TQWidget *parent );
+    DynamicTip( TQWidget *tqparent );
 
   protected:
     /**
-     * Qt's callback to ask the object to provide an approrpiate text for the
+     * TQt's callback to ask the object to provide an approrpiate text for the
      * tooltip to be shown.
      *
      * @param pos coordinates of the mouse.
@@ -73,14 +73,14 @@ class DynamicTip : public QToolTip
     void maybeTip( const TQPoint &pos );
 
   private:
-    /** the parent control this tooltip is designed for. */
+    /** the tqparent control this tooltip is designed for. */
     KODayMatrix *mMatrix;
 };
 
 /**
  *  Replacement for kdpdatebuton.cpp that used 42 widgets for the day matrix to be displayed.
  *  Cornelius thought this was a waste of memory and a lot of overhead.
- *  In addition the selection was not very intuitive so I decided to rewrite it using a QFrame
+ *  In addition the selection was not very intuitive so I decided to rewrite it using a TQFrame
  *  that draws the labels and allows for dragging selection while maintaining nearly full
  *  compatibility in behavior with its predecessor.
  *
@@ -91,7 +91,7 @@ class DynamicTip : public QToolTip
  *  o no support for Ctrl+click to create groups of dates
  *    (This has not really been supported in the predecessor. It was not very intuitive nor was it
  *     user friendly.)
- *    This feature has been tqreplaced with dragging a selection on the matrix. The matrix will
+ *    This feature has been replaced with dragging a selection on the matrix. The matrix will
  *    automatically choose the appropriate selection (e.g. you are not any longer able to select
  *    two distinct groups of date selections as in the old class)
  *  o now that you can select more then a week it can happen that not all selected days are
@@ -105,14 +105,15 @@ class DynamicTip : public QToolTip
 class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /** constructor to create a day matrix widget.
      *
-     *  @param parent widget that is the parent of the day matrix.
+     *  @param tqparent widget that is the tqparent of the day matrix.
      *  Normally this should be a KDateNavigator
      *  @param name name of the widget
      */
-    KODayMatrix( TQWidget *parent, const char *name );
+    KODayMatrix( TQWidget *tqparent, const char *name );
 
     /** destructor that deallocates all dynamically allocated private members.
      */
@@ -121,7 +122,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
     /** returns the first and last date of the 6*7 matrix that displays @p month
      * @param month The month we want to get matrix boundaries
      */
-    static QPair<TQDate,TQDate> matrixLimits( const TQDate &month );
+    static TQPair<TQDate,TQDate> matrixLimits( const TQDate &month );
 
     /**
       Associate a calendar with this day matrix. If there is a calendar, the day
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 11f01aa5..ff26d005 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kcmultidialog.h>
@@ -90,8 +90,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) :
   mFilterEditDialog = 0;
 
   mCategoryEditDialog = new KPIM::CategoryEditDialog( KOPrefs::instance(), mMainView );
-  // don't set any specific parent for the dialog, as its kept around and reused
-  // in different cases where it should have different parents
+  // don't set any specific tqparent for the dialog, as its kept around and reused
+  // in different cases where it should have different tqparents
   KWin::setMainWindow( mCategoryEditDialog, 0 );
   connect( mainView, TQT_SIGNAL( categoriesChanged() ),
            mCategoryEditDialog, TQT_SLOT( reload() ) );
@@ -108,9 +108,9 @@ KODialogManager::~KODialogManager()
   delete mFilterEditDialog;
 }
 
-void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence )
+void KODialogManager::errorSaveIncidence( TQWidget *tqparent, Incidence *incidence )
 {
-  KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".")
+  KMessageBox::sorry( tqparent, i18n("Unable to save %1 \"%2\".")
                       .arg( i18n( incidence->type() ) )
                       .arg( incidence->summary() ) );
 }
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index 63fee901..b078e01d 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
   As a special exception, permission is given to link this program
-  with any edition of Qt, and distribute the resulting executable,
-  without including the source code for Qt in the source distribution.
+  with any edition of TQt, and distribute the resulting executable,
+  without including the source code for TQt in the source distribution.
 */
 #ifndef KODIALOGMANAGER_H
 #define KODIALOGMANAGER_H
@@ -48,9 +48,10 @@ using namespace KCal;
   This class manages the dialogs used by the calendar view. It owns the objects
   and handles creation and selection.
 */
-class KODialogManager : public QObject
+class KODialogManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KODialogManager( CalendarView * );
     virtual ~KODialogManager();
@@ -69,7 +70,7 @@ class KODialogManager : public QObject
 
     void connectTypeAhead( KOEventEditor *editor, KOrg::AgendaView *agenda );
 
-    static void errorSaveIncidence( TQWidget *parent, Incidence *incidence );
+    static void errorSaveIncidence( TQWidget *tqparent, Incidence *incidence );
 
   public slots:
     void showOptionsDialog();
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index 8f3cb464..d4549578 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeditoralarms_base.h"
@@ -51,10 +51,10 @@
 
 #include <libemailfunctions/email.h>
 
-class AlarmListViewItem : public QListViewItem
+class AlarmListViewItem : public TQListViewItem
 {
   public:
-    AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm, const TQCString &inctype );
+    AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm, const TQCString &inctype );
     virtual ~AlarmListViewItem();
     KCal::Alarm *alarm() const { return mAlarm; }
     void construct();
@@ -67,9 +67,9 @@ class AlarmListViewItem : public QListViewItem
     TQCString mIncType;
 };
 
-AlarmListViewItem::AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm,
+AlarmListViewItem::AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm,
                                       const TQCString &inctype )
-    : TQListViewItem( parent ), mIncType( inctype )
+    : TQListViewItem( tqparent ), mIncType( inctype )
 {
   if ( alarm ) {
     mAlarm = new KCal::Alarm( *alarm );
@@ -188,9 +188,9 @@ void AlarmListViewItem::construct()
 
 
 KOEditorAlarms::KOEditorAlarms( const TQCString &type,
-                                KCal::Alarm::List *alarms, TQWidget *parent,
+                                KCal::Alarm::List *alarms, TQWidget *tqparent,
                                 const char *name )
-  : KDialogBase( parent, name, true, i18n("Advanced Reminders"), Ok | Cancel ),
+  : KDialogBase( tqparent, name, true, i18n("Advanced Reminders"), Ok | Cancel ),
     mType( type ), mAlarms( alarms ),mCurrentItem( 0 )
 {
   if ( mType != "Todo" ) {
@@ -385,7 +385,7 @@ void KOEditorAlarms::writeAlarm( KCal::Alarm *alarm )
           add << KCal::Person( *it );
         }
         // TODO: Add a subject line and possibilities for attachments
-        alarm->setEmailAlarm( TQString::null, mWidget->mEmailText->text(),
+        alarm->setEmailAlarm( TQString(), mWidget->mEmailText->text(),
                               add );
         break; }
     case 0: // Display
diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h
index 971df799..399a4693 100644
--- a/korganizer/koeditoralarms.h
+++ b/korganizer/koeditoralarms.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEDITORALARMS_H
 #define KOEDITORALARMS_H
@@ -34,9 +34,10 @@ class AlarmListViewItem;
 class KOEditorAlarms : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOEditorAlarms( const TQCString &type,
-                    KCal::Alarm::List *alarms, TQWidget *parent = 0,
+                    KCal::Alarm::List *alarms, TQWidget *tqparent = 0,
                     const char *name = 0 );
     ~KOEditorAlarms();
 
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index d7ccd665..2d050159 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KOEditorAlarms_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KOEditorAlarms_base</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>mTimeGroup</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout3</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QSpinBox">
+                        <widget class="TQSpinBox">
                             <property name="name">
                                 <cstring>mAlarmOffset</cstring>
                             </property>
@@ -60,7 +60,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>minute(s)</string>
@@ -80,7 +80,7 @@
                                 <cstring>mOffsetUnit</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>before the start</string>
@@ -107,7 +107,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout8</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>mHowOftenLabel</cstring>
                             </property>
@@ -137,7 +137,7 @@
                                 <cstring>mRepeatCount</cstring>
                             </property>
                         </widget>
-                        <widget class="QSpinBox" row="0" column="2">
+                        <widget class="TQSpinBox" row="0" column="2">
                             <property name="name">
                                 <cstring>mRepeatCount</cstring>
                             </property>
@@ -154,7 +154,7 @@
                                 <number>1</number>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="1">
+                        <widget class="TQLabel" row="1" column="1">
                             <property name="name">
                                 <cstring>mIntervalLabel</cstring>
                             </property>
@@ -168,7 +168,7 @@
                                 <cstring>mRepeatInterval</cstring>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>mRepeats</cstring>
                             </property>
@@ -184,7 +184,7 @@
                                 <string>&amp;Repeat:</string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox" row="1" column="2">
+                        <widget class="TQSpinBox" row="1" column="2">
                             <property name="name">
                                 <cstring>mRepeatInterval</cstring>
                             </property>
@@ -208,7 +208,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>mTypeGroup</cstring>
             </property>
@@ -219,7 +219,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>mAlarmType</cstring>
                     </property>
@@ -250,7 +250,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>mTypeDisplayRadio</cstring>
                             </property>
@@ -261,7 +261,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>mTypeSoundRadio</cstring>
                             </property>
@@ -269,7 +269,7 @@
                                 <string>A&amp;udio</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>mTypeAppRadio</cstring>
                             </property>
@@ -277,7 +277,7 @@
                                 <string>Program</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>mTypeEmailRadio</cstring>
                             </property>
@@ -321,11 +321,11 @@
                         <enum>Vertical</enum>
                     </property>
                 </widget>
-                <widget class="QWidgetStack">
+                <widget class="TQWidgetStack">
                     <property name="name">
                         <cstring>mTypeStack</cstring>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>WStackPage</cstring>
                         </property>
@@ -339,7 +339,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>mDisplayTextLabel</cstring>
                                 </property>
@@ -350,14 +350,14 @@
                                     <cstring>mDisplayText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QTextEdit">
+                            <widget class="TQTextEdit">
                                 <property name="name">
                                     <cstring>mDisplayText</cstring>
                                 </property>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>WStackPage</cstring>
                         </property>
@@ -371,7 +371,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>mSoundFileLabel</cstring>
                                 </property>
@@ -409,7 +409,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>WStackPage</cstring>
                         </property>
@@ -423,7 +423,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>mApplicationLabel</cstring>
                                 </property>
@@ -442,7 +442,7 @@
                                     <string>*.*|All files</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>mAppArgumentsLabel</cstring>
                                 </property>
@@ -453,7 +453,7 @@
                                     <cstring>mAppArguments</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>mAppArguments</cstring>
                                 </property>
@@ -477,7 +477,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>WStackPage</cstring>
                         </property>
@@ -491,7 +491,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>mEmailTextLabel</cstring>
                                 </property>
@@ -502,7 +502,7 @@
                                     <cstring>mEmailText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QTextEdit" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQTextEdit" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>mEmailText</cstring>
                                 </property>
@@ -512,7 +512,7 @@
                                     <cstring>mEmailAddress</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>mEmailToLabel</cstring>
                                 </property>
@@ -528,7 +528,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout7</cstring>
             </property>
@@ -536,7 +536,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>mRemoveButton</cstring>
                     </property>
@@ -544,7 +544,7 @@
                         <string>&amp;Remove</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>mAddButton</cstring>
                     </property>
@@ -552,7 +552,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>mDuplicateButton</cstring>
                     </property>
@@ -577,7 +577,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QListView" row="0" column="0" rowspan="4" colspan="1">
+                <widget class="TQListView" row="0" column="0" rowspan="4" colspan="1">
                     <column>
                         <property name="text">
                             <string>Type</string>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 19a75a99..ddade881 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeditorattachments.h"
@@ -73,8 +73,8 @@
 class AttachmentListItem : public KIconViewItem
 {
   public:
-    AttachmentListItem( KCal::Attachment*att, TQIconView *parent ) :
-        KIconViewItem( parent )
+    AttachmentListItem( KCal::Attachment*att, TQIconView *tqparent ) :
+        KIconViewItem( tqparent )
     {
       if ( att ) {
         mAttachment = new KCal::Attachment( *att );
@@ -151,7 +151,7 @@ class AttachmentListItem : public KIconViewItem
         if ( mAttachment->isUri() ) {
           mimeType = KMimeType::findByURL( mAttachment->uri() );
         } else {
-          mimeType = KMimeType::tqfindByContent( mAttachment->decodedData() );
+          mimeType = KMimeType::findByContent( mAttachment->decodedData() );
         }
         mAttachment->setMimeType( mimeType->name() );
       }
@@ -164,8 +164,8 @@ class AttachmentListItem : public KIconViewItem
 };
 
 AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
-                                            TQWidget *parent )
-  : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, parent, 0, false, false ),
+                                            TQWidget *tqparent )
+  : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, tqparent, 0, false, false ),
     mItem( item ), mURLRequester( 0 )
 {
   TQFrame *topFrame = plainPage();
@@ -313,16 +313,16 @@ void AttachmentEditDialog::urlSelected( const TQString &url )
   mIcon->setPixmap( AttachmentListItem::icon( mMimeType, kurl.path() ) );
 }
 
-AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
-  : KIconView( parent ),
-    mParent( parent )
+AttachmentIconView::AttachmentIconView( KOEditorAttachments* tqparent )
+  : KIconView( tqparent ),
+    mParent( tqparent )
 {
   setSelectionMode( TQIconView::Extended );
   setMode( KIconView::Select );
   setItemTextPos( TQIconView::Right );
   setArrangement( TQIconView::LeftToRight );
-  setMaxItemWidth( QMAX(maxItemWidth(), 250) );
-  setMinimumHeight( QMAX(fontMetrics().height(), 16) + 12 );
+  setMaxItemWidth( TQMAX(maxItemWidth(), 250) );
+  setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 );
 
   connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
            this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) );
@@ -337,10 +337,10 @@ KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
 
   KTempFile *file;
   if ( !patterns.empty() ) {
-    file = new KTempFile( TQString::null,
+    file = new KTempFile( TQString(),
                           TQString( patterns.first() ).remove( '*' ),0600 );
   } else {
-    file = new KTempFile( TQString::null, TQString::null, 0600 );
+    file = new KTempFile( TQString(), TQString(), 0600 );
   }
   file->setAutoDelete( true );
   file->file()->open( IO_WriteOnly );
@@ -447,9 +447,9 @@ void AttachmentIconView::dragEnterEvent( TQDragEnterEvent *event )
   mParent->dragEnterEvent( event );
 }
 
-KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
+KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *tqparent,
                                           const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQHBoxLayout( this );
   topLayout->setSpacing( spacing );
@@ -574,7 +574,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
     TQStringList lst = TQStringList::split( '\n', text, FALSE );
     for ( TQStringList::ConstIterator it = lst.constBegin(); it != lst.constEnd(); ++it ) {
       urls.append( *it );
-      labels.append( TQString::null );
+      labels.append( TQString() );
     }
     probablyWeHaveUris = true;
   }
@@ -609,7 +609,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
       if ( mAttachments->findItem( label ) ) {
         label += '~' + randomString( 3 );
       }
-      addUriAttachment( (*it).url(), TQString::null, label, true );
+      addUriAttachment( (*it).url(), TQString(), label, true );
     }
   } else if ( action != DRAG_CANCEL ) {
     if ( probablyWeHaveUris ) {
@@ -622,7 +622,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
         if ( mAttachments->findItem( label ) ) {
           label += '~' + randomString( 3 );
         }
-        addUriAttachment( (*it).url(), TQString::null, label, true );
+        addUriAttachment( (*it).url(), TQString(), label, true );
       }
     } else { // we take anything
       addDataAttachment( source->tqencodedData( source->format() ),
@@ -675,7 +675,7 @@ void KOEditorAttachments::slotAddData()
     if ( label.isEmpty() ) {
       label = uri.prettyURL();
     }
-    addUriAttachment( uri.url(), TQString::null, label, true );
+    addUriAttachment( uri.url(), TQString(), label, true );
   }
 }
 
@@ -833,7 +833,7 @@ void KOEditorAttachments::addDataAttachment( const TQByteArray &data,
   item->setData( data );
   item->setLabel( nlabel );
   if ( mimeType.isEmpty() ) {
-    item->setMimeType( KMimeType::tqfindByContent( data )->name() );
+    item->setMimeType( KMimeType::findByContent( data )->name() );
   } else {
     item->setMimeType( mimeType );
   }
@@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i )
 
 void KOEditorAttachments::slotCopy()
 {
-    TQApplication::clipboard()->setData( mAttachments->mimeData(), QClipboard::Clipboard );
+    TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
 }
 
 void KOEditorAttachments::slotCut()
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index dfcdb2b5..b5df45c6 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEDITORATTACHMENTS_H
 #define KOEDITORATTACHMENTS_H
@@ -57,8 +57,9 @@ class KTempDir;
 class AttachmentEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 );
+    AttachmentEditDialog( AttachmentListItem *item, TQWidget *tqparent=0 );
 
     void accept();
 
@@ -77,11 +78,12 @@ class AttachmentEditDialog : public KDialogBase
     KURLRequester *mURLRequester;
 };
 
-class KOEditorAttachments : public QWidget
+class KOEditorAttachments : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorAttachments( int spacing = 8, TQWidget *parent = 0,
+    KOEditorAttachments( int spacing = 8, TQWidget *tqparent = 0,
                          const char *name = 0 );
     ~KOEditorAttachments();
 
@@ -150,10 +152,11 @@ class KOEditorAttachments : public QWidget
 class AttachmentIconView : public KIconView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class KOEditorAttachments;
   public:
-    AttachmentIconView( KOEditorAttachments* parent=0 );
+    AttachmentIconView( KOEditorAttachments* tqparent=0 );
     KURL tempFileForAttachment( KCal::Attachment *attachment );
     TQDragObject *mimeData();
     ~AttachmentIconView();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index ee57a3d4..9d31182c 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeditordetails.h"
@@ -91,8 +91,8 @@ void CustomListViewItem<KCal::Attendee *>::updateItem()
   setText(6, mData->delegator());
 }
 
-KOAttendeeListView::KOAttendeeListView ( TQWidget *parent, const char *name )
-  : KListView(parent, name)
+KOAttendeeListView::KOAttendeeListView ( TQWidget *tqparent, const char *name )
+  : KListView(tqparent, name)
 {
   setAcceptDrops( true );
   setAllColumnsShowFocus( true );
@@ -178,9 +178,9 @@ void KOAttendeeListView::dropEvent( TQDropEvent *e )
 }
 
 
-KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent,
+KOEditorDetails::KOEditorDetails( int spacing, TQWidget *tqparent,
                                   const char *name )
-  : KOAttendeeEditor( parent, name), mDisableItemUpdate( false )
+  : KOAttendeeEditor( tqparent, name), mDisableItemUpdate( false )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( spacing );
@@ -199,7 +199,7 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent,
   mListView->addColumn( i18n("Name"), 200 );
   mListView->addColumn( i18n("Email"), 200 );
   mListView->addColumn( i18n("Role"), 80 );
-  mListView->addColumn( i18n("Status"), 100 );
+  mListView->addColumn( i18n("tqStatus"), 100 );
   mListView->addColumn( i18n("RSVP"), 55 );
   mListView->addColumn( i18n("Delegated to"), 120 );
   mListView->addColumn( i18n("Delegated from" ), 120 );
@@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status)
     AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() );
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->data()->email() == *it2 ) {
-        item->data()->seStatus( status );
+        item->data()->setqStatus( status );
         item->updateItem();
       }
     }
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 890841f6..697c4640 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOEDITORDETAILS_H
 #define _KOEDITORDETAILS_H
@@ -60,8 +60,9 @@ typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem;
 class KOAttendeeListView : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  KOAttendeeListView (TQWidget *parent=0, const char *name=0);
+  KOAttendeeListView (TQWidget *tqparent=0, const char *name=0);
   virtual ~KOAttendeeListView();
   virtual void addAttendee( const TQString& newAttendee );
 public slots:
@@ -78,8 +79,9 @@ signals:
 class KOEditorDetails : public KOAttendeeEditor
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0);
+    KOEditorDetails (int spacing = 8,TQWidget* tqparent = 0, const char* name = 0);
     virtual ~KOEditorDetails();
 
     /** Set widgets to default values */
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index af8b0f5c..da7f36f0 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -69,8 +69,8 @@
 class FreeBusyItem : public KDGanttViewTaskItem
 {
   public:
-    FreeBusyItem( Attendee *attendee, KDGanttView *parent ) :
-      KDGanttViewTaskItem( parent, parent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ),
+    FreeBusyItem( Attendee *attendee, KDGanttView *tqparent ) :
+      KDGanttViewTaskItem( tqparent, tqparent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ),
       mIsDownloading( false )
     {
       Q_ASSERT( attendee );
@@ -92,7 +92,7 @@ class FreeBusyItem : public KDGanttViewTaskItem
 
     TQString key( int column, bool ) const
     {
-      TQMap<int,TQString>::ConstIterator it = mKeyMap.find( column );
+      TQMap<int,TQString>::ConstIterator it = mKeyMap.tqfind( column );
       if ( it == mKeyMap.end() ) return listViewText( column );
       else return *it;
     }
@@ -172,7 +172,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
       KDGanttViewTaskItem *newSubItem = new KDGanttViewTaskItem( this );
       newSubItem->setStartTime( per.start() );
       newSubItem->setEndTime( per.end() );
-      newSubItem->setColors( Qt::red, Qt::red, Qt::red );
+      newSubItem->setColors( TQt::red, TQt::red, TQt::red );
 
       TQString toolTip = "<qt>";
       toolTip += "<b>" + i18n( "Freebusy Period" ) + "</b>";
@@ -209,7 +209,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
       //           newSubItem->setStartTime( cur );
       //           cur = cur.addSecs( 7200 );
       //           newSubItem->setEndTime( cur );
-      //           newSubItem->setColors( Qt::red, Qt::red, Qt::red );
+      //           newSubItem->setColors( TQt::red, TQt::red, TQt::red );
       //       }
       //debug only end
       setFreeBusy( 0 );
@@ -222,9 +222,9 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
 
 ////
 
-KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
+KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *tqparent,
                                     const char *name )
-  : KOAttendeeEditor( parent, name )
+  : KOAttendeeEditor( tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( spacing );
@@ -327,7 +327,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
 
   // mEventRectangle is the colored rectangle representing the event being modified
   mEventRectangle = new KDIntervalColorRectangle( mGanttView );
-  mEventRectangle->setColor( Qt::magenta );
+  mEventRectangle->setColor( TQt::magenta );
   mGanttView->addIntervalBackgroundColor( mEventRectangle );
 
   connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &,
@@ -544,7 +544,7 @@ void KOEditorFreeBusy::slotPickDate()
   if( success ) {
     if ( start == mDtStart && end == mDtEnd ) {
       KMessageBox::information( this,
-          i18n( "The meeting already has suitable start/end times." ), TQString::null,
+          i18n( "The meeting already has suitable start/end times." ), TQString(),
           "MeetingTimeOKFreeBusy" );
     } else {
       if ( KMessageBox::questionYesNo(
@@ -553,7 +553,7 @@ void KOEditorFreeBusy::slotPickDate()
                    "Start: %1<br>End: %2<br>"
                    "Would you like to move the meeting to this time slot?</qt>" ).
              arg( start.toString(), end.toString() ),
-             TQString::null,
+             TQString(),
              KStdGuiItem::yes(), KStdGuiItem::no(),
              "MeetingMovedFreeBusy" ) == KMessageBox::Yes ) {
         emit dateTimesChanged( start, end );
@@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status)
   {
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->attendee()->email() == *it2 ) {
-        item->attendee()->seStatus( status );
+        item->attendee()->setqStatus( status );
         item->updateItem();
       }
     }
@@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
   popup.setItemChecked( currentAttendee()->status(), true );
   int status = popup.exec( TQCursor::pos() );
   if ( status >= 0 ) {
-    currentAttendee()->seStatus( (Attendee::PartStat)status );
+    currentAttendee()->setqStatus( (Attendee::PartStat)status );
     updateCurrentItem();
     updateAttendeeInput();
   }
@@ -920,7 +920,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
 
 void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item)
 {
-  if ( button == Qt::LeftButton && item == 0 )
+  if ( button == TQt::LeftButton && item == 0 )
     addNewAttendee();
 }
 
diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h
index 72ce6e7d..ec870d22 100644
--- a/korganizer/koeditorfreebusy.h
+++ b/korganizer/koeditorfreebusy.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEDITORFREEBUSY_H
 #define KOEDITORFREEBUSY_H
@@ -45,8 +45,9 @@ namespace KCal {
 class KOEditorFreeBusy : public KOAttendeeEditor
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0,
+    KOEditorFreeBusy( int spacing = 8, TQWidget *tqparent = 0,
                       const char *name = 0 );
     virtual ~KOEditorFreeBusy();
 
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 6b7e2caa..3a15188a 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -68,8 +68,8 @@
 #include "koeditorgeneral.moc"
 #include "kohelper.h"
 
-KOEditorGeneral::KOEditorGeneral( TQObject *parent, const char* name) :
-  TQObject( parent, name ), mAttachments(0)
+KOEditorGeneral::KOEditorGeneral( TQObject *tqparent, const char* name) :
+  TQObject( tqparent, name ), mAttachments(0)
 {
   mType = "Event";
   ResourceCached::setEditorWindowOpen(true);
@@ -82,8 +82,8 @@ KOEditorGeneral::~KOEditorGeneral()
 }
 
 
-FocusLineEdit::FocusLineEdit( TQWidget *parent )
-  : TQLineEdit( parent ), mSkipFirst( true )
+FocusLineEdit::FocusLineEdit( TQWidget *tqparent )
+  : TQLineEdit( tqparent ), mSkipFirst( true )
 {
 }
 
@@ -98,37 +98,37 @@ void FocusLineEdit::focusInEvent ( TQFocusEvent *e )
 }
 
 
-void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneral::initHeader( TQWidget *tqparent,TQBoxLayout *topLayout)
 {
   TQGridLayout *headerLayout = new TQGridLayout();
   headerLayout->setSpacing( topLayout->spacing() );
   topLayout->addLayout( headerLayout );
 
   TQString whatsThis = i18n("Sets the Title of this event or to-do.");
-  TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent );
+  TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent );
   TQWhatsThis::add( summaryLabel, whatsThis );
   TQFont f = summaryLabel->font();
   f.setBold( true );
   summaryLabel->setFont(f);
   headerLayout->addWidget(summaryLabel,1,0);
 
-  mSummaryEdit = new FocusLineEdit( parent );
+  mSummaryEdit = new FocusLineEdit( tqparent );
   TQWhatsThis::add( mSummaryEdit, whatsThis );
   connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ),
            TQT_SIGNAL( focusReceivedSignal() ) );
   headerLayout->addWidget(mSummaryEdit,1,1);
   summaryLabel->setBuddy( mSummaryEdit );
 
-  mAttendeeSummaryLabel = new TQLabel( parent );
+  mAttendeeSummaryLabel = new TQLabel( tqparent );
   updateAttendeeSummary( 0 );
   headerLayout->addWidget( mAttendeeSummaryLabel, 1, 2 );
 
   whatsThis = i18n("Sets where the event or to-do will take place.");
-  TQLabel *locationLabel = new TQLabel( i18n("&Location:"), parent );
+  TQLabel *locationLabel = new TQLabel( i18n("&Location:"), tqparent );
   TQWhatsThis::add( locationLabel, whatsThis );
   headerLayout->addWidget(locationLabel,2,0);
 
-  mLocationEdit = new TQLineEdit( parent );
+  mLocationEdit = new TQLineEdit( tqparent );
   TQWhatsThis::add( mLocationEdit, whatsThis );
   headerLayout->addMultiCellWidget( mLocationEdit, 2, 2, 1, 2 );
   locationLabel->setBuddy( mLocationEdit );
@@ -136,31 +136,31 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
   TQBoxLayout *thirdLineLayout = new TQHBoxLayout();
   headerLayout->addMultiCellLayout( thirdLineLayout, 3, 3, 0, 2 );
 
-  mResourceLabel = new TQLabel( parent );
+  mResourceLabel = new TQLabel( tqparent );
   mResourceLabel->hide();
   thirdLineLayout->addWidget( mResourceLabel );
 
   whatsThis = i18n("Allows you to select the categories that this event or to-do belongs to.");
-  TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), parent );
+  TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), tqparent );
   TQWhatsThis::add( categoriesLabel, whatsThis );
   thirdLineLayout->addWidget( categoriesLabel );
-  mCategoriesLabel = new KSqueezedTextLabel( parent );
+  mCategoriesLabel = new KSqueezedTextLabel( tqparent );
   TQWhatsThis::add( mCategoriesLabel, whatsThis );
   mCategoriesLabel->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
   thirdLineLayout->addWidget( mCategoriesLabel );
 
-  mCategoriesButton = new TQPushButton( parent );
+  mCategoriesButton = new TQPushButton( tqparent );
   mCategoriesButton->setText(i18n("Select..."));
   TQWhatsThis::add( mCategoriesButton, whatsThis );
   connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories()));
   thirdLineLayout->addWidget( mCategoriesButton );
 }
 
-void KOEditorGeneral::initSecrecy(TQWidget *parent, TQBoxLayout *topLayout)
+void KOEditorGeneral::initSecrecy(TQWidget *tqparent, TQBoxLayout *topLayout)
 {
   TQBoxLayout *secrecyLayout = new TQHBoxLayout( topLayout );
 
-  TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),parent);
+  TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),tqparent);
   TQString whatsThis = i18n("Sets whether the access to this event or to-do "
   			   "is restricted. Please note that KOrganizer "
 			   "currently does not use this setting, so the "
@@ -171,16 +171,16 @@ void KOEditorGeneral::initSecrecy(TQWidget *parent, TQBoxLayout *topLayout)
   TQWhatsThis::add( secrecyLabel, whatsThis );
   secrecyLayout->addWidget(secrecyLabel);
 
-  mSecrecyCombo = new TQComboBox(parent);
+  mSecrecyCombo = new TQComboBox(tqparent);
   TQWhatsThis::add( mSecrecyCombo, whatsThis );
   mSecrecyCombo->insertStringList(Incidence::secrecyList());
   secrecyLayout->addWidget(mSecrecyCombo);
   secrecyLabel->setBuddy( mSecrecyCombo );
 }
 
-void KOEditorGeneral::initDescription(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneral::initDescription(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
-  mDescriptionEdit = new KTextEdit(parent);
+  mDescriptionEdit = new KTextEdit(tqparent);
   TQWhatsThis::add( mDescriptionEdit,
 		   i18n("Sets the description for this event or to-do. This "
 			"will be displayed in a reminder if one is set, "
@@ -194,16 +194,16 @@ void KOEditorGeneral::initDescription(TQWidget *parent,TQBoxLayout *topLayout)
   topLayout->addWidget(mDescriptionEdit, 4);
 }
 
-void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
+void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout )
 {
   TQBoxLayout *alarmLayout = new TQHBoxLayout( topLayout );
 
-  mAlarmButton = new TQCheckBox( parent );
+  mAlarmButton = new TQCheckBox( tqparent );
   TQWhatsThis::add( mAlarmButton, i18n( "Enable reminders for this event or to-do." ) );
   TQToolTip::add( mAlarmButton, i18n( "Enable reminders" ) );
   alarmLayout->addWidget( mAlarmButton );
 
-  mAlarmAdvancedButton = new TQPushButton( parent );
+  mAlarmAdvancedButton = new TQPushButton( tqparent );
   mAlarmAdvancedButton->setIconSet( KOGlobals::self()->smallIconSet( "bell", 16 ) );
   TQWhatsThis::add( mAlarmAdvancedButton,
                    i18n( "Push this button to create an advanced set of reminders "
@@ -212,7 +212,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
   connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) );
   alarmLayout->addWidget( mAlarmAdvancedButton );
 
-  mSimpleAlarmBox = new TQHBox( parent );
+  mSimpleAlarmBox = new TQHBox( tqparent );
   alarmLayout->addWidget( mSimpleAlarmBox );
 
   TQString whatsThis, toolTip;
@@ -235,7 +235,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
   TQWhatsThis::add( mAlarmIncrCombo, whatsThis );
   TQToolTip::add( mAlarmIncrCombo, toolTip );
 
-  mAlarmInfoLabel = new TQLabel( parent );
+  mAlarmInfoLabel = new TQLabel( tqparent );
   if ( mType == "Event" ) {
     mAlarmInfoLabel->setText( i18n( "before the start" ) );
   } else {
@@ -253,9 +253,9 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
   connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) );
 }
 
-void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneral::initAttachments(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
-  mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent );
+  mAttachments = new KOEditorAttachments( KDialog::spacingHint(), tqparent );
   connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) ,
            this, TQT_SIGNAL( openURL( const KURL & ) ) );
   topLayout->addWidget( mAttachments, 1 );
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index 1a9d6017..d67305cf 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEDITORGENERAL_H
 #define KOEDITORGENERAL_H
@@ -46,11 +46,12 @@ namespace KCal {
 }
 using namespace KCal;
 
-class FocusLineEdit : public QLineEdit
+class FocusLineEdit : public TQLineEdit
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FocusLineEdit( TQWidget *parent );
+    FocusLineEdit( TQWidget *tqparent );
 
   signals:
     void focusReceivedSignal();
@@ -62,14 +63,15 @@ class FocusLineEdit : public QLineEdit
     bool mSkipFirst;
 };
 
-class KOEditorGeneral : public QObject
+class KOEditorGeneral : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorGeneral (TQObject* parent=0,const char* name=0);
+    KOEditorGeneral (TQObject* tqparent=0,const char* name=0);
     virtual ~KOEditorGeneral();
 
-    void initHeader( TQWidget *parent,TQBoxLayout *topLayout );
+    void initHeader( TQWidget *tqparent,TQBoxLayout *topLayout );
     void initDescription(TQWidget *,TQBoxLayout *);
     void initSecrecy(TQWidget *,TQBoxLayout *);
     void initAlarm(TQWidget *,TQBoxLayout *);
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 3466e412..123632f3 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -56,9 +56,9 @@
 #include "koeditorgeneralevent.h"
 #include "koeditorgeneralevent.moc"
 
-KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent,
+KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* tqparent,
                                            const char* name) :
-  KOEditorGeneral( parent, name)
+  KOEditorGeneral( tqparent, name)
 {
   connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
            TQT_SLOT( setDuration() ) );
@@ -91,12 +91,12 @@ void KOEditorGeneralEvent::finishSetup()
   mSummaryEdit->setFocus();
 }
 
-void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
 
   TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal,
-                                          i18n("Date && Time"),parent);
+                                          i18n("Date && Time"),tqparent);
   TQWhatsThis::add( timeGroupBox,
        i18n("Sets options related to the date and time of the "
             "event or to-do.") );
@@ -175,17 +175,17 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   initClass( timeBoxFrame, classLayout );
 }
 
-void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralEvent::initClass(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *classLayout = new TQHBoxLayout(topLayout);
 
-  TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),parent);
+  TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),tqparent);
   TQString whatsThis = i18n("Sets how this time will appear on your Free/Busy "
                            "information.");
   TQWhatsThis::add( freeTimeLabel, whatsThis );
   classLayout->addWidget(freeTimeLabel);
 
-  mFreeTimeCombo = new TQComboBox(false, parent);
+  mFreeTimeCombo = new TQComboBox(false, tqparent);
   TQWhatsThis::add( mFreeTimeCombo, whatsThis );
   mFreeTimeCombo->insertItem(i18n("Busy"));
   mFreeTimeCombo->insertItem(i18n("Free"));
@@ -193,10 +193,10 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * tqparent, TQBoxLayout * tqlayout)
 {
   TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
-  mInvitationBar = new TQFrame( parent );
+  mInvitationBar = new TQFrame( tqparent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 7e7916d6..83b09ecc 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOEDITORGENERALEVENT_H
 #define _KOEDITORGENERALEVENT_H
@@ -42,13 +42,14 @@ using namespace KCal;
 class KOEditorGeneralEvent : public KOEditorGeneral
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorGeneralEvent (TQObject* parent=0,const char* name=0);
+    KOEditorGeneralEvent (TQObject* tqparent=0,const char* name=0);
     virtual ~KOEditorGeneralEvent();
 
     void initTime(TQWidget *,TQBoxLayout *);
     void initClass(TQWidget *,TQBoxLayout *);
-    void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout );
+    void initInvitationBar( TQWidget* tqparent, TQBoxLayout *tqlayout );
 
     void finishSetup();
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index c53babbe..274c58b9 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeditorgeneraljournal.h"
@@ -45,9 +45,9 @@
 #include <tqwhatsthis.h>
 
 
-KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent,
+KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *tqparent,
                                                 const char *name )
-  : KOEditorGeneral( parent, name )
+  : KOEditorGeneral( tqparent, name )
 {
   setType( "Journal" );
 }
@@ -56,43 +56,43 @@ KOEditorGeneralJournal::~KOEditorGeneralJournal()
 {
 }
 
-void KOEditorGeneralJournal::initTitle( TQWidget *parent, TQBoxLayout *topLayout )
+void KOEditorGeneralJournal::initTitle( TQWidget *tqparent, TQBoxLayout *topLayout )
 {
   TQHBoxLayout *hbox = new TQHBoxLayout( topLayout );
 
   TQString whatsThis = i18n("Sets the title of this journal.");
-  TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent );
+  TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent );
   TQWhatsThis::add( summaryLabel, whatsThis );
   TQFont f = summaryLabel->font();
   f.setBold( true );
   summaryLabel->setFont( f );
   hbox->addWidget( summaryLabel );
 
-  mSummaryEdit = new FocusLineEdit( parent );
+  mSummaryEdit = new FocusLineEdit( tqparent );
   TQWhatsThis::add( mSummaryEdit, whatsThis );
   summaryLabel->setBuddy( mSummaryEdit );
   hbox->addWidget( mSummaryEdit );
 }
 
 
-void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout )
+void KOEditorGeneralJournal::initDate( TQWidget *tqparent, TQBoxLayout *topLayout )
 {
 //  TQBoxLayout *dateLayout = new TQVBoxLayout(topLayout);
   TQBoxLayout *dateLayout = new TQHBoxLayout( topLayout );
 
-  mDateLabel = new TQLabel( i18n("&Date:"), parent);
+  mDateLabel = new TQLabel( i18n("&Date:"), tqparent);
   dateLayout->addWidget( mDateLabel );
 
-  mDateEdit = new KDateEdit( parent );
+  mDateEdit = new KDateEdit( tqparent );
   dateLayout->addWidget( mDateEdit );
   mDateLabel->setBuddy( mDateEdit );
 
   dateLayout->addStretch();
 
-  mTimeCheckBox = new TQCheckBox( i18n("&Time: "), parent );
+  mTimeCheckBox = new TQCheckBox( i18n("&Time: "), tqparent );
   dateLayout->addWidget( mTimeCheckBox );
 
-  mTimeEdit = new KTimeEdit( parent );
+  mTimeEdit = new KTimeEdit( tqparent );
   dateLayout->addWidget( mTimeEdit );
   connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)),
            mTimeEdit, TQT_SLOT(setEnabled(bool)) );
@@ -120,9 +120,9 @@ kdDebug()<<"KOEditorGeneralJournal::setTime, time is valid"<<endl;
   }
 }
 
-void KOEditorGeneralJournal::initDescription( TQWidget *parent, TQBoxLayout *topLayout )
+void KOEditorGeneralJournal::initDescription( TQWidget *tqparent, TQBoxLayout *topLayout )
 {
-  mDescriptionEdit = new KTextEdit( parent );
+  mDescriptionEdit = new KTextEdit( tqparent );
   mDescriptionEdit->append("");
   mDescriptionEdit->setReadOnly( false );
   mDescriptionEdit->setOverwriteMode( false );
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index 649a6d34..f8155ea2 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEDITORGENERALJOURNAL_H
 #define KOEDITORGENERALJOURNAL_H
@@ -48,13 +48,14 @@ using namespace KCal;
 class KOEditorGeneralJournal : public KOEditorGeneral
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 );
+    KOEditorGeneralJournal ( TQWidget *tqparent=0, const char* name=0 );
     virtual ~KOEditorGeneralJournal();
 
     void initDate( TQWidget *, TQBoxLayout * );
     void initDescription( TQWidget *, TQBoxLayout * );
-    void initTitle( TQWidget *parent, TQBoxLayout *topLayout );
+    void initTitle( TQWidget *tqparent, TQBoxLayout *topLayout );
 
     /** Set widgets to default values */
     void setDefaults( const TQDate &date );
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 13ba5192..93caec36 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -56,8 +56,8 @@
 #include "koeditorgeneraltodo.h"
 #include "koeditorgeneraltodo.moc"
 
-KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *parent, const char *name )
-  : KOEditorGeneral( parent, name )
+KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *tqparent, const char *name )
+  : KOEditorGeneral( tqparent, name )
 {
   setType( "Todo" );
 }
@@ -91,13 +91,13 @@ void KOEditorGeneralTodo::finishSetup()
   mSummaryEdit->setFocus();
 }
 
-void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
   kdDebug(5850) << k_funcinfo << endl;
   TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
 
   TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal,
-                                          i18n("Date && Time"),parent);
+                                          i18n("Date && Time"),tqparent);
   timeLayout->addWidget(timeGroupBox);
 
   TQFrame *timeBoxFrame = new TQFrame(timeGroupBox);
@@ -182,14 +182,14 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
 }
 
 
-void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayout )
+void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLayout )
 {
   TQHBoxLayout *completionLayout = new TQHBoxLayout( topLayout );
 
-  TQLabel *label = new TQLabel( i18n( "&Completed:" ), parent );
+  TQLabel *label = new TQLabel( i18n( "&Completed:" ), tqparent );
   completionLayout->addWidget( label );
 
-  mCompletedToggle = new TQCheckBox( parent );
+  mCompletedToggle = new TQCheckBox( tqparent );
   TQToolTip::add( mCompletedToggle,
                  i18n( "Toggle between 0% and 100% complete" ) );
   TQWhatsThis::add( mCompletedToggle,
@@ -199,7 +199,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
   completionLayout->addWidget( mCompletedToggle );
   label->setBuddy( mCompletedToggle );
 
-  mCompletedCombo = new TQComboBox( parent );
+  mCompletedCombo = new TQComboBox( tqparent );
   TQToolTip::add( mCompletedCombo,
                  i18n( "Select the completed percentage" ) );
   TQWhatsThis::add( mCompletedCombo,
@@ -212,25 +212,25 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
   connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
   completionLayout->addWidget( mCompletedCombo );
 
-  mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent );
+  mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), tqparent );
   mCompletedLabel->hide();
   completionLayout->addWidget( mCompletedLabel );
 
-  mCompletionDateEdit = new KDateEdit( parent );
+  mCompletionDateEdit = new KDateEdit( tqparent );
   mCompletionDateEdit->hide();
   completionLayout->addWidget( mCompletionDateEdit );
 
-  mCompletionTimeEdit = new KTimeEdit( parent, TQTime() );
+  mCompletionTimeEdit = new KTimeEdit( tqparent, TQTime() );
   mCompletionTimeEdit->hide();
   completionLayout->addWidget( mCompletionTimeEdit );
 }
 
-void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::initPriority(TQWidget *tqparent, TQBoxLayout *topLayout)
 {
-  TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), parent );
+  TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), tqparent );
   topLayout->addWidget( priorityLabel );
 
-  mPriorityCombo = new TQComboBox( parent );
+  mPriorityCombo = new TQComboBox( tqparent );
   TQToolTip::add( mPriorityCombo,
                  i18n( "Set the priority of the to-do" ) );
   TQWhatsThis::add( mPriorityCombo,
@@ -252,15 +252,15 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
   priorityLabel->setBuddy( mPriorityCombo );
 }
 
-void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::initqStatus(TQWidget *tqparent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout);
 
-  initCompletion( parent, statusLayout );
+  initCompletion( tqparent, statusLayout );
 
   statusLayout->addStretch( 1 );
 
-  initPriority( parent, statusLayout );
+  initPriority( tqparent, statusLayout );
 }
 
 void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay )
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 438ff9c2..cd50285e 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOEDITORGENERALTODO_H
 #define _KOEDITORGENERALTODO_H
@@ -42,12 +42,13 @@ using namespace KCal;
 class KOEditorGeneralTodo : public KOEditorGeneral
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorGeneralTodo (TQObject* parent=0,const char* name=0);
+    KOEditorGeneralTodo (TQObject* tqparent=0,const char* name=0);
     virtual ~KOEditorGeneralTodo();
 
     void initTime(TQWidget *, TQBoxLayout *);
-    void iniStatus(TQWidget *, TQBoxLayout *);
+    void initqStatus(TQWidget *, TQBoxLayout *);
     void initCompletion(TQWidget *, TQBoxLayout *);
     void initPriority(TQWidget *, TQBoxLayout *);
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 46038834..834ea1ce 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -60,8 +60,8 @@
 
 /////////////////////////// RecurBase ///////////////////////////////
 
-RecurBase::RecurBase( TQWidget *parent, const char *name ) :
-  TQWidget( parent, name )
+RecurBase::RecurBase( TQWidget *tqparent, const char *name ) :
+  TQWidget( tqparent, name )
 {
   mFrequencyEdit = new TQSpinBox( 1, 9999, 1, this );
   mFrequencyEdit->setValue( 1 );
@@ -84,9 +84,9 @@ int RecurBase::frequency()
   return mFrequencyEdit->value();
 }
 
-TQComboBox *RecurBase::createWeekCountCombo( TQWidget *parent, const char *name )
+TQComboBox *RecurBase::createWeekCountCombo( TQWidget *tqparent, const char *name )
 {
-  TQComboBox *combo = new TQComboBox( parent, name );
+  TQComboBox *combo = new TQComboBox( tqparent, name );
   TQWhatsThis::add( combo,
                    i18n("The number of the week from the beginning "
                         "of the month on which this event or to-do "
@@ -105,9 +105,9 @@ TQComboBox *RecurBase::createWeekCountCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQComboBox *RecurBase::createWeekdayCombo( TQWidget *parent, const char *name )
+TQComboBox *RecurBase::createWeekdayCombo( TQWidget *tqparent, const char *name )
 {
-  TQComboBox *combo = new TQComboBox( parent, name );
+  TQComboBox *combo = new TQComboBox( tqparent, name );
   TQWhatsThis::add( combo,
                    i18n("The weekday on which this event or to-do "
                         "should recur.") );
@@ -119,9 +119,9 @@ TQComboBox *RecurBase::createWeekdayCombo( TQWidget *parent, const char *name )
   return combo;
 }
 
-TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name )
+TQComboBox *RecurBase::createMonthNameCombo( TQWidget *tqparent, const char *name )
 {
-  TQComboBox *combo = new TQComboBox( parent, name );
+  TQComboBox *combo = new TQComboBox( tqparent, name );
   TQWhatsThis::add( combo,
                    i18n("The month during which this event or to-do "
                         "should recur.") );
@@ -135,13 +135,13 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout,
     TQString everyText, TQString unitText )
 {
   TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
-  TQLabel *preLabel = new TQLabel( everyText, parent );
+  TQLabel *preLabel = new TQLabel( everyText, tqparent );
   TQWhatsThis::add( preLabel, whatsThis );
   freqLayout->addWidget( preLabel );
 
@@ -149,7 +149,7 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqla
   preLabel->setBuddy( frequencyEdit() );
   TQWhatsThis::add( preLabel->buddy(), whatsThis );
 
-  TQLabel *postLabel = new TQLabel( unitText, parent );
+  TQLabel *postLabel = new TQLabel( unitText, tqparent );
   TQWhatsThis::add( postLabel, whatsThis );
   freqLayout->addWidget( postLabel );
   freqLayout->addStretch();
@@ -158,8 +158,8 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqla
 
 /////////////////////////// RecurDaily ///////////////////////////////
 
-RecurDaily::RecurDaily( TQWidget *parent, const char *name ) :
-  RecurBase( parent, name )
+RecurDaily::RecurDaily( TQWidget *tqparent, const char *name ) :
+  RecurBase( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -170,8 +170,8 @@ RecurDaily::RecurDaily( TQWidget *parent, const char *name ) :
 
 /////////////////////////// RecurWeekly ///////////////////////////////
 
-RecurWeekly::RecurWeekly( TQWidget *parent, const char *name ) :
-  RecurBase( parent, name )
+RecurWeekly::RecurWeekly( TQWidget *tqparent, const char *name ) :
+  RecurBase( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -223,8 +223,8 @@ TQBitArray RecurWeekly::days()
 
 /////////////////////////// RecurMonthly ///////////////////////////////
 
-RecurMonthly::RecurMonthly( TQWidget *parent, const char *name ) :
-  RecurBase( parent, name )
+RecurMonthly::RecurMonthly( TQWidget *tqparent, const char *name ) :
+  RecurBase( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -396,8 +396,8 @@ int RecurMonthly::weekday()
 
 /////////////////////////// RecurYearly ///////////////////////////////
 
-RecurYearly::RecurYearly( TQWidget *parent, const char *name ) :
-  RecurBase( parent, name )
+RecurYearly::RecurYearly( TQWidget *tqparent, const char *name ) :
+  RecurBase( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -573,8 +573,8 @@ int RecurYearly::day()
 
 //////////////////////////// ExceptionsWidget //////////////////////////
 
-ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
-  TQWidget( parent, name )
+ExceptionsWidget::ExceptionsWidget( TQWidget *tqparent, const char *name ) :
+  TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -675,8 +675,8 @@ DateList ExceptionsWidget::dates()
 
 ///////////////////////// ExceptionsDialog ///////////////////////////
 
-ExceptionsDialog::ExceptionsDialog( TQWidget *parent, const char *name ) :
-  KDialogBase( parent, name, true, i18n("Edit Exceptions"), Ok|Cancel )
+ExceptionsDialog::ExceptionsDialog( TQWidget *tqparent, const char *name ) :
+  KDialogBase( tqparent, name, true, i18n("Edit Exceptions"), Ok|Cancel )
 {
   mExceptions = new ExceptionsWidget( this );
   setMainWidget( mExceptions );
@@ -694,9 +694,9 @@ DateList ExceptionsDialog::dates()
 
 ///////////////////////// RecurrenceRangeWidget ///////////////////////////
 
-RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent,
+RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *tqparent,
                                               const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -829,9 +829,9 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start,
 
 ///////////////////////// RecurrenceRangeDialog ///////////////////////////
 
-RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *parent,
+RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *tqparent,
                                               const char *name ) :
-  KDialogBase( parent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel )
+  KDialogBase( tqparent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel )
 {
   mRecurrenceRangeWidget = new RecurrenceRangeWidget( this );
   setMainWidget( mRecurrenceRangeWidget );
@@ -870,8 +870,8 @@ void RecurrenceRangeDialog::setDateTimes( const TQDateTime &start,
 
 //////////////////////////// RecurrenceChooser ////////////////////////
 
-RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) :
-  TQWidget( parent, name )
+RecurrenceChooser::RecurrenceChooser( TQWidget *tqparent, const char *name ) :
+  TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -965,8 +965,8 @@ void RecurrenceChooser::emitChoice()
 
 /////////////////////////////// Main Widget /////////////////////////////
 
-KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
-  TQWidget( parent, name )
+KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) :
+  TQWidget( tqparent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -1633,8 +1633,8 @@ void KOEditorRecurrence::restoreValues()
   mExceptions->setDates( mSaveRec.exDates() );
 }
 
-KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * parent)
-  : KDialogBase( parent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false )
+KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * tqparent)
+  : KDialogBase( tqparent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false )
 {
   mRecurrence = new KOEditorRecurrence( this );
   setMainWidget( mRecurrence );
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 831ba62b..3060d660 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOEDITORRECURRENCE_H
 #define _KOEDITORRECURRENCE_H
@@ -44,10 +44,10 @@ class Incidence;
 }
 using namespace KCal;
 
-class RecurBase : public QWidget
+class RecurBase : public TQWidget
 {
   public:
-    RecurBase( TQWidget *parent = 0, const char *name = 0 );
+    RecurBase( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setFrequency( int );
     int frequency();
@@ -58,10 +58,10 @@ class RecurBase : public QWidget
     TQWidget *frequencyEdit();
 
   protected:
-    static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 );
-    static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 );
-    static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 );
-    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
+    static TQComboBox *createWeekCountCombo( TQWidget *tqparent=0, const char *name=0 );
+    static TQComboBox *createWeekdayCombo( TQWidget *tqparent=0, const char *name=0 );
+    static TQComboBox *createMonthNameCombo( TQWidget *tqparent=0, const char *name=0 );
+    TQBoxLayout *createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout,
     TQString everyText, TQString unitText );
 
   private:
@@ -71,13 +71,13 @@ class RecurBase : public QWidget
 class RecurDaily : public RecurBase
 {
   public:
-    RecurDaily( TQWidget *parent = 0, const char *name = 0 );
+    RecurDaily( TQWidget *tqparent = 0, const char *name = 0 );
 };
 
 class RecurWeekly : public RecurBase
 {
   public:
-    RecurWeekly( TQWidget *parent = 0, const char *name = 0 );
+    RecurWeekly( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setDays( const TQBitArray & );
     TQBitArray days();
@@ -89,7 +89,7 @@ class RecurWeekly : public RecurBase
 class RecurMonthly : public RecurBase
 {
   public:
-    RecurMonthly( TQWidget *parent = 0, const char *name = 0 );
+    RecurMonthly( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setByDay( int day );
     void setByPos( int count, int weekday );
@@ -116,7 +116,7 @@ class RecurYearly : public RecurBase
   public:
     enum YearlyType { byDay, byPos, byMonth };
 
-    RecurYearly( TQWidget *parent = 0, const char *name = 0 );
+    RecurYearly( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setByDay( int day );
     void setByPos( int count, int weekday, int month );
@@ -146,11 +146,12 @@ class RecurYearly : public RecurBase
     TQSpinBox *mByDaySpin;
 };
 
-class RecurrenceChooser : public QWidget
+class RecurrenceChooser : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 );
+    RecurrenceChooser( TQWidget *tqparent = 0, const char *name = 0 );
 
     enum { Daily, Weekly, Monthly, Yearly };
 
@@ -182,8 +183,9 @@ class ExceptionsBase
 class ExceptionsWidget : public TQWidget, public ExceptionsBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 );
+    ExceptionsWidget( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setDates( const DateList & );
     DateList dates();
@@ -202,7 +204,7 @@ class ExceptionsWidget : public TQWidget, public ExceptionsBase
 class ExceptionsDialog : public KDialogBase, public ExceptionsBase
 {
   public:
-    ExceptionsDialog( TQWidget *parent, const char *name = 0 );
+    ExceptionsDialog( TQWidget *tqparent, const char *name = 0 );
 
     void setDates( const DateList & );
     DateList dates();
@@ -229,8 +231,9 @@ class RecurrenceRangeBase
 class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 );
+    RecurrenceRangeWidget( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setDefaults( const TQDateTime &from );
 
@@ -259,7 +262,7 @@ class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase
 class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase
 {
   public:
-    RecurrenceRangeDialog( TQWidget *parent = 0, const char *name = 0 );
+    RecurrenceRangeDialog( TQWidget *tqparent = 0, const char *name = 0 );
 
     void setDefaults( const TQDateTime &from );
 
@@ -276,11 +279,12 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase
     RecurrenceRangeWidget *mRecurrenceRangeWidget;
 };
 
-class KOEditorRecurrence : public QWidget
+class KOEditorRecurrence : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 );
+    KOEditorRecurrence ( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~KOEditorRecurrence();
 
     enum { Daily, Weekly, Monthly, Yearly };
@@ -345,8 +349,9 @@ class KOEditorRecurrence : public QWidget
 class KOEditorRecurrenceDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KOEditorRecurrenceDialog( TQWidget *parent );
+    KOEditorRecurrenceDialog( TQWidget *tqparent );
     KOEditorRecurrence* editor() const { return mRecurrence; }
 
   protected slots:
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 69cb9c76..3373778a 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -50,8 +50,8 @@
 
 #include "koeventeditor.h"
 
-KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *parent )
-  : KOIncidenceEditor( TQString::null, calendar, parent ),
+KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *tqparent )
+  : KOIncidenceEditor( TQString(), calendar, tqparent ),
     mEvent( 0 ), mCalendar( 0 ), mGeneral( 0 ), mRecurrence( 0 ), mFreeBusy( 0 )
 {
 }
@@ -232,7 +232,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti
 {
   if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.find( "\n" );
+    int pos = summary.tqfind( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
@@ -307,7 +307,7 @@ bool KOEventEditor::processInput()
     mEvent->setOrganizer( Person( KOPrefs::instance()->fullName(),
                           KOPrefs::instance()->email() ) );
     writeEvent( mEvent );
-    // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (parent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns.
+    // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (tqparent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns.
     if ( !mChanger->addIncidence( mEvent, mResource, mSubResource, this ) ) {
       delete mEvent;
       mEvent = 0;
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index 3d65bb0a..c9559a1e 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEVENTEDITOR_H
 #define KOEVENTEDITOR_H
@@ -48,11 +48,12 @@ using namespace KCal;
 class KOEventEditor : public KOIncidenceEditor
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Construct new event editor.
     */
-    KOEventEditor( Calendar *calendar, TQWidget *parent );
+    KOEventEditor( Calendar *calendar, TQWidget *tqparent );
     virtual ~KOEventEditor(void);
 
     void init();
@@ -67,10 +68,10 @@ class KOEventEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary tqcontains multiple lines, the summary will be used as description
+      summary contains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
-    void setTexts( const TQString &summary, const TQString &description = TQString::null );
+    void setTexts( const TQString &summary, const TQString &description = TQString() );
     /**
       Edit an existing event.
     */
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index b0326ee5..3c5dd519 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 96911b8c..8232da4e 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEVENTPOPUPMENU_H
 #define KOEVENTPOPUPMENU_H
@@ -38,6 +38,7 @@ using namespace KCal;
 
 class KOEventPopupMenu : public TQPopupMenu {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOEventPopupMenu();
 
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 9e01ea4e..8938d8d4 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpopupmenu.h>
@@ -44,8 +44,8 @@ using namespace KOrg;
 
 //---------------------------------------------------------------------------
 
-KOEventView::KOEventView(Calendar *cal,TQWidget *parent,const char *name)
-  : KOrg::BaseView(cal,parent,name)
+KOEventView::KOEventView(Calendar *cal,TQWidget *tqparent,const char *name)
+  : KOrg::BaseView(cal,tqparent,name)
 {
 }
 
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index 69f6377f..0a29e0c9 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOEVENTVIEW_H
 #define _KOEVENTVIEW_H
@@ -55,16 +55,17 @@ class TQPopupMenu;
 class KOEventView : public KOrg::BaseView
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
      * Constructs a view.
      * @param cal is a pointer to the calendar object from which events
      *        will be retrieved for display.
-     * @param parent is the parent TQWidget.
+     * @param tqparent is the tqparent TQWidget.
      * @param name is the view name.
      */
-    KOEventView(Calendar *cal,TQWidget *parent=0,const char *name=0);
+    KOEventView(Calendar *cal,TQWidget *tqparent=0,const char *name=0);
 
     /**
      * Destructor.  Views will do view-specific cleanups here.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 3937c387..8cd16faa 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeventviewer.h"
@@ -39,8 +39,8 @@
 #include <tqregexp.h>
 #include <tqtooltip.h>
 
-KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char *name )
-  : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("")
+KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *tqparent, const char *name )
+  : TQTextBrowser( tqparent, name ), mCalendar( calendar ), mDefaultText("")
 {
   mIncidence = 0;
   connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) );
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index c4022d02..19ef3774 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
@@ -37,11 +37,12 @@ using namespace KCal;
 /**
   Viewer widget for events.
 */
-class KDE_EXPORT KOEventViewer : public QTextBrowser
+class KDE_EXPORT KOEventViewer : public TQTextBrowser
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
+    explicit KOEventViewer( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~KOEventViewer();
 
     /**
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index d88aa31c..eccf2ac9 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koeventviewerdialog.h"
@@ -28,9 +28,9 @@
 
 #include <klocale.h>
 
-KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent,
+KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent,
                                           const char *name, bool compact )
-  : KDialogBase( parent, name, false, i18n("Event Viewer"), Ok, Ok, false,
+  : KDialogBase( tqparent, name, false, i18n("Event Viewer"), Ok, Ok, false,
                  i18n("Edit") )
 {
   mEventViewer = new KOEventViewer( calendar, this );
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index dc0ceb7b..147df906 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOEVENTVIEWERDIALOG_H
 #define KOEVENTVIEWERDIALOG_H
@@ -41,8 +41,9 @@ class KOEventViewer;
 class KDE_EXPORT KOEventViewerDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0,
+    explicit KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent = 0,
                                   const char *name = 0, bool compact = false );
     virtual ~KOEventViewerDialog();
 
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 814ea178..8f41e82c 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -126,11 +126,7 @@ void KOGlobals::fitDialogToScreen( TQWidget *wid, bool force )
 
 bool KOGlobals::reverseLayout()
 {
-#if QT_VERSION >= 0x030000
   return TQApplication::reverseLayout();
-#else
-  return false;
-#endif
 }
 
 TQPixmap KOGlobals::smallIcon( const TQString& name )
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 119eb6c1..74a2006c 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_GLOBALS_H
 #define KORG_GLOBALS_H
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index c4e3a607..5bf8d8fb 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -1,7 +1,7 @@
 /*
   This file is part of the Groupware/KOrganizer integration.
 
-  Requires the Qt and KDE widget libraries, available at no cost at
+  Requires the TQt and KDE widget libraries, available at no cost at
   http://www.trolltech.com and http://www.kde.org respectively
 
   Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB
@@ -24,11 +24,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -174,7 +174,7 @@ void KOGroupware::incomingDirChanged( const TQString& path )
 
   KCal::Scheduler::Method method =
     static_cast<KCal::Scheduler::Method>( message->method() );
-  KCal::ScheduleMessage::Status status = message->status();
+  KCal::ScheduleMessage::tqStatus status = message->status();
   KCal::Incidence* incidence =
     dynamic_cast<KCal::Incidence*>( message->event() );
   if(!incidence) {
@@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path )
     for ( it = attendees.begin(); it != attendees.end(); ++it ) {
       if( (*it)->email() == receiver ) {
         if ( action.startsWith( "accepted" ) )
-          (*it)->seStatus( KCal::Attendee::Accepted );
+          (*it)->setqStatus( KCal::Attendee::Accepted );
         else if ( action.startsWith( "tentative" ) )
-          (*it)->seStatus( KCal::Attendee::Tentative );
+          (*it)->setqStatus( KCal::Attendee::Tentative );
         else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) )
-          (*it)->seStatus( KCal::Attendee::Tentative );
+          (*it)->setqStatus( KCal::Attendee::Tentative );
         else if ( action.startsWith( "delegated" ) )
-          (*it)->seStatus( KCal::Attendee::Delegated );
+          (*it)->setqStatus( KCal::Attendee::Delegated );
         break;
       }
     }
@@ -238,7 +238,7 @@ class KOInvitationFormatterHelper : public InvitationFormatterHelper
  * Return true means accept the changes
  * Return false means revert the changes
  */
-bool KOGroupware::sendICalMessage( TQWidget* parent,
+bool KOGroupware::sendICalMessage( TQWidget* tqparent,
                                    KCal::Scheduler::Method method,
                                    Incidence* incidence,
                                    KOGlobals::HowChanged action,
@@ -318,7 +318,7 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
         }
 
         rc = KMessageBox::questionYesNo(
-               parent, txt, i18n( "Group Scheduling Email" ),
+               tqparent, txt, i18n( "Group Scheduling Email" ),
                KGuiItem( i18n( "Send Email" ) ), KGuiItem( i18n( "Do Not Send" ) ) );
       } else {
         return true;
@@ -331,14 +331,14 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
       // Ask if the user wants to tell the organizer about the current status
       TQString txt = i18n( "Do you want to send a status update to the "
                           "organizer of this task?");
-      rc = KMessageBox::questionYesNo( parent, txt, TQString::null, i18n("Send Update"), i18n("Do Not Send") );
+      rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") );
     } else if( incidence->type() == "Event" ) {
       TQString txt;
       if ( attendeeStatusChanged && method == Scheduler::Request ) {
         txt = i18n( "Your status as an attendee of this event changed. "
                     "Do you want to send a status update to the event organizer?" );
         method = Scheduler::Reply;
-        rc = KMessageBox::questionYesNo( parent, txt, TQString::null, i18n("Send Update"), i18n("Do Not Send") );
+        rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") );
       } else {
         if( action == KOGlobals::INCIDENCEDELETED ) {
           const TQStringList myEmails = KOPrefs::instance()->allEmails();
@@ -360,14 +360,14 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
                       "Do you want to send an updated response to the organizer "
                       "declining the invitation?" );
           rc = KMessageBox::questionYesNo(
-            parent, txt, i18n( "Group Scheduling Email" ),
+            tqparent, txt, i18n( "Group Scheduling Email" ),
             KGuiItem( i18n( "Send Update" ) ), KGuiItem( i18n( "Do Not Send" ) ) );
           setDoNotNotify( rc == KMessageBox::No );
         } else {
           txt = i18n( "You are not the organizer of this event. Editing it will "
                       "bring your calendar out of sync with the organizer's calendar. "
                       "Do you really want to edit it?" );
-          rc = KMessageBox::warningYesNo( parent, txt );
+          rc = KMessageBox::warningYesNo( tqparent, txt );
           return ( rc == KMessageBox::Yes );
         }
       }
diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index 5df80a6a..4e74ed43 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -1,7 +1,7 @@
 /*
   This file is part of the Groupware/KOrganizer integration.
 
-  Requires the Qt and KDE widget libraries, available at no cost at
+  Requires the TQt and KDE widget libraries, available at no cost at
   http://www.trolltech.com and http://www.kde.org respectively
 
   Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB
@@ -24,11 +24,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -62,9 +62,10 @@ class IncidenceChangerBase;
 
 using namespace KOrg;
 
-class KOGroupware : public QObject
+class KOGroupware : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     static KOGroupware* create( CalendarView*, KCal::CalendarResources* );
     static KOGroupware* instance();
@@ -75,7 +76,7 @@ class KOGroupware : public QObject
          Returns false if the user cancels the dialog, and true if the
          user presses Yes og or No.
     */
-    bool sendICalMessage( TQWidget *parent, KCal::Scheduler::Method method,
+    bool sendICalMessage( TQWidget *tqparent, KCal::Scheduler::Method method,
                           Incidence* incidence,
                           KOGlobals::HowChanged action,
                           bool attendeeStatusChanged,
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 71d392d6..4f1e604d 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KOGroupwarePrefsPage</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KOGroupwarePrefsPage</cstring>
     </property>
@@ -16,14 +16,14 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>groupwareTab</cstring>
             </property>
             <property name="enabled">
                 <bool>true</bool>
             </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="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -45,7 +45,7 @@
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>publishEnable</cstring>
                         </property>
@@ -58,7 +58,7 @@ It is possible to skip this option and mail or upload your Free/Busy information
 Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as the Kolab2 server taking care of publishing your Free/Busy information and manages the access to it from other users.</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>tqlayout8</cstring>
                         </property>
@@ -66,7 +66,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>publishDelayLabel</cstring>
                                 </property>
@@ -80,7 +80,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                     <string>Configure minimum the interval of time in minutes between each upload here. This configuration is only effective in case you choose to publish your information automatically.</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox">
+                            <widget class="TQSpinBox">
                                 <property name="name">
                                     <cstring>publishDelay</cstring>
                                 </property>
@@ -93,7 +93,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout16</cstring>
                         </property>
@@ -101,7 +101,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel3</cstring>
                                 </property>
@@ -115,7 +115,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                     <string>Configure the number of calendar days you wish to be published and available to others here.</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox">
+                            <widget class="TQSpinBox">
                                 <property name="name">
                                     <cstring>publishDays</cstring>
                                 </property>
@@ -132,7 +132,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                     <string>Configure the number of calendar days you wish to be published and available to others here.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel4</cstring>
                                 </property>
@@ -162,7 +162,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>ButtonGroup2</cstring>
                         </property>
@@ -173,7 +173,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit" row="3" column="1">
+                            <widget class="TQLineEdit" row="3" column="1">
                                 <property name="name">
                                     <cstring>publishUrl</cstring>
                                 </property>
@@ -185,7 +185,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
 Ask the server administrator for this information.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>publishSavePassword</cstring>
                                 </property>
@@ -197,7 +197,7 @@ Ask the server administrator for this information.</string>
 For security reasons, it is not recommended to store your password in the configuration file.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="6" column="0">
+                            <widget class="TQLabel" row="6" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -211,7 +211,7 @@ For security reasons, it is not recommended to store your password in the config
                                     <string>Enter your groupware server login password here.</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="6" column="1">
+                            <widget class="TQLineEdit" row="6" column="1">
                                 <property name="name">
                                     <cstring>publishPassword</cstring>
                                 </property>
@@ -222,7 +222,7 @@ For security reasons, it is not recommended to store your password in the config
                                     <string>Enter your groupware server login password here.</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="5" column="1">
+                            <widget class="TQLineEdit" row="5" column="1">
                                 <property name="name">
                                     <cstring>publishUser</cstring>
                                 </property>
@@ -238,7 +238,7 @@ For security reasons, it is not recommended to store your password in the config
 A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="5" column="0">
+                            <widget class="TQLabel" row="5" column="0">
                                 <property name="name">
                                     <cstring>TextLabel6</cstring>
                                 </property>
@@ -254,7 +254,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default
 A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID.</string>
                                 </property>
                             </widget>
-                            <widget class="QFrame" row="4" column="0" rowspan="1" colspan="2">
+                            <widget class="TQFrame" row="4" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>frame5</cstring>
                                 </property>
@@ -265,7 +265,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default
                                     <enum>Sunken</enum>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>TextLabel7</cstring>
                                 </property>
@@ -301,7 +301,7 @@ Ask the server administrator for this information.</string>
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -312,7 +312,7 @@ Ask the server administrator for this information.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
@@ -323,7 +323,7 @@ Ask the server administrator for this information.</string>
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>retrieveEnable</cstring>
                         </property>
@@ -334,7 +334,7 @@ Ask the server administrator for this information.</string>
                             <string>Check this box to retrieve other peoples' Free/Busy information automatically. Note that you have to fill the correct server information to make this possible.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>fullDomainRetrieval</cstring>
                         </property>
@@ -351,7 +351,7 @@ Ask the server administrator for this information.</string>
                             <string>Check this box to download a free/busy file in the format "user@domain.ifb" (for example joe@company.com.ifb). Otherwise, it will download a free/busy file in the format user.ifb (for example joe.ifb). Ask the server Administrator if you are not sure about how to configure this option.</string>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>ButtonGroup2_2</cstring>
                         </property>
@@ -362,7 +362,7 @@ Ask the server administrator for this information.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout7_2</cstring>
                                 </property>
@@ -370,7 +370,7 @@ Ask the server administrator for this information.</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel7_2</cstring>
                                         </property>
@@ -390,7 +390,7 @@ Alternatively, you can specify a full path to the Free/Busy file,
 For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>retrieveUrl</cstring>
                                         </property>
@@ -409,7 +409,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QFrame">
+                            <widget class="TQFrame">
                                 <property name="name">
                                     <cstring>frame7</cstring>
                                 </property>
@@ -420,7 +420,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                                     <enum>Sunken</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>tqlayout13</cstring>
                                 </property>
@@ -428,7 +428,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLineEdit" row="0" column="1">
+                                    <widget class="TQLineEdit" row="0" column="1">
                                         <property name="name">
                                             <cstring>retrieveUser</cstring>
                                         </property>
@@ -438,7 +438,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
 A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>textLabel3</cstring>
                                         </property>
@@ -454,7 +454,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default
 A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>textLabel4</cstring>
                                         </property>
@@ -468,7 +468,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default
                                             <string>Enter your groupware server login password here.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit" row="1" column="1">
+                                    <widget class="TQLineEdit" row="1" column="1">
                                         <property name="name">
                                             <cstring>retrievePassword</cstring>
                                         </property>
@@ -481,7 +481,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>retrieveSavePassword</cstring>
                                 </property>
@@ -620,12 +620,12 @@ For security reasons, it is not recommended to store your password in the config
     <include location="global" impldecl="in declaration">kdepimmacros.h</include>
     <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
-<signals>
+<Q_SIGNALS>
     <signal>changed()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>slotChanged()</slot>
-</slots>
+</Q_SLOTS>
 <exportmacro>KDE_EXPORT</exportmacro>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/kogroupwareprefspage.ui.h b/korganizer/kogroupwareprefspage.ui.h
index aea1618e..c45191b3 100644
--- a/korganizer/kogroupwareprefspage.ui.h
+++ b/korganizer/kogroupwareprefspage.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/korganizer/kohelper.cpp b/korganizer/kohelper.cpp
index 3b7bd877..b96412c8 100644
--- a/korganizer/kohelper.cpp
+++ b/korganizer/kohelper.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcolor.h>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index 07d91058..049459b4 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOHELPER_H
 #define KOHELPER_H
diff --git a/korganizer/koidentitymanager.cpp b/korganizer/koidentitymanager.cpp
index 86bac4c9..fde652ff 100644
--- a/korganizer/koidentitymanager.cpp
+++ b/korganizer/koidentitymanager.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koidentitymanager.h"
diff --git a/korganizer/koidentitymanager.h b/korganizer/koidentitymanager.h
index c1a70fc2..8fcf8811 100644
--- a/korganizer/koidentitymanager.h
+++ b/korganizer/koidentitymanager.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KOIDENTITYMANAGER_H
@@ -32,8 +32,8 @@ namespace KOrg {
 class IdentityManager : public KPIM::IdentityManager
 {
 public:
-  IdentityManager( TQObject * parent=0, const char * name=0 )
-    : KPIM::IdentityManager( true /*readonly*/, parent, name ) {}
+  IdentityManager( TQObject * tqparent=0, const char * name=0 )
+    : KPIM::IdentityManager( true /*readonly*/, tqparent, name ) {}
 
 protected:
   virtual void createDefaultIdentity( TQString& fullName, TQString& emailAddress );
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9a917699..9047cff9 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -56,9 +56,9 @@
 #include "templatemanagementdialog.h"
 
 KOIncidenceEditor::KOIncidenceEditor( const TQString &caption,
-                                      Calendar *calendar, TQWidget *parent )
+                                      Calendar *calendar, TQWidget *tqparent )
   : KDialogBase( Tabbed, caption, Ok | Apply | Cancel | Default, Ok,
-                 parent, 0, false, false ),
+                 tqparent, 0, false, false ),
     mAttendeeEditor( 0 ), mResource( 0 ), mIsCounter( false ), mIsCreateTask( false ),
     mRecurIncidence( 0 ), mRecurIncidenceAfterDissoc( 0 )
 {
@@ -197,7 +197,7 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type )
     "korganizer/designer/" + type + "/*.ui", true, true );
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
     const TQString &fn = (*it).mid( (*it).findRev('/') + 1 );
-    if ( activePages.find( fn ) != activePages.end() ) {
+    if ( activePages.tqfind( fn ) != activePages.end() ) {
       addDesignerTab( *it );
     }
   }
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index a2ac6055..4ff8915b 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOINCIDENCEEDITOR_H
 #define KOINCIDENCEEDITOR_H
@@ -57,12 +57,13 @@ using namespace KOrg;
 class KOIncidenceEditor : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Construct new IncidenceEditor.
     */
     KOIncidenceEditor( const TQString &caption, Calendar *calendar,
-                       TQWidget *parent );
+                       TQWidget *tqparent );
     virtual ~KOIncidenceEditor();
 
     /** This incidence has been modified externally */
@@ -78,7 +79,7 @@ class KOIncidenceEditor : public KDialogBase
       This should be called when editing only one occurrence of a recurring incidence,
       before showing the editor.
 
-      It gives the editor a pointer to the original incidence, which tqcontains all occurrences
+      It gives the editor a pointer to the original incidence, which contains all occurrences
       and a pointer to the original incidence already dissociated from the event (mEvent).
 
       If the user presses ok/apply the changes made to the incAfterDissociation are commited
@@ -133,7 +134,7 @@ class KOIncidenceEditor : public KDialogBase
     virtual void slotTemplatesChanged( const TQStringList& );
 
   protected:
-    virtual TQString type() { return TQString::null; }
+    virtual TQString type() { return TQString(); }
     virtual TQStringList& templates() const = 0;
     virtual void loadTemplate( /*const*/ CalendarLocal& ) = 0;
 
diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp
index c01b5487..ca1e7672 100644
--- a/korganizer/koincidencetooltip.cpp
+++ b/korganizer/koincidencetooltip.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <libkcal/incidence.h>
diff --git a/korganizer/koincidencetooltip.h b/korganizer/koincidencetooltip.h
index 348ab890..7b8a3536 100644
--- a/korganizer/koincidencetooltip.h
+++ b/korganizer/koincidencetooltip.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOINCIDENCETOOLTIP_H
 #define KOINCIDENCETOOLTIP_H
@@ -37,7 +37,7 @@ class KOAgendaItem;
 /**
 @author Reinhold Kainhofer
 */
-class KOIncidenceToolTip : public QToolTip
+class KOIncidenceToolTip : public TQToolTip
 {
   public:
     KOIncidenceToolTip( TQWidget *widget, Calendar *calendar, const TQDate &date, TQToolTipGroup *group = 0 )
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index c7566cae..3570f6ec 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kojournaleditor.h"
@@ -43,8 +43,8 @@
 
 using namespace KCal;
 
-KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *parent ) :
-  KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, parent )
+KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *tqparent ) :
+  KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, tqparent )
 {
   mJournal = 0;
 }
@@ -120,7 +120,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip
 {
   if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.find( "\n" );
+    int pos = summary.tqfind( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 731682e9..7f757389 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOJOURNALEDITOR_H
 #define KOJOURNALEDITOR_H
@@ -46,11 +46,12 @@ class KOEditorGeneralJournal;
 class KOJournalEditor : public KOIncidenceEditor
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a new Journal editor.
     */
-    KOJournalEditor( Calendar *calendar, TQWidget *parent );
+    KOJournalEditor( Calendar *calendar, TQWidget *tqparent );
     virtual ~KOJournalEditor();
 
     void init();
@@ -64,10 +65,10 @@ class KOJournalEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary tqcontains multiple lines, the summary will be used as description
+      summary contains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
-    void setTexts( const TQString &summary, const TQString &description = TQString::null );
+    void setTexts( const TQString &summary, const TQString &description = TQString() );
     /** Edit an existing Journal. */
     void editIncidence(Incidence *, const TQDate &date, Calendar *);
 
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 4a5513d9..412ef5a7 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 //
@@ -42,9 +42,9 @@
 #include "koglobals.h"
 using namespace KOrg;
 
-KOJournalView::KOJournalView(Calendar *calendar, TQWidget *parent,
+KOJournalView::KOJournalView(Calendar *calendar, TQWidget *tqparent,
                        const char *name)
-  : KOrg::BaseView(calendar, parent, name)
+  : KOrg::BaseView(calendar, tqparent, name)
 {
   TQVBoxLayout*topLayout = new TQVBoxLayout( this );
   topLayout->setAutoAdd(true);
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index a22c4d8a..404c6b93 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOJOURNALVIEW_H
 #define KOJOURNALVIEW_H
@@ -41,8 +41,9 @@ class TQVBox;
 class KOJournalView : public KOrg::BaseView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOJournalView( Calendar *calendar, TQWidget *parent = 0,
+    KOJournalView( Calendar *calendar, TQWidget *tqparent = 0,
                    const char *name = 0);
     ~KOJournalView();
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 35474f89..973550d6 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlistview.h>
@@ -56,10 +56,10 @@ enum {
 };
 
 
-KOListViewToolTip::KOListViewToolTip( TQWidget* parent,
+KOListViewToolTip::KOListViewToolTip( TQWidget* tqparent,
                                       Calendar *calendar,
                                       KListView *lv )
-  :TQToolTip( parent ), mCalendar( calendar )
+  :TQToolTip( tqparent ), mCalendar( calendar )
 {
   eventlist = lv;
 }
@@ -135,9 +135,9 @@ bool KOListView::ListItemVisitor::visit( Event *e )
   TQString endDateTime;
 
   mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtStart(), e->doesFloat() ) );
-  mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) );
+  mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( TQt::ISODate ) );
   mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) );
-  mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::ISODate ) );
+  mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) );
   mItem->setText( Categories_Column, e->categoriesStr() );
 
   return true;
@@ -167,14 +167,14 @@ bool KOListView::ListItemVisitor::visit( Todo *t )
 
   if ( t->hasStartDate() ) {
     mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtStart(), t->doesFloat() ) );
-    mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::ISODate ) );
+    mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( TQt::ISODate ) );
   } else {
     mItem->setText( StartDateTime_Column, "---" );
   }
 
   if ( t->hasDueDate() ) {
     mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtDue(), t->doesFloat() ) );
-    mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::ISODate ) );
+    mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( TQt::ISODate ) );
   } else {
     mItem->setText( EndDateTime_Column, "---" );
   }
@@ -190,16 +190,16 @@ bool KOListView::ListItemVisitor::visit( Journal *j )
   // Just use the first line
   mItem->setText( Summary_Column, j->description().section( "\n", 0, 0 ) );
   mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( j->dtStart(), j->doesFloat() ) );
-  mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) );
+  mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( TQt::ISODate ) );
 
   return true;
 }
 
 KOListView::KOListView( Calendar *calendar,
-                        TQWidget *parent,
+                        TQWidget *tqparent,
                         const char *name,
                         bool nonInteractive )
-  : KOEventView( calendar, parent, name )
+  : KOEventView( calendar, tqparent, name )
 {
   mActiveItem = 0;
   mIsNonInteractive = nonInteractive;
@@ -352,7 +352,7 @@ void KOListView::addIncidences( const Incidence::List &incidenceList, const TQDa
 
 void KOListView::addIncidence( Incidence *incidence, const TQDate &date )
 {
-  if ( mUidDict.find( incidence->uid() ) ) {
+  if ( mUidDict.tqfind( incidence->uid() ) ) {
     return;
   }
 
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index e29a5e39..50d0ab5c 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOLISTVIEW_H
 #define _KOLISTVIEW_H
@@ -41,10 +41,10 @@ typedef CustomListViewItem<Incidence *> KOListViewItem;
 
 class KOListView;
 
-class KOListViewToolTip : public QToolTip
+class KOListViewToolTip : public TQToolTip
 {
   public:
-    KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv );
+    KOListViewToolTip ( TQWidget* tqparent, Calendar *calendar, KListView* lv );
 
   protected:
     void maybeTip( const TQPoint &pos );
@@ -68,9 +68,10 @@ class KOListViewToolTip : public QToolTip
 class KOListView : public KOEventView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
    explicit KOListView( Calendar *calendar,
-                        TQWidget *parent = 0,
+                        TQWidget *tqparent = 0,
                         const char *name = 0,
                         bool nonInteractive = false );
     ~KOListView();
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 8b65d1d1..42322597 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <unistd.h>
@@ -148,7 +148,7 @@ bool KOMailClient::mailOrganizer(IncidenceBase *incidence,const TQString &attach
 
   bool bcc = KOPrefs::instance()->mBcc;
 
-  return send(from,to,TQString::null,subject,body,bcc,attachment);
+  return send(from,to,TQString(),subject,body,bcc,attachment);
 }
 
 bool KOMailClient::mailTo(IncidenceBase *incidence,const TQString &recipients,
@@ -165,7 +165,7 @@ bool KOMailClient::mailTo(IncidenceBase *incidence,const TQString &recipients,
   TQString body = IncidenceFormatter::mailBodyString(incidence);
   bool bcc = KOPrefs::instance()->mBcc;
   kdDebug () << "KOMailClient::mailTo " << recipients << endl;
-  return send(from,recipients,TQString::null,subject,body,bcc,attachment);
+  return send(from,recipients,TQString(),subject,body,bcc,attachment);
 }
 
 bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString &cc,
@@ -253,10 +253,10 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
       if (!kMailOpenComposer(to,cc,bcc ? from : "",subject,body,0,KURL())) return false;
     } else {
       TQString meth;
-      int idx = attachment.find("METHOD");
+      int idx = attachment.tqfind("METHOD");
       if (idx>=0) {
-        idx = attachment.find(':',idx)+1;
-        const int newline = attachment.find('\n',idx);
+        idx = attachment.tqfind(':',idx)+1;
+        const int newline = attachment.tqfind('\n',idx);
         meth = attachment.mid(idx, newline - idx - 1);
         meth = meth.lower().stripWhiteSpace();
       } else {
diff --git a/korganizer/komailclient.h b/korganizer/komailclient.h
index 3051bab7..d919b83f 100644
--- a/korganizer/komailclient.h
+++ b/korganizer/komailclient.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOMAILCLIENT_H
 #define KOMAILCLIENT_H
@@ -38,16 +38,16 @@ class KOMailClient
     KOMailClient();
     virtual ~KOMailClient();
 
-    bool mailAttendees(IncidenceBase *,const TQString &attachment=TQString::null);
-    bool mailOrganizer(IncidenceBase *,const TQString &attachment=TQString::null, const TQString &sub = TQString::null);
-    bool mailTo(IncidenceBase *,const TQString &recipients,const TQString &attachment=TQString::null);
+    bool mailAttendees(IncidenceBase *,const TQString &attachment=TQString());
+    bool mailOrganizer(IncidenceBase *,const TQString &attachment=TQString(), const TQString &sub = TQString());
+    bool mailTo(IncidenceBase *,const TQString &recipients,const TQString &attachment=TQString());
 
   protected:
     /** Send mail with specified from, to and subject field and body as text. If
      * bcc is set, send a blind carbon copy to the sender from */
     bool send(const TQString &from,const TQString &to,const TQString &cc,
               const TQString &subject,const TQString &body,bool bcc=false,
-              const TQString &attachment=TQString::null);
+              const TQString &attachment=TQString());
 
     int kMailOpenComposer(const TQString& to, const TQString& cc,
                           const TQString& bcc, const TQString& subject,
diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp
index 1874fe20..dbc1e8af 100644
--- a/korganizer/komessagebox.cpp
+++ b/korganizer/komessagebox.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kmessagebox.h>
@@ -28,12 +28,12 @@
 
 #include "komessagebox.h"
 
-int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, 
+int KOMessageBox::fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, 
             const TQString &text, const TQString &caption, 
             const KGuiItem &button1, const KGuiItem &button2, 
             const KGuiItem &button3, int options)
 {
-  KDialogBase *dialog= new KDialogBase( parent, "KOMessageBox", true,
+  KDialogBase *dialog= new KDialogBase( tqparent, "KOMessageBox", true,
                      caption.isEmpty() ? "" : caption,
                      KDialogBase::Yes | KDialogBase::No | KDialogBase::Ok | KDialogBase::Cancel,
                      KDialogBase::Yes, 
@@ -48,7 +48,7 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type,
 
   bool checkboxResult = false;
   int result = KMessageBox::createKMessageBox(dialog, type, text, TQStringList(),
-                     TQString::null, &checkboxResult, options);
+                     TQString(), &checkboxResult, options);
   switch (result) {
     case KDialogBase::Yes: result = KMessageBox::Yes; break;
     case KDialogBase::No: result = KMessageBox::No; break;
diff --git a/korganizer/komessagebox.h b/korganizer/komessagebox.h
index a1499bfe..1ddfa88c 100644
--- a/korganizer/komessagebox.h
+++ b/korganizer/komessagebox.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOMESSAGEBOX_H
 #define KOMESSAGEBOX_H
@@ -33,8 +33,8 @@
 class KOMessageBox
 {
   public:
-    static int fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, 
-            const TQString &text, const TQString &caption = TQString::null, 
+    static int fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, 
+            const TQString &text, const TQString &caption = TQString(), 
             const KGuiItem &button1 = KStdGuiItem::yes(), const KGuiItem &button2 = KStdGuiItem::no(), 
             const KGuiItem &button3 = KStdGuiItem::cont(), 
             int options = 0 );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 930e6c8d..ad03aec4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpopupmenu.h>
@@ -61,11 +61,11 @@
 
 //--------------------------------------------------------------------------
 
-KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *parent,
+KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *tqparent,
                                         Calendar *calendar,
                                         const TQDate &date,
                                         KNoScrollListBox *lv )
-  : TQToolTip( parent ), mCalendar( calendar ), mDate( date )
+  : TQToolTip( tqparent ), mCalendar( calendar ), mDate( date )
 {
   eventlist = lv;
 }
@@ -87,8 +87,8 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos )
   }
 }
 
-KNoScrollListBox::KNoScrollListBox( TQWidget *parent, const char *name )
-  : TQListBox( parent, name ),
+KNoScrollListBox::KNoScrollListBox( TQWidget *tqparent, const char *name )
+  : TQListBox( tqparent, name ),
     mSqueezing( false )
 {
   TQPalette pal = palette();
@@ -239,11 +239,7 @@ TQColor MonthViewItem::catColor() const
 
 void MonthViewItem::paint( TQPainter *p )
 {
-#if QT_VERSION >= 0x030000
   bool sel = isSelected();
-#else
-  bool sel = selected();
-#endif
 
   TQColor bgColor = TQColor(); // Default invalid color;
   if ( mIncidence && mTodo ) {
@@ -347,8 +343,8 @@ void MonthViewItem::paint( TQPainter *p )
   }
   TQFontMetrics fm = p->fontMetrics();
   int yPos;
-  int pmheight = QMAX( mRecurPixmap.height(),
-                       QMAX( mAlarmPixmap.height(), mReplyPixmap.height() ) );
+  int pmheight = TQMAX( mRecurPixmap.height(),
+                       TQMAX( mAlarmPixmap.height(), mReplyPixmap.height() ) );
   if( pmheight < fm.height() )
     yPos = fm.ascent() + fm.leading()/2;
   else
@@ -361,8 +357,8 @@ void MonthViewItem::paint( TQPainter *p )
 
 int MonthViewItem::height( const TQListBox *lb ) const
 {
-  return QMAX( QMAX( mRecurPixmap.height(), mReplyPixmap.height() ),
-               QMAX( mAlarmPixmap.height(), lb->fontMetrics().lineSpacing()+1) );
+  return TQMAX( TQMAX( mRecurPixmap.height(), mReplyPixmap.height() ),
+               TQMAX( mAlarmPixmap.height(), lb->fontMetrics().lineSpacing()+1) );
 }
 
 int MonthViewItem::width( const TQListBox *lb ) const
@@ -382,9 +378,9 @@ int MonthViewItem::width( const TQListBox *lb ) const
 }
 
 
-MonthViewCell::MonthViewCell( KOMonthView *parent)
-  : TQWidget( parent ),
-    mMonthView( parent ), mPrimary( false ), mHoliday( false ),
+MonthViewCell::MonthViewCell( KOMonthView *tqparent)
+  : TQWidget( tqparent ),
+    mMonthView( tqparent ), mPrimary( false ), mHoliday( false ),
     isSelected( false )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
@@ -814,8 +810,8 @@ void MonthViewCell::contextMenu( TQListBoxItem *item )
 }
 
 
-KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name )
-    : KOEventView( calendar, parent, name ),
+KOMonthView::KOMonthView( Calendar *calendar, TQWidget *tqparent, const char *name )
+    : KOEventView( calendar, tqparent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index f503a29d..7a988559 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef _KOMONTHVIEW_H
@@ -33,10 +33,10 @@
 
 class KNoScrollListBox;
 
-class KOMonthCellToolTip : public QToolTip
+class KOMonthCellToolTip : public TQToolTip
 {
   public:
-    KOMonthCellToolTip (TQWidget* parent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv );
+    KOMonthCellToolTip (TQWidget* tqparent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv );
 
   protected:
     void maybeTip( const TQPoint & pos);
@@ -48,11 +48,12 @@ class KOMonthCellToolTip : public QToolTip
 };
 
 
-class KNoScrollListBox: public QListBox
+class KNoScrollListBox: public TQListBox
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KNoScrollListBox(TQWidget *parent=0, const char *name=0);
+    KNoScrollListBox(TQWidget *tqparent=0, const char *name=0);
     ~KNoScrollListBox() {}
 
     void setBackground( bool primary, bool workday );
@@ -74,7 +75,7 @@ class KNoScrollListBox: public QListBox
 };
 
 
-class MonthViewItem: public QListBoxItem
+class MonthViewItem: public TQListBoxItem
 {
   public:
     MonthViewItem( Incidence *, const TQDateTime &qd, const TQString & title );
@@ -131,9 +132,10 @@ class KOMonthView;
 
 @see KOMonthView
 */
-class MonthViewCell : public QWidget
+class MonthViewCell : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     class CreateItemVisitor;
     MonthViewCell( KOMonthView * );
@@ -143,7 +145,7 @@ class MonthViewCell : public QWidget
     /** @return Date of cell */
     TQDate date() const;
 
-    /** @return MonthView parent */
+    /** @return MonthView tqparent */
     KOMonthView *monthView() { return mMonthView; }
 
     /**
@@ -243,8 +245,9 @@ class MonthViewCell : public QWidget
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
+    KOMonthView(Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 );
     ~KOMonthView();
 
     /** Returns maximum number of days supported by the komonthview */
diff --git a/korganizer/konewstuff.cpp b/korganizer/konewstuff.cpp
index 83ee226d..1c9daa81 100644
--- a/korganizer/konewstuff.cpp
+++ b/korganizer/konewstuff.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kapplication.h>
diff --git a/korganizer/konewstuff.h b/korganizer/konewstuff.h
index ba70394f..92e9a0dc 100644
--- a/korganizer/konewstuff.h
+++ b/korganizer/konewstuff.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONEWSTUFF_H
 #define KONEWSTUFF_H
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a5b44cce..66dd686d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <time.h>
@@ -75,7 +75,7 @@ KOPrefs::KOPrefs() :
   mDefaultTimeBarFont = KGlobalSettings::generalFont();
   // make a large default time bar font, at least 16 points.
   mDefaultTimeBarFont.setPointSize(
-    QMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) );
+    TQMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) );
 
   mDefaultMonthViewFont = KGlobalSettings::generalFont();
   // make it a bit smaller
@@ -403,7 +403,7 @@ bool KOPrefs::thatIsMe( const TQString& _email )
     return true;
   */
 
-  // in case email tqcontains a full name, strip it out
+  // in case email contains a full name, strip it out
   // the below is the simpler but slower version of the following KMime code
   // const TQString email = KPIM::getEmailAddress( _email );
   const TQCString tmp = _email.utf8();
@@ -418,14 +418,14 @@ bool KOPrefs::thatIsMe( const TQString& _email )
     if ( email == (*it).primaryEmailAddress() )
       return true;
     const TQStringList & aliases = (*it).emailAliases();
-    if ( aliases.find( email ) != aliases.end() )
+    if ( aliases.tqfind( email ) != aliases.end() )
         return true;
   }
 
-  if ( mAdditionalMails.find( email ) != mAdditionalMails.end() )
+  if ( mAdditionalMails.tqfind( email ) != mAdditionalMails.end() )
     return true;
   TQStringList lst = mMyAddrBookMails;
-  if ( lst.find( email ) != lst.end() )
+  if ( lst.tqfind( email ) != lst.end() )
     return true;
   return false;
 }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index fcda7143..013407e3 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 63b2a347..d074ae91 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -80,8 +80,8 @@
 #include <kdepimmacros.h>
 
 
-KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
-  : KPrefsModule( KOPrefs::instance(), parent, name )
+KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *tqparent, const char *name )
+  : KPrefsModule( KOPrefs::instance(), tqparent, name )
 {
   TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -138,9 +138,9 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on )
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogMain( parent, "kcmkorganizermain" );
+    return new KOPrefsDialogMain( tqparent, "kcmkorganizermain" );
   }
 }
 
@@ -148,8 +148,8 @@ extern "C"
 class KOPrefsDialogTime : public KPrefsModule
 {
   public:
-    KOPrefsDialogTime( TQWidget *parent, const char *name )
-      : KPrefsModule( KOPrefs::instance(), parent, name )
+    KOPrefsDialogTime( TQWidget *tqparent, const char *name )
+      : KPrefsModule( KOPrefs::instance(), tqparent, name )
     {
       TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -212,7 +212,7 @@ class KOPrefsDialogTime : public KPrefsModule
       // Read all system time zones
     #if defined(USE_SOLARIS)       // MARCO
         snprintf(buf, MAXPATHLEN,
-               "/bin/find %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-",
+               "/bin/tqfind %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-",
                ZONEINFODIR, strlen(ZONEINFODIR) + 2);
 
         if (f = popen(buf, "r"))
@@ -340,7 +340,7 @@ class KOPrefsDialogTime : public KPrefsModule
 
       TQCheckBox *cb = addWidBool( KOPrefs::instance()->defaultAudioFileRemindersItem(),
                                   audioFileRemindersBox )->checkBox();
-      cb->setText( TQString::null );
+      cb->setText( TQString() );
 
       if ( KOPrefs::instance()->audioFilePathItem()->value().isEmpty() ) {
         TQString defAudioFile = KGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg");
@@ -436,7 +436,7 @@ class KOPrefsDialogTime : public KPrefsModule
         KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
 
       KOPrefs::instance()->mHolidays = ( mHolidayCombo->currentItem() == 0 ) ?  // (None)
-                                       TQString::null :
+                                       TQString() :
                                        mRegionMap[mHolidayCombo->currentText()];
 
       KOPrefs::instance()->mReminderTime = mReminderTimeSpin->value();
@@ -479,10 +479,10 @@ class KOPrefsDialogTime : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigtime( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigtime( TQWidget *tqparent, const char * )
   {
     KGlobal::locale()->insertCatalogue( "timezones" );
-    return new KOPrefsDialogTime( parent, "kcmkorganizertime" );
+    return new KOPrefsDialogTime( tqparent, "kcmkorganizertime" );
   }
 }
 
@@ -490,8 +490,8 @@ extern "C"
 class KOPrefsDialogViews : public KPrefsModule
 {
   public:
-    KOPrefsDialogViews( TQWidget *parent, const char *name )
-      : KPrefsModule( KOPrefs::instance(), parent, name )
+    KOPrefsDialogViews( TQWidget *tqparent, const char *name )
+      : KPrefsModule( KOPrefs::instance(), tqparent, name )
     {
       TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -579,9 +579,9 @@ class KOPrefsDialogViews : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigviews( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigviews( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogViews( parent, "kcmkorganizerviews" );
+    return new KOPrefsDialogViews( tqparent, "kcmkorganizerviews" );
   }
 }
 
@@ -589,8 +589,8 @@ extern "C"
 class KOPrefsDialogFonts : public KPrefsModule
 {
   public:
-    KOPrefsDialogFonts( TQWidget *parent, const char *name )
-      : KPrefsModule( KOPrefs::instance(), parent, name )
+    KOPrefsDialogFonts( TQWidget *tqparent, const char *name )
+      : KPrefsModule( KOPrefs::instance(), tqparent, name )
     {
       TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -639,15 +639,15 @@ class KOPrefsDialogFonts : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfonts( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigfonts( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogFonts( parent, "kcmkorganizerfonts" );
+    return new KOPrefsDialogFonts( tqparent, "kcmkorganizerfonts" );
   }
 }
 
 
-KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
-      : KPrefsModule( KOPrefs::instance(), parent, name )
+KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *tqparent, const char *name )
+      : KPrefsModule( KOPrefs::instance(), tqparent, name )
 {
   TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -781,7 +781,7 @@ void KOPrefsDialogColors::setCategoryColor()
 void KOPrefsDialogColors::updateCategoryColor()
 {
   TQString cat = mCategoryCombo->currentText();
-  TQColor *color = mCategoryDict.find(cat);
+  TQColor *color = mCategoryDict.tqfind(cat);
   if (!color) {
     color = KOPrefs::instance()->categoryColor(cat);
   }
@@ -832,7 +832,7 @@ void KOPrefsDialogColors::updateResourceColor()
 {
   kdDebug( 5850 ) << "KOPrefsDialogColors::updateResourceColor()" << endl;
   TQString res= mResourceIdentifier[mResourceCombo->currentItem()];
-  TQColor *color = mCategoryDict.find(res);
+  TQColor *color = mCategoryDict.tqfind(res);
   if( !color )  {
     color = KOPrefs::instance()->resourceColor( res );
   }
@@ -842,15 +842,15 @@ void KOPrefsDialogColors::updateResourceColor()
 }
 extern "C"
 {
-  KCModule *create_korganizerconfigcolors( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigcolors( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogColors( parent, "kcmkorganizercolors" );
+    return new KOPrefsDialogColors( tqparent, "kcmkorganizercolors" );
   }
 }
 
 
-KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name )
-  : KPrefsModule( KOPrefs::instance(), parent, name )
+KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name )
+  : KPrefsModule( KOPrefs::instance(), tqparent, name )
 {
   TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -1005,17 +1005,17 @@ void KOPrefsDialogGroupScheduling::updateInput()
 
 extern "C"
 {
-  KCModule *create_korganizerconfiggroupscheduling( TQWidget *parent,
+  KCModule *create_korganizerconfiggroupscheduling( TQWidget *tqparent,
                                                      const char * )
   {
-    return new KOPrefsDialogGroupScheduling( parent,
+    return new KOPrefsDialogGroupScheduling( tqparent,
                                              "kcmkorganizergroupscheduling" );
   }
 }
 
 
-KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name )
-  : KPrefsModule( KOPrefs::instance(), parent, name )
+KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name )
+  : KPrefsModule( KOPrefs::instance(), tqparent, name )
 {
   mGroupwarePage = new KOGroupwarePrefsPage( this );
   connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) );
@@ -1069,9 +1069,9 @@ void KOPrefsDialogGroupwareScheduling::usrWriteConfig()
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigfreebusy( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogGroupwareScheduling( parent,
+    return new KOPrefsDialogGroupwareScheduling( tqparent,
                                                  "kcmkorganizerfreebusy" );
   }
 }
@@ -1080,8 +1080,8 @@ extern "C"
 
 class PluginItem : public TQCheckListItem {
   public:
-    PluginItem( TQListView *parent, KService::Ptr service ) :
-      TQCheckListItem( parent, service->name(), TQCheckListItem::CheckBox ), mService( service )
+    PluginItem( TQListView *tqparent, KService::Ptr service ) :
+      TQCheckListItem( tqparent, service->name(), TQCheckListItem::CheckBox ), mService( service )
     {}
     KService::Ptr service() { return mService; }
   private:
@@ -1092,8 +1092,8 @@ class PluginItem : public TQCheckListItem {
 /**
   Dialog for selecting and configuring KOrganizer plugins
 */
-KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
-  : KPrefsModule( KOPrefs::instance(), parent, name )
+KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *tqparent, const char* name )
+  : KPrefsModule( KOPrefs::instance(), tqparent, name )
 {
   TQBoxLayout *topTopLayout = new TQVBoxLayout( this );
 
@@ -1121,7 +1121,7 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
   TQWidget *buttonRow = new TQWidget( topFrame );
   TQBoxLayout *buttonRowLayout = new TQHBoxLayout( buttonRow );
   mConfigureButton = new KPushButton( KGuiItem( i18n("Configure &Plugin..."),
-      "configure", TQString::null, i18n("This button allows you to configure"
+      "configure", TQString(), i18n("This button allows you to configure"
       " the plugin that you have selected in the list above") ), buttonRow );
 
   buttonRowLayout->addWidget( mConfigureButton );
@@ -1150,7 +1150,7 @@ void KOPrefsDialogPlugins::usrReadConfig()
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
     TQCheckListItem *item = new PluginItem( mListView, *it );
-    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
       item->setOn( true );
     }
@@ -1192,7 +1192,7 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i )
   PluginItem *item = dynamic_cast<PluginItem*>( i );
   if ( !item ) {
     mConfigureButton->setEnabled( false );
-    mDescription->setText( TQString::null );
+    mDescription->setText( TQString() );
     return;
   }
 
@@ -1210,9 +1210,9 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i )
 
 extern "C"
 {
-  KCModule *create_korganizerconfigplugins( TQWidget *parent, const char * )
+  KCModule *create_korganizerconfigplugins( TQWidget *tqparent, const char * )
   {
-    return new KOPrefsDialogPlugins( parent,
+    return new KOPrefsDialogPlugins( tqparent,
                                      "kcmkorganizerplugins" );
   }
 }
@@ -1220,13 +1220,13 @@ extern "C"
 
 extern "C"
 {
-  KCModule *create_korgdesignerfields( TQWidget *parent, const char * ) {
-    return new KOPrefsDesignerFields( parent, "kcmkorgdesignerfields" );
+  KCModule *create_korgdesignerfields( TQWidget *tqparent, const char * ) {
+    return new KOPrefsDesignerFields( tqparent, "kcmkorgdesignerfields" );
   }
 }
 
-KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *parent, const char *name )
-  : KCMDesignerFields( parent, name )
+KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *tqparent, const char *name )
+  : KCMDesignerFields( tqparent, name )
 {
 }
 
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 8be91a82..c50b5f37 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOPREFSDIALOG_H
 #define KOPREFSDIALOG_H
@@ -41,8 +41,9 @@ class TQListView;
 class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOPrefsDialogMain( TQWidget *parent, const char *name );
+    KOPrefsDialogMain( TQWidget *tqparent, const char *name );
 
   protected slots:
     void toggleEmailSettings( bool on );
@@ -53,8 +54,9 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOPrefsDialogColors( TQWidget *parent, const char *name );
+    KOPrefsDialogColors( TQWidget *tqparent, const char *name );
 
   protected:
     void usrWriteConfig();
@@ -83,8 +85,9 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name );
+    KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name );
 
   protected:
     void usrReadConfig();
@@ -106,8 +109,9 @@ class KOGroupwarePrefsPage;
 class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name );
+    KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name );
 
   protected:
     void usrReadConfig();
@@ -120,8 +124,9 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOPrefsDialogPlugins( TQWidget *parent, const char *name );
+    KOPrefsDialogPlugins( TQWidget *tqparent, const char *name );
 
   protected slots:
     void usrReadConfig();
@@ -139,7 +144,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
 class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields
 {
   public:
-    KOPrefsDesignerFields( TQWidget *parent = 0, const char *name = 0 );
+    KOPrefsDesignerFields( TQWidget *tqparent = 0, const char *name = 0 );
 
   protected:
     TQString localUiDir();
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 6b12f76c..e095950a 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqhbox.h>
@@ -65,8 +65,8 @@ static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks
 class AlarmListItem : public KListViewItem
 {
   public:
-    AlarmListItem( const TQString &uid, TQListView *parent )
-      : KListViewItem( parent ), mUid( uid ), mNotified( false )
+    AlarmListItem( const TQString &uid, TQListView *tqparent )
+      : KListViewItem( tqparent ), mUid( uid ), mNotified( false )
     {
     }
 
@@ -96,10 +96,10 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co
 
 typedef TQValueList<AlarmListItem*> ItemList;
 
-AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, const char *name )
+AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *tqparent, const char *name )
   : KDialogBase( Plain,
                  WType_TopLevel | WStyle_Customize | WStyle_StaysOnTop | WStyle_DialogBorder,
-                 parent, name, false, i18n("Reminder"),
+                 tqparent, name, false, i18n("Reminder"),
                  Ok | User1 | User2 | User3, NoDefault,
                  false, i18n("Edit..."), i18n("Dismiss All"), i18n("Dismiss Reminder") ),
                  mCalendar( calendar ), mSuspendTimer(this)
@@ -437,7 +437,7 @@ void AlarmDialog::setTimer()
     AlarmListItem * item = static_cast<AlarmListItem*>( it.current() );
     if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) {
       int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt );
-      nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs );
+      nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs );
     }
   }
 
@@ -650,8 +650,8 @@ bool AlarmDialog::ensureKorganizerRunning() const
   TQString error;
   TQCString dcopService;
 
-  int result = KDCOPServiceStarter::self()->tqfindServiceFor(
-    "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+  int result = KDCOPServiceStarter::self()->findServiceFor(
+    "DCOP/Organizer", TQString(), TQString(), &error, &dcopService );
 
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we
@@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const
     // but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->tqfindObject(
+    if ( !kapp->dcopClient()->findObject(
            dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
-        Q_ASSERT( kapp->dcopClient()->tqfindObject(
+        Q_ASSERT( kapp->dcopClient()->findObject(
                     dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else {
         kdWarning() << "Error loading " << dcopService << endl;
diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index 75208f65..e82832fa 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef ALARMDIALOG_H
 #define ALARMDIALOG_H
@@ -44,8 +44,9 @@ class TQSplitter;
 
 class AlarmDialog : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 );
+    explicit AlarmDialog( CalendarResources *calendar, TQWidget *tqparent = 0, const char *name = 0 );
 
     ~AlarmDialog();
 
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 90360dc6..27badddb 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "alarmdockwindow.h"
@@ -178,7 +178,7 @@ void AlarmDockWindow::enableAutostart( bool enable )
 void AlarmDockWindow::mousePressEvent( TQMouseEvent *e )
 {
   if ( e->button() == LeftButton ) {
-    kapp->startServiceByDesktopName( "korganizer", TQString::null );
+    kapp->startServiceByDesktopName( "korganizer", TQString() );
   } else {
     KSystemTray::mousePressEvent( e );
   }
diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h
index 548e39aa..f73c667b 100644
--- a/korganizer/korgac/alarmdockwindow.h
+++ b/korganizer/korgac/alarmdockwindow.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef ALARMDOCKWINDOW_H
 #define ALARMDOCKWINDOW_H
@@ -31,6 +31,7 @@
 class AlarmDockWindow : public KSystemTray
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     AlarmDockWindow( const char *name = 0 );
     virtual ~AlarmDockWindow();
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 7ed25518..c1254f12 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koalarmclient.h"
@@ -39,8 +39,8 @@
 
 #include <tqpushbutton.h>
 
-KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
-  : DCOPObject( "ac" ), TQObject( parent, name ), mDialog( 0 )
+KOAlarmClient::KOAlarmClient( TQObject *tqparent, const char *name )
+  : DCOPObject( "ac" ), TQObject( tqparent, name ), mDialog( 0 )
 {
   kdDebug(5890) << "KOAlarmClient::KOAlarmClient()" << endl;
 
@@ -116,8 +116,8 @@ void KOAlarmClient::checkAlarms()
 
   TQValueList<Alarm *>::ConstIterator it;
   for( it = alarms.begin(); it != alarms.end(); ++it ) {
-    kdDebug(5891) << "REMINDER: " << (*it)->parent()->summary() << endl;
-    Incidence *incidence = mCalendar->incidence( (*it)->parent()->uid() );
+    kdDebug(5891) << "REMINDER: " << (*it)->tqparent()->summary() << endl;
+    Incidence *incidence = mCalendar->incidence( (*it)->tqparent()->uid() );
     createReminder( mCalendar, incidence, from, (*it)->text() );
   }
 }
@@ -163,7 +163,7 @@ void KOAlarmClient::quit()
   kapp->quit();
 }
 
-bool KOAlarmClient::commitData( QSessionManager& )
+bool KOAlarmClient::commitData( TQSessionManager& )
 {
   emit saveAllSignal();
   saveLastCheckTime();
@@ -201,7 +201,7 @@ TQStringList KOAlarmClient::dumpAlarms()
   TQValueList<Alarm*>::ConstIterator it;
   for( it = alarms.begin(); it != alarms.end(); ++it ) {
     Alarm *a = *it;
-    lst << TQString("  ") + a->parent()->summary() + " ("
+    lst << TQString("  ") + a->tqparent()->summary() + " ("
               + a->time().toString() + ")";
   }
 
diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h
index c8eee984..b1b8c189 100644
--- a/korganizer/korgac/koalarmclient.h
+++ b/korganizer/korgac/koalarmclient.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOALARMCLIENT_H
 #define KOALARMCLIENT_H
@@ -44,11 +44,12 @@ class Incidence;
 class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOAlarmClient( TQObject *parent = 0, const char *name = 0 );
+    KOAlarmClient( TQObject *tqparent = 0, const char *name = 0 );
     ~KOAlarmClient();
 
-    bool commitData( QSessionManager & );
+    bool commitData( TQSessionManager & );
 
     // DCOP interface
     void quit();
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index b4c9df7f..6df1f0e1 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <stdlib.h>
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 7cf090e2..1d9159ae 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 69ab0f4a..96a45820 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -25,8 +25,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "korganizer.h"
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index d5246b87..facf9f59 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -25,8 +25,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORGANIZER_H
 #define KORGANIZER_H
@@ -65,10 +65,11 @@ typedef KParts::MainWindow KPartsMainWindow;
 class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a new main window.
-      @param name     Qt internal widget name
+      @param name     TQt internal widget name
     */
     KOrganizer( const char *name = 0 );
     virtual ~KOrganizer();
diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h
index cbe7e036..52511ac9 100644
--- a/korganizer/korganizer_options.h
+++ b/korganizer/korganizer_options.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORGANIZER_OPTIONS_H
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index cc6252d5..064c4f12 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "korganizer_part.h"
@@ -67,9 +67,9 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory )
 
 KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
-                                TQObject *parent, const char *name,
+                                TQObject *tqparent, const char *name,
                                 const TQStringList & ) :
-  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() )
+  KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() )
 {
   KGlobal::locale()->insertCatalogue( "libkcal" );
   KGlobal::locale()->insertCatalogue( "libkdepim" );
@@ -151,7 +151,7 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & )
     emit textChanged( incidence->summary() + " / " +
                       incidence->dtStartTimeStr() );
   } else {
-    emit textChanged( TQString::null );
+    emit textChanged( TQString() );
   }
 }
 
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 1aececaf..fb6584e1 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORGANIZER_PART_H
 #define KORGANIZER_PART_H
@@ -57,9 +57,10 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
                       public KOrg::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
-                    TQObject *parent, const char *name, const TQStringList & );
+                    TQObject *tqparent, const char *name, const TQStringList & );
     virtual ~KOrganizerPart();
 
     static KAboutData *createAboutData();
diff --git a/korganizer/korganizer_part.rc b/korganizer/korganizer_part.rc
index da92935a..5115d226 100644
--- a/korganizer/korganizer_part.rc
+++ b/korganizer/korganizer_part.rc
@@ -39,7 +39,7 @@
       <Separator/>
       <Action name="edit_delete" append="edit_paste_merge"/>
       <Separator/>
-      <Action name="korganizer_find"/>
+      <Action name="korganizer_tqfind"/>
     </Menu>
     <Menu name="view"><text>&amp;View</text>
       <Action name="view_whatsnext"/>
diff --git a/korganizer/korganizerifaceimpl.cpp b/korganizer/korganizerifaceimpl.cpp
index e482e0f4..9ec8b26c 100644
--- a/korganizer/korganizerifaceimpl.cpp
+++ b/korganizer/korganizerifaceimpl.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -35,8 +35,8 @@
 
 
 KOrganizerIfaceImpl::KOrganizerIfaceImpl( ActionManager* actionManager,
-                                          TQObject* parent, const char* name )
-  : DCOPObject( "KOrganizerIface" ), TQObject( parent, name ),
+                                          TQObject* tqparent, const char* name )
+  : DCOPObject( "KOrganizerIface" ), TQObject( tqparent, name ),
     mActionManager( actionManager )
 {
 }
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 3efa4b17..4ecddcb0 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -42,7 +42,7 @@ class ActionManager;
 class KDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface {
 public:
   KOrganizerIfaceImpl( ActionManager* mActionManager,
-                       TQObject* parent=0, const char* name=0 );
+                       TQObject* tqparent=0, const char* name=0 );
   ~KOrganizerIfaceImpl();
 
   bool openURL( const TQString &url );
diff --git a/korganizer/korganizerui.rc b/korganizer/korganizerui.rc
index 82e97f71..5ece25d3 100644
--- a/korganizer/korganizerui.rc
+++ b/korganizer/korganizerui.rc
@@ -122,7 +122,7 @@
     <Action name="edit_copy"/>
     <Action name="edit_paste"/>
     <Separator/>
-    <Action name="edit_find"/>
+    <Action name="edit_tqfind"/>
     <Separator/>
     <Action name="go_previous"/>
     <Action name="go_next"/>
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 5bd9be91..84e4f2ef 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <kaboutdata.h>
 #include <kapplication.h>
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index ea987ccf..93296daa 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -41,9 +41,9 @@
 using namespace KOrg;
 using namespace KCal;
 
-KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent,
+KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *tqparent,
                                  const char *name)
-  : KOEventView(calendar, parent, name),
+  : KOEventView(calendar, tqparent, name),
   mEventPopup( 0 )
 {
     TQVBoxLayout* vbox = new TQVBoxLayout(this);
@@ -340,8 +340,8 @@ void KOTimelineView::itemMoved(KDGanttViewItem * item)
     if ( duration < 0 ) duration = 0;
   }
   i->setDuration( duration );
-  TimelineItem *parent = static_cast<TimelineItem*>( tlit->parent() );
-  parent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset );
+  TimelineItem *tqparent = static_cast<TimelineItem*>( tlit->tqparent() );
+  tqparent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset );
   mChanger->endChange( i, 0, TQString() );
 }
 
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 72ba9084..36907e6b 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOTIMELINEVIEW_H
 #define KOTIMELINEVIEW_H
@@ -44,8 +44,9 @@ namespace KOrg {
 class KOTimelineView : public KOEventView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOTimelineView(Calendar *calendar, TQWidget *parent = 0,
+    KOTimelineView(Calendar *calendar, TQWidget *tqparent = 0,
                     const char *name = 0);
     ~KOTimelineView();
 
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 180ff139..f996321e 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqtooltip.h>
@@ -51,8 +51,8 @@
 #include "kotodoeditor.h"
 #include "kocore.h"
 
-KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *parent ) :
-  KOIncidenceEditor( TQString::null, calendar, parent ),
+KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *tqparent ) :
+  KOIncidenceEditor( TQString(), calendar, tqparent ),
   mTodo( 0 ), mCalendar( 0 ), mRelatedTodo( 0 ), mGeneral( 0 ), mRecurrence( 0 )
 {
 }
@@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral()
 
     mGeneral->initHeader( topFrame, topLayout );
     mGeneral->initTime(topFrame,topLayout);
-    mGeneral->iniStatus(topFrame,topLayout);
+    mGeneral->initqStatus(topFrame,topLayout);
     mGeneral->initDescription(topFrame,topLayout);
     mGeneral->initAttachments(topFrame,topLayout);
     connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
@@ -174,7 +174,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio
 {
   if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.find( "\n" );
+    int pos = summary.tqfind( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
@@ -257,7 +257,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv
 {
   mRelatedTodo = relatedEvent;
 
-  // inherit some properties from parent todo
+  // inherit some properties from tqparent todo
   if ( mRelatedTodo ) {
     mGeneral->setCategories( mRelatedTodo->categories() );
   }
@@ -306,7 +306,7 @@ void KOTodoEditor::writeTodo( Todo *todo )
   }
   writeDesignerFields( todo );
 
-  // set related incidence, i.e. parent to-do in this case.
+  // set related incidence, i.e. tqparent to-do in this case.
   if ( mRelatedTodo ) {
     todo->setRelatedTo( mRelatedTodo );
   }
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index f743c11c..5322714f 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KOTODOEDITOR_H
 #define _KOTODOEDITOR_H
@@ -37,11 +37,12 @@ class KOEditorRecurrence;
 class KOTodoEditor : public KOIncidenceEditor
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a new todo editor.
     */
-    KOTodoEditor( Calendar *calendar, TQWidget *parent );
+    KOTodoEditor( Calendar *calendar, TQWidget *tqparent );
     virtual ~KOTodoEditor();
 
     void init();
@@ -55,10 +56,10 @@ class KOTodoEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary tqcontains multiple lines, the summary will be used as description
+      summary contains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
-    void setTexts( const TQString &summary, const TQString &description = TQString::null );
+    void setTexts( const TQString &summary, const TQString &description = TQString() );
     /** Edit an existing todo. */
     void editIncidence(Incidence *incidence, const TQDate &date, Calendar* calendar);
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 333e2fbf..475a2f63 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -64,10 +64,10 @@ using namespace KOrg;
 #include "calprinter.h"
 #endif
 
-KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *parent,
+KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *tqparent,
                                               Calendar *calendar,
                                               KOTodoListView *lv )
-  :TQToolTip(parent), mCalendar( calendar )
+  :TQToolTip(tqparent), mCalendar( calendar )
 {
   todolist=lv;
 }
@@ -100,8 +100,8 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos)
 
 
 
-KOTodoListView::KOTodoListView( TQWidget *parent, const char *name )
-  : KListView( parent, name ), mCalendar( 0 ), mChanger( 0 )
+KOTodoListView::KOTodoListView( TQWidget *tqparent, const char *name )
+  : KListView( tqparent, name ), mCalendar( 0 ), mChanger( 0 )
 {
   mOldCurrent = 0;
   mMousePressed = false;
@@ -227,7 +227,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e )
         mChanger->changeIncidence( oldTodo, existingTodo, KOGlobals::RELATION_MODIFIED, this );
         mChanger->endChange( existingTodo, 0, TQString() );
       } else {
-        KMessageBox::sorry( this, i18n("Unable to change to-do's parent, "
+        KMessageBox::sorry( this, i18n("Unable to change to-do's tqparent, "
                             "because the to-do cannot be locked.") );
       }
       delete oldTodo;
@@ -263,7 +263,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e )
           TQStringList emails = KPIM::splitEmailAddrList( text );
           for(TQStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
             kdDebug(5850) << " Email: " << (*it) << endl;
-            int pos = (*it).find("<");
+            int pos = (*it).tqfind("<");
             TQString name = (*it).left(pos);
             TQString email = (*it).mid(pos);
             if (!email.isEmpty() && todoi) {
@@ -299,7 +299,7 @@ void KOTodoListView::contentsMousePressEvent(TQMouseEvent* e)
         treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
         itemMargin() ||
         p.x() < header()->sectionPos(header()->mapToIndex(0))) {
-      if (e->button()==Qt::LeftButton) {
+      if (e->button()==TQt::LeftButton) {
         mPressPos = e->pos();
         mMousePressed = true;
       }
@@ -360,8 +360,8 @@ void KOTodoListView::contentsMouseDoubleClickEvent(TQMouseEvent *e)
 
 /////////////////////////////////////////////////////////////////////////////
 
-KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name)
-  : KOrg::BaseView( calendar, parent, name )
+KOTodoView::KOTodoView( Calendar *calendar, TQWidget *tqparent, const char* name)
+  : KOrg::BaseView( calendar, tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -558,7 +558,7 @@ void KOTodoView::updateView()
 */
 
   // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
-  // specific order of events. That means that we have to generate parent items
+  // specific order of events. That means that we have to generate tqparent items
   // recursively for proper hierarchical display of Todos.
   mTodoMap.clear();
   Todo::List::ConstIterator it;
@@ -603,7 +603,7 @@ TQMap<Todo *,KOTodoViewItem *>::ConstIterator
 
 //    kdDebug(5850) << "  has Related" << endl;
     TQMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
-    itemIterator = mTodoMap.find(relatedTodo);
+    itemIterator = mTodoMap.tqfind(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug(5850) << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
@@ -612,7 +612,7 @@ TQMap<Todo *,KOTodoViewItem *>::ConstIterator
     // and one into the map. Sure finding is more easy but why? -zecke
     KOTodoViewItem *todoItem;
 
-    // in case we found a related parent, which has no KOTodoViewItem yet, this must
+    // in case we found a related tqparent, which has no KOTodoViewItem yet, this must
     // be the case where 2 items refer to each other, therefore simply create item as root item
     if ( *itemIterator == 0 ) {
       todo->setRelatedTo(0);  // break the recursion, else we will have troubles later
@@ -703,15 +703,15 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
             scheduleRemoveTodoItem( todoItem );
           } else {
             // correctly update changes in relations
-            Todo*parent = dynamic_cast<Todo*>( todo->relatedTo() );
-            KOTodoViewItem*parentItem = 0;
-            if ( parent && mTodoMap.tqcontains(parent) ) {
-              parentItem = mTodoMap[ parent ];
+            Todo*tqparent = dynamic_cast<Todo*>( todo->relatedTo() );
+            KOTodoViewItem*tqparentItem = 0;
+            if ( tqparent && mTodoMap.tqcontains(tqparent) ) {
+              tqparentItem = mTodoMap[ tqparent ];
             }
-            if ( todoItem->parent() != parentItem ) {
+            if ( todoItem->tqparent() != tqparentItem ) {
               // The relations changed
-              if ( parentItem ) {
-                parentItem->insertItem( todoItem );
+              if ( tqparentItem ) {
+                tqparentItem->insertItem( todoItem );
               } else {
                 mTodoListView->insertItem( todoItem );
               }
@@ -992,7 +992,7 @@ void KOTodoView::copyTodoToDate( TQDate date )
     newTodo->setDtDue( dt );
     newTodo->setPercentComplete( 0 );
 
-    QPair<ResourceCalendar *, TQString>p =
+    TQPair<ResourceCalendar *, TQString>p =
       CalHelper::incSubResourceCalendar( calendar(), mActiveItem->todo() );
 
     mChanger->addIncidence( newTodo, p.first, p.second, this );
@@ -1011,7 +1011,7 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem )
         ++it ) {
     int index = tempMenu->insertItem( *it );
     mCategory[ index ] = *it;
-    if ( checkedCategories.find( *it ) != checkedCategories.end() )
+    if ( checkedCategories.tqfind( *it ) != checkedCategories.end() )
       tempMenu->setItemChecked( index, true );
   }
 
@@ -1030,7 +1030,7 @@ void KOTodoView::changedCategories(int index)
     Todo *oldTodo = todo->clone();
 
     TQStringList categories = todo->categories ();
-    if ( categories.find( mCategory[index] ) != categories.end() )
+    if ( categories.tqfind( mCategory[index] ) != categories.end() )
       categories.remove( mCategory[index] );
     else
       categories.insert( categories.end(), mCategory[index] );
@@ -1072,7 +1072,7 @@ void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage )
 
 void KOTodoView::processDelayedNewPercentage()
 {
-  TQValueList< QPair< KOTodoViewItem *, int> >::Iterator it;
+  TQValueList< TQPair< KOTodoViewItem *, int> >::Iterator it;
   for ( it = mPercentChangedMap.begin(); it != mPercentChangedMap.end(); ++it )
     setNewPercentage( (*it).first, (*it).second );
 
@@ -1128,7 +1128,7 @@ void KOTodoView::addQuickTodo()
       delete todo;
       return;
     }
-    mQuickAdd->setText( TQString::null );
+    mQuickAdd->setText( TQString() );
   }
 }
 
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 1d53a382..03a41b9f 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOTODOVIEW_H
 #define KOTODOVIEW_H
@@ -55,10 +55,10 @@ class Calendar;
 using namespace KCal;
 using namespace KOrg;
 
-class KOTodoListViewToolTip : public QToolTip
+class KOTodoListViewToolTip : public TQToolTip
 {
   public:
-    KOTodoListViewToolTip( TQWidget *parent, Calendar *calendar, KOTodoListView *lv );
+    KOTodoListViewToolTip( TQWidget *tqparent, Calendar *calendar, KOTodoListView *lv );
 
   protected:
     void maybeTip( const TQPoint &pos );
@@ -72,8 +72,9 @@ class KOTodoListViewToolTip : public QToolTip
 class KOTodoListView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOTodoListView( TQWidget *parent = 0, const char *name = 0 );
+    KOTodoListView( TQWidget *tqparent = 0, const char *name = 0 );
     ~KOTodoListView();
 
     void setCalendar( Calendar * );
@@ -112,8 +113,9 @@ class KOTodoListView : public KListView
 class KOTodoView : public KOrg::BaseView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
+    KOTodoView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 );
     ~KOTodoView();
 
     void setCalendar( Calendar * );
@@ -218,7 +220,7 @@ class KOTodoView : public KOrg::BaseView
 
     TQMap<Todo *,KOTodoViewItem *> mTodoMap;
     TQPtrList<KOTodoViewItem> mItemsToDelete;
-    TQValueList< QPair<KOTodoViewItem *, int> > mPercentChangedMap;
+    TQValueList< TQPair<KOTodoViewItem *, int> > mPercentChangedMap;
 
     DocPrefs *mDocPrefs;
     TQString mCurrentDoc;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index bb03fe32..02369d91 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kotodoviewitem.h"
@@ -38,14 +38,14 @@
 
 #include <tqpainter.h>
 
-KOTodoViewItem::KOTodoViewItem( TQListView *parent, Todo *todo, KOTodoView *kotodo)
-  : TQCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+KOTodoViewItem::KOTodoViewItem( TQListView *tqparent, Todo *todo, KOTodoView *kotodo)
+  : TQCheckListItem( tqparent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
   construct();
 }
 
-KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
-  : TQCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo )
+  : TQCheckListItem( tqparent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
   construct();
 }
@@ -119,14 +119,11 @@ int KOTodoViewItem::compare( TQListViewItem *it, int col, bool ascending ) const
   }
 }
 
-#if QT_VERSION >= 300
 void KOTodoViewItem::paintBranches(TQPainter *p,const TQColorGroup & cg,int w,
                                    int y,int h)
 {
   TQListViewItem::paintBranches(p,cg,w,y,h);
 }
-#else
-#endif
 
 void KOTodoViewItem::construct()
 {
@@ -154,7 +151,7 @@ void KOTodoViewItem::construct()
     setText( KOTodoView::eDueDateColumn, dtStr );
     mEffectiveDueDate = mTodo->dtDue();
     KOTodoViewItem *myParent;
-    if ( ( myParent = dynamic_cast<KOTodoViewItem *>( parent() ) ) )
+    if ( ( myParent = dynamic_cast<KOTodoViewItem *>( tqparent() ) ) )
       if ( !myParent->mEffectiveDueDate.isValid() ||
           myParent->mEffectiveDueDate > mEffectiveDueDate ) {
         myParent->mEffectiveDueDate = mEffectiveDueDate;
@@ -216,12 +213,12 @@ bool KOTodoViewItem::isAlternate()
     {
        KOTodoViewItem *item;
        bool previous = true;
-       if (TQListViewItem::parent())
+       if (TQListViewItem::tqparent())
        {
-          item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::parent());
+          item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::tqparent());
           if (item)
              previous = item->m_odd;
-          item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::parent()->firstChild());
+          item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::tqparent()->firstChild());
        }
        else
        {
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index 5388d6da..9f7032f8 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOTODOVIEWITEM_H
 #define KOTODOVIEWITEM_H
@@ -45,18 +45,18 @@ class KOTodoView;
   @author Cornelius Schumacher <schumacher@kde.org>
   @see KOTodoView
 */
-class KOTodoViewItem : public QCheckListItem
+class KOTodoViewItem : public TQCheckListItem
 {
   public:
     /**
       Constructor.
 
-      @param parent is the list view to which this item belongs.
+      @param tqparent is the list view to which this item belongs.
       @param todo is the todo to have the item display information for.
       @param kotodo is a pointer to the KOTodoView object.
     */
-    KOTodoViewItem(TQListView *parent, Todo *todo, KOTodoView *kotodo);
-    KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo);
+    KOTodoViewItem(TQListView *tqparent, Todo *todo, KOTodoView *kotodo);
+    KOTodoViewItem(KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo);
     virtual ~KOTodoViewItem() {}
 
     void construct();
@@ -69,10 +69,7 @@ class KOTodoViewItem : public QCheckListItem
       int column, int width, int tqalignment);
 
   protected:
-#if QT_VERSION >= 300
     void paintBranches(TQPainter *p,const TQColorGroup & cg,int w,int y,int h);
-#else
-#endif
   virtual void stateChange(bool);
 
   private:
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 06ae0741..e04e0c9a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidgetstack.h>
@@ -315,11 +315,7 @@ void KOViewManager::zoomOutVertically()
 void KOViewManager::addView(KOrg::BaseView *view)
 {
   connectView( view );
-#if QT_VERSION >= 300
   mMainView->viewStack()->addWidget( view );
-#else
-  mMainView->viewStack()->addWidget( view, 1 );
-#endif
 }
 
 void KOViewManager::showWhatsNextView()
@@ -358,12 +354,12 @@ void KOViewManager::showAgendaView()
 
   const bool showSideBySide = !isLocalFile && ( showBoth || mode == KOPrefs::CalendarsSideBySide );
 
-  TQWidget *parent = mMainView->viewStack();
+  TQWidget *tqparent = mMainView->viewStack();
   if ( !mAgendaViewTabs && showBoth ) {
     mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() );
     connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ),
              this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
-    parent = mAgendaViewTabs;
+    tqparent = mAgendaViewTabs;
 
     KConfig *config = KOGlobals::self()->config();
     config->setGroup( "Views" );
@@ -373,7 +369,7 @@ void KOViewManager::showAgendaView()
   if ( !mAgendaView && showMerged ) {
     mAgendaView = new KOAgendaView( mMainView->calendar(),
                                     mMainView,
-                                    parent,
+                                    tqparent,
                                     "KOViewManager::AgendaView" );
 
     addView(mAgendaView);
@@ -390,7 +386,7 @@ void KOViewManager::showAgendaView()
 
   if ( !mAgendaSideBySideView && showSideBySide ) {
     mAgendaSideBySideView =
-      new MultiAgendaView( mMainView->calendar(), mMainView, parent,
+      new MultiAgendaView( mMainView->calendar(), mMainView, tqparent,
                         "KOViewManager::AgendaSideBySideView" );
 
     addView(mAgendaSideBySideView);
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 9fe521e4..c8900d01 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
   As a special exception, permission is given to link this program
-  with any edition of Qt, and distribute the resulting executable,
-  without including the source code for Qt in the source distribution.
+  with any edition of TQt, and distribute the resulting executable,
+  without including the source code for TQt in the source distribution.
 */
 #ifndef KOVIEWMANAGER_H
 #define KOVIEWMANAGER_H
@@ -49,9 +49,10 @@ using namespace KCal;
   This class manages the views of the calendar. It owns the objects and handles
   creation and selection.
 */
-class KOViewManager : public QObject
+class KOViewManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
 
     enum AgendaMode {
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 1ec28ed2..4f3b3dc2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -60,9 +60,9 @@ void WhatsNextTextBrowser::setSource(const TQString& n)
   }
 }
 
-KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
+KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *tqparent,
                                  const char *name)
-  : KOrg::BaseView(calendar, parent, name)
+  : KOrg::BaseView(calendar, tqparent, name)
 {
 //  TQLabel *dateLabel =
 //      new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this);
@@ -302,7 +302,7 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
 
 void KOWhatsNextView::appendTodo( Incidence *ev )
 {
-  if ( mTodos.find( ev ) != mTodos.end() ) return;
+  if ( mTodos.tqfind( ev ) != mTodos.end() ) return;
 
   mTodos.append( ev );
 
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 211984ed..7fd07aeb 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOWHATSNEXTVIEW_H
 #define KOWHATSNEXTVIEW_H
@@ -34,8 +34,9 @@ class KOEventViewerDialog;
 
 class WhatsNextTextBrowser : public TQTextBrowser {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {}
+    WhatsNextTextBrowser(TQWidget *tqparent) : TQTextBrowser(tqparent) {}
 
     void setSource(const TQString &);
 
@@ -50,8 +51,9 @@ class WhatsNextTextBrowser : public TQTextBrowser {
 class KOWhatsNextView : public KOrg::BaseView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0,
+    KOWhatsNextView(Calendar *calendar, TQWidget *tqparent = 0,
                     const char *name = 0);
     ~KOWhatsNextView();
 
diff --git a/korganizer/kowindowlist.cpp b/korganizer/kowindowlist.cpp
index ddb3d680..4d9c5353 100644
--- a/korganizer/kowindowlist.cpp
+++ b/korganizer/kowindowlist.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kdebug.h>
diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h
index 97ce2d1f..f6e58319 100644
--- a/korganizer/kowindowlist.h
+++ b/korganizer/kowindowlist.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOWINDOWLIST_H
 #define KOWINDOWLIST_H
@@ -40,9 +40,10 @@ class KURL;
   @short manages a list of all KOrganizer instances
   @author Cornelius Schumacher
 */
-class KOWindowList : public QObject
+class KOWindowList : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructs a new list of KOrganizer windows. There should only be one
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index a5fe92b4..5176ca22 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqdir.h>
@@ -176,7 +176,7 @@ bool MailScheduler::acceptCounterProposal( Incidence *incidence )
     exInc = mCalendar->incidenceFromSchedulingID( incidence->uid() );
   incidence->setRevision( incidence->revision() + 1 );
   if ( exInc ) {
-    incidence->setRevision( QMAX( incidence->revision(), exInc->revision() + 1 ) );
+    incidence->setRevision( TQMAX( incidence->revision(), exInc->revision() + 1 ) );
     // some stuff we don't want to change, just to be safe
     incidence->setSchedulingID( exInc->schedulingID() );
     incidence->setUid( exInc->uid() );
diff --git a/korganizer/mailscheduler.h b/korganizer/mailscheduler.h
index 7553ee74..d57a2886 100644
--- a/korganizer/mailscheduler.h
+++ b/korganizer/mailscheduler.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef MAILSCHEDULER_H
 #define MAILSCHEDULER_H
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 99795644..39a219d6 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "koapp.h"
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 7d77a3da..d613941c 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -41,8 +41,8 @@ for(TQValueList<KOAgendaView*>::ConstIterator it = mAgendaViews.constBegin(); \
 using namespace KOrg;
 
 MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
-                                 TQWidget * parent, const char *name ) :
-    AgendaView( cal, parent, name ),
+                                 TQWidget * tqparent, const char *name ) :
+    AgendaView( cal, tqparent, name ),
     mSelectedAgendaView( 0 ),
     mLastMovedSplitter( 0 ),
     mUpdateOnShow( false ),
@@ -57,10 +57,10 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   TQVBox *topSideBox = new TQVBox( this );
   mLeftTopSpacer = new TQWidget( topSideBox );
   mLeftTopSpacer->setFixedHeight( topLabelHeight );
-  mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+  mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
-  label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+  label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   TQVBox *sideBox = new TQVBox( mLeftSplitter );
   EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->changeColumns( 0 );
@@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   topSideBox = new TQVBox( this );
   mRightTopSpacer = new TQWidget( topSideBox );
   mRightTopSpacer->setFixedHeight( topLabelHeight );
-  mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+  mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox );
   mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   new TQWidget( mRightSplitter );
   sideBox = new TQVBox( mRightSplitter );
   eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
-  mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
+  mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
   eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
@@ -265,7 +265,7 @@ void MultiAgendaView::setupViews()
 
   int minWidth = 0;
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
-    minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() );
+    minWidth = TQMAX( minWidth, (*it)->tqminimumSizeHint().width() );
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
     (*it)->setMinimumWidth( minWidth );
 }
@@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev)
 void MultiAgendaView::resizeScrollView(const TQSize & size)
 {
   const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width();
-  int width = QMAX( mTopBox->tqsizeHint().width(), widgetWidth );
+  int width = TQMAX( mTopBox->tqsizeHint().width(), widgetWidth );
   int height = size.height();
   if ( width > widgetWidth ) {
     const int sbHeight = mScrollView->horizontalScrollBar()->height();
@@ -459,17 +459,17 @@ void MultiAgendaView::updateConfig()
 
 bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
 {
-  if ( obj->className() == TQCString("QSplitterHandle") ) {
+  if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) {
     // KDE4: not needed anymore, TQSplitter has a moved signal there
     if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize())
            || event->type() == TQEvent::MouseButtonRelease ) {
       FOREACH_VIEW( agenda ) {
-        if ( agenda->splitter() == obj->parent() )
+        if ( agenda->splitter() == obj->tqparent() )
           mLastMovedSplitter = agenda->splitter();
       }
-      if ( mLeftSplitter == obj->parent() )
+      if ( mLeftSplitter == obj->tqparent() )
         mLastMovedSplitter = mLeftSplitter;
-      else if ( mRightSplitter == obj->parent() )
+      else if ( mRightSplitter == obj->tqparent() )
         mLastMovedSplitter = mRightSplitter;
       TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
     }
@@ -522,7 +522,7 @@ void MultiAgendaView::resizeSpacers( int newY )
 
 void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
 {
-  if ( ori == Qt::Vertical ) {
+  if ( ori == TQt::Vertical ) {
     if ( delta > 0 ) {
       if ( KOPrefs::instance()->mHourSize > 4 )
         KOPrefs::instance()->mHourSize--;
@@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
 // KDE4: not needed, use existing TQSplitter signals instead
 void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter)
 {
-  TQObjectList *objlist = splitter->queryList( "QSplitterHandle" );
+  TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING );
   // HACK: when not being visible, the splitter handle is sometimes not found
   // for unknown reasons, so trigger an update when we are shown again
   if ( objlist->count() == 0 && !isVisible() )
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index 8fec0b7c..c25f3903 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -41,9 +41,10 @@ namespace KOrg {
 class MultiAgendaView : public AgendaView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView,
-                              TQWidget *parent = 0, const char *name = 0 );
+                              TQWidget *tqparent = 0, const char *name = 0 );
     ~MultiAgendaView();
 
     KOAgendaView *selectedAgendaView();
@@ -77,7 +78,7 @@ class MultiAgendaView : public AgendaView
     bool eventFilter( TQObject *obj, TQEvent *event );
 
   private:
-    void addView( const TQString &label, KCal::ResourceCalendar *res, const TQString &subRes = TQString::null );
+    void addView( const TQString &label, KCal::ResourceCalendar *res, const TQString &subRes = TQString() );
     void deleteViews();
     void recreateViews();
     void setupViews();
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 836c251f..b22b3f70 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -42,8 +42,8 @@
 
 #include "navigatorbar.h"
 
-ActiveLabel::ActiveLabel( TQWidget *parent, const char *name )
-  : TQLabel( parent, name )
+ActiveLabel::ActiveLabel( TQWidget *tqparent, const char *name )
+  : TQLabel( tqparent, name )
 {
 }
 
@@ -53,8 +53,8 @@ void ActiveLabel::mouseReleaseEvent( TQMouseEvent * )
 }
 
 
-NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mHasMinWidth( false )
+NavigatorBar::NavigatorBar( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mHasMinWidth( false )
 {
   TQFont tfont = font();
   tfont.setPointSize( 10 );
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 05d624a5..19cda40a 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef NAVIGATORBAR_H
 #define NAVIGATORBAR_H
@@ -31,11 +31,12 @@
 class TQPushButton;
 class TQFrame;
 
-class ActiveLabel : public QLabel
+class ActiveLabel : public TQLabel
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ActiveLabel( TQWidget *parent, const char *name = 0 );
+    ActiveLabel( TQWidget *tqparent, const char *name = 0 );
 
   signals:
     void clicked();
@@ -45,11 +46,12 @@ class ActiveLabel : public QLabel
 };
 
 
-class NavigatorBar: public QWidget
+class NavigatorBar: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    NavigatorBar( TQWidget *parent = 0, const char *name = 0 );
+    NavigatorBar( TQWidget *tqparent = 0, const char *name = 0 );
     ~NavigatorBar();
 
     void showButtons( bool left, bool right );
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 3766e2ff..6f5c4d86 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -34,8 +34,8 @@
 #include "configdialog.h"
 #include "configdialog.moc"
 
-ConfigDialog::ConfigDialog(TQWidget *parent)
-  : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,parent)
+ConfigDialog::ConfigDialog(TQWidget *tqparent)
+  : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,tqparent)
 {
   TQFrame *topFrame = plainPage();
   TQVBoxLayout *topLayout = new TQVBoxLayout(topFrame,0,spacingHint());
diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h
index 992eeccc..f7291bd4 100644
--- a/korganizer/plugins/datenums/configdialog.h
+++ b/korganizer/plugins/datenums/configdialog.h
@@ -26,8 +26,9 @@ class TQButtonGroup;
 class ConfigDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ConfigDialog(TQWidget *parent=0);
+    ConfigDialog(TQWidget *tqparent=0);
     virtual ~ConfigDialog();
 
   protected:
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index af022837..a8c8fbd9 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -40,9 +40,9 @@ Datenums::Datenums()
   mDateNum = config.readNumEntry( "ShowDayNumbers", 0 );
 }
 
-void Datenums::configure(TQWidget *parent)
+void Datenums::configure(TQWidget *tqparent)
 {
-  ConfigDialog *dlg = new ConfigDialog(parent);
+  ConfigDialog *dlg = new ConfigDialog(tqparent);
   dlg->exec();
   delete dlg;
 }
diff --git a/korganizer/plugins/datenums/datenums.h b/korganizer/plugins/datenums/datenums.h
index f9ca7783..c15b04eb 100644
--- a/korganizer/plugins/datenums/datenums.h
+++ b/korganizer/plugins/datenums/datenums.h
@@ -30,7 +30,7 @@ class Datenums : public CalendarDecoration {
     Datenums();
     ~Datenums() {}
     
-    void configure(TQWidget *parent);
+    void configure(TQWidget *tqparent);
     TQString shortText(const TQDate &);
     
     TQString info();
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 8455d61b..f2aaa33e 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -46,18 +46,18 @@ using namespace KCal; // Needed for connecting slots
 
 class ExchangeFactory : public KOrg::PartFactory {
   public:
-    KOrg::Part *create(KOrg::MainWindow *parent, const char *name)
+    KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name)
     {
       kdDebug(5850) << "Registering Exchange Plugin...\n";
       KGlobal::locale()->insertCatalogue("libkpimexchange");
-      return new Exchange(parent,name);
+      return new Exchange(tqparent,name);
     }
 };
 
 K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory )
 
-Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
-  KOrg::Part(parent,name)
+Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) :
+  KOrg::Part(tqparent,name)
 {
   setInstance( new KInstance( "korganizer" ) );
 
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
   mClient = new KPIM::ExchangeClient( mAccount );
-  mClient->setWindow( parent->tqtopLevelWidget() );
+  mClient->setWindow( tqparent->tqtopLevelWidget() );
 
   setXMLFile("plugins/exchangeui.rc");
 
@@ -187,7 +187,7 @@ void Exchange::configure()
     mAccount->save( "Calendar/Exchange Plugin" );
 }
 
-void Exchange::showError( int error, const TQString& moreInfo /* = TQString::null */ )
+void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */ )
 {
   TQString errorText;
   switch( error ) {
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 22a15f1c..8f021004 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -35,6 +35,7 @@ using namespace KCal;
 
 class Exchange : public KOrg::Part {
     Q_OBJECT
+  TQ_OBJECT
   public:
     Exchange( KOrg::MainWindow *, const char *name );
     ~Exchange();
@@ -58,7 +59,7 @@ class Exchange : public KOrg::Part {
 
   private:
     void test2();
-    void showError( int error, const TQString& moreInfo = TQString::null );
+    void showError( int error, const TQString& moreInfo = TQString() );
 
     KPIM::ExchangeClient *mClient;
     KPIM::ExchangeAccount* mAccount;
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index fe01324a..76e6abe7 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -31,8 +31,8 @@
 
 #include "exchangeconfig.h"
 
-ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent )
-  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent)
+ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* tqparent )
+  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent)
 {
   mAccount = account;
 
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index 0e18bfe2..095f73cd 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -30,8 +30,9 @@
 class ExchangeConfig : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
+    ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *tqparent=0);
     virtual ~ExchangeConfig();
 
 //  protected:
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index de56a3a1..8c5cb74f 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -30,8 +30,8 @@
 
 #include "exchangedialog.h"
 
-ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *parent)
-  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent)
+ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *tqparent)
+  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent)
 {
   TQFrame *topFrame = plainPage();
   TQGridLayout *topLayout = new TQGridLayout( topFrame, 2, 2, 3 );
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index b2635f7a..1aa17c38 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -27,8 +27,9 @@ class TQComboBox;
 class ExchangeDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);
+    ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *tqparent=0);
     virtual ~ExchangeDialog();
 
   protected slots:
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 6298151a..ee74a577 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -26,8 +26,8 @@
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
-ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok,
-            parent)
+ConfigDialog::ConfigDialog(TQWidget * tqparent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok,
+            tqparent)
 {
   TQFrame *topFrame = plainPage();
   TQVBoxLayout *topLayout =
diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h
index 1638f75c..1ef1153f 100644
--- a/korganizer/plugins/hebrew/configdialog.h
+++ b/korganizer/plugins/hebrew/configdialog.h
@@ -27,9 +27,12 @@
 */
 class ConfigDialog:public KDialogBase
 {
-Q_OBJECT public:
+  Q_OBJECT
+  TQ_OBJECT
 
-  ConfigDialog(TQWidget * parent = 0);
+public:
+
+  ConfigDialog(TQWidget * tqparent = 0);
   virtual ~ ConfigDialog();
 
 protected:
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 8a9f37bd..ce0d9696 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -103,9 +103,9 @@ TQString Hebrew::info()
     i18n("This plugin provides the date in the Jewish calendar.");
 }
 
-void Hebrew::configure(TQWidget * parent)
+void Hebrew::configure(TQWidget * tqparent)
 {
-  ConfigDialog *dlg = new ConfigDialog(parent);        //parent?
+  ConfigDialog *dlg = new ConfigDialog(tqparent);        //tqparent?
 
   dlg->exec();
   delete dlg;
diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h
index c337f7ef..80507fad 100644
--- a/korganizer/plugins/hebrew/hebrew.h
+++ b/korganizer/plugins/hebrew/hebrew.h
@@ -34,7 +34,7 @@ public:
   ~Hebrew()
   {
   }
-  void configure(TQWidget * parent);
+  void configure(TQWidget * tqparent);
   TQString shortText(const TQDate &);
 
   TQString info();
diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp
index 9b5ea3f1..c6afbb61 100644
--- a/korganizer/plugins/hebrew/holiday.cpp
+++ b/korganizer/plugins/hebrew/holiday.cpp
@@ -34,7 +34,7 @@ Holiday::~Holiday()
 * We are also influenced by the IsraelP flag
 */
 
-QStringList
+TQStringList
   Holiday::FindHoliday(int month, int day, int weekday, int kvia,
                        bool leap_year_p, bool israel_p,
                        int day_number, int year)
diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp
index d8ff2dd6..bba30f62 100644
--- a/korganizer/plugins/hebrew/parsha.cpp
+++ b/korganizer/plugins/hebrew/parsha.cpp
@@ -22,7 +22,7 @@ Parsha::~Parsha()
 {
 }
 
-QString
+TQString
   Parsha::FindParshaName(int daynumber, int kvia, bool leap_p,
                          bool israel_p)
 {
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index 1e41fdb8..ffd6a1e8 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintJournalConfig_Base</class>
 <comment>Configuration page for the print journal mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintJournal_Base</cstring>
     </property>
@@ -24,7 +24,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mAllJournals</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <number>0</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mRangeJournals</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout2</cstring>
                     </property>
@@ -88,7 +88,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mFromDateLabel</cstring>
                             </property>
@@ -107,7 +107,7 @@
                                 <enum>StrongFocus</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mToDateLabel</cstring>
                             </property>
diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp
index 93bc51ef..089e8de6 100644
--- a/korganizer/plugins/printing/journal/journalprint.cpp
+++ b/korganizer/plugins/printing/journal/journalprint.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h
index f1c0db44..c84153a4 100644
--- a/korganizer/plugins/printing/journal/journalprint.h
+++ b/korganizer/plugins/printing/journal/journalprint.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef JOURNALPRINT_H
 #define JOURNALPRINT_H
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index 22c6d577..857e063b 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintListConfig_Base</class>
 <comment>Configuration page for the print list mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintList_Base</cstring>
     </property>
@@ -24,7 +24,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout2</cstring>
                     </property>
@@ -63,7 +63,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mFromDateLabel</cstring>
                             </property>
@@ -82,7 +82,7 @@
                                 <enum>StrongFocus</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mToDateLabel</cstring>
                             </property>
@@ -122,7 +122,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -133,7 +133,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mEvents</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <string>&amp;Events</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mTodos</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <string>&amp;To-dos</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mJournals</cstring>
                     </property>
diff --git a/korganizer/plugins/printing/list/listprint.cpp b/korganizer/plugins/printing/list/listprint.cpp
index 4a90bfb5..c3bd91fa 100644
--- a/korganizer/plugins/printing/list/listprint.cpp
+++ b/korganizer/plugins/printing/list/listprint.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h
index 561e0d46..db799727 100644
--- a/korganizer/plugins/printing/list/listprint.h
+++ b/korganizer/plugins/printing/list/listprint.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef LISTPRINT_H
 #define LISTPRINT_H
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index c855976a..383074fe 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintWhatsNextConfig_Base</class>
 <comment>Configuration page for the print whatsnext mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintWhatsNext_Base</cstring>
     </property>
@@ -24,7 +24,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout2</cstring>
                     </property>
@@ -63,7 +63,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mFromDateLabel</cstring>
                             </property>
@@ -82,7 +82,7 @@
                                 <enum>StrongFocus</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mToDateLabel</cstring>
                             </property>
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
index b5d43ae9..fdae41d5 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
index fb9ee66e..467e0257 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef WHATSNEXTPRINT_H
 #define WHATSNEXTPRINT_H
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index 38b7822b..98f90597 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintYearConfig_Base</class>
 <comment>Configuration page for the yearly print mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintYear_Base</cstring>
     </property>
@@ -24,7 +24,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>mYearLabel</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <cstring>mYear</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mPagesLabel</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <cstring>mPages</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="0" column="1">
+                <widget class="TQSpinBox" row="0" column="1">
                     <property name="name">
                         <cstring>mYear</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>mPages</cstring>
                     </property>
@@ -115,7 +115,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>mDisplayOptionsGroup</cstring>
             </property>
@@ -126,7 +126,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>mSubDaysLabel</cstring>
                     </property>
@@ -134,7 +134,7 @@
                         <string>Show sub-day events as:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mHolidaysLabel</cstring>
                     </property>
@@ -142,7 +142,7 @@
                         <string>Show holidays as:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <item>
                         <property name="text">
                             <string>Text</string>
@@ -160,7 +160,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>Text</string>
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 59a43db7..0c124bbe 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORG_NOPRINTER
@@ -154,7 +154,7 @@ void CalPrintYear::print( TQPainter &p, int width, int height )
   int months = calsys->monthsInYear( start );
   int maxdays = 1;
   for ( int i = 1; i< months; ++i ) {
-    maxdays = QMAX( maxdays, temp.daysInMonth() );
+    maxdays = TQMAX( maxdays, temp.daysInMonth() );
     temp = calsys->addMonths( temp, 1 );
   }
 
diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h
index f993e5da..99c1422e 100644
--- a/korganizer/plugins/printing/year/yearprint.h
+++ b/korganizer/plugins/printing/year/yearprint.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef YEARPRINT_H
 #define YEARPRINT_H
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index d5abb1f4..d0d2db38 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -45,11 +45,11 @@
 
 using namespace KOrg;
 
-KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* parentTask,
+KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* tqparentTask,
                                      const TQString& text,
                                      const TQDateTime& start,
                                      const TQDateTime& end) :
-  KGanttItem(parentTask,text,start,end)
+  KGanttItem(tqparentTask,text,start,end)
 {
   mEvent = event;
 }
@@ -64,9 +64,9 @@ Todo *KOProjectViewItem::event()
 }
 
 
-KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
+KOProjectView::KOProjectView(Calendar *calendar,TQWidget* tqparent,
                              const char* name) :
-  KOrg::BaseView(calendar,parent,name)
+  KOrg::BaseView(calendar,tqparent,name)
 {
   TQBoxLayout *topLayout = new TQVBoxLayout(this);
 
@@ -183,7 +183,7 @@ void KOProjectView::updateView()
 */
 
   // Put for each Event a KOProjectViewItem in the list view. Don't rely on a
-  // specific order of events. That means that we have to generate parent items
+  // specific order of events. That means that we have to generate tqparent items
   // recursively for proper hierarchical display of Todos.
   mTodoMap.clear();
   Todo::List::ConstIterator it;
@@ -202,7 +202,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator
   if (relatedTodo) {
 //    kdDebug(5850) << "  has Related" << endl;
     TQMap<Todo *,KGanttItem *>::ConstIterator itemIterator;
-    itemIterator = mTodoMap.find(relatedTodo);
+    itemIterator = mTodoMap.tqfind(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug(5850) << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
@@ -216,7 +216,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator
   }
 }
 
-KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
+KGanttItem *KOProjectView::createTask(KGanttItem *tqparent,Todo *todo)
 {
   TQDateTime startDt;
   TQDateTime endDt;
@@ -237,7 +237,7 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
     endDt = todo->dtDue();
   }
 
-  KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt,
+  KGanttItem *task = new KOProjectViewItem(todo,tqparent,todo->summary(),startDt,
                                        endDt);
   connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
           TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change)));
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 39062179..b71afbd0 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -41,12 +41,12 @@ class TQStrList;
 class TQListView;
 
 /**
-  This class provides an item of the project view. It is a xQTask with
+  This class provides an item of the project view. It is a xTQTask with
   an additional Event attribute.
 */
 class KOProjectViewItem : public KGanttItem {
   public:
-    KOProjectViewItem(Todo *,KGanttItem* parentTask, const TQString& text,
+    KOProjectViewItem(Todo *,KGanttItem* tqparentTask, const TQString& text,
                       const TQDateTime& start, const TQDateTime& end);
     ~KOProjectViewItem();
 
@@ -66,8 +66,9 @@ class KOProjectViewItem : public KGanttItem {
 class KOProjectView : public KOrg::BaseView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 );
+    KOProjectView(Calendar *, TQWidget* tqparent=0, const char* name=0 );
     ~KOProjectView() {}
 
     Incidence::List selectedIncidences();
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 2e7b3dc6..d6a009c8 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -35,18 +35,18 @@ using namespace KOrg;
 
 class ProjectViewFactory : public KOrg::PartFactory {
   public:
-    KOrg::Part *create(KOrg::MainWindow *parent, const char *name)
+    KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name)
     {
       KGlobal::locale()->insertCatalogue( "kgantt" );
-      return new ProjectView(parent,name);
+      return new ProjectView(tqparent,name);
     }
 };
 
 K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory )
 
 
-ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) :
-  KOrg::Part(parent,name), mView(0)
+ProjectView::ProjectView(KOrg::MainWindow *tqparent, const char *name) :
+  KOrg::Part(tqparent,name), mView(0)
 {
   setInstance( new KInstance( "korganizer" ) );
 
diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h
index a3f372a8..c6059650 100644
--- a/korganizer/plugins/projectview/projectview.h
+++ b/korganizer/plugins/projectview/projectview.h
@@ -25,6 +25,7 @@
 
 class ProjectView : public KOrg::Part {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ProjectView(KOrg::MainWindow *, const char *);
     ~ProjectView();
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 01fc0cb4..7f70f12e 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -35,9 +35,9 @@
 #include "kotimespanview.h"
 #include "kotimespanview.moc"
 
-KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, 
+KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *tqparent, 
                const char *name) :
-  KOEventView( calendar, parent, name )
+  KOEventView( calendar, tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index 49e54ab6..f0d6c6ce 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KOTIMESPANVIEW_H
 #define KOTIMESPANVIEW_H
@@ -32,8 +32,9 @@ class TimeSpanWidget;
 class KOTimeSpanView : public KOEventView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0,
+    KOTimeSpanView( Calendar *calendar, TQWidget *tqparent = 0,
                     const char *name = 0 );
     ~KOTimeSpanView();
 
diff --git a/korganizer/plugins/timespanview/lineview.cpp b/korganizer/plugins/timespanview/lineview.cpp
index 93a2f0bf..fe337f4e 100644
--- a/korganizer/plugins/timespanview/lineview.cpp
+++ b/korganizer/plugins/timespanview/lineview.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpainter.h>
@@ -31,8 +31,8 @@
 #include "lineview.h"
 #include "lineview.moc"
 
-LineView::LineView( TQWidget *parent, const char *name ) :
-  TQScrollView( parent, name )
+LineView::LineView( TQWidget *tqparent, const char *name ) :
+  TQScrollView( tqparent, name )
 {
   mPixelWidth = 1000;
 
diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h
index e98d905b..df028cdb 100644
--- a/korganizer/plugins/timespanview/lineview.h
+++ b/korganizer/plugins/timespanview/lineview.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef LINEVIEW_H
 #define LINEVIEW_H
@@ -27,11 +27,12 @@
 #include <tqscrollview.h>
 #include <tqptrlist.h>
 
-class LineView : public QScrollView
+class LineView : public TQScrollView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    LineView( TQWidget *parent = 0, const char *name = 0 );
+    LineView( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~LineView();
 
     int pixelWidth();
diff --git a/korganizer/plugins/timespanview/timeline.cpp b/korganizer/plugins/timespanview/timeline.cpp
index 19ed7581..513701cd 100644
--- a/korganizer/plugins/timespanview/timeline.cpp
+++ b/korganizer/plugins/timespanview/timeline.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpainter.h>
@@ -29,8 +29,8 @@
 #include "timeline.h"
 #include "timeline.moc"
 
-TimeLine::TimeLine( TQWidget *parent, const char *name ) :
-  TQScrollView( parent, name )
+TimeLine::TimeLine( TQWidget *tqparent, const char *name ) :
+  TQScrollView( tqparent, name )
 {
   mPixelWidth = 1000;
   
diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h
index 031763f7..d7718928 100644
--- a/korganizer/plugins/timespanview/timeline.h
+++ b/korganizer/plugins/timespanview/timeline.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TIMELINE_H
 #define TIMELINE_H
@@ -27,11 +27,12 @@
 #include <tqscrollview.h>
 #include <tqdatetime.h>
 
-class TimeLine : public QScrollView
+class TimeLine : public TQScrollView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    TimeLine( TQWidget *parent = 0, const char *name = 0 );
+    TimeLine( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~TimeLine();
 
     void setDateRange( const TQDateTime &start, const TQDateTime &end );
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 24a45abb..3f9e2ee5 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -35,17 +35,17 @@ using namespace KOrg;
 
 class TimespanViewFactory : public KOrg::PartFactory {
   public:
-    KOrg::Part *create( KOrg::MainWindow *parent, const char *name )
+    KOrg::Part *create( KOrg::MainWindow *tqparent, const char *name )
     {
-      return new TimespanView( parent, name );
+      return new TimespanView( tqparent, name );
     }
 };
 
 K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory )
 
 
-TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) :
-  KOrg::Part(parent,name), mView(0)
+TimespanView::TimespanView(KOrg::MainWindow *tqparent, const char *name) :
+  KOrg::Part(tqparent,name), mView(0)
 {
   setInstance( new KInstance( "korganizer" ) );
 
diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h
index cb2d17f7..5338e8ff 100644
--- a/korganizer/plugins/timespanview/timespanview.h
+++ b/korganizer/plugins/timespanview/timespanview.h
@@ -25,6 +25,7 @@
 
 class TimespanView : public KOrg::Part {
     Q_OBJECT
+  TQ_OBJECT
   public:
     TimespanView(KOrg::MainWindow *, const char *);
     ~TimespanView();
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index 0e8f0c4b..e208c088 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqsplitter.h>
@@ -39,8 +39,8 @@
 #include "timespanwidget.h"
 #include "timespanwidget.moc"
 
-TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) :
-  TQWidget( parent, name )
+TimeSpanWidget::TimeSpanWidget( TQWidget *tqparent, const char *name ) :
+  TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -123,11 +123,8 @@ void TimeSpanWidget::clear()
 
 void TimeSpanWidget::updateView()
 {
-#if QT_VERSION >= 300
   mLineView->updateContents();
   mTimeLine->updateContents();
-#else
-#endif
 }
 
 void TimeSpanWidget::setDateRange( const TQDateTime &start, const TQDateTime &end )
diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h
index fa037872..103efc5f 100644
--- a/korganizer/plugins/timespanview/timespanwidget.h
+++ b/korganizer/plugins/timespanview/timespanwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TimeSpanWidget_H
 #define TimeSpanWidget_H
@@ -35,11 +35,12 @@ class TQListView;
 class LineView;
 class TimeLine;
 
-class TimeSpanWidget : public QWidget
+class TimeSpanWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    TimeSpanWidget( TQWidget *parent=0, const char *name=0 );
+    TimeSpanWidget( TQWidget *tqparent=0, const char *name=0 );
     virtual ~TimeSpanWidget();
     
     void addItem( KCal::Event * );
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index 23671bd9..8a7c83a3 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -49,8 +49,8 @@
 
 using namespace KCal;
 
-PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent )
-  : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, parent,
+PreviewDialog::PreviewDialog( const KURL &url, TQWidget *tqparent )
+  : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, tqparent,
                  0, true, true, KGuiItem( i18n("&Merge into existing calendar"), "merge" ) ),
     mOriginalUrl( url )
 {
diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h
index ed32c5f5..16d43089 100644
--- a/korganizer/previewdialog.h
+++ b/korganizer/previewdialog.h
@@ -41,8 +41,9 @@ namespace KCal {
 class PreviewDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    PreviewDialog( const KURL &url, TQWidget *parent );
+    PreviewDialog( const KURL &url, TQWidget *tqparent );
     ~PreviewDialog();
     bool loadCalendar();
 
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index bb1bfc0b..c16bfe63 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintDayConfig_Base</class>
 <comment>Configuration page for the print day mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintDay_Base</cstring>
     </property>
@@ -21,7 +21,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>mIncludeTodos</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <string>You should check this option if you want to print to-dos which are due on one of the dates which are in the supplied date range.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -80,7 +80,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>mFromDateLabel</cstring>
                     </property>
@@ -94,7 +94,7 @@
                         <string>If you want to print more days at once, you can define a range of dates with this option and the &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>mToTimeLabel</cstring>
                     </property>
@@ -108,7 +108,7 @@
                         <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="1" column="3">
+                <widget class="TQTimeEdit" row="1" column="3">
                     <property name="name">
                         <cstring>mToTime</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <string>It's possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="5">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>mIncludeAllEvents</cstring>
                     </property>
@@ -148,7 +148,7 @@
                         <string>If you want to print more days at once, you can define a range of dates with this option and the &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="0" column="3">
+                <widget class="TQTimeEdit" row="0" column="3">
                     <property name="name">
                         <cstring>mFromTime</cstring>
                     </property>
@@ -166,7 +166,7 @@
                         <string>It's possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the &lt;i&gt;End time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>mFromTimeLabel</cstring>
                     </property>
@@ -191,7 +191,7 @@
                         <string>If you want to print more days at once, you can define a range of dates with this option and the &lt;i&gt;Start date&lt;/i&gt; option. This option is used to define the end date.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mToDateLabel</cstring>
                     </property>
@@ -207,7 +207,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>mColors</cstring>
             </property>
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index b62c7add..c5f69dd0 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -21,8 +21,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORG_NOPRINTER
@@ -144,7 +144,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor
           event->dtStart(), event->doesFloat(), false );
       } else {
         mStartCaption = i18n( "No start date" );
-        mStartString = TQString::null;
+        mStartString = TQString();
       }
 
       if ( event->hasEndDate() ) {
@@ -162,7 +162,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor
         }
       } else {
         mEndCaption = i18n("No end date");
-        mEndString = TQString::null;
+        mEndString = TQString();
       }
       return true;
     }
@@ -173,7 +173,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor
           todo->dtStart(), todo->doesFloat(), false );
       } else {
         mStartCaption = i18n( "No start date" );
-        mStartString = TQString::null;
+        mStartString = TQString();
       }
 
       if ( todo->hasDueDate() ) {
@@ -182,7 +182,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor
           todo->dtDue(), todo->doesFloat(), false );
       } else {
         mEndCaption = i18n("No due date");
-        mEndString = TQString::null;
+        mEndString = TQString();
       }
       return true;
     }
@@ -190,8 +190,8 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor
       mStartCaption = i18n( "Start date: " );
       mStartString = IncidenceFormatter::dateTimeToString(
         journal->dtStart(), journal->doesFloat(), false );
-      mEndCaption = TQString::null;
-      mEndString = TQString::null;
+      mEndCaption = TQString();
+      mEndString = TQString();
       return true;
     }
 };
@@ -204,12 +204,12 @@ int CalPrintIncidence::printCaptionAndText( TQPainter &p, const TQRect &box, con
 
   TQFont oldFont( p.font() );
   p.setFont( captionFont );
-  p.drawText( box, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, caption );
+  p.drawText( box, TQt::AlignLeft|TQt::AlignTop|TQt::SingleLine, caption );
 
   if ( !text.isEmpty() ) {
     textRect.setLeft( textRect.left() + textWd );
     p.setFont( textFont );
-    p.drawText( textRect, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, text );
+    p.drawText( textRect, TQt::AlignLeft|TQt::AlignTop|TQt::SingleLine, text );
   }
   p.setFont( oldFont );
   return textRect.bottom();
@@ -283,7 +283,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
 
       textRect.setLeft( textRect.right() );
       textRect.setRight( timesBox.right() - padding() );
-      h = QMAX( printCaptionAndText( p, textRect, stringVis.mEndCaption, stringVis.mEndString, captionFont, textFont ), h );
+      h = TQMAX( printCaptionAndText( p, textRect, stringVis.mEndCaption, stringVis.mEndString, captionFont, textFont ), h );
     }
 
     // Convert recurrence to a string
@@ -303,7 +303,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
         }
       }
       displayString.append(exceptString);
-      h = QMAX( printCaptionAndText( p, recurBox, i18n( "Repeats: "), displayString, captionFont, textFont ), h );
+      h = TQMAX( printCaptionAndText( p, recurBox, i18n( "Repeats: "), displayString, captionFont, textFont ), h );
     }
 
     // Alarms Printing
@@ -359,14 +359,14 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
       txt = alarmStrings.join( i18n("Spacer for the joined list of categories", ", ") );
 
     }
-    h = QMAX( printCaptionAndText( p, alarmBox, cap, txt, captionFont, textFont ), h );
+    h = TQMAX( printCaptionAndText( p, alarmBox, cap, txt, captionFont, textFont ), h );
 
 
     TQRect organizerBox( timesBox.left()+padding(), h+padding(), timesBox.right()-padding(), lineHeight );
-    h = QMAX( printCaptionAndText( p, organizerBox, i18n("Organizer: "), (*it)->organizer().fullName(), captionFont, textFont ), h );
+    h = TQMAX( printCaptionAndText( p, organizerBox, i18n("Organizer: "), (*it)->organizer().fullName(), captionFont, textFont ), h );
 
     // Finally, draw the frame around the time information...
-    timesBox.setBottom( QMAX( timesBox.bottom(), h+padding() ) );
+    timesBox.setBottom( TQMAX( timesBox.bottom(), h+padding() ) );
     drawBox( p, BOX_BORDER_WIDTH, timesBox );
 
 
@@ -439,10 +439,10 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
     if ( mShowSubitemsNotes ) {
       if ( (*it)->relations().isEmpty() || (*it)->type() != "Todo" ) {
         int notesPosition = drawBoxWithCaption( p, notesBox, i18n("Notes:"),
-                         TQString::null, /*sameLine=*/false, /*expand=*/false,
+                         TQString(), /*sameLine=*/false, /*expand=*/false,
                          captionFont, textFont );
         TQPen oldPen( p.pen() );
-        p.setPen( Qt::DotLine );
+        p.setPen( TQt::DotLine );
         while ( (notesPosition += int(1.5*lineHeight)) < notesBox.bottom() ) {
           p.drawLine( notesBox.left()+padding(), notesPosition, notesBox.right()-padding(), notesPosition );
         }
@@ -510,8 +510,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
             subitemString += datesString;
             subitemString += "\n";
           }
-          subitemString += i18n( "subitem Status: statusString",
-                                  "Status: %1\n").arg( statusString );
+          subitemString += i18n( "subitem tqStatus: statusString",
+                                  "tqStatus: %1\n").arg( statusString );
           subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
           subitemString += i18n( "subitem Priority: N",
                                   "Priority: %1\n").arg( (*rit)->priority() );
@@ -559,7 +559,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
       for ( Attendee::List::ConstIterator ait = attendees.begin(); ait != attendees.end(); ++ait ) {
         if ( !attendeeString.isEmpty() ) attendeeString += "\n";
         attendeeString += i18n("Formatting of an attendee: "
-               "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+               "'Name (Role): tqStatus', e.g. 'Reinhold Kainhofer "
                "<reinhold@kainhofer.com> (Participant): Awaiting Response'",
                "%1 (%2): %3")
                        .arg( (*ait)->fullName() )
@@ -572,7 +572,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
     if ( mShowOptions ) {
       TQString optionsString;
       if ( !(*it)->statusStr().isEmpty() ) {
-        optionsString += i18n("Status: %1").arg( (*it)->statusStr() );
+        optionsString += i18n("tqStatus: %1").arg( (*it)->statusStr() );
         optionsString += "\n";
       }
       if ( !(*it)->secrecyStr().isEmpty() ) {
@@ -740,8 +740,8 @@ void CalPrintDay::print( TQPainter &p, int width, int height )
     uint lineSpacing = p.fontMetrics().lineSpacing();
 
     uint maxAllDayEvents = 8; // the max we allow to be printed, sorry.
-    uint allDayHeight = QMIN( alldayEvents.count(), maxAllDayEvents ) * lineSpacing;
-    allDayHeight = QMAX( allDayHeight, ( 5 * lineSpacing ) ) + ( 2 * padding() );
+    uint allDayHeight = TQMIN( alldayEvents.count(), maxAllDayEvents ) * lineSpacing;
+    allDayHeight = TQMAX( allDayHeight, ( 5 * lineSpacing ) ) + ( 2 * padding() );
     TQRect allDayBox( TIMELINE_WIDTH + padding(), headerBox.bottom() + padding(),
                      width - TIMELINE_WIDTH - padding(), allDayHeight );
     if ( alldayEvents.count() > 0 ) {
diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h
index a1652643..162b8a4e 100644
--- a/korganizer/printing/calprintdefaultplugins.h
+++ b/korganizer/printing/calprintdefaultplugins.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef CALPRINTDEFAULTPLUGINS_H
 #define CALPRINTDEFAULTPLUGINS_H
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 0517dec0..0b2c098c 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqvbuttongroup.h>
@@ -46,10 +46,10 @@
 
 #include "calprintdefaultplugins.h"
 
-CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper *helper )
-  : TQObject( parent, "CalPrinter" )
+CalPrinter::CalPrinter( TQWidget *tqparent, Calendar *calendar, KOrg::CoreHelper *helper )
+  : TQObject( tqparent, "CalPrinter" )
 {
-  mParent = parent;
+  mParent = tqparent;
   mConfig = new KSimpleConfig( "korganizer_printing.rc" );
   mCoreHelper = helper;
 
@@ -168,8 +168,8 @@ void CalPrinter::updateConfig()
 /****************************************************************************/
 
 CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
-                                TQWidget *parent, const char *name )
-  : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel )
+                                TQWidget *tqparent, const char *name )
+  : KDialogBase( tqparent, name, /*modal*/true, i18n("Print"), Ok | Cancel )
 {
   TQVBox *page = makeVBoxMainWidget();
 
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index a75d3fc6..f3e2ad2d 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _CALPRINTER_H
 #define _CALPRINTER_H
@@ -53,6 +53,7 @@ class TQLabel;
 class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum ePrintOrientation {
@@ -63,7 +64,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
     };
   public:
     /**
-      \param par parent widget for dialogs
+      \param par tqparent widget for dialogs
       \param cal calendar to be printed
       \param helper is a pointer to the KOrg::CoreHelper object
     */
@@ -106,9 +107,10 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
 class CalPrintDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     CalPrintDialog( KOrg::PrintPlugin::List plugins,
-                    TQWidget *parent = 0, const char *name = 0 );
+                    TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~CalPrintDialog();
     KOrg::PrintPlugin *selectedPlugin();
     void setOrientation( CalPrinter::ePrintOrientation orientation );
diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui
index ef238b52..d3fb58d1 100644
--- a/korganizer/printing/calprintincidenceconfig_base.ui
+++ b/korganizer/printing/calprintincidenceconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintIncidenceConfig_Base</class>
 <comment>Configuration page for printing incidences.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintIncidence_Base</cstring>
     </property>
@@ -21,7 +21,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>mComponentsGroup</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowDetails</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <string>Detai&amp;ls (visiblility, secrecy, etc.)</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowSubitemsNotes</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <string>&amp;Notes, Subitems</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowAttendees</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <string>&amp;Attendees</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mShowAttachments</cstring>
                     </property>
@@ -69,7 +69,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>mColors</cstring>
             </property>
diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui
index 6fd311ea..1a4a1b50 100644
--- a/korganizer/printing/calprintmonthconfig_base.ui
+++ b/korganizer/printing/calprintmonthconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintMonthConfig_Base</class>
 <comment>Configuration page for the print day mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintMonth_Base</cstring>
     </property>
@@ -38,7 +38,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>mFromDateLabel</cstring>
                     </property>
@@ -85,7 +85,7 @@
                         <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the on &lt;i&gt;End month&lt;/i&gt; to define the last month in this range.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>mToDateLabel</cstring>
                     </property>
@@ -140,7 +140,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QCheckBox" row="4" column="0">
+        <widget class="TQCheckBox" row="4" column="0">
             <property name="name">
                 <cstring>mIncludeTodos</cstring>
             </property>
@@ -154,7 +154,7 @@
                 <string>Check this option if you want to have to-dos on the print, placed by their due date.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>mWeekNumbers</cstring>
             </property>
@@ -165,7 +165,7 @@
                 <string>Enable this to print week numbers at the left of each row.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>mRecurDaily</cstring>
             </property>
@@ -176,7 +176,7 @@
                 <string>With this option it is possible to leave out the daily recurring to-dos and events in the print. They take a lot of space and make the month view needlessly complicated.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0">
+        <widget class="TQCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>mRecurWeekly</cstring>
             </property>
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index c0e61b92..3d330efe 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqpainter.h>
@@ -156,7 +156,7 @@ void CalPrintPluginBase::doPrint( KPrinter *printer )
 
   p.begin( mPrinter );
   // TODO: Fix the margins!!!
-  // the painter initially begins at 72 dpi per the Qt docs.
+  // the painter initially begins at 72 dpi per the TQt docs.
   // we want half-inch margins.
   int margins = margin();
   p.setViewport( margins, margins,
@@ -270,7 +270,7 @@ bool CalPrintPluginBase::isWorkingDay( const TQDate &dt )
 
 TQString CalPrintPluginBase::holidayString( const TQDate &dt )
 {
-  return (mCoreHelper)?(mCoreHelper->holidayString(dt)):(TQString::null);
+  return (mCoreHelper)?(mCoreHelper->holidayString(dt)):(TQString());
 }
 
 
@@ -387,7 +387,7 @@ void CalPrintPluginBase::printEventString( TQPainter &p, const TQRect &box, cons
 {
   TQRect newbox( box );
   newbox.addCoords( 3, 1, -1, -1 );
-  p.drawText( newbox, (flags==-1)?(Qt::AlignTop | Qt::AlignJustify | Qt::BreakAnywhere):flags, str );
+  p.drawText( newbox, (flags==-1)?(TQt::AlignTop | TQt::AlignJustify | TQt::BreakAnywhere):flags, str );
 }
 
 
@@ -418,7 +418,7 @@ void CalPrintPluginBase::drawSubHeaderBox(TQPainter &p, const TQString &str, con
   drawShadedBox( p, BOX_BORDER_WIDTH, TQColor( 232, 232, 232 ), box );
   TQFont oldfont( p.font() );
   p.setFont( TQFont( "sans-serif", 10, TQFont::Bold ) );
-  p.drawText( box, Qt::AlignCenter | Qt::AlignVCenter, str );
+  p.drawText( box, TQt::AlignCenter | TQt::AlignVCenter, str );
   p.setFont( oldfont );
 }
 
@@ -429,7 +429,7 @@ void CalPrintPluginBase::drawVerticalBox( TQPainter &p, int linewidth, const TQR
   p.rotate( -90 );
   TQRect rotatedBox( -box.top()-box.height(), box.left(), box.height(), box.width() );
   showEventBox( p, linewidth, rotatedBox, 0, str,
-                ( flags == -1 ) ? Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine : flags );
+                ( flags == -1 ) ? TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine : flags );
 
   p.restore();
 }
@@ -455,7 +455,7 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox,
   // Bounding rectangle for caption, single-line, clip on the right
   TQRect captionBox( box.left() + padding(), box.top() + padding(), 0, 0 );
   p.setFont( captionFont );
-  captionBox = p.boundingRect( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine, caption );
+  captionBox = p.boundingRect( captionBox, TQt::AlignLeft | TQt::AlignTop | TQt::SingleLine, caption );
   p.setFont( oldFont );
   if ( captionBox.right() > box.right() )
     captionBox.setRight( box.right() );
@@ -473,7 +473,7 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox,
     textBox.setRight( box.right() );
     textBox.setHeight( 0 );
     p.setFont( textFont );
-    textBox = p.boundingRect( textBox, Qt::WordBreak | Qt::AlignTop | Qt::AlignLeft, contents );
+    textBox = p.boundingRect( textBox, TQt::WordBreak | TQt::AlignTop | TQt::AlignLeft, contents );
     p.setFont( oldFont );
     if ( textBox.bottom() + padding() > box.bottom() ) {
       if ( expand ) {
@@ -486,10 +486,10 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox,
 
   drawBox( p, BOX_BORDER_WIDTH, box );
   p.setFont( captionFont );
-  p.drawText( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine, caption );
+  p.drawText( captionBox, TQt::AlignLeft | TQt::AlignTop | TQt::SingleLine, caption );
   if ( !contents.isEmpty() ) {
     p.setFont( textFont );
-    p.drawText( textBox, Qt::WordBreak | Qt::AlignTop | Qt::AlignLeft, contents );
+    p.drawText( textBox, TQt::WordBreak | TQt::AlignTop | TQt::AlignLeft, contents );
   }
   p.setFont( oldFont );
 
@@ -523,7 +523,7 @@ int CalPrintPluginBase::drawHeader( TQPainter &p, TQString title,
   TQFont newFont("sans-serif", (textRect.height()<60)?16:18, TQFont::Bold);
   if ( expand ) {
     p.setFont( newFont );
-    TQRect boundingR = p.boundingRect( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, title );
+    TQRect boundingR = p.boundingRect( textRect, TQt::AlignLeft | TQt::AlignVCenter | TQt::WordBreak, title );
     p.setFont( oldFont );
     int h = boundingR.height();
     if ( h > allbox.height() ) {
@@ -546,7 +546,7 @@ int CalPrintPluginBase::drawHeader( TQPainter &p, TQString title,
 
   // Set the margins
   p.setFont( newFont );
-  p.drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, title );
+  p.drawText( textRect, TQt::AlignLeft | TQt::AlignVCenter | TQt::WordBreak, title );
   p.setFont( oldFont );
 
   return textRect.bottom();
@@ -587,7 +587,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd,
   if ( mCalSys ) {
     TQRect titleBox( box );
     titleBox.setHeight( int(cellHeight+1) );
-    p.drawText( titleBox, Qt::AlignTop | Qt::AlignHCenter, mCalSys->monthName( qd ) );
+    p.drawText( titleBox, TQt::AlignTop | TQt::AlignHCenter, mCalSys->monthName( qd ) );
   }
 
   // draw days of week
@@ -600,7 +600,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd,
       TQString tmpStr = mCalSys->weekDayName( monthDate2 )[0].upper();
       wdayBox.setLeft( int(box.left() + col*cellWidth) );
       wdayBox.setRight( int(box.left() + (col+1)*cellWidth) );
-      p.drawText( wdayBox, Qt::AlignCenter, tmpStr );
+      p.drawText( wdayBox, TQt::AlignCenter, tmpStr );
       monthDate2 = monthDate2.addDays( 1 );
     }
   }
@@ -616,7 +616,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd,
         TQRect dayRect( int( box.left() + col*cellWidth ), int( calStartY + row*cellHeight ), 0, 0 );
         dayRect.setRight( int( box.left() + (col+1)*cellWidth ) );
         dayRect.setBottom( int( calStartY + (row+1)*cellHeight ) );
-        p.drawText( dayRect, Qt::AlignCenter, TQString::number( monthDate.day() ) );
+        p.drawText( dayRect, TQt::AlignCenter, TQString::number( monthDate.day() ) );
       }
       monthDate = monthDate.addDays(1);
     }
@@ -655,7 +655,7 @@ void CalPrintPluginBase::drawDaysOfWeek(TQPainter &p,
 void CalPrintPluginBase::drawDaysOfWeekBox(TQPainter &p, const TQDate &qd,
     const TQRect &box )
 {
-  drawSubHeaderBox( p, (mCalSys)?(mCalSys->weekDayName( qd )):(TQString::null), box );
+  drawSubHeaderBox( p, (mCalSys)?(mCalSys->weekDayName( qd )):(TQString()), box );
 }
 
 
@@ -699,10 +699,10 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime,
           p.setFont( TQFont( "sans-serif", 12, TQFont::Bold ) );
         }
         p.drawText( box.left() + 4, (int)currY + 2, box.width() / 2 - 2, (int)cellHeight,
-                    Qt::AlignTop | Qt::AlignRight, numStr );
+                    TQt::AlignTop | TQt::AlignRight, numStr );
         p.setFont( TQFont ( "helvetica", 10, TQFont::Normal ) );
         p.drawText( xcenter + 4, (int)currY + 2, box.width() / 2 + 2, (int)(cellHeight / 2 ) - 3,
-                    Qt::AlignTop | Qt::AlignLeft, "00" );
+                    TQt::AlignTop | TQt::AlignLeft, "00" );
       } else {
         p.drawLine( box.left(), (int)newY, box.right(), (int)newY );
         TQTime time( curTime.hour(), 0 );
@@ -713,7 +713,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime,
           p.setFont( TQFont( "sans-serif", 12, TQFont::Bold ) ); // for dayprint
         }
         p.drawText( box.left() + 2, (int)currY + 2, box.width() - 4, (int)cellHeight / 2 - 3,
-                    Qt::AlignTop|Qt::AlignLeft, numStr );
+                    TQt::AlignTop|TQt::AlignLeft, numStr );
       }
       currY += cellHeight;
       p.setFont( oldFont );
@@ -955,10 +955,10 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
   if (!hstring.isEmpty()) {
     p.setFont( TQFont( "sans-serif", 8, TQFont::Bold, true ) );
 
-    p.drawText( headerTextBox, Qt::AlignLeft | Qt::AlignVCenter, hstring );
+    p.drawText( headerTextBox, TQt::AlignLeft | TQt::AlignVCenter, hstring );
   }
   p.setFont(TQFont("sans-serif", 10, TQFont::Bold));
-  p.drawText( headerTextBox, Qt::AlignRight | Qt::AlignVCenter, dayNumStr);
+  p.drawText( headerTextBox, TQt::AlignRight | TQt::AlignVCenter, dayNumStr);
 
   Event::List eventList = mCalendar->events( qd,
                                              EventSortStartDate,
@@ -1038,7 +1038,7 @@ void CalPrintPluginBase::drawIncidence( TQPainter &p, const TQRect &dayBox, cons
 {
   kdDebug(5850) << "summary = " << summary << endl;
 
-  int flags = Qt::AlignLeft;
+  int flags = TQt::AlignLeft;
   TQFontMetrics fm = p.fontMetrics();
   TQRect timeBound = p.boundingRect( dayBox.x() + 5, dayBox.y() + textY,
                                     dayBox.width() - 10, fm.lineSpacing(),
@@ -1180,7 +1180,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
   if ( daysinmonth<maxdays ) {
     TQRect dayBox( box.left(), daysBox.top() + round(dayheight*daysinmonth), box.width(), 0 );
     dayBox.setBottom( daysBox.bottom() );
-    p.fillRect( dayBox, Qt::DiagCrossPattern );
+    p.fillRect( dayBox, TQt::DiagCrossPattern );
   }
   // Backgrounded boxes for each day, plus day numbers
   TQBrush oldbrush( p.brush() );
@@ -1195,7 +1195,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
     p.drawRect( dayBox );
     TQRect dateBox( dayBox );
     dateBox.setWidth( dayNrWidth+3 );
-    p.drawText( dateBox, Qt::AlignRight | Qt::AlignVCenter | Qt::SingleLine,
+    p.drawText( dateBox, TQt::AlignRight | TQt::AlignVCenter | TQt::SingleLine,
                 TQString::number(d+1) );
   }
   p.setBrush( oldbrush );
@@ -1318,7 +1318,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
            14, 0 );
     eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) );
     drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() );
-    newxstartcont = QMAX( newxstartcont, eventBox.right() );
+    newxstartcont = TQMAX( newxstartcont, eventBox.right() );
   }
   xstartcont = newxstartcont;
 
@@ -1330,10 +1330,10 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
     TQRect dayBox( xstartcont, daysBox.top()+round(dayheight*d), 0, 0 );
     dayBox.setRight( box.right() );
     dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) );
-    printEventString(p, dayBox, txt, Qt::AlignTop | Qt::AlignLeft | Qt::BreakAnywhere );
+    printEventString(p, dayBox, txt, TQt::AlignTop | TQt::AlignLeft | TQt::BreakAnywhere );
   }
   p.setFont( oldfont );
-//   p.setBrush( Qt::NoBrush );
+//   p.setBrush( TQt::NoBrush );
   drawBox( p, BOX_BORDER_WIDTH, borderBox );
   p.restore();
 }
@@ -1379,7 +1379,7 @@ void CalPrintPluginBase::drawMonthTable(TQPainter &p, const TQDate &qd, bool wee
     for (int row = 0; row<rows; ++row ) {
       int calWeek = weekDate.weekNumber();
       TQRect rc( box.left(), rowedges[row], coledges[0] - 3 - box.left(), rowedges[row+1]-rowedges[row] );
-      p.drawText( rc, Qt::AlignRight | Qt::AlignVCenter, TQString::number( calWeek ) );
+      p.drawText( rc, TQt::AlignRight | TQt::AlignVCenter, TQString::number( calWeek ) );
       weekDate = weekDate.addDays( 7 );
     }
     p.setFont( oldFont );
@@ -1427,7 +1427,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   TQRect rect;
   TodoParentStart startpt;
 
-  // This list keeps all starting points of the parent to-dos so the connection
+  // This list keeps all starting points of the tqparent to-dos so the connection
   // lines of the tree can easily be drawn (needed if a new page is started)
   static TQPtrList<TodoParentStart> startPoints;
   if ( level < 1 ) {
@@ -1442,15 +1442,15 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   // size of to-do
   outStr=todo->summary();
   int left = posSummary + ( level*10 );
-  rect = p.boundingRect( left, y, ( rhs-left-5 ), -1, Qt::WordBreak, outStr );
+  rect = p.boundingRect( left, y, ( rhs-left-5 ), -1, TQt::WordBreak, outStr );
   if ( !todo->description().isEmpty() && desc ) {
     outStr = todo->description();
     rect = p.boundingRect( left+20, rect.bottom()+5, width-(left+10-x), -1,
-                           Qt::WordBreak, outStr );
+                           TQt::WordBreak, outStr );
   }
   // if too big make new page
   if ( rect.bottom() > pageHeight ) {
-    // first draw the connection lines from parent to-dos:
+    // first draw the connection lines from tqparent to-dos:
     if ( level > 0 && connectSubTodos ) {
       TodoParentStart *rct;
       for ( rct = startPoints.first(); rct; rct = startPoints.next() ) {
@@ -1458,7 +1458,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
         int center = rct->mRect.left() + (rct->mRect.width()/2);
         int to = p.viewport().bottom();
 
-        // draw either from start point of parent or from top of the page
+        // draw either from start point of tqparent or from top of the page
         if ( rct->mSamePage )
           start = rct->mRect.bottom() + 1;
         else
@@ -1473,7 +1473,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   }
 
   // If this is a sub-to-do, r will not be 0, and we want the LH side
-  // of the priority line up to the RH side of the parent to-do's priority
+  // of the priority line up to the RH side of the tqparent to-do's priority
   bool showPriority = posPriority>=0;
   int lhs = posPriority;
   if ( r ) {
@@ -1481,13 +1481,13 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   }
 
   outStr.setNum( todo->priority() );
-  rect = p.boundingRect( lhs, y + 10, 5, -1, Qt::AlignCenter, outStr );
+  rect = p.boundingRect( lhs, y + 10, 5, -1, TQt::AlignCenter, outStr );
   // Make it a more reasonable size
   rect.setWidth(18);
   rect.setHeight(18);
 
   // Draw a checkbox
-  p.setBrush( TQBrush( Qt::NoBrush ) );
+  p.setBrush( TQBrush( TQt::NoBrush ) );
   p.drawRect( rect );
   if ( todo->isCompleted() ) {
     // cross out the rectangle for completed to-dos
@@ -1498,7 +1498,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
 
   // Priority
   if ( todo->priority() > 0 && showPriority ) {
-    p.drawText( rect, Qt::AlignCenter, outStr );
+    p.drawText( rect, TQt::AlignCenter, outStr );
   }
   startpt.mRect = rect; //save for later
 
@@ -1520,7 +1520,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   // summary
   outStr=todo->summary();
   rect = p.boundingRect( lhs, rect.top(), (rhs-(left + rect.width() + 5)),
-                         -1, Qt::WordBreak, outStr );
+                         -1, TQt::WordBreak, outStr );
 
   TQRect newrect;
   //FIXME: the following code prints underline rather than strikeout text
@@ -1530,12 +1530,12 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     f.setStrikeOut( true );
     p.setFont( f );
   }
-  p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
+  p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect );
   f.setStrikeOut( false );
   p.setFont( f );
 #endif
   //TODO: Remove this section when the code above is fixed
-  p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
+  p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect );
   if ( todo->isCompleted() && strikeoutCompleted ) {
     // strike out the summary text if to-do is complete
     // Note: we tried to use a strike-out font and for unknown reasons the
@@ -1552,8 +1552,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
   if ( todo->hasDueDate() && posDueDt>=0 ) {
     outStr = local->formatDate( todo->dtDue().date(), true );
     rect = p.boundingRect( posDueDt, y, x + width, -1,
-                           Qt::AlignTop | Qt::AlignLeft, outStr );
-    p.drawText( rect, Qt::AlignTop | Qt::AlignLeft, outStr );
+                           TQt::AlignTop | TQt::AlignLeft, outStr );
+    p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
   }
 
   // percentage completed
@@ -1564,7 +1564,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     //first, draw the progress bar
     int progress = (int)(( lwidth*todo->percentComplete())/100.0 + 0.5);
 
-    p.setBrush( TQBrush( Qt::NoBrush ) );
+    p.setBrush( TQBrush( TQt::NoBrush ) );
     p.drawRect( posPercentComplete, y+3, lwidth, lheight );
     if ( progress > 0 ) {
       p.setBrush( TQColor( 128, 128, 128 ) );
@@ -1574,8 +1574,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     //now, write the percentage
     outStr = i18n( "%1%" ).arg( todo->percentComplete() );
     rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1,
-                           Qt::AlignTop | Qt::AlignLeft, outStr );
-    p.drawText( rect, Qt::AlignTop | Qt::AlignLeft, outStr );
+                           TQt::AlignTop | TQt::AlignLeft, outStr );
+    p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
   }
 
   // description
@@ -1583,8 +1583,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     y = newrect.bottom() + 5;
     outStr = todo->description();
     rect = p.boundingRect( left+20, y, x+width-(left+10), -1,
-                           Qt::WordBreak, outStr );
-    p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
+                           TQt::WordBreak, outStr );
+    p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect );
   }
 
   // Set the new line position
@@ -1650,17 +1650,17 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin
 
   TQString entry( field.arg( text ) );
 
-  TQRect rect( p.boundingRect( x, y, width, -1, Qt::WordBreak, entry) );
+  TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) );
   if ( rect.bottom() > pageHeight) {
     // Start new page...
     // FIXME: If it's a multi-line text, draw a few lines on this page, and the
     // remaining lines on the next page.
     y=0;
     mPrinter->newPage();
-    rect = p.boundingRect( x, y, width, -1, Qt::WordBreak, entry);
+    rect = p.boundingRect( x, y, width, -1, TQt::WordBreak, entry);
   }
   TQRect newrect;
-  p.drawText( rect, Qt::WordBreak, entry, -1, &newrect );
+  p.drawText( rect, TQt::WordBreak, entry, -1, &newrect );
   y = newrect.bottom() + 7;
 }
 
@@ -1681,15 +1681,15 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
                      .arg( dateText );
   }
 
-  TQRect rect( p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText) );
+  TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) );
   if ( rect.bottom() > pageHeight) {
     // Start new page...
     y=0;
     mPrinter->newPage();
-    rect = p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText );
+    rect = p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText );
   }
   TQRect newrect;
-  p.drawText( rect, Qt::WordBreak, headerText, -1, &newrect );
+  p.drawText( rect, TQt::WordBreak, headerText, -1, &newrect );
   p.setFont( oldFont );
 
   y = newrect.bottom() + 4;
@@ -1711,7 +1711,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
   TQFont oldFont( p.font() );
 
   TQPen oldPen( p.pen() );
-  TQPen pen( Qt::black, 4 );
+  TQPen pen( TQt::black, 4 );
 
   TQString title;
   if ( mCalSys ) {
@@ -1734,7 +1734,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
 
   int lineSpacing = p.fontMetrics().lineSpacing();
   p.drawText( 0, lineSpacing * 0, width, lineSpacing,
-              Qt::AlignRight | Qt::AlignTop, title );
+              TQt::AlignRight | TQt::AlignTop, title );
 
   title.truncate(0);
 
@@ -1746,7 +1746,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
   int newlineSpacing = p.fontMetrics().lineSpacing();
   title += TQString::number(fd.year());
   p.drawText( 0, lineSpacing * 1 + 4, width, newlineSpacing,
-              Qt::AlignRight | Qt::AlignTop, title );
+              TQt::AlignRight | TQt::AlignTop, title );
 
   p.setFont( oldFont );
 }
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 16a1cc2f..38594962 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef CALPRINTPLUGINBASE_H
 #define CALPRINTPLUGINBASE_H
@@ -200,7 +200,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
 
     /**
       Print the box for the given event with the given string.
-      \param p QPainer of the printout
+      \param p TQPainer of the printout
       \param linewidth is the width of the line used to draw the box, ignored if less than 1.
       \param box Coordinates of the event's box
       \param incidence The incidence (if available), from which the category
@@ -259,7 +259,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       It prints the given text and optionally one or two small
       month views, as specified by the two TQDate. The printed
       text can also contain a line feed.
-      If month2 is invalid, only the month that tqcontains month1
+      If month2 is invalid, only the month that contains month1
       is printed.
       E.g. the filofax week view draws just the current month,
       while the month view draws the previous and the next month.
@@ -419,7 +419,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       On the left side the time scale is printed (using drawTimeLine), then each
       day gets one column (printed using drawAgendaDayBox),
       and the events are displayed as boxes (like in korganizer's day/week view).
-      The first cell of each column tqcontains the all-day events (using
+      The first cell of each column contains the all-day events (using
       drawAllDayBox with expandable=false).
       The given time range cannot be expanded to include all events.
       \param p TQPainter of the printout
@@ -435,7 +435,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
 
     /**
       Draw the month table of the month containing the date qd. Each day gets one
-      box (using drawDayBox) that tqcontains a list of all events on that day. They are arranged
+      box (using drawDayBox) that contains a list of all events on that day. They are arranged
       in a matrix, with the first column being the first day of the
       week (so it might display some days of the previous and the next month).
       Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek).
@@ -478,7 +478,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       \param p TQPainter of the printout
       \param sortField Specifies on which attribute of the todo you want to sort.
       \param sortDir Specifies if you want to sort ascending or descending.
-      \param connectSubTodos Whether sub-to-dos shall be connected with their parent by a line (tree-like).
+      \param connectSubTodos Whether sub-to-dos shall be connected with their tqparent by a line (tree-like).
       \param strikeoutCompleted Whether completed to-dos should be printed with strike-out summaries.
       \param desc Whether to print the whole description of the to-do (the summary is always printed).
       \param posPriority x-coordinate where the priority is supposed to be printed. If <0, no priority will be printed.
@@ -491,7 +491,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       \param width width of the whole to-do list.
       \param pageHeight Total height allowed for the to-do list on a page. If an to-do would be below that line, a new page is started.
       \param todoList Contains a list of sub-todos for the specified @p todo .
-      \param r Internal (used when printing sub-to-dos to give information about its parent)
+      \param r Internal (used when printing sub-to-dos to give information about its tqparent)
     */
     void drawTodo( int &count, Todo *todo, TQPainter &p,
                    TodoSortField sortField, SortDirection sortDir,
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index ea2dcff2..5b330edd 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintTodoConfig_Base</class>
 <comment>Configuration page for the print day mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintTodoConfig_Base</cstring>
     </property>
@@ -21,7 +21,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>mTitleLabel</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <cstring>mTitle</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>mTitle</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>To-do List</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>mPrintType</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mPrintAll</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mPrintUnfinished</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         <string>Print &amp;unfinished to-dos only</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>mPrintDueRange</cstring>
                     </property>
@@ -84,7 +84,7 @@
                         <string>Print only to-dos due in the &amp;range:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout2</cstring>
                     </property>
@@ -109,7 +109,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mFromDateLabel</cstring>
                             </property>
@@ -145,7 +145,7 @@
                                 <string>If you want to print more days at once, you can define a range of dates with this option and the &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>mToDateLabel</cstring>
                             </property>
@@ -202,7 +202,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>includeInfoBox</cstring>
             </property>
@@ -216,7 +216,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>mPriority</cstring>
                     </property>
@@ -227,7 +227,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>mDescription</cstring>
                     </property>
@@ -238,7 +238,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="1">
+                <widget class="TQCheckBox" row="0" column="1">
                     <property name="name">
                         <cstring>mDueDate</cstring>
                     </property>
@@ -252,7 +252,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="1">
+                <widget class="TQCheckBox" row="1" column="1">
                     <property name="name">
                         <cstring>mPercentComplete</cstring>
                     </property>
@@ -282,7 +282,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>sortingOptionsBox</cstring>
             </property>
@@ -293,7 +293,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>sortFieldLabel</cstring>
                     </property>
@@ -304,7 +304,7 @@
                         <string>Sort field:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>mSortField</cstring>
                     </property>
@@ -312,7 +312,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>sortDirectionLabel</cstring>
                     </property>
@@ -323,7 +323,7 @@
                         <string>Sort direction:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>mSortDirection</cstring>
                     </property>
@@ -367,7 +367,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>otherOptionsBox</cstring>
             </property>
@@ -378,18 +378,18 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mConnectSubTodos</cstring>
                     </property>
                     <property name="text">
-                        <string>Co&amp;nnect sub-to-dos with its parent</string>
+                        <string>Co&amp;nnect sub-to-dos with its tqparent</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>mStrikeOutCompleted</cstring>
                     </property>
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index 32ea6fb4..6943de85 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -2,7 +2,7 @@
 <class>CalPrintWeekConfig_Base</class>
 <comment>Configuration page for the print week mode.</comment>
 <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CalPrintWeek_Base</cstring>
     </property>
@@ -41,7 +41,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>mDateRangeGroup</cstring>
             </property>
@@ -69,7 +69,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>mFromDateLabel</cstring>
                     </property>
@@ -94,7 +94,7 @@
                         <string>Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the &lt;i&gt;End date&lt;/i&gt; to enter the end date of the daterange.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>mToTimeLabel</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QTimeEdit" row="1" column="3">
+                <widget class="TQTimeEdit" row="1" column="3">
                     <property name="name">
                         <cstring>mToTime</cstring>
                     </property>
@@ -143,7 +143,7 @@
                         <string>All events which start later than the given time will not be printed.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>mFromTimeLabel</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <string>All events which start earlier than the given time will not be printed.</string>
                     </property>
                 </widget>
-                <widget class="QTimeEdit" row="0" column="3">
+                <widget class="TQTimeEdit" row="0" column="3">
                     <property name="name">
                         <cstring>mFromTime</cstring>
                     </property>
@@ -186,7 +186,7 @@
                         <string>Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the &lt;i&gt;Start date&lt;/i&gt; to enter the start date of the daterange.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mToDateLabel</cstring>
                     </property>
@@ -202,7 +202,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="3" column="0">
+        <widget class="TQCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>mColors</cstring>
             </property>
@@ -213,7 +213,7 @@
                 <string>The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used.</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>mPrintType</cstring>
             </property>
@@ -224,7 +224,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>mPrintTypeButton1</cstring>
                     </property>
@@ -238,7 +238,7 @@
                         <string>The Filofax view prints one week per page, so all days have a large surface.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="5">
+                <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>mPrintTypeButton2</cstring>
                     </property>
@@ -249,7 +249,7 @@
                         <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>mPrintTypeButton3</cstring>
                     </property>
@@ -262,7 +262,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>mIncludeTodos</cstring>
             </property>
diff --git a/korganizer/printing/cellitem.cpp b/korganizer/printing/cellitem.cpp
index 73c8aa50..4dfc882f 100644
--- a/korganizer/printing/cellitem.cpp
+++ b/korganizer/printing/cellitem.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "cellitem.h"
@@ -65,7 +65,7 @@ TQPtrList<CellItem> CellItem::placeItem( TQPtrList<CellItem> cells,
     int i;
     for( i = 0; i < maxSubCells; ++i ) {
       kdDebug(5855) << "  Trying subcell " << i << endl;
-      if ( !subCellDict.find( i ) ) {
+      if ( !subCellDict.tqfind( i ) ) {
         kdDebug(5855) << "  Use subcell " << i << endl;
         placeItem->setSubCell( i );
         break;
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index 83759cc8..4217e8b9 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_CELLITEM_H
 #define KORG_CELLITEM_H
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 68d5c630..33e30e9b 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlineedit.h>
@@ -37,9 +37,9 @@
 #include "publishdialog.h"
 #include "publishdialog_base.h"
 
-PublishDialog::PublishDialog( TQWidget* parent, const char* name,
+PublishDialog::PublishDialog( TQWidget* tqparent, const char* name,
                               bool modal )
-  : KDialogBase( parent, name, modal,
+  : KDialogBase( tqparent, name, modal,
     i18n("Select Addresses"), Ok|Cancel|Help, Ok, true )
 {
   mWidget = new PublishDialog_base( this, "PublishFreeBusy" );
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index d7f64205..83281600 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef PUBLISHDIALOG_H
 #define PUBLISHDIALOG_H
@@ -34,8 +34,9 @@ class PublishDialog_base;
 class PublishDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    PublishDialog(TQWidget* parent=0,const char* name=0,
+    PublishDialog(TQWidget* tqparent=0,const char* name=0,
                    bool modal=true );
     ~PublishDialog();
 
diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui
index 7e7a5ff1..e8b3d34d 100644
--- a/korganizer/publishdialog_base.ui
+++ b/korganizer/publishdialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PublishDialog_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PublishDialog_base</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="4" colspan="2">
+        <widget class="TQListView" row="0" column="0" rowspan="4" colspan="2">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -49,7 +49,7 @@
                 <cstring>mAddressListView</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <string>Name:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -65,7 +65,7 @@
                 <string>Email:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="5" column="1">
+        <widget class="TQLineEdit" row="5" column="1">
             <property name="name">
                 <cstring>mEmailLineEdit</cstring>
             </property>
@@ -73,12 +73,12 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1">
+        <widget class="TQLineEdit" row="4" column="1">
             <property name="name">
                 <cstring>mNameLineEdit</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="2">
+        <widget class="TQPushButton" row="0" column="2">
             <property name="name">
                 <cstring>mNew</cstring>
             </property>
@@ -86,7 +86,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>mSelectAddressee</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <string>Select &amp;Addressee...</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>mRemove</cstring>
             </property>
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 0f2d0e13..7b00a461 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "resourceview.h"
@@ -96,9 +96,9 @@ ResourceViewFactory::ResourceViewFactory( CalendarResources *calendar, CalendarV
 {
 }
 
-CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent )
+CalendarViewExtension *ResourceViewFactory::create( TQWidget *tqparent )
 {
-  mResourceView = new ResourceView( mCalendar, mCalendarView, parent );
+  mResourceView = new ResourceView( mCalendar, mCalendarView, tqparent );
 
   TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
                     mCalendarView, TQT_SLOT( resourcesChanged() ) );
@@ -127,10 +127,10 @@ ResourceView *ResourceViewFactory::resourceView() const
 }
 
 ResourceItem::ResourceItem( ResourceCalendar *resource, ResourceView *view,
-                            KListView *parent )
-  : TQCheckListItem( parent, resource->resourceName(), CheckBox ),
+                            KListView *tqparent )
+  : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ),
     mResource( resource ), mResourceView( view ), mBlockStateChange( false ),
-    mIsSubresource( false ), mResourceIdentifier( TQString::null ),
+    mIsSubresource( false ), mResourceIdentifier( TQString() ),
     mSubItemsCreated( false ), mIsStandardResource( false )
 {
   mResourceColor = TQColor();
@@ -164,8 +164,8 @@ void ResourceItem::createSubresourceItems()
 }
 
 ResourceItem::ResourceItem( ResourceCalendar *resource, const TQString &identifier,
-                            const TQString &label, ResourceView *view, ResourceItem *parent )
-  : TQCheckListItem( parent, label, CheckBox ), mResource( resource ),
+                            const TQString &label, ResourceView *view, ResourceItem *tqparent )
+  : TQCheckListItem( tqparent, label, CheckBox ), mResource( resource ),
     mResourceView( view ), mBlockStateChange( false ), mIsSubresource( true ),
     mSubItemsCreated( false ), mIsStandardResource( false )
 {
@@ -258,8 +258,8 @@ void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 
 
 ResourceView::ResourceView( CalendarResources *calendar,
-                            CalendarView *view, TQWidget *parent, const char *name )
-  : CalendarViewExtension( parent, name ), mCalendar( calendar ), mCalendarView( view )
+                            CalendarView *view, TQWidget *tqparent, const char *name )
+  : CalendarViewExtension( tqparent, name ), mCalendar( calendar ), mCalendarView( view )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -368,12 +368,12 @@ void ResourceView::addResource()
   if ( item && ( item->isSubresource() || item->resource()->canHaveSubresources() ) ) {
     const TQString folderName =
       KInputDialog::getText( i18n( "Add Subresource" ),
-                             i18n( "Please enter a name for the new subresource" ), TQString::null,
+                             i18n( "Please enter a name for the new subresource" ), TQString(),
                              &ok, this );
     if ( !ok )
       return;
-    const TQString parentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null;
-    if ( !item->resource()->addSubresource( folderName, parentId ) ) {
+    const TQString tqparentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null;
+    if ( !item->resource()->addSubresource( folderName, tqparentId ) ) {
       KMessageBox::error(
         this,
         i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) );
@@ -508,7 +508,7 @@ void ResourceView::slotSubresourceRemoved( ResourceCalendar *resource,
 
 void ResourceView::closeResource( ResourceCalendar *resource )
 {
-  if ( mResourcesToClose.find( resource ) >= 0 ) {
+  if ( mResourcesToClose.tqfind( resource ) >= 0 ) {
     resource->close();
     mResourcesToClose.remove( resource );
   }
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index 304ab8c6..39606a53 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_RESOURCEVIEW_H
 #define KORG_RESOURCEVIEW_H
@@ -54,12 +54,12 @@ class ResourceViewFactory : public CalendarViewExtension::Factory
 };
 
 
-class ResourceItem : public QCheckListItem
+class ResourceItem : public TQCheckListItem
 {
   public:
-    ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *parent );
+    ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *tqparent );
     ResourceItem( ResourceCalendar *resource, const TQString &identifier,
-                  const TQString &label, ResourceView *view, ResourceItem *parent );
+                  const TQString &label, ResourceView *view, ResourceItem *tqparent );
 
     ResourceCalendar *resource() { return mResource; }
     const TQString& resourceIdentifier() { return mResourceIdentifier; }
@@ -95,9 +95,10 @@ class ResourceItem : public QCheckListItem
 class ResourceView : public CalendarViewExtension
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceView( CalendarResources *calendar, CalendarView *view,
-                  TQWidget *parent = 0, const char *name = 0 );
+                  TQWidget *tqparent = 0, const char *name = 0 );
     ~ResourceView();
 
     CalendarResources *calendar() const { return mCalendar; }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index b8b6ea1e..8b79bda1 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -45,9 +45,9 @@
 #include "searchdialog.h"
 #include "searchdialog.moc"
 
-SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
-  : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,parent,0,false,false,
-                KGuiItem( i18n("&Find"), "find") )
+SearchDialog::SearchDialog(Calendar *calendar,TQWidget *tqparent)
+  : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,tqparent,0,false,false,
+                KGuiItem( i18n("&Find"), "tqfind") )
 {
   mCalendar = calendar;
 
@@ -228,31 +228,19 @@ void SearchDialog::search( const TQRegExp &re )
   for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) {
     Incidence *ev = *it;
     if ( mSummaryCheck->isChecked() ) {
-#if QT_VERSION >= 300
       if ( re.search( ev->summary() ) != -1 ) {
-#else
-      if ( re.match( ev->summary() ) != -1 ) {
-#endif
         mMatchedEvents.append( ev );
         continue;
       }
     }
     if ( mDescriptionCheck->isChecked() ) {
-#if QT_VERSION >= 300
       if ( re.search( ev->description() ) != -1 ) {
-#else
-      if ( re.match( ev->description() ) != -1 ) {
-#endif
         mMatchedEvents.append( ev );
         continue;
       }
     }
     if ( mCategoryCheck->isChecked() ) {
-#if QT_VERSION >= 300
       if ( re.search( ev->categoriesStr() ) != -1 ) {
-#else
-      if ( re.match( ev->categoriesStr() ) != -1 ) {
-#endif
         mMatchedEvents.append( ev );
         continue;
       }
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 53195bc1..33427c25 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef SEARCHDIALOG_H
 #define SEARCHDIALOG_H
@@ -46,8 +46,9 @@ using namespace KCal;
 class SearchDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    SearchDialog(Calendar *calendar,TQWidget *parent=0);
+    SearchDialog(Calendar *calendar,TQWidget *tqparent=0);
     virtual ~SearchDialog();
 
     void updateView();
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 29eb04ef..a90ab28d 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -35,10 +35,10 @@
 #include "statusdialog.h"
 #include "statusdialog.moc"
 
-StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
-  KDialog(parent,name,true)
+StatusDialog::StatusDialog(TQWidget* tqparent, const char* name) :
+  KDialog(tqparent,name,true)
 {
-  setCaption(i18n("Set Your Status"));
+  setCaption(i18n("Set Your tqStatus"));
 
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( spacingHint() );
@@ -49,9 +49,9 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
   TQLabel *text = new TQLabel(i18n("Set your status"),this);
   statusLayout->addWidget( text );
 
-  mStatus = new TQComboBox(false,this);
-  mStatus->insertStringList(Attendee::statusList());
-  statusLayout->addWidget( mStatus );
+  mtqStatus = new TQComboBox(false,this);
+  mtqStatus->insertStringList(Attendee::statusList());
+  statusLayout->addWidget( mtqStatus );
 
   TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
 
@@ -70,5 +70,5 @@ StatusDialog::~StatusDialog()
 
 Attendee::PartStat StatusDialog::status()
 {
-  return Attendee::PartStat( mStatus->currentItem() ) ;
+  return Attendee::PartStat( mtqStatus->currentItem() ) ;
 }
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index d97c1ac2..6c1b90f2 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -29,14 +29,15 @@ class TQComboBox;
 class StatusDialog : public KDialog
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    StatusDialog(TQWidget* parent=0,const char* name=0);
+    StatusDialog(TQWidget* tqparent=0,const char* name=0);
     ~StatusDialog();
 
     Attendee::PartStat status();
 
   private:
-    TQComboBox *mStatus;
+    TQComboBox *mtqStatus;
 };
 
 #endif
diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui
index 606db9ec..edcf9448 100644
--- a/korganizer/template_management_dialog_base.ui
+++ b/korganizer/template_management_dialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TemplateManagementDialog_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TemplateManagementDialog_base</cstring>
     </property>
@@ -27,7 +27,7 @@
                 <cstring>m_listBox</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>m_buttonAdd</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>m_buttonDelete</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <string>Delete</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_introLabel</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <string>Select a template and click &lt;b&gt;Apply Template&lt;/b&gt; to apply it to the current event or task. Click &lt;b&gt;New&lt;/b&gt; to create a new template based on the current event or task.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="0">
+        <widget class="TQPushButton" row="4" column="0">
             <property name="name">
                 <cstring>m_buttonApply</cstring>
             </property>
diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp
index 18c82214..e6ee19da 100644
--- a/korganizer/templatemanagementdialog.cpp
+++ b/korganizer/templatemanagementdialog.cpp
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -45,10 +45,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStringList &templates )
-    :KDialogBase( parent, "template_management_dialog", true,
+TemplateManagementDialog::TemplateManagementDialog(TQWidget *tqparent, const TQStringList &templates )
+    :KDialogBase( tqparent, "template_management_dialog", true,
                         i18n("Manage Templates"), Ok|Cancel, Ok, true , i18n("Apply Template")),
-      m_templates( templates ), m_newTemplate( TQString::null ), m_changed( false )
+      m_templates( templates ), m_newTemplate( TQString() ), m_changed( false )
 {
   m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" );
   setMainWidget( m_base );
@@ -72,7 +72,7 @@ void TemplateManagementDialog::slotAddTemplate()
                                        i18n("Please enter a name for the new template:"),
                                        i18n("New Template"), &ok );
   if ( newTemplate.isEmpty() || !ok ) return;
-  if ( m_templates.find( newTemplate) != m_templates.end() ) {
+  if ( m_templates.tqfind( newTemplate) != m_templates.end() ) {
     int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite"));
     if ( rc == KMessageBox::Cancel ) {
       TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) );
@@ -102,7 +102,7 @@ void TemplateManagementDialog::slotDeleteTemplate()
   m_templates.remove( item->text() );
   m_base->m_listBox->removeItem( m_base->m_listBox->currentItem() );
   m_changed = true;
-  m_base->m_listBox->setSelected(QMAX(current -1, 0), true);
+  m_base->m_listBox->setSelected(TQMAX(current -1, 0), true);
 }
 
 void TemplateManagementDialog::slotUpdateDeleteButton( TQListBoxItem *item )
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index 9216108f..134211c4 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -25,11 +25,11 @@
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
-**   the Qt library by Trolltech AS, Norway (or with modified versions
-**   of Qt that use the same license as Qt), and distribute linked
+**   the TQt library by Trolltech AS, Norway (or with modified versions
+**   of TQt that use the same license as TQt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
-**   Qt.  If you modify this file, you may extend this exception to
+**   TQt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
@@ -46,8 +46,9 @@
 
 class TemplateManagementDialog: public KDialogBase {
 Q_OBJECT
+  TQ_OBJECT
   public:
-    TemplateManagementDialog( TQWidget *parent, const TQStringList& templates );
+    TemplateManagementDialog( TQWidget *tqparent, const TQStringList& templates );
 
   signals:
     /* Emitted whenever the user hits apply, indicating that the currently selected template
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 53bc3458..5431594a 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "timelabels.h"
@@ -42,8 +42,8 @@
 #include "koprefs.h"
 #include "koagenda.h"
 
-TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) :
-  TQScrollView(parent,name,f)
+TimeLabels::TimeLabels(int rows,TQWidget *tqparent,const char *name,WFlags f) :
+  TQScrollView(tqparent,name,f)
 {
   mRows = rows;
   mMiniWidth = 0;
@@ -63,7 +63,7 @@ TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) :
   mMousePos = new TQFrame(this);
   mMousePos->setLineWidth(0);
   mMousePos->setMargin(0);
-  mMousePos->setBackgroundColor(Qt::red);
+  mMousePos->setBackgroundColor(TQt::red);
   mMousePos->setFixedSize(width(), 1);
   addChild(mMousePos, 0, 0);
 }
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 63881c4e..df555ab5 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef TIMELABELS_H
 #define TIMELABELS_H
@@ -36,11 +36,12 @@ class KOAgenda;
 class KOAgendaItem;
 class KConfig;
 
-class TimeLabels : public QScrollView
+class TimeLabels : public TQScrollView
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0,
+    TimeLabels( int rows, TQWidget *tqparent = 0, const char *name = 0,
                 WFlags f = 0 );
 
     /** Calculates the minimum width */
diff --git a/korganizer/timelineitem.cpp b/korganizer/timelineitem.cpp
index 6ebff843..649bcfa8 100644
--- a/korganizer/timelineitem.cpp
+++ b/korganizer/timelineitem.cpp
@@ -31,8 +31,8 @@
 using namespace KOrg;
 using namespace KCal;
 
-TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * parent) :
-    KDGanttViewTaskItem( parent ), mCalendar( calendar )
+TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * tqparent) :
+    KDGanttViewTaskItem( tqparent ), mCalendar( calendar )
 {
   setListViewText( 0, label );
   setDisplaySubitemsAsGroup( true );
@@ -92,8 +92,8 @@ void TimelineItem::moveItems(KCal::Incidence * incidence, int delta, int duratio
 
 
 TimelineSubItem::TimelineSubItem( KCal::Calendar *calendar,
-                                  KCal::Incidence *incidence, TimelineItem *parent) :
-    KDGanttViewTaskItem( parent ),
+                                  KCal::Incidence *incidence, TimelineItem *tqparent) :
+    KDGanttViewTaskItem( tqparent ),
     mIncidence( incidence ),
     mLeft( 0 ),
     mRight( 0 ),
@@ -124,11 +124,11 @@ void TimelineSubItem::showItem(bool show, int coordY)
   int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
   int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
 
-  const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
+  const int mw = TQMAX( 1, TQMIN( 4, endX - startX ) );
   if ( !mLeft || mw != mMarkerWidth ) {
     if ( !mLeft ) {
       mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
-      mLeft->setBrush( Qt::black );
+      mLeft->setBrush( TQt::black );
     }
     TQPointArray a = TQPointArray( 4 );
     a.setPoint( 0, 0, -mw -myItemSize/2 - 2 );
@@ -140,7 +140,7 @@ void TimelineSubItem::showItem(bool show, int coordY)
   if ( !mRight || mw != mMarkerWidth ) {
     if ( !mRight ) {
       mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
-      mRight->setBrush( Qt::black );
+      mRight->setBrush( TQt::black );
     }
     TQPointArray a = TQPointArray( 4 );
     a.setPoint( 0, -mw, -myItemSize/2 - 2 );
diff --git a/korganizer/timelineitem.h b/korganizer/timelineitem.h
index a3406f11..7cf45145 100644
--- a/korganizer/timelineitem.h
+++ b/korganizer/timelineitem.h
@@ -42,7 +42,7 @@ class TimelineSubItem;
 class TimelineItem : public KDGanttViewTaskItem
 {
   public:
-    TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* parent );
+    TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* tqparent );
 
     void insertIncidence( KCal::Incidence *incidence,
                           const TQDateTime &start = TQDateTime(),
@@ -59,7 +59,7 @@ class TimelineItem : public KDGanttViewTaskItem
 class TimelineSubItem : public KDGanttViewTaskItem
 {
   public:
-    TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *parent );
+    TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *tqparent );
     ~TimelineSubItem();
 
     KCal::Incidence* incidence() const { return mIncidence; }
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index d95ae3cf..3b751b6a 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include <time.h>
 
@@ -56,7 +56,7 @@ int main(int argc,char **argv)
   TQTime qtime = TQTime::currentTime();
   
   kdDebug(5850) << "TQDateTime::currentTime(): "
-            << qtime.toString( Qt::ISODate ) << endl;
+            << qtime.toString( TQt::ISODate ) << endl;
 
   kdDebug(5850) << "KLocale::formatTime(): "
             << KGlobal::locale()->formatTime( qtime ) << endl;
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 0c406318..7caad0e3 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "urihandler.h"
@@ -69,7 +69,7 @@ TQString UriHandler::uidFromUri( const TQString &uri )
   return tmp;
 }
 
-bool UriHandler::process( TQWidget *parent, const TQString &uri )
+bool UriHandler::process( TQWidget *tqparent, const TQString &uri )
 {
   kdDebug(5850) << "UriHandler::process(): " << uri << endl;
 
@@ -80,10 +80,10 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
     kapp->startServiceByDesktopPath("kmail");
 
     // parse string, show
-    int colon = uri.find( ':' );
+    int colon = uri.tqfind( ':' );
     // extract 'number' from 'kmail:<number>/<id>'
     TQString serialNumberStr = uri.mid( colon + 1 );
-    serialNumberStr = serialNumberStr.left( serialNumberStr.find( '/' ) );
+    serialNumberStr = serialNumberStr.left( serialNumberStr.tqfind( '/' ) );
 
     KMailIface_stub kmailIface( "kmail", "KMailIface" );
     kmailIface.showMail( serialNumberStr.toUInt(), TQString() );
@@ -91,7 +91,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
 
   } else if ( uri.startsWith( "mailto:" ) ) {
 
-    KApplication::kApplication()->invokeMailer( uri.mid(7), TQString::null );
+    KApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
     return true;
 
   } else if ( uri.startsWith( "uid:" ) ) {
@@ -127,7 +127,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
   } else if ( uri.startsWith( "ATTACH:" ) ) {
 
     // a calendar incidence attachment
-    return AttachmentHandler::view( parent, attachmentNameFromUri( uri ), uidFromUri( uri ) );
+    return AttachmentHandler::view( tqparent, attachmentNameFromUri( uri ), uidFromUri( uri ) );
 
   } else {  // no special URI, let KDE handle it
     new KRun( KURL( uri ) );
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index 1dc9264c..360e58e3 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef URIHANDLER_H
 #define URIHANDLER_H
@@ -35,7 +35,7 @@ class KDE_EXPORT UriHandler
     /**
       Process URI. Return true if handler handled the URI, otherwise false.
     */
-    static bool process( TQWidget *parent, const TQString &uri );
+    static bool process( TQWidget *tqparent, const TQString &uri );
 
     static TQString attachmentNameFromUri( const TQString &uri );
     static TQString uidFromUri( const TQString &uri );
diff --git a/korganizer/version.h b/korganizer/version.h
index a25f926f..2ab3ba54 100644
--- a/korganizer/version.h
+++ b/korganizer/version.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KORG_VERSION_H
 #define KORG_VERSION_H
diff --git a/korn/ChangeLog b/korn/ChangeLog
index d22d617a..d759fb3f 100644
--- a/korn/ChangeLog
+++ b/korn/ChangeLog
@@ -14,7 +14,7 @@
 	* Converted C-style casts to C++-style, and checked retvals
 	  of dynamic_casts. Currently only assert() used, but that's
 	  better than crashing.
-	* Fixed layout of polldlg.
+	* Fixed tqlayout of polldlg.
 	* Split 'General' cfg widget into two, 'View' and 'Commands'
 	* Added some keyboard accelerators.
 	* Still need to connect config stuff up properly...
@@ -27,8 +27,8 @@
 1999-06-23  Cristian Tibirna  <ctibirna@total.net>
 
 	* temporarily take care of korn (with Taj's blessing)
-	* fix most of the layouts (/me being too stupid to fix Taj's nice
-		custom layout classes, I switched completely to pure QLayouts)
+	* fix most of the tqlayouts (/me being too stupid to fix Taj's nice
+		custom tqlayout classes, I switched completely to pure QLayouts)
 	* fixed most of the i18n
 	* made FileDialogs start with the current path by default (instead no
 		path, used before)
diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index feafbe86..e10f6659 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -44,11 +44,11 @@ TQString AccountInput::configName() const
 	return *_configName;
 }
 
-TextInput::TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName )
+TextInput::TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName )
 	: AccountInput( configName )
 {
-	_left = new TQLabel( title, parent, "label" );
-	_right = new KLineEdit( "", parent, "edit" );
+	_left = new TQLabel( title, tqparent, "label" );
+	_right = new KLineEdit( "", tqparent, "edit" );
 	switch( type )
 	{
 	case text:
@@ -60,11 +60,11 @@ TextInput::TextInput( TQWidget *parent, const TQString& title, Type type, const
 	setValue( defaul );
 }
 
-TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName )
+TextInput::TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName )
 	: AccountInput( configName )
 {
-	_left = new TQLabel( title, parent, "label" );
-	_right = new KLineEdit( "", parent, "edit" );
+	_left = new TQLabel( title, tqparent, "label" );
+	_right = new KLineEdit( "", tqparent, "edit" );
 	_right->setValidator( new TQIntValidator( min, max, _right, "validator" ) );
 	setValue( defaul );
 }
@@ -85,11 +85,11 @@ void TextInput::setValue( const TQString& value )
 	return _right->setText( value );
 }
 
-URLInput::URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName )
+URLInput::URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName )
 	: AccountInput( configName )
 {
-	_left = new TQLabel( title, parent, "label" );
-	_right = new KURLRequester( "", parent, "kurledit" );
+	_left = new TQLabel( title, tqparent, "label" );
+	_right = new KURLRequester( "", tqparent, "kurledit" );
 	setValue( defaul );
 }
 
@@ -109,13 +109,13 @@ void URLInput::setValue( const TQString& value )
 	_right->setURL( value );
 }
 
-ComboInput::ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString, TQString>& list,
+ComboInput::ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString, TQString>& list,
                         const TQString& defaul, const TQString& configName )
 	: AccountInput( configName )
 	, _list( new TQMap< TQString, TQString >( list ) )
 {
-	_left = new TQLabel( title, parent, "label" );
-	_right = new TQComboBox( false, parent, "combo" );
+	_left = new TQLabel( title, tqparent, "label" );
+	_right = new TQComboBox( false, tqparent, "combo" );
 	_right->insertStringList( TQStringList( _list->values() ) );
 	setValue( defaul );
 }
@@ -142,10 +142,10 @@ void ComboInput::setValue( const TQString& value )
 		_right->setCurrentItem( -1 );
 }
 
-CheckboxInput::CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName )
+CheckboxInput::CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName )
 	: AccountInput( configName )
 {
-	_right = new TQCheckBox( title, parent, "checkbox" );
+	_right = new TQCheckBox( title, tqparent, "checkbox" );
 	setValue( defaul );
 }
 
diff --git a/korn/account_input.h b/korn/account_input.h
index 43e68047..8cff757c 100644
--- a/korn/account_input.h
+++ b/korn/account_input.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 #include <tqmap.h>
 
 /**
- * This classe tqcontains methods to use in the creation of the protocol configuration box.
+ * This classe contains methods to use in the creation of the protocol configuration box.
  * The subclasses of this classes define the methods.
  */
 class AccountInput
@@ -106,24 +106,24 @@ public:
 	/**
 	 * Constructor
 	 *
-	 * @param parent The parent widget
+	 * @param tqparent The tqparent widget
 	 * @param title The title that appears on the screen
 	 * @param type The type of TextEdit which is used
 	 * @param defaul The default value of this object
 	 * @param configName The name it has in the configuration box.
 	 */
-	TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName );
+	TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName );
 	/**
 	 * Constructor. Use this one if you want to ensure a number is inserted.
 	 *
-	 * @param parent The parent widget
+	 * @param tqparent The tqparent widget
 	 * @param title The title that appears on the screen
 	 * @param min The minimum value that can be inserted
 	 * @param max The maximum value that can be inserted
 	 * @param defaul The default value of this object
 	 * @param configName The name it has in the configuration box.
 	 */
-	TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName );
+	TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName );
 	/**
 	 * Destructor
 	 */
@@ -163,12 +163,12 @@ class URLInput : public AccountInput
 public:
 	/**
 	 * Constructor
-	 * @param parent The parent of this object
+	 * @param tqparent The tqparent of this object
 	 * @param title The title of the label next to the URL.
 	 * @param defaul The default value
 	 * @param configName The name of the configuration entry
 	 */
-	URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName );
+	URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName );
 	/**
 	 * Destructor
 	 */
@@ -210,14 +210,14 @@ public:
 	/** 
 	 * Constructor
 	 *
-	 * @param parent The parent of the widgets which are created
+	 * @param tqparent The tqparent of the widgets which are created
 	 * @param title The title next to the combo box
 	 * @param list A mapping which maps a value in the configuration to a (translated) entry in the
 	 *             combo box.
 	 * @param default The default value of the combo box.
 	 * @param configName The name in which the option is saved.
 	 */
-	ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString,TQString>& list,
+	ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString,TQString>& list,
 	            const TQString& defaul, const TQString& configName );
 	/**
 	 * Destructor
@@ -264,12 +264,12 @@ public:
 	/**
 	 * Constructor
 	 *
-	 * @param parent The parent for the objects which are created
+	 * @param tqparent The tqparent for the objects which are created
 	 * @param title The title of the checkbox
 	 * @param defaul The default value ("true" for checked, "false" otherwise")
 	 * @param configName The name of the configuration entry of this object
 	 */
-	CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName );
+	CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName );
 	/**
 	 * Destructor
 	 */
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index a791c53d..9c2d3fd4 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -34,8 +34,8 @@
 
 KornSubjectsDlg* AccountManager::_subjectsDlg = 0;
 
-AccountManager::AccountManager( TQObject * parent, const char * name )
-	: TQObject( parent, name ),
+AccountManager::AccountManager( TQObject * tqparent, const char * name )
+	: TQObject( tqparent, name ),
 	_kioList( new TQPtrList< KMailDrop > ),
 	_dcopList( new TQPtrList< DCOPDrop > ),
 	_dropInfo( new TQMap< KMailDrop*, Dropinfo* > )
@@ -241,7 +241,7 @@ void AccountManager::playSound( const TQString& file )
 
 void AccountManager::slotChanged( int count, KMailDrop* mailDrop )
 {
-	Dropinfo *info = _dropInfo->find( mailDrop ).data();
+	Dropinfo *info = _dropInfo->tqfind( mailDrop ).data();
 	info->newMessages = count > info->msgnr || ( count == info->msgnr && info->newMessages );
 	
 	if( count > info->msgnr )
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index 5d0f3293..27c4cd07 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -38,13 +38,14 @@ template< class T, class W > class TQMap;
  * This class reads the config and makes the accounts,
  * and it communicate with the boxes.
  */
-class AccountManager : public QObject
+class AccountManager : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor, parameters are directed to TQObject.
 	 */
-	AccountManager( TQObject * parent = 0, const char * name = 0 );
+	AccountManager( TQObject * tqparent = 0, const char * name = 0 );
 
 	/**
 	 * Destructor
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 934a47c5..e8649d13 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -24,8 +24,8 @@
 
 #include <tqptrlist.h>
 
-BoxContainer::BoxContainer( TQObject * parent, const char * name )
-	: TQObject( parent, name ),
+BoxContainer::BoxContainer( TQObject * tqparent, const char * name )
+	: TQObject( tqparent, name ),
 	_items( new TQPtrList< BoxContainerItem > )
 {
 	_items->setAutoDelete( true );
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index ec054318..33e1c63d 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -31,16 +31,17 @@ class KConfig;
  * This class is the base for all BoxContainers. A BoxContainer is a place
  * where BoxContainerItems can be placed. BoxContainerItems are the boxes you see.
  */
-class BoxContainer : public QObject
+class BoxContainer : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor: everything is passed to TQObject.
 	 *
-	 * @param parent The parent of this object
+	 * @param tqparent The tqparent of this object
 	 * @param name The name of this object
 	 */
-	BoxContainer( TQObject *parent = 0, const char * name = 0 );
+	BoxContainer( TQObject *tqparent = 0, const char * name = 0 );
 	/**
 	 * Destructor
 	 */
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index c4976f23..c357fd4f 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -47,8 +47,8 @@
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-BoxContainerItem::BoxContainerItem( TQObject * parent, const char * name )
-	: AccountManager( parent, name ),
+BoxContainerItem::BoxContainerItem( TQObject * tqparent, const char * name )
+	: AccountManager( tqparent, name ),
 	DCOPObject(),
 	_command( new TQString )
 {
@@ -168,14 +168,14 @@ void BoxContainerItem::runCommand( const TQString& cmd )
 	process->start();
 }
 
-void BoxContainerItem::mouseButtonPressed( Qt::ButtonState state )
+void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state )
 {
 	int button;
-	if( state & Qt::LeftButton )
+	if( state & TQt::LeftButton )
 		button = 0;
-	else if( state & Qt::RightButton )
+	else if( state & TQt::RightButton )
 		button = 2;
-	else if( state & Qt::MidButton )
+	else if( state & TQt::MidButton )
 		button = 1;
 	else
 		return; //Invalid mouse button
@@ -211,10 +211,10 @@ void BoxContainerItem::fillKPopupMenu( KPopupMenu* popupMenu, KActionCollection*
 	KStdAction::aboutApp(  this, TQT_SLOT( about()     ), actions )->plug( popupMenu );
 }
 
-void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total,
+void BoxContainerItem::showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total,
 					 const TQString &accountName, bool date )
 {
-	KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
+	KPassivePopup *popup = new KPassivePopup( tqparent, "Passive popup" );
 		
 	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
 			.arg( total ), "", TQPixmap(), 0 );
@@ -288,7 +288,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 		if( hasBg )
 		{
 			label->setPixmap( calcComplexPixmap( pixmap, *_fgColour[ index ], _fonts[ index ], count ) );
-			label->setBackgroundMode( Qt::FixedColor );
+			label->setBackgroundMode( TQt::FixedColor );
 			label->setPaletteBackgroundColor( *_bgColour[ index ] );
 		} else
 		{
@@ -299,11 +299,11 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 	
 	if( hasBg )
 	{
-		label->setBackgroundMode( Qt::FixedColor );
+		label->setBackgroundMode( TQt::FixedColor );
 		label->setPaletteBackgroundColor( *_bgColour[ index ] );
 	} else
 	{
-		label->setBackgroundMode( Qt::X11ParentRelative );
+		label->setBackgroundMode( TQt::X11ParentRelative );
 	}
 	
 	if( hasIcon )
@@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 		if( _fonts[ index ] )
 			label->setFont( *_fonts[ index ] );
 		label->setPaletteForegroundColor( *_fgColour[ index ] );
-		label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+		label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 		label->setText( TQString::number( count ) );
 	}
 	
@@ -333,17 +333,17 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 	TQPixmap numberPixmap( icon.size() );
 	TQImage iconImage( icon.convertToImage() );
 	TQImage numberImage;
-	QRgb *rgbline;
+	TQRgb *rgbline;
 	TQPainter p;
 	
 	//Make a transparent number; first make a white number on a black background.
 	//This pixmap also is the base alpha-channel, the foreground colour is added later.
-	numberPixmap.fill( Qt::black );
+	numberPixmap.fill( TQt::black );
 	p.begin( &numberPixmap, false );
-	p.setPen( Qt::white );
+	p.setPen( TQt::white );
 	if( font )
 		p.setFont( *font );
-	p.drawText( icon.rect(), Qt::AlignCenter, TQString::number( count ) );
+	p.drawText( icon.rect(), TQt::AlignCenter, TQString::number( count ) );
 	p.end();
 
 	//Convert to image and add the alpha channel.
@@ -353,7 +353,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 	numberImage.setAlphaBuffer( true ); //Enable alpha channel
 	for( int xx = 0; xx < numberImage.height(); ++xx )
 	{
-		rgbline = (QRgb*)numberImage.scanLine( xx );
+		rgbline = (TQRgb*)numberImage.scanLine( xx );
 
 		for( int yy = 0; yy < numberImage.width(); ++yy )
 		{
@@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 
 void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim )
 {
-	label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+	label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 	label->setMovie( TQMovie( anim ) );
 	label->show();
 }
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index 06c02993..5393852a 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -41,19 +41,21 @@ class TQString;
  * @author Mart Kelder <mart.kde@hccnet.nl>
  */
 class BoxContainerItem : public AccountManager, public DCOPObject
-{ Q_OBJECT
+{
+  Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 public:
 	/**
-	 * Standaard QObject-constuctor
+	 * Standaard TQObject-constuctor
 	 * This constructor implements the default arguments for any TQObject.
 	 * Note that is does not give a name to DCOPObject; that name
 	 * is set in the readConfig-function.
-	 * @param parent The parent of this object, See Object::QObject
-	 * @param name The name of this object, See TQObject::QObject
+	 * @param tqparent The tqparent of this object, See Object::TQObject
+	 * @param name The name of this object, See TQObject::TQObject
 	 * @see BoxContainerItem::readConfig
 	 */
-	BoxContainerItem( TQObject * parent = 0, const char * name = 0 );
+	BoxContainerItem( TQObject * tqparent = 0, const char * name = 0 );
 	
 	/**
 	 * The default destructor. This only removes _command-pointer.
@@ -68,7 +70,7 @@ public:
 	/**
 	 * This function reads the config. It stores the readed values in the class.
 	 * It also sets the DCOPObject-name.
-	 * @param config The KConfigGroup-object which tqcontains the configuration of this box.
+	 * @param config The KConfigGroup-object which contains the configuration of this box.
 	 * @param index The index of the box used in the config-file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
@@ -105,14 +107,14 @@ public slots:
 	 * This functions should be called if a mouse-button has been pressed.
 	 * This handles the connected events of it.
 	 * 
-	 * @param button The button that was pressed, See Qt::ButtonState
+	 * @param button The button that was pressed, See TQt::ButtonState
 	 */
-	void mouseButtonPressed( Qt::ButtonState button );
+	void mouseButtonPressed( TQt::ButtonState button );
 protected:
 	/**
 	 * This function filles a KPopupMenu-reference. The target is
 	 * to set in all implementations the same KPopupMenu-content.
-	 * Because some implementations (DockedItem) got a KPopupMenu
+	 * Because some implementations (TQt::DockedItem) got a KPopupMenu
 	 * by itself, this only changes a KPopupMenu instance.
 	 * @param menu The menu to be changed.
 	 * @param actions The actions to which the items should be added.
@@ -122,13 +124,13 @@ protected:
 	/**
 	 * This displays the passive popup.
 	 *
-	 * @param parent The Winget of the visual widget
+	 * @param tqparent The Winget of the visual widget
 	 * @param list List with the first (five) subjects
 	 * @param total The total numbers of unread mail
 	 * @param accountName The name of the account it belongs to
 	 * @param date Should the date be displayed?
 	 */
-	void showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date );
+	void showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date );
 		
 	//this functions should be reimplemented
 	/**
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 7eb8d2a0..03c0db43 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -78,7 +78,7 @@ bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 		//The mapping MUST contain dcopname.
 		kdDebug() << "mapping is niet compleet" << endl;
 
-	this->setDCOPName( *map.find( "dcopname" ) );
+	this->setDCOPName( *map.tqfind( "dcopname" ) );
 	
 	return true;
 }
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index c14953f0..c6558d98 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -39,6 +39,7 @@ class TQString;
  */
 class DCOPDrop : public KMailDrop
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor: no parameters
@@ -93,7 +94,7 @@ public:
 	/**
 	 * This function reeds the config which are shipped which the group.
 	 *
-	 * @param config The configuration group which tqcontains the info for this account.
+	 * @param config The configuration group which contains the info for this account.
 	 * @return The same value as KMailDrop::readConfigGroup( config ) returns.
 	 */
 	virtual bool readConfigGroup( const KConfigGroup& config );
diff --git a/korn/dcopdropif.h b/korn/dcopdropif.h
index 9e755ac6..48514164 100644
--- a/korn/dcopdropif.h
+++ b/korn/dcopdropif.h
@@ -32,7 +32,7 @@ K_DCOP
 public:
 	/**
 	 * Constructor
-	 * @param drop The parent DCOPDrop
+	 * @param drop The tqparent DCOPDrop
 	 * @param name The name of the dcop-object
 	 */
 	DCOPDropInterface( DCOPDrop* drop, const char* name );
diff --git a/korn/dockedcontainer.cpp b/korn/dockedcontainer.cpp
index 5e246388..989e19f0 100644
--- a/korn/dockedcontainer.cpp
+++ b/korn/dockedcontainer.cpp
@@ -20,8 +20,8 @@
 
 #include "dockeditem.h"
 
-DockedContainer::DockedContainer( TQObject * parent, const char * name )
-	: BoxContainer( parent, name )
+DockedContainer::DockedContainer( TQObject * tqparent, const char * name )
+	: BoxContainer( tqparent, name )
 {
 }	
 
diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h
index 278de044..d40623b6 100644
--- a/korn/dockedcontainer.h
+++ b/korn/dockedcontainer.h
@@ -25,19 +25,20 @@ class BoxContainerItem;
 
 /**
  * This class is a implementation of a BoxContainer and does almost nothing.
- * The only thing it does is creating DocketItems.
+ * The only thing it does is creating TQt::DocketItems.
  */
 class DockedContainer : public BoxContainer
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	DockedContainer( TQObject * parent = 0, const char * name = 0 );
+	DockedContainer( TQObject * tqparent = 0, const char * name = 0 );
 	~DockedContainer();
 	
 protected:
 	//virtual void addItem( BoxContainerItem* ); //Overiding not neccesairy
 
 	/**
-	 * @return A new instance to a DocketItem.
+	 * @return A new instance to a TQt::DocketItem.
 	 */
 	virtual BoxContainerItem* newBoxInstance() const;
 };
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 4423e766..9849155f 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -36,15 +36,15 @@
 #include <tqpixmap.h>
 #include <tqmovie.h>
 
-DockedItem::DockedItem( TQWidget * parent, const char * name )
-	: BoxContainerItem( parent, name ),
-	_systemtray( new SystemTray( parent, "System tray" ) )	
+DockedItem::DockedItem( TQWidget * tqparent, const char * name )
+	: BoxContainerItem( tqparent, name ),
+	_systemtray( new SystemTray( tqparent, "System tray" ) )	
 {
 	this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );
 	
 	connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) );
-	connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( Qt::ButtonState ) ),
-		 this, TQT_SLOT( mouseButtonPressed( Qt::ButtonState ) ) );
+	connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
+		 this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
 
 DockedItem::~DockedItem()
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index 13cce3af..a80c1787 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -36,13 +36,14 @@ class TQPixmap;
  */
 class DockedItem : public BoxContainerItem
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
-	 * This contructor gives all it parameters to its parents.
-	 * @param parant The parent window
-	 * @param name The name of the QObject's parents.
+	 * This contructor gives all it parameters to its tqparents.
+	 * @param parant The tqparent window
+	 * @param name The name of the TQObject's tqparents.
 	 */
-	DockedItem( TQWidget * parent = 0, const char * name = 0 );
+	DockedItem( TQWidget * tqparent = 0, const char * name = 0 );
 	/**
 	 * Empty destructor; does nothing at the moment
 	 */
@@ -54,10 +55,10 @@ public:
 	virtual void showBox();
 	
 	/**
-	 * This functions reads the config. It used the parent
+	 * This functions reads the config. It used the tqparent
 	 * version for the main things, but it is possible to
 	 * add some configurations over here.
-	 * @param config The KConfig-instance which tqcontains the settings of this tray-item.
+	 * @param config The KConfig-instance which contains the settings of this tray-item.
 	 * @param index The index of the box in the configuration file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp
index fa815179..991f66eb 100644
--- a/korn/hvcontainer.cpp
+++ b/korn/hvcontainer.cpp
@@ -24,11 +24,11 @@
 
 #include <tqvbox.h>
 
-HVContainer::HVContainer( Qt::Orientation orientation, TQObject * parent, const char * name )
-	: BoxContainer( parent, name ),
+HVContainer::HVContainer( Qt::Orientation orientation, TQObject * tqparent, const char * name )
+	: BoxContainer( tqparent, name ),
 	box( 0 )	
 {
-	if( orientation == Qt::Horizontal )
+	if( orientation == TQt::Horizontal )
 		box = new TQHBox( 0, "hbox" );
 	else
 		box = new TQVBox( 0, "vbox" );
diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h
index d00551d5..b590aa55 100644
--- a/korn/hvcontainer.h
+++ b/korn/hvcontainer.h
@@ -31,13 +31,14 @@ class TQHBox;
 
 class HVContainer : public BoxContainer
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor: all elements are passed to BoxContainer, except orientation.
 	 *
 	 * @param orientation The orientation of the box: it is a vertical or horizontal box?
 	 */
-	HVContainer( Qt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 );
+	HVContainer( Qt::Orientation orientation, TQObject * tqparent = 0 , const char * name = 0 );
 	~HVContainer();
 	
 	/**
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index 7d836da3..36551ae1 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -30,9 +30,9 @@
 #include <tqcursor.h>
 #include <tqtooltip.h>
 
-HVItem::HVItem( TQWidget *parent, const char *name )
+HVItem::HVItem( TQWidget *tqparent, const char *name )
 	: BoxContainerItem( 0, name ),
-	_label( new Label( parent, "label" ) ),
+	_label( new Label( tqparent, "label" ) ),
 	_popup( new KPopupMenu( _label, "popupmenu" ) ),
 	_actions( new KActionCollection( _popup, "actions" ) )
 {
@@ -41,12 +41,12 @@ HVItem::HVItem( TQWidget *parent, const char *name )
 	_popup->insertSeparator();
 	KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup );
 	
-	connect( _label, TQT_SIGNAL( mouseButtonPressed( Qt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( Qt::ButtonState ) ) );
+	connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
 
 HVItem::~HVItem()
 {
-	//Let everything be deleted by his parents.
+	//Let everything be deleted by his tqparents.
 }
 	
 void HVItem::showBox()
diff --git a/korn/hvitem.h b/korn/hvitem.h
index e728846a..8cb62eaa 100644
--- a/korn/hvitem.h
+++ b/korn/hvitem.h
@@ -31,8 +31,9 @@ class Label;
  */
 class HVItem : public BoxContainerItem
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	HVItem( TQWidget *parent = 0, const char *name = 0 );
+	HVItem( TQWidget *tqparent = 0, const char *name = 0 );
 	~HVItem();
 	
 	/**
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index 735f5de6..78a42b68 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -65,12 +65,12 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
 	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) );
 	if( metadata->tqcontains( "auth" ) )
-		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) );
+		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->tqfind( "auth" ) ) );
 }
 
 void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
@@ -78,12 +78,12 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 	TQString metadata;
 	if( map->tqcontains( "encryption" ) )
 	{
-		if( *map->find( "encryption" ) == "ssl" )
+		if( *map->tqfind( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
 		else
 		{
 			map->insert( "ssl", "false" );
-			metadata += *map->find( "encryption" );
+			metadata += *map->tqfind( "encryption" );
 		}
 		map->erase( "encryption" );
 	}
@@ -92,7 +92,7 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 	{
 		if( !metadata.isEmpty() )
 			metadata += ",";
-		metadata += *map->find( "auth" );
+		metadata += *map->tqfind( "auth" );
 		map->erase( "auth" );
 	}
 
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 451742eb..97fb209a 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -134,7 +134,7 @@ public:
 	 * This function edits writeEntry. It merge things back to a metadata-key and adds this
 	 * key to the configuration.
 	 *
-	 * @param map The mapping which tqcontains the information to be written to a configuarion file.
+	 * @param map The mapping which contains the information to be written to a configuarion file.
 	 *	the contents of this mapping can change in this function.
 	 */
         virtual void writeEntries( TQMap< TQString, TQString >* map ) const;
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp
index 9f275181..0cea4577 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -104,11 +104,11 @@ void printToprint( TQTextStream &out, TQMap<TQString,TQString> &to_printed, cons
 
 int main( int, char**  )
 {
-	TQString line = TQString::null;
-	TQString currentGroup1 = TQString::null;
-	TQString currentGroup2 = TQString::null;
-	TQString type = TQString::null;
-	TQString password = TQString::null;
+	TQString line = TQString();
+	TQString currentGroup1 = TQString();
+	TQString currentGroup2 = TQString();
+	TQString type = TQString();
+	TQString password = TQString();
 	TQRegExp interesting_group( "^\\[box-(\\d+)\\]" );
 	TQRegExp key_value( "^(\\w*)=(.*)$" );
 	TQValueList<TQString> tobe_deleted;
@@ -168,7 +168,7 @@ int main( int, char**  )
 				printToprint( out, to_printed, type );
 			}
 			
-			currentGroup1 = TQString::null;
+			currentGroup1 = TQString();
 		}
 		
 		if( interesting_group.search( line ) >= 0 )
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index cab1d777..cb306672 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -24,9 +24,9 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-KEditListBoxManager::KEditListBoxManager(	TQWidget *parent, const char *name,
+KEditListBoxManager::KEditListBoxManager(	TQWidget *tqparent, const char *name,
 						bool checkAtEntering, int buttons )
-	: KEditListBox( parent, name, checkAtEntering, buttons ),
+	: KEditListBox( tqparent, name, checkAtEntering, buttons ),
 	_config( 0 ),
 	_groupName( 0 ),
 	_subGroupName( 0 ),
@@ -35,10 +35,10 @@ KEditListBoxManager::KEditListBoxManager(	TQWidget *parent, const char *name,
 	init();
 }
 
-KEditListBoxManager::KEditListBoxManager(	const TQString& title, TQWidget *parent,
+KEditListBoxManager::KEditListBoxManager(	const TQString& title, TQWidget *tqparent,
 						const char *name, bool checkAtEntering,
 						int buttons)
-	: KEditListBox( title, parent, name, checkAtEntering, buttons ),
+	: KEditListBox( title, tqparent, name, checkAtEntering, buttons ),
 	_config( 0 ),
 	_groupName( 0 ),
 	_subGroupName( 0 ),
@@ -49,9 +49,9 @@ KEditListBoxManager::KEditListBoxManager(	const TQString& title, TQWidget *paren
 
 KEditListBoxManager::KEditListBoxManager(	const TQString& title,
 						const KEditListBox::CustomEditor &customEditor,
-						TQWidget *parent, const char *name,
+						TQWidget *tqparent, const char *name,
 						bool checkAtEntering, int buttons )
-	: KEditListBox( title, customEditor, parent, name, checkAtEntering, buttons ),
+	: KEditListBox( title, customEditor, tqparent, name, checkAtEntering, buttons ),
 	_config( 0 ),
 	_groupName( 0 ),
 	_subGroupName( 0 ),
@@ -112,7 +112,7 @@ void KEditListBoxManager::readNames()
 	while( _config->hasGroup( _groupName->arg( number ) ) )
 	{
 		_config->setGroup( _groupName->arg( number ) );
-		this->insertItem( _config->readEntry( "name", TQString::null ) );
+		this->insertItem( _config->readEntry( "name", TQString() ) );
 		++number;
 	}
 
@@ -140,12 +140,12 @@ void KEditListBoxManager::slotChanged()
 	
 	_config->setGroup( _groupName->arg( this->currentItem() ) );
 	
-	if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString::null ) )
+	if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString() ) )
 		changeItem( this->currentItem() - 1, this->currentItem() ); //moved down
 	else if( this->currentItem() < this->count() - 1 &&
-		 this->text( this->currentItem() + 1 ) == _config->readEntry( "name", TQString::null ) )
+		 this->text( this->currentItem() + 1 ) == _config->readEntry( "name", TQString() ) )
 		changeItem( this->currentItem(), this->currentItem() + 1 );  //moved up
-	else if( this->currentText() != _config->readEntry( "name", TQString::null ) )
+	else if( this->currentText() != _config->readEntry( "name", TQString() ) )
 		changedText(); //changed
 }
 
@@ -186,7 +186,7 @@ void KEditListBoxManager::slotRemoved( const TQString& name )
 			break;
 		}
 		_config->setGroup( _groupName->arg( number ) );
-		if( name == _config->readEntry( "name", TQString::null ) )
+		if( name == _config->readEntry( "name", TQString() ) )
 			break; //found
 		
 		++number; //Try next group
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index b683a364..45fb9d69 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -33,17 +33,18 @@ class TQWidget;
  */
 class KEditListBoxManager : public KEditListBox
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor: @see KEditListBoxManager::KEditListBoxManager( const TQString&, TQWidget, const char * name, bool, int )
 	 */
-	KEditListBoxManager(	TQWidget *parent = 0, const char *name = 0,
+	KEditListBoxManager(	TQWidget *tqparent = 0, const char *name = 0,
 			bool checkAtEntering=true, int buttons = All );
 			
 	/**
 	 * The save as above, but with other options for KEditListBox.
 	 */
-	KEditListBoxManager(	const TQString& title, TQWidget *parent = 0,
+	KEditListBoxManager(	const TQString& title, TQWidget *tqparent = 0,
 			const char *name = 0, bool checkAtEntering=true,
 			int buttons = All );
 		
@@ -52,7 +53,7 @@ public:
 	 */
 	KEditListBoxManager(	const TQString& title,
 			const KEditListBox::CustomEditor &customEditor,
-			TQWidget *parent = 0, const char *name = 0,
+			TQWidget *tqparent = 0, const char *name = 0,
 			bool checkAtEntering = true, int buttons = All );
 	
 	/**
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 6fdacdcd..54d0e773 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -96,7 +96,7 @@ KKioDrop::KKioDrop()
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
 	_kurl->setPort( _protocol->defaultPort( _ssl ) );
 
-	//Creating children and connect them to the outside world; this class passes the messages for them...
+	//Creating tqchildren and connect them to the outside world; this class passes the messages for them...
 	//This class handles all the counting.
 	_count = new KIO_Count( this, "kio_count" );
 		
@@ -134,7 +134,7 @@ KKioDrop::KKioDrop( KConfigGroup* )
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
 	_kurl->setPort( _protocol->defaultPort( _ssl ) );
 		
-	//Creating children and connect them to the outside world; this class passes the messages for them...
+	//Creating tqchildren and connect them to the outside world; this class passes the messages for them...
 	//This class handles all the counting.
 	_count = new KIO_Count( this, "kio_count" );
 	
@@ -344,25 +344,25 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 		return false;
 	}
 
-	this->setName( (*map.find( "name" )).utf8() );
+	this->setName( (*map.tqfind( "name" )).utf8() );
 	
 	_protocol = protocol->getKIOProtocol();
 	if( !_protocol )
 		_protocol = Protocols::firstProtocol()->getKIOProtocol();
 			
-	val = *map.find( "server" );
-	setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false );
+	val = *map.tqfind( "server" );
+	setKioServer( val2, val, (*map.tqfind( "port" )).toInt(), KIO::MetaData(), *map.tqfind( "ssl" ) == "true", false );
 
-	_kurl->setUser( *map.find( "username" ) );
-	_kurl->setPath( *map.find( "mailbox" ) );
+	_kurl->setUser( *map.tqfind( "username" ) );
+	_kurl->setPath( *map.tqfind( "mailbox" ) );
 
-	_kurl->setPass( *map.find( "password" ) );
+	_kurl->setPass( *map.tqfind( "password" ) );
 	
-	TQStringList list = TQStringList::split( ',', *map.find( "metadata" ) );
+	TQStringList list = TQStringList::split( ',', *map.tqfind( "metadata" ) );
 	TQStringList::Iterator it;
 	for( it = list.begin(); it != list.end(); ++it )
 	{
-		int split = (*it).find( "=" );
+		int split = (*it).tqfind( "=" );
 		if( split > 0 )
 			_metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) );
 	}
diff --git a/korn/kio.h b/korn/kio.h
index d54846c8..eceb8653 100644
--- a/korn/kio.h
+++ b/korn/kio.h
@@ -50,6 +50,7 @@ namespace KIO { class Job; class MetaData; class Slave; class TransferJob; }
 class KKioDrop : public KPollableDrop
 {
  Q_OBJECT
+  TQ_OBJECT
 private:
 	KURL *_kurl;
 	KIO::MetaData *_metadata;
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index 71da3080..683f8829 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -34,8 +34,8 @@
 
 #include <tqstring.h>
 
-KIO_Count::KIO_Count( TQObject * parent, const char * name )
-	: TQObject ( parent, name ),
+KIO_Count::KIO_Count( TQObject * tqparent, const char * name )
+	: TQObject ( tqparent, name ),
 	_kurl( 0 ),
 	_metadata( 0 ),
 	_protocol( 0 ),
@@ -259,12 +259,12 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 	for ( it1 = list.begin() ; it1 != list.end() ; it1++ )
 	{
 		/*
-		 * The list tqcontains multiple objects. Each object could be a file.
+		 * The list contains multiple objects. Each object could be a file.
 		 * Settings about it are saved in this scope until it is added to the list.
 		 */
 		isFile=false;
 		KKioDrop::FileInfo fileinfo;
-		fileinfo.name = TQString::null;
+		fileinfo.name = TQString();
 		fileinfo.size = 0;
 
 		for ( it2 = (*it1).begin() ; it2 != (*it1).end() ; it2++ )
diff --git a/korn/kio_count.h b/korn/kio_count.h
index a881d410..c97ce2f6 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -41,10 +41,11 @@ class KURL;
 
 class TQString;
 
-class KIO_Count : public QObject
+class KIO_Count : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KIO_Count( TQObject * parent = 0, const char * name = 0 );
+	KIO_Count( TQObject * tqparent = 0, const char * name = 0 );
 	~KIO_Count();
 	
 	//This function starts counting
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index db27e28d..fa31ad75 100644
--- a/korn/kio_delete.cpp
+++ b/korn/kio_delete.cpp
@@ -32,7 +32,7 @@
 
 #include <tqptrlist.h>
 
-KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ),
+KIO_Delete::KIO_Delete( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ),
 	_kio( 0 ),
 	_total( 0 ),
 	_jobs( 0 ),
diff --git a/korn/kio_delete.h b/korn/kio_delete.h
index 24a1eef7..30c95554 100644
--- a/korn/kio_delete.h
+++ b/korn/kio_delete.h
@@ -34,11 +34,12 @@ namespace KIO { class MetaData; class Job; class Slave; }
 
 template<class T> class TQPtrList;
 
-class KIO_Delete : public QObject
+class KIO_Delete : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	//constructors
-	KIO_Delete( TQObject * parent = 0, const char * name = 0 );
+	KIO_Delete( TQObject * tqparent = 0, const char * name = 0 );
 	~KIO_Delete( );
 	
 	//This function should be called if there are messages to be deleted.
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index 5177a2f3..fc0a45ac 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -65,11 +65,11 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const
 
 	if( map->tqcontains( "metadata" ) )
 	{
-		TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) );
+		TQStringList list = TQStringList::split( ",", *map->tqfind( "metadata" ) );
 		TQStringList::Iterator it;
 		for( it = list.begin(); it != list.end(); ++it )
 		{
-			int split = (*it).find( '=' );
+			int split = (*it).tqfind( '=' );
 
 			metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) );
 		}
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index b92da304..e87fa822 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -33,8 +33,8 @@
 #include <tqcstring.h>
 #include <tqstring.h>
 
-KIO_Read::KIO_Read( TQObject * parent, const char * name )
-	: TQObject( parent, name ),
+KIO_Read::KIO_Read( TQObject * tqparent, const char * name )
+	: TQObject( tqparent, name ),
 	_job( 0 ),
 	_message( 0 )
 {
diff --git a/korn/kio_read.h b/korn/kio_read.h
index a3e30c88..234cd36a 100644
--- a/korn/kio_read.h
+++ b/korn/kio_read.h
@@ -32,10 +32,11 @@ class KIO_Protocol;
 
 class TQString;
 
-class KIO_Read : public QObject
+class KIO_Read : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KIO_Read( TQObject * parent = 0, const char * name = 0 );
+	KIO_Read( TQObject * tqparent = 0, const char * name = 0 );
 	~KIO_Read();
 
 public slots:
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 02a6a103..782b1bde 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -35,10 +35,10 @@
 #include <tqcstring.h>
 #include <tqstring.h>
 
-KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
+KIO_Single_Subject::KIO_Single_Subject( TQObject * tqparent, const char * name,
 		    KURL &kurl, KIO::MetaData &metadata, const KIO_Protocol * protocol, KIO::Slave *& slave,
 		    const TQString &url, const long size ) 
-		: TQObject( parent, name )
+		: TQObject( tqparent, name )
 {
 	_kurl = new KURL( kurl );
 	_metadata = new KIO::MetaData( metadata );
diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h
index ee021a33..9057a09e 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -33,10 +33,11 @@ class TQString;
 template<class T> class TQMemArray;
 typedef TQMemArray<char> TQByteArray;
 
-class KIO_Single_Subject : public QObject
+class KIO_Single_Subject : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *,
+	KIO_Single_Subject( TQObject * tqparent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *,
 	                    KIO::Slave *&, const TQString &, const long );
 	~KIO_Single_Subject( );
 	
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index 2de6ac59..ae0ab8fd 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/kio_subjects.cpp
@@ -31,8 +31,8 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 
-KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name )
-	: TQObject( parent, name ),
+KIO_Subjects::KIO_Subjects( TQObject * tqparent, const char * name )
+	: TQObject( tqparent, name ),
 	_protocol( 0 ),
 	_slave( 0 ),
 	_valid( true )
diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h
index 6ed1798a..3e16d326 100644
--- a/korn/kio_subjects.h
+++ b/korn/kio_subjects.h
@@ -34,10 +34,11 @@ template<class T> class TQPtrList;
 class TQString;
 template<class T> class TQValueList;
 
-class KIO_Subjects : public QObject
+class KIO_Subjects : public TQObject
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KIO_Subjects( TQObject * parent, const char * name );
+	KIO_Subjects( TQObject * tqparent, const char * name );
 	~KIO_Subjects( );
 	
 	//This function let it start fetching headers.
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index b0b65233..fb6166c3 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -38,7 +38,7 @@ const char* KMail_Protocol::kmailKeyType = "Type";
 const char* KMail_Protocol::kmailKeyName = "Name";
 const char* KMail_Protocol::kmailKeyId = "Id";
 const char* KMail_Protocol::kmailKeyMBox = "Location";
-const char* KMail_Protocol::kmailKeyQMail = "Location";
+const char* KMail_Protocol::kmailKeyTQMail = "Location";
 const int KMail_Protocol::kmailFirstGroup = 1;
 
 class KMailDrop;
@@ -164,7 +164,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config
 		result->insert( "ssl", "false" );
 		result->insert( "metadata", "" );
 		result->insert( "username", "" );
-		result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyQMail, "" ) );
+		result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyTQMail, "" ) );
 		result->insert( "password", "" );
 		result->insert( "savepassword", "false" );
 	}
@@ -188,8 +188,8 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje
 	while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
 	{
 		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
-		type = kmailconfig.readEntry( kmailKeyType, TQString::null );
-		name = kmailconfig.readEntry( kmailKeyName, TQString::null );
+		type = kmailconfig.readEntry( kmailKeyType, TQString() );
+		name = kmailconfig.readEntry( kmailKeyName, TQString() );
 		if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" )
 		{
 			accountList.insert( name, name );
@@ -227,7 +227,7 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k
 	while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
 	{
 		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
-		if( kmailconfig.readEntry( kmailKeyName, TQString::null ) == kmailname )
+		if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname )
 		{
 			id = kmailconfig.readNumEntry( kmailKeyId, 0 );	
 			found = true;
@@ -237,10 +237,10 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k
 	if( !found )
 	{
 		nummer = -1;
-		return TQString::null;
+		return TQString();
 	}
 
 	//The correct group is found, and kmailconfig.setGroup() is already called for the right group.
-	return kmailconfig.readEntry( kmailKeyType, TQString::null );
+	return kmailconfig.readEntry( kmailKeyType, TQString() );
 }
 
diff --git a/korn/kmail_proto.h b/korn/kmail_proto.h
index 9a255ad0..72e846d2 100644
--- a/korn/kmail_proto.h
+++ b/korn/kmail_proto.h
@@ -115,7 +115,7 @@ private:
 	static const char* kmailKeyType;
 	static const char* kmailKeyId;
 	static const char* kmailKeyMBox;
-	static const char* kmailKeyQMail;
+	static const char* kmailKeyTQMail;
 	static const int kmailFirstGroup;
 };
 
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index 15afffef..318ad944 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KornAccountCfg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KornAccountCfg</cstring>
     </property>
@@ -16,18 +16,18 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tab</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>server_tab</cstring>
                 </property>
                 <attribute name="title">
                     <string>&amp;Server</string>
                 </attribute>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lbProtocol</cstring>
                     </property>
@@ -46,7 +46,7 @@
                         <cstring>cbProtocol</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>cbProtocol</cstring>
                     </property>
@@ -60,7 +60,7 @@
                     </property>
                 </widget>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>tqlayout35</cstring>
                         </property>
@@ -79,7 +79,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>lbInterval</cstring>
                                 </property>
@@ -90,7 +90,7 @@
                                     <cstring>edInterval</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>edInterval</cstring>
                                 </property>
@@ -99,7 +99,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -110,7 +110,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>chUseBox</cstring>
                         </property>
@@ -121,7 +121,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>gbNewMail</cstring>
                         </property>
@@ -135,7 +135,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>tqlayout33</cstring>
                                 </property>
@@ -148,7 +148,7 @@
                                             <cstring>edRunCommand</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>lbRunCommand</cstring>
                                         </property>
@@ -164,7 +164,7 @@
                                             <cstring>edPlaySound</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>lbPlaySound</cstring>
                                         </property>
@@ -177,7 +177,7 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chPassivePopup</cstring>
                                 </property>
@@ -185,7 +185,7 @@
                                     <string>Show &amp;passive popup</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chPassiveDate</cstring>
                                 </property>
@@ -234,9 +234,9 @@
     <tabstop>chPassivePopup</tabstop>
     <tabstop>chPassiveDate</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotProtocolChanged( const QString&amp; )</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 5b7706e1..0346f3e8 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -37,8 +37,8 @@
 #include <tqlabel.h>
 #include <tqwidget.h>
 
-KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
-	: KornAccountCfg( parent, name ),
+KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * tqparent, const char * name )
+	: KornAccountCfg( tqparent, name ),
 	_config( 0 ),
 	_fields( 0 ),
 	_urlfields( 0 ),
@@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
 {
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+	connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
+	connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
 	
 	this->cbProtocol->insertStringList( Protocols::getProtocols() );
 
@@ -81,7 +81,7 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt
 	
 	for( input = _accountinput->first(); input; input = _accountinput->next() )
 		if( entries->tqcontains( input->configName() ) )
-			input->setValue( *(entries->find( input->configName() ) ) );
+			input->setValue( *(entries->tqfind( input->configName() ) ) );
 	
 	this->edInterval->setText( _config->readEntry( "interval", "300" ) );
 	
@@ -117,7 +117,7 @@ void KornAccountCfgImpl::writeConfig()
 
 	if( map->tqcontains( "password" ) )
 	{
-		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) );
+		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->tqfind( "password" ) );
 		map->erase( "password" );
 	}
 
@@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 		grid->setMargin( 15 );
 		for( input = _accountinput->first(); input; input = _accountinput->next() )
 		{
-			if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->parent() )
+			if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->tqparent() )
 			{
 				grid->addWidget( input->leftWidget(), counter, 0 );
-				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() )
+				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() )
 					grid->addWidget( input->rightWidget(), counter, 1 );
 				++counter;
 			} else {
-				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() )
+				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() )
 				{
 					grid->addWidget( input->rightWidget(), counter, 1 );
 					++counter;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 9be27bc6..d00da509 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -37,8 +37,9 @@ template< class T > class TQPtrVector;
 
 class KornAccountCfgImpl : public KornAccountCfg
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 );
+	KornAccountCfgImpl( TQWidget * tqparent = 0, const char * name = 0 );
 	~KornAccountCfgImpl();
 	
 	void readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr );
diff --git a/korn/kornapp.h b/korn/kornapp.h
index c07ac55c..513695b2 100644
--- a/korn/kornapp.h
+++ b/korn/kornapp.h
@@ -17,6 +17,7 @@ class KornShell;
 class KornApp : public KUniqueApplication
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	/**
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 3f69aabf..69806308 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KornBoxCfg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KornBoxCfg</cstring>
     </property>
@@ -16,11 +16,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget3</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="2">
+                    <widget class="TQLayoutWidget" row="1" column="2">
                         <property name="name">
                             <cstring>tqlayout32</cstring>
                         </property>
@@ -39,7 +39,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNewText</cstring>
                                 </property>
@@ -67,7 +67,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1">
+                    <widget class="TQLayoutWidget" row="2" column="1">
                         <property name="name">
                             <cstring>tqlayout34</cstring>
                         </property>
@@ -75,7 +75,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNormalBack</cstring>
                                 </property>
@@ -106,7 +106,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>lbIcon</cstring>
                         </property>
@@ -114,7 +114,7 @@
                             <string>Icon:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>lbBackground</cstring>
                         </property>
@@ -122,7 +122,7 @@
                             <string>Background:</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="2">
+                    <widget class="TQLayoutWidget" row="2" column="2">
                         <property name="name">
                             <cstring>tqlayout33</cstring>
                         </property>
@@ -130,7 +130,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNewBack</cstring>
                                 </property>
@@ -154,7 +154,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="0" column="1">
+                    <widget class="TQLabel" row="0" column="1">
                         <property name="name">
                             <cstring>lbNormal</cstring>
                         </property>
@@ -165,7 +165,7 @@
                             <set>AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="3" column="2">
+                    <widget class="TQLayoutWidget" row="3" column="2">
                         <property name="name">
                             <cstring>tqlayout36</cstring>
                         </property>
@@ -173,7 +173,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNewIcon</cstring>
                                 </property>
@@ -194,7 +194,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="0" column="2">
+                    <widget class="TQLabel" row="0" column="2">
                         <property name="name">
                             <cstring>lbNew</cstring>
                         </property>
@@ -205,7 +205,7 @@
                             <set>AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>lbText</cstring>
                         </property>
@@ -213,7 +213,7 @@
                             <string>Text:</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
                             <cstring>tqlayout31</cstring>
                         </property>
@@ -221,7 +221,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNormalText</cstring>
                                 </property>
@@ -249,7 +249,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="3" column="1">
+                    <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
                             <cstring>tqlayout35</cstring>
                         </property>
@@ -257,7 +257,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNormalIcon</cstring>
                                 </property>
@@ -295,7 +295,7 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLayoutWidget" row="5" column="1">
+                    <widget class="TQLayoutWidget" row="5" column="1">
                         <property name="name">
                             <cstring>tqlayout29</cstring>
                         </property>
@@ -303,7 +303,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNormalAnim</cstring>
                                 </property>
@@ -311,7 +311,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>pbNormalAnim</cstring>
                                 </property>
@@ -324,7 +324,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="5" column="2">
+                    <widget class="TQLayoutWidget" row="5" column="2">
                         <property name="name">
                             <cstring>tqlayout28</cstring>
                         </property>
@@ -332,7 +332,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNewAnim</cstring>
                                 </property>
@@ -340,7 +340,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>pbNewAnim</cstring>
                                 </property>
@@ -353,7 +353,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>lbAnimation</cstring>
                         </property>
@@ -361,7 +361,7 @@
                             <string>Animation:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>lbFont</cstring>
                         </property>
@@ -369,7 +369,7 @@
                             <string>Font:</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="4" column="2">
+                    <widget class="TQLayoutWidget" row="4" column="2">
                         <property name="name">
                             <cstring>tqlayout28_2</cstring>
                         </property>
@@ -377,7 +377,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNewFont</cstring>
                                 </property>
@@ -385,7 +385,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>pbNewFont</cstring>
                                 </property>
@@ -398,7 +398,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="4" column="1">
+                    <widget class="TQLayoutWidget" row="4" column="1">
                         <property name="name">
                             <cstring>tqlayout29_2</cstring>
                         </property>
@@ -406,7 +406,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chNormalFont</cstring>
                                 </property>
@@ -414,7 +414,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>pbNormalFont</cstring>
                                 </property>
@@ -429,7 +429,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -440,7 +440,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>tqlayout31</cstring>
                         </property>
@@ -448,7 +448,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="TQLabel" row="1" column="1">
                                 <property name="name">
                                     <cstring>lbLeft</cstring>
                                 </property>
@@ -459,7 +459,7 @@
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="5" column="2">
+                            <widget class="TQLayoutWidget" row="5" column="2">
                                 <property name="name">
                                     <cstring>tqlayout52_7</cstring>
                                 </property>
@@ -484,7 +484,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chMiddleRun</cstring>
                                         </property>
@@ -511,7 +511,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="1" column="3">
+                            <widget class="TQLabel" row="1" column="3">
                                 <property name="name">
                                     <cstring>lbRight</cstring>
                                 </property>
@@ -522,7 +522,7 @@
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="2" column="2">
+                            <widget class="TQLayoutWidget" row="2" column="2">
                                 <property name="name">
                                     <cstring>tqlayout52</cstring>
                                 </property>
@@ -547,7 +547,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chMiddleRecheck</cstring>
                                         </property>
@@ -574,7 +574,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="3" column="1">
+                            <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
                                     <cstring>tqlayout52_4</cstring>
                                 </property>
@@ -599,7 +599,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chLeftReset</cstring>
                                         </property>
@@ -626,7 +626,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="5" column="3">
+                            <widget class="TQLayoutWidget" row="5" column="3">
                                 <property name="name">
                                     <cstring>tqlayout52_9</cstring>
                                 </property>
@@ -651,7 +651,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chRightRun</cstring>
                                         </property>
@@ -678,7 +678,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="2" column="1">
+                            <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
                                     <cstring>tqlayout52</cstring>
                                 </property>
@@ -703,7 +703,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chLeftRecheck</cstring>
                                         </property>
@@ -730,7 +730,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>lbReset</cstring>
                                 </property>
@@ -738,7 +738,7 @@
                                     <string>Reset counter:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3">
+                            <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>lbMouseButton</cstring>
                                 </property>
@@ -749,7 +749,7 @@
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="4" column="3">
+                            <widget class="TQLayoutWidget" row="4" column="3">
                                 <property name="name">
                                     <cstring>tqlayout52_9</cstring>
                                 </property>
@@ -774,7 +774,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chRightView</cstring>
                                         </property>
@@ -801,7 +801,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="5" column="1">
+                            <widget class="TQLayoutWidget" row="5" column="1">
                                 <property name="name">
                                     <cstring>tqlayout52_5</cstring>
                                 </property>
@@ -826,7 +826,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chLeftRun</cstring>
                                         </property>
@@ -853,7 +853,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="1" column="2">
+                            <widget class="TQLabel" row="1" column="2">
                                 <property name="name">
                                     <cstring>lbMiddle</cstring>
                                 </property>
@@ -864,7 +864,7 @@
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="6" column="1">
+                            <widget class="TQLayoutWidget" row="6" column="1">
                                 <property name="name">
                                     <cstring>tqlayout52_5</cstring>
                                 </property>
@@ -889,7 +889,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chLeftPopup</cstring>
                                         </property>
@@ -916,7 +916,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="6" column="0">
+                            <widget class="TQLabel" row="6" column="0">
                                 <property name="name">
                                     <cstring>lbPopup</cstring>
                                 </property>
@@ -924,7 +924,7 @@
                                     <string>Popup:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="3" column="3">
+                            <widget class="TQLayoutWidget" row="3" column="3">
                                 <property name="name">
                                     <cstring>tqlayout52_8</cstring>
                                 </property>
@@ -949,7 +949,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chRightReset</cstring>
                                         </property>
@@ -976,7 +976,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="4" column="0">
+                            <widget class="TQLabel" row="4" column="0">
                                 <property name="name">
                                     <cstring>lbView</cstring>
                                 </property>
@@ -984,7 +984,7 @@
                                     <string>View emails:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="6" column="2">
+                            <widget class="TQLayoutWidget" row="6" column="2">
                                 <property name="name">
                                     <cstring>tqlayout52_7</cstring>
                                 </property>
@@ -1009,7 +1009,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chMiddlePopup</cstring>
                                         </property>
@@ -1036,7 +1036,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>lbRecheck</cstring>
                                 </property>
@@ -1044,7 +1044,7 @@
                                     <string>Recheck:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="4" column="1">
+                            <widget class="TQLayoutWidget" row="4" column="1">
                                 <property name="name">
                                     <cstring>tqlayout52_5</cstring>
                                 </property>
@@ -1069,7 +1069,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chLeftView</cstring>
                                         </property>
@@ -1096,7 +1096,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="2" column="3">
+                            <widget class="TQLayoutWidget" row="2" column="3">
                                 <property name="name">
                                     <cstring>tqlayout52_3</cstring>
                                 </property>
@@ -1121,7 +1121,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chRightRecheck</cstring>
                                         </property>
@@ -1148,7 +1148,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="3" column="2">
+                            <widget class="TQLayoutWidget" row="3" column="2">
                                 <property name="name">
                                     <cstring>tqlayout52_6</cstring>
                                 </property>
@@ -1173,7 +1173,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chMiddleReset</cstring>
                                         </property>
@@ -1200,7 +1200,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="4" column="2">
+                            <widget class="TQLayoutWidget" row="4" column="2">
                                 <property name="name">
                                     <cstring>tqlayout52_7</cstring>
                                 </property>
@@ -1225,7 +1225,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chMiddleView</cstring>
                                         </property>
@@ -1252,7 +1252,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="5" column="0">
+                            <widget class="TQLabel" row="5" column="0">
                                 <property name="name">
                                     <cstring>lbRun</cstring>
                                 </property>
@@ -1260,7 +1260,7 @@
                                     <string>Run command:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="6" column="3">
+                            <widget class="TQLayoutWidget" row="6" column="3">
                                 <property name="name">
                                     <cstring>tqlayout52_9</cstring>
                                 </property>
@@ -1285,7 +1285,7 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>chRightPopup</cstring>
                                         </property>
@@ -1314,7 +1314,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>tqlayout31_3</cstring>
                         </property>
@@ -1322,7 +1322,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>lbCommand</cstring>
                                 </property>
@@ -1343,7 +1343,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>gbNewMail</cstring>
                         </property>
@@ -1354,7 +1354,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>tqlayout33</cstring>
                                 </property>
@@ -1367,7 +1367,7 @@
                                             <cstring>edNewRun</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>lbNewRun</cstring>
                                         </property>
@@ -1383,7 +1383,7 @@
                                             <cstring>edPlaySound</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>lbPlaySound</cstring>
                                         </property>
@@ -1396,7 +1396,7 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chShowPassive</cstring>
                                 </property>
@@ -1404,7 +1404,7 @@
                                     <string>Show &amp;passive popup</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>chPassiveDate</cstring>
                                 </property>
@@ -1419,7 +1419,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -1435,7 +1435,7 @@
                             <cstring>elbAccounts</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>pbEdit</cstring>
                         </property>
@@ -1445,7 +1445,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -1665,7 +1665,7 @@
     <tabstop>chPassiveDate</tabstop>
     <tabstop>pbEdit</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotEditBox()</slot>
     <slot access="protected">slotActivated( const QString&amp; )</slot>
     <slot access="protected">slotActivated( const int )</slot>
@@ -1676,7 +1676,7 @@
     <slot access="protected">slotChangeNewAnim()</slot>
     <slot access="protected">slotNormalAnimToggled( bool )</slot>
     <slot access="protected">slotNewAnimToggled( bool )</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index f7c1845f..58ffd4da 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -38,8 +38,8 @@ class KConfig;
 #include <tqlabel.h>
 #include <tqstring.h>
 
-KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name )
-	: KornBoxCfg( parent, name ),
+KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * tqparent, const char * name )
+	: KornBoxCfg( tqparent, name ),
 	_config( 0 ),
 	_base( 0 ),
 	_index( -1 )
@@ -56,8 +56,8 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name )
 	if( lbRight->text() == "Right" )
 		lbRight->setText( i18n( "Right" ) );
 	
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+	connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
+	connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
 	
 	elbAccounts->setTitle( i18n( "Accounts" ) );
 
@@ -100,13 +100,13 @@ void KornBoxCfgImpl::writeConfig( KConfig * config, const int index )
 void KornBoxCfgImpl::readViewConfig()
 {
 	this->chNormalText->setChecked(_config->readBoolEntry ( "hasnormalfgcolour", true ) );
-	this->cbNormalText->setColor(  _config->readColorEntry( "normalfgcolour", &Qt::black ) );
+	this->cbNormalText->setColor(  _config->readColorEntry( "normalfgcolour", &TQt::black ) );
 	this->chNewText->setChecked(   _config->readBoolEntry ( "hasnewfgcolour", true ) );
-	this->cbNewText->setColor(     _config->readColorEntry( "newfgcolour", &Qt::black ) );
+	this->cbNewText->setColor(     _config->readColorEntry( "newfgcolour", &TQt::black ) );
 	this->chNormalBack->setChecked(_config->readBoolEntry ( "hasnormalbgcolour", false ) );
-	this->cbNormalBack->setColor(  _config->readColorEntry( "normalbgcolour", &Qt::white ) );
+	this->cbNormalBack->setColor(  _config->readColorEntry( "normalbgcolour", &TQt::white ) );
 	this->chNewBack->setChecked(   _config->readBoolEntry ( "hasnewbgcolour", false ) );
-	this->cbNewBack->setColor(     _config->readColorEntry( "newbgcolour", &Qt::white ) );
+	this->cbNewBack->setColor(     _config->readColorEntry( "newbgcolour", &TQt::white ) );
 	
 	this->chNormalIcon->setChecked(_config->readBoolEntry( "hasnormalicon", false ) );
 	this->ibNormalIcon->setIcon(   _config->readEntry    ( "normalicon", "" ) );
@@ -274,13 +274,13 @@ void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, KConfig*
 {
 	config->writeEntry( "name", name );
 	config->writeEntry( "protocol", "mbox" );
-	config->writeEntry( "host", TQString::null );
-	config->writeEntry( "port", TQString::null );
-	config->writeEntry( "username", TQString::null );
+	config->writeEntry( "host", TQString() );
+	config->writeEntry( "port", TQString() );
+	config->writeEntry( "username", TQString() );
 	config->writeEntry( "mailbox", "/var/spool/mail/" );
 	config->writeEntry( "savepassword", 0 );
-	config->writeEntry( "password", TQString::null );
-	config->writeEntry( "auth", TQString::null );
+	config->writeEntry( "password", TQString() );
+	config->writeEntry( "auth", TQString() );
 	config->writeEntry( "interval", 300 );
 	config->writeEntry( "boxsettings", true );
 	config->writeEntry( "command", "" );
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index 47bbbfd1..a3802b81 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -31,8 +31,9 @@ class TQWidget;
 
 class KornBoxCfgImpl : public KornBoxCfg
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KornBoxCfgImpl( TQWidget *parent, const char * name );
+	KornBoxCfgImpl( TQWidget *tqparent, const char * name );
 	~KornBoxCfgImpl();
 	
 	/**
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index b1b55307..b43d32a4 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KornCfgWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KornCfgWidget</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabKornCfg</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -39,7 +39,7 @@
                             <cstring>elbBoxes</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>pbEdit</cstring>
                         </property>
@@ -47,7 +47,7 @@
                             <string>&amp;Edit</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>chUseWallet</cstring>
                         </property>
@@ -60,7 +60,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>bgCheckBoxes</cstring>
                         </property>
@@ -85,7 +85,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>rbHorizontal</cstring>
                                 </property>
@@ -93,7 +93,7 @@
                                     <string>&amp;Horizontal</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>rbVertical</cstring>
                                 </property>
@@ -101,7 +101,7 @@
                                     <string>&amp;Vertical</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>rbDocked</cstring>
                                 </property>
@@ -163,7 +163,7 @@
         <slot>slotEditBox()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotActivated( const QString&amp; )</slot>
     <slot access="protected">slotActivated( const int )</slot>
     <slot>slotOK()</slot>
@@ -171,6 +171,6 @@
     <slot>slotCancel()</slot>
     <slot access="protected">slotSetDefaults( const QString&amp;, const int, KConfig* )</slot>
     <slot access="protected">slotEditBox()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index df426464..487c48ba 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -35,10 +35,10 @@
 
 
 /*
- * parent should be of type KDialogBase
+ * tqparent should be of type KDialogBase
  */
-KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
-	: KornCfgWidget( parent, name ),	
+KornCfgImpl::KornCfgImpl( TQWidget * tqparent, const char * name )
+	: KornCfgWidget( tqparent, name ),	
 	_config( new KConfig( "kornrc" ) ),
 	_base( 0 )
 {
@@ -47,9 +47,9 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
 	elbBoxes->setConfig( _config );
 	elbBoxes->setTitle( i18n( "Boxes" ) );
 	
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
-	connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
+	connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
+	connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+	connect( tqparent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
 
 	connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) );
 	connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) );
@@ -131,14 +131,14 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi
 	config->writeEntry( "hasnewicon", false );
 	config->writeEntry( "hasnormalanim", false );
 	config->writeEntry( "hasnewanim", false );
-	config->writeEntry( "normalfgcolour", Qt::black );
-	config->writeEntry( "newfgcolour", Qt::black );
-	config->writeEntry( "normalbgcolour", TQString::null );
-	config->writeEntry( "newbgcolour", TQString::null );
-	config->writeEntry( "normalicon", TQString::null );
-	config->writeEntry( "newicon", TQString::null );
-	config->writeEntry( "normalanim", TQString::null );
-	config->writeEntry( "newanim", TQString::null );
+	config->writeEntry( "normalfgcolour", TQt::black );
+	config->writeEntry( "newfgcolour", TQt::black );
+	config->writeEntry( "normalbgcolour", TQString() );
+	config->writeEntry( "newbgcolour", TQString() );
+	config->writeEntry( "normalicon", TQString() );
+	config->writeEntry( "newicon", TQString() );
+	config->writeEntry( "normalanim", TQString() );
+	config->writeEntry( "newanim", TQString() );
 	config->writeEntry( "leftrecheck", true );
 	config->writeEntry( "middlerecheck", false );
 	config->writeEntry( "rightrecheck", false );
@@ -164,13 +164,13 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi
 	config->setGroup( TQString( "korn-%1-0" ).arg( index ) );
 	config->writeEntry( "name", name );
 	config->writeEntry( "protocol", "mbox" );
-	config->writeEntry( "server", TQString::null );
-	config->writeEntry( "port", TQString::null );
-	config->writeEntry( "username", TQString::null );
+	config->writeEntry( "server", TQString() );
+	config->writeEntry( "port", TQString() );
+	config->writeEntry( "username", TQString() );
 	config->writeEntry( "mailbox", "/var/spool/mail/" );
 	config->writeEntry( "savepassword", 0 );
-	config->writeEntry( "password", TQString::null );
-	config->writeEntry( "auth", TQString::null );
+	config->writeEntry( "password", TQString() );
+	config->writeEntry( "auth", TQString() );
 	config->writeEntry( "interval", 300 );
 	config->writeEntry( "boxsettings", true );
 	config->writeEntry( "command", "" );
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index 5ce4ef4a..1168ec08 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -29,8 +29,9 @@ class TQString;
 
 class KornCfgImpl : public KornCfgWidget
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KornCfgImpl( TQWidget * parent = 0, const char * name = 0 );
+	KornCfgImpl( TQWidget * tqparent = 0, const char * name = 0 );
 	~KornCfgImpl();
 
 private slots:
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 553cac42..f7d30358 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -32,8 +32,8 @@
 
 #include <tqtimer.h>
 
-KornShell::KornShell( TQWidget * parent, const char * name )
-	: TQWidget( parent, name ),
+KornShell::KornShell( TQWidget * tqparent, const char * name )
+	: TQWidget( tqparent, name ),
 	_config( new KConfig( "kornrc" ) ),
 	_box( 0 ),
 	_configDialog( 0 ),
@@ -99,9 +99,9 @@ void KornShell::readConfig()
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
 	if( tqlayout == 'H' )
-		_box = new HVContainer( Qt::Horizontal, this, "horizontal container" );
+		_box = new HVContainer( TQt::Horizontal, this, "horizontal container" );
 	else if( tqlayout == 'V' )
-		_box = new HVContainer( Qt::Vertical, this, "vertical container" );
+		_box = new HVContainer( TQt::Vertical, this, "vertical container" );
 	else
 		_box = new DockedContainer( this, "docked container" );
 
@@ -135,14 +135,14 @@ void KornShell::slotDialogClosed()
 	_configDialog->deleteLater(); _configDialog = 0;
 
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should tqreplaces later by a better variant.
+	//Maybe, this should replaces later by a better variant.
 	slotApply();
 }
 
 void KornShell::slotApply()
 {
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should tqreplaces later by a better variant.
+	//Maybe, this should replaces later by a better variant.
 	
 	delete _box; _box = 0;
 
diff --git a/korn/kornshell.h b/korn/kornshell.h
index 1e94173a..aa97c40a 100644
--- a/korn/kornshell.h
+++ b/korn/kornshell.h
@@ -29,10 +29,11 @@ class KConfig;
 /**
  * This is a rewritten KornShell class. It is rewritten because the depending classes changed.
  */
-class KornShell : public QWidget
+class KornShell : public TQWidget
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	KornShell( TQWidget * parent = 0, const char * name = 0 );
+	KornShell( TQWidget * tqparent = 0, const char * name = 0 );
 	~KornShell();
 
 	void show();	
diff --git a/korn/label.h b/korn/label.h
index 18d4cb29..86db3c42 100644
--- a/korn/label.h
+++ b/korn/label.h
@@ -25,10 +25,11 @@
 /**
  * A simple overriding of the TQLabel class to get a mouseButtonPressed() signal
  */
-class Label : public QLabel
+class Label : public TQLabel
 { Q_OBJECT
+  TQ_OBJECT
 public:
-	Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {}
+	Label( TQWidget * tqparent = 0, const char * name = 0 ) : TQLabel( tqparent, name ) {}
 	virtual ~Label() {}
 	
 protected:
@@ -37,7 +38,7 @@ signals:
 	/**
 	 * Emitted when a button is pressed.
 	 */
-	void mouseButtonPressed( Qt::ButtonState );
+	void mouseButtonPressed( TQt::ButtonState );
 };
 
 #endif //MK_LABEL_H
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index 3424e19e..5ea61430 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -7,8 +7,8 @@
 #include <tqprogressdialog.h>
 #include "maildrop.h"
 
-KornMailDlg::KornMailDlg( TQWidget *parent )
-   : KDialogBase( parent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))),
+KornMailDlg::KornMailDlg( TQWidget *tqparent )
+   : KDialogBase( tqparent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))),
    _progress( 0 )
 {
 	TQWidget * page = new TQWidget( this );
diff --git a/korn/maildlg.h b/korn/maildlg.h
index c8ba216a..68f8f30e 100644
--- a/korn/maildlg.h
+++ b/korn/maildlg.h
@@ -17,6 +17,7 @@ class TQString;
 class KornMailDlg : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	/**
 	 * Edit control showing the mail (read only)
@@ -45,9 +46,9 @@ class KornMailDlg : public KDialogBase
 public:
 	/**
 	 * KornMailDlg Constructor
-	 * @param parent parent widget
+	 * @param tqparent tqparent widget
 	 */
-	KornMailDlg( TQWidget *parent=0 );
+	KornMailDlg( TQWidget *tqparent=0 );
 
 	/**
 	 * Set the mail details to show. The mails body is transfered to the edit control
diff --git a/korn/maildrop.h b/korn/maildrop.h
index b15ec973..160a59cd 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -27,9 +27,10 @@ template< class T, class R > class TQMap;
 * @author Sirtaj Singh Kang (taj@kde.org)
 * @version $Id$
 */
-class KMailDrop : public QObject
+class KMailDrop : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -358,7 +359,7 @@ signals:
     
     /**
      * The next signal is emitted when a passive popup could be displayed.
-     * As argument, there is a KornSubject, which tqcontains a subject and
+     * As argument, there is a KornSubject, which contains a subject and
      * some more info that could be used with the popup.
      */
     void showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& realname );
diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp
index d431f440..b71205b1 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -54,20 +54,20 @@ TQString KornMailSubject::toString() const
 	date.setTime_t(_date);
 	return TQString("KornMailSubject, Id: ") + (_id?_id->toString():TQString("NULL")) + ", " + i18n("Subject:") + " " + _subject
 		+ ", " + i18n("Sender:") + " " + _sender + ", " + i18n("Size:") + " " + TQString::number(_size)
-		+ ", " + i18n("Date:") + " " + date.toString(Qt::ISODate);
+		+ ", " + i18n("Date:") + " " + date.toString(TQt::ISODate);
 }
 
 TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr)
 {
 	if ( aStr.isEmpty() )
-		return TQString::null;
+		return TQString();
 
 	const TQCString str = unfold( aStr );
 
 	if ( str.isEmpty() )
-		return TQString::null;
+		return TQString();
 
-	if ( str.find( "=?" ) < 0 ) {
+	if ( str.tqfind( "=?" ) < 0 ) {
 		// No need to decode
 		return TQString(str);
 	}
@@ -128,7 +128,7 @@ TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr)
 			in.resetRawData( enc_start, pos - enc_start );
 
 			const TQTextCodec * codec = codecForName(charset);
-			if (!codec) return TQString::null;
+			if (!codec) return TQString();
 			result += codec->toUnicode(enc);
 			lastWasEncodedWord = true;
 
diff --git a/korn/mailsubject.h b/korn/mailsubject.h
index 3e85b69e..6e4c214b 100644
--- a/korn/mailsubject.h
+++ b/korn/mailsubject.h
@@ -18,9 +18,9 @@ class KornMailSubject
 {
 	KornMailId * 	_id;
 	KMailDrop *     _drop;
-	QString		_subject;
-	QString		_sender;
-	QString		_header;
+	TQString		_subject;
+	TQString		_sender;
+	TQString		_header;
 	int 		_size;
 	int		_date;
 	bool 		_fullMessage;
@@ -47,7 +47,7 @@ public:
 	KornMailSubject(const KornMailSubject & src);
 
 	/**
-	 * tqreplaces the contents of this by the contents of another
+	 * replaces the contents of this by the contents of another
 	 * KornMailSubject instance.  All data of the source
 	 * KornMailSubject instance are cloned.
 	 * @param src KornMailSubject to copy from
@@ -92,7 +92,7 @@ public:
 	/**
 	 * Set the mails header and (if possible) body.
 	 * @param header the mails header with or without body (see fullMessage parameter).
-	 * @param fullMessage true, if header tqcontains the message body as well, false otherwise.
+	 * @param fullMessage true, if header contains the message body as well, false otherwise.
 	 */
 	void setHeader(const TQString & header, bool fullMessage) {_header = header; _fullMessage = fullMessage;}
 
@@ -103,8 +103,8 @@ public:
 	const TQString & getHeader() const {return _header;}
 
 	/**
-	 * Return true, if the header tqcontains the header and the full message.
-	 * Return false if the header just tqcontains the header.
+	 * Return true, if the header contains the header and the full message.
+	 * Return false if the header just contains the header.
 	 * @return see above.
 	 */
 	bool isHeaderFullMessage() const {return _fullMessage;}
diff --git a/korn/password.h b/korn/password.h
index 05450ae5..ebfb24c4 100644
--- a/korn/password.h
+++ b/korn/password.h
@@ -47,7 +47,7 @@ public:
 	 * @param box The boxnumber of the account
 	 * @param account The accountnumber of the account
 	 * @param fallbackConfig The configuration file if KWallet cannot be used.
-	 * @return The password, or TQString::null if it failes.
+	 * @return The password, or TQString() if it failes.
 	 */
 	static TQString readKOrnPassword( int box, int account, const KConfigBase& fallbackConfig );
 	/**
@@ -55,7 +55,7 @@ public:
 	 *
 	 * @param accountnr The id of the KMail account
 	 * @param fallbackConfig The configuration used if KWallet isn't available.
-	 * @return The password, QStirng::null if it failes.
+	 * @return The password, TQStirng::null if it failes.
 	 */
 	static TQString readKMailPassword( int accountnr, const KConfigBase& fallbackConfig );
 	
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index 8d05a03b..7cc6bc57 100644
--- a/korn/polldrop.cpp
+++ b/korn/polldrop.cpp
@@ -52,7 +52,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev )
 {
 	if( _timerRunning && (ev->timerId() == _timerId) ) {
 		// this event is ours.
-		recheck(); // should be reimplemented by children.
+		recheck(); // should be reimplemented by tqchildren.
 	}
 	else {
 		TQObject::timerEvent( ev );
diff --git a/korn/polldrop.h b/korn/polldrop.h
index 94444d4d..751bebc0 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -21,6 +21,7 @@ class TQTimerEvent;
 class KPollableDrop : public KMailDrop
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	static const char *PollConfigKey;
 	static const int DefaultPoll;
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index 6f904614..e97fd82c 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -64,10 +64,10 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
 	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) );
 	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
@@ -77,21 +77,21 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 	TQString metadata;
 	if( map->tqcontains( "encryption" ) )
 	{
-		if( *map->find( "encryption" ) == "ssl" )
+		if( *map->tqfind( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
 		else
 		{
 			map->insert( "ssl", "false" );
-			metadata += *map->find( "encryption" );
+			metadata += *map->tqfind( "encryption" );
 		}
 		map->erase( "encryption" );
 	}
 
 	if( map->tqcontains( "auth" ) )
 	{
-		if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() )
+		if( !metadata.isEmpty() && ! (*map->tqfind( "auth" )).isEmpty() )
 			metadata += ",";
-		metadata += *map->find( "auth" );
+		metadata += *map->tqfind( "auth" );
 		map->erase( "auth" );
 	}
 
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index d21ecee2..9cb237ba 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DoubleProgressDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DoubleProgressDialog</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>lbText</cstring>
             </property>
@@ -27,17 +27,17 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QProgressBar">
+        <widget class="TQProgressBar">
             <property name="name">
                 <cstring>pbBoxes</cstring>
             </property>
         </widget>
-        <widget class="QProgressBar">
+        <widget class="TQProgressBar">
             <property name="name">
                 <cstring>pbProgress</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout1</cstring>
             </property>
@@ -62,7 +62,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbCancel</cstring>
                     </property>
@@ -105,16 +105,16 @@
 <includes>
     <include location="local" impldecl="in implementation">progress_dialog.ui.h</include>
 </includes>
-<signals>
+<Q_SIGNALS>
     <signal>cancelPressed()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>setText( const QString &amp; str )</slot>
     <slot>setNumberOfBoxes( int number )</slot>
     <slot>setProgressOfBoxes( int number )</slot>
     <slot>setNumberOfSteps( int number )</slot>
     <slot>setProgress( int number )</slot>
     <slot access="private" specifier="non virtual">cancelbutton()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korn/progress_dialog.ui.h b/korn/progress_dialog.ui.h
index 2407ca53..a9188a90 100644
--- a/korn/progress_dialog.ui.h
+++ b/korn/progress_dialog.ui.h
@@ -20,7 +20,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/korn/protocols.cpp b/korn/protocols.cpp
index 526c099b..c35ce4ba 100644
--- a/korn/protocols.cpp
+++ b/korn/protocols.cpp
@@ -42,7 +42,7 @@ const Protocol* Protocols::getProto( const TQString& proto )
 	if( !protocols )
 		fillProtocols();
 		
-	return protocols->find( proto );
+	return protocols->tqfind( proto );
 }
 
 const Protocol* Protocols::firstProtocol()
@@ -75,7 +75,7 @@ void Protocols::fillProtocols()
 	addProtocol( new Pop3_Protocol );
 	addProtocol( new Process_Protocol );
 	addProtocol( new Nntp_Protocol );
-	addProtocol( new QMail_Protocol );
+	addProtocol( new TQMail_Protocol );
 	addProtocol( new DCOP_Protocol );
 	addProtocol( new KMail_Protocol );
 }
diff --git a/korn/qmail_proto.cpp b/korn/qmail_proto.cpp
index 55b98123..c902ad49 100644
--- a/korn/qmail_proto.cpp
+++ b/korn/qmail_proto.cpp
@@ -28,22 +28,22 @@
 
 #include "account_input.h"
 
-void QMail_Protocol::configFillGroupBoxes( TQStringList* groupBoxes ) const
+void TQMail_Protocol::configFillGroupBoxes( TQStringList* groupBoxes ) const
 {
 	groupBoxes->append( "Maildir" );
 }
 
-void QMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput > *result ) const
+void TQMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput > *result ) const
 {
 	result->append( new URLInput( (TQWidget*)vector->at( 0 ), i18n( "Path:" ), "", "mailbox" ) );
 	dynamic_cast<KURLRequester*>(result->last()->rightWidget())->setMode( KFile::Directory );
 }
 
-void QMail_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, TQString >* ) const
+void TQMail_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, TQString >* ) const
 {
 }
 
-void QMail_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
+void TQMail_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	clearFields( map, (KIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) );
 }
diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h
index aaa722ee..4abd7fbc 100644
--- a/korn/qmail_proto.h
+++ b/korn/qmail_proto.h
@@ -16,18 +16,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef MK_QMAIL_PROTO_H
-#define MK_QMAIL_PROTO_H
+#ifndef MK_TQMAIL_PROTO_H
+#define MK_TQMAIL_PROTO_H
 
 #include "kio_proto.h"
 
-class QMail_Protocol : public KIO_Protocol
+class TQMail_Protocol : public KIO_Protocol
 {
 public:
-	QMail_Protocol() {}
-	virtual ~QMail_Protocol() {}
+	TQMail_Protocol() {}
+	virtual ~TQMail_Protocol() {}
 
-	virtual KIO_Protocol * clone() const { return new QMail_Protocol; }
+	virtual KIO_Protocol * clone() const { return new TQMail_Protocol; }
 
 	virtual bool connectionBased() const { return false; }
 
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index b001f776..f770d075 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -13,9 +13,9 @@
 #include "maildlg.h"
 #include "progress_dialog.h"
 
-KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item)
+KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *tqparent, KornMailSubject * item)
 	// set the column strings except column 2 (date)
-	: KListViewItem(parent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0))
+	: KListViewItem(tqparent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0))
 	, _mailSubject( new KornMailSubject( *item ) )
 {
 	// convert the date according to the user settings and show it in column 2
@@ -53,14 +53,14 @@ int KornSubjectsDlg::SubjectListViewItem::compare( TQListViewItem* item, int col
 	}
 }
 
-KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
-   : KDialogBase( parent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), 
+KornSubjectsDlg::KornSubjectsDlg( TQWidget *tqparent )
+   : KDialogBase( tqparent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), 
  	_subjects(0), _delete(0), mailDlg(0), _canDeleteMaildrop( true )
 {
 	_loadSubjectsCanceled = false;
 	setModal( true );
 
-	// The dialog tqcontains a list view and several buttons.
+	// The dialog contains a list view and several buttons.
 	// Two box tqlayouts hol dthem.
 	TQWidget * page = new TQWidget( this );
 	setMainWidget(page);
@@ -88,8 +88,8 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_list->addColumn(i18n("Date"));
 	_list->addColumn(i18n("Size (Bytes)"));
 
-	// column 3 tqcontains a number (change tqalignment)
-	_list->setColumnAlignment(3, Qt::AlignRight);
+	// column 3 contains a number (change tqalignment)
+	_list->setColumnAlignment(3, TQt::AlignRight);
 	_list->setItemMargin(3);
 
 	// connect the selection changed and double click events of the list view
diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h
index e7c032c2..8201e8e6 100644
--- a/korn/subjectsdlg.h
+++ b/korn/subjectsdlg.h
@@ -24,6 +24,7 @@ template< class T > class TQPtrList;
 class KornSubjectsDlg: public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	/**
 	* SubjectListViewItem is a helper class representing one line in the list view.
@@ -35,11 +36,11 @@ class KornSubjectsDlg: public KDialogBase
 	public:
 		/**
 		* SubjectListViewItem Constructor
-		* @param parent list view
+		* @param tqparent list view
 		* @param item KornMailSubject this item should represent. It is NOT deleted
 		* if SubjectListViewItem is deleted.
 		*/
-		SubjectListViewItem( TQListView *parent, KornMailSubject * item);
+		SubjectListViewItem( TQListView *tqparent, KornMailSubject * item);
 
 		/**
 		 * SubjectListViewItem Destructor
@@ -103,9 +104,9 @@ class KornSubjectsDlg: public KDialogBase
 public:
 	/**
 	 * KornSubjectsDlg Constructor
-	 * @param parent parent widget
+	 * @param tqparent tqparent widget
 	 */
-	KornSubjectsDlg( TQWidget *parent=0 );
+	KornSubjectsDlg( TQWidget *tqparent=0 );
 
 	/**
 	 * This functions clears all available KMailDrop's.
diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp
index e7ca45f7..67a58eb0 100644
--- a/korn/systemtray.cpp
+++ b/korn/systemtray.cpp
@@ -24,8 +24,8 @@
 
 #include <tqmovie.h>
 
-SystemTray::SystemTray( TQWidget * parent, const char * name )
-	: KSystemTray( parent, name )	
+SystemTray::SystemTray( TQWidget * tqparent, const char * name )
+	: KSystemTray( tqparent, name )	
 {
 }
 
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 83daaeb3..6338ae57 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -31,13 +31,14 @@ class TQWidget;
  */
 class SystemTray : public KSystemTray
 { Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
-	 * This contructor gives all it parameters to its parents.
-	 * @param parant The parent window
-	 * @param name The name of the QObject's parents.
+	 * This contructor gives all it parameters to its tqparents.
+	 * @param parant The tqparent window
+	 * @param name The name of the TQObject's tqparents.
 	 */
-	SystemTray( TQWidget * parent = 0, const char * name = 0 );
+	SystemTray( TQWidget * tqparent = 0, const char * name = 0 );
 	/**
 	 * Empty destructor; does nothing at the moment
 	 */
@@ -47,12 +48,12 @@ protected:
 	/**
 	 * Reimplementation because in the reimplementation of KSystray it popup's of restores.
 	 * In this implemention, the action depends on the settings.
-	 * @param me An object which tqcontains the mousebutton which is pressed.
+	 * @param me An object which contains the mousebutton which is pressed.
 	 */
 	virtual void mousePressEvent( TQMouseEvent* me );
 	
 signals:
-	void mouseButtonPressed( Qt::ButtonState );
+	void mouseButtonPressed( TQt::ButtonState );
 };
 
 #endif //MK_SYSTEMTRAY_H
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index b52a0982..815df5ca 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -220,7 +220,7 @@ bool ResourceKABC::doLoad()
     TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
     if (anniversary_string.isEmpty() )
       continue;
-    TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
+    TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
     if ( !anniversary.isValid() )
       continue;
 
@@ -232,7 +232,7 @@ bool ResourceKABC::doLoad()
       for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
         if ( name == (*addrIt).realName() ) {
           TQDate spouseAnniversary =
-            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
           if ( anniversary == spouseAnniversary ) {
             found = true;
             break;
@@ -247,7 +247,7 @@ bool ResourceKABC::doLoad()
   }
 
   for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
-    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
     kdDebug(5800) << "found a anniversary " << anniversary.toString() << endl;
     TQString name;
     TQString name_1 = (*addrIt).nickName();
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index 9dedd0ab..1dce9cf0 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -48,6 +48,7 @@ namespace KCal {
 class KDE_EXPORT ResourceKABC : public ResourceCalendar
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ResourceKABCConfig;
 
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index ec33aaba..20a9aaf4 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KCal;
 
-ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceKABCConfig::ResourceKABCConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 );
 
diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h
index 7d3ddf09..81fbdf10 100644
--- a/kresources/birthdays/resourcekabcconfig.h
+++ b/kresources/birthdays/resourcekabcconfig.h
@@ -41,8 +41,9 @@ namespace KCal {
 class ResourceKABCConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceKABCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource);
diff --git a/kresources/blogging/API_Blog.cpp b/kresources/blogging/API_Blog.cpp
index b6ac3752..2ad11c1d 100644
--- a/kresources/blogging/API_Blog.cpp
+++ b/kresources/blogging/API_Blog.cpp
@@ -12,9 +12,9 @@
 
 using namespace KBlog;
 
-APIBlog::APIBlog( const KURL &url, TQObject *parent, const char *name ) :
-    TQObject( parent, name ),
-    mServerURL( url ), mAppID( TQString::null ), mDownloadCount( 20 )
+APIBlog::APIBlog( const KURL &url, TQObject *tqparent, const char *name ) :
+    TQObject( tqparent, name ),
+    mServerURL( url ), mAppID( TQString() ), mDownloadCount( 20 )
 {}
 
 APIBlog::~APIBlog()
@@ -70,9 +70,9 @@ KCal::Journal *APIBlog::journalFromPosting( KBlog::BlogPosting *blog )
   TQDateTime dt = blog->dateTime();
   TQDateTime creationDt = blog->creationDateTime();
   TQDateTime modificationDt = blog->modificationDateTime();
-kdDebug() << "dt            ="<<dt.toString( Qt::ISODate ) << endl;
-kdDebug() << "creationDt    ="<<creationDt.toString( Qt::ISODate ) << endl;
-kdDebug() << "modificationDt="<<modificationDt.toString( Qt::ISODate ) << endl;
+kdDebug() << "dt            ="<<dt.toString( TQt::ISODate ) << endl;
+kdDebug() << "creationDt    ="<<creationDt.toString( TQt::ISODate ) << endl;
+kdDebug() << "modificationDt="<<modificationDt.toString( TQt::ISODate ) << endl;
   if ( dt.isValid() && !dt.isNull() ) {
     j->setDtStart( dt );
   } else if ( creationDt.isValid() && !creationDt.isNull() ) {
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h
index 18bc1be0..c3ed7d07 100644
--- a/kresources/blogging/API_Blog.h
+++ b/kresources/blogging/API_Blog.h
@@ -81,11 +81,12 @@ protected:
 };
 
 
-class APIBlog : public QObject
+class APIBlog : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
+    APIBlog( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L );
     virtual ~APIBlog();
     virtual TQString interfaceName() const = 0;
 
@@ -120,7 +121,7 @@ class APIBlog : public QObject
     };
 
     virtual TQString getFunctionName( blogFunctions type ) = 0;
-    virtual TQValueList<TQVariant> defaultArgs( const TQString &id = TQString::null );
+    virtual TQValueList<TQVariant> defaultArgs( const TQString &id = TQString() );
 
     virtual KIO::Job *createUserInfoJob() = 0;
     virtual KIO::Job *createListFoldersJob() = 0;
diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp
index 5cca14e1..c5e3c4a6 100644
--- a/kresources/blogging/API_Blogger.cpp
+++ b/kresources/blogging/API_Blogger.cpp
@@ -37,7 +37,7 @@ TQString APIBlogger::getFunctionName( blogFunctions type )
     case bloggerGetPost:        return "blogger.getPost";
     case bloggerGetTemplate:    return "blogger.getTemplate";
     case bloggerSetTemplate:    return "blogger.setTemplate";
-    default: return TQString::null;
+    default: return TQString();
   }
 }
 
@@ -259,22 +259,22 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQ
   TQStringList mapkeys = postInfo.keys();
   kdDebug() << endl << "Keys: " << mapkeys.join(", ") << endl << endl;
 
-  TQString fp( TQString::null );
+  TQString fp( TQString() );
   
   TQDateTime dt( postInfo[ "dateCreated" ].toDateTime() );
   if ( dt.isValid() && !dt.isNull() ) {
     post->setCreationDateTime( dt );
-    TQString fp = dt.toString( Qt::ISODate );
+    TQString fp = dt.toString( TQt::ISODate );
   }
   dt = postInfo[ "postDate" ].toDateTime();
   if ( dt.isValid() && !dt.isNull() ) {
     post->setDateTime( dt );
-    fp = dt.toString( Qt::ISODate );
+    fp = dt.toString( TQt::ISODate );
   }
   dt = postInfo[ "lastModified" ].toDateTime();
   if ( dt.isValid() && !dt.isNull() ) {
     post->setModificationDateTime( dt );
-    fp = dt.toString( Qt::ISODate );
+    fp = dt.toString( TQt::ISODate );
   }
   post->setFingerprint( fp );
 
@@ -299,8 +299,8 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQ
     TQString titleTagOpen = mTemplate.titleTagOpen();
     TQString titleTagClose = mTemplate.titleTagClose();
 
-    int catStart = contents.find( catTagOpen, 0, false ) + catTagOpen.length();
-    int catEnd = contents.find( catTagClose, 0, false );
+    int catStart = contents.tqfind( catTagOpen, 0, false ) + catTagOpen.length();
+    int catEnd = contents.tqfind( catTagClose, 0, false );
 kdDebug() << "  catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClose << ", start - end : " << catStart <<" - " << catEnd << endl;
     if ( catEnd > catStart ) {
       category = contents.mid( catStart, catEnd - catStart );
@@ -308,8 +308,8 @@ kdDebug() << "  catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClos
       contents = contents.remove( catStart - catTagOpen.length(),
               catEnd - catStart + catTagClose.length() + catTagOpen.length() );
     }
-    int titleStart = contents.find( titleTagOpen, 0, false ) + titleTagOpen.length();
-    int titleEnd = contents.find( titleTagClose, 0, false );
+    int titleStart = contents.tqfind( titleTagOpen, 0, false ) + titleTagOpen.length();
+    int titleEnd = contents.tqfind( titleTagClose, 0, false );
 kdDebug() << "  titleTagOpen = " << titleTagOpen << ", titleTagClose = " << titleTagClose << ", start - end : " << titleStart <<" - " << titleEnd << endl;
     kdDebug() << "Title start and end: " << titleStart << ", " << titleEnd << endl;
     if ( titleEnd > titleStart ) {
diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h
index 32610bf6..5255e19f 100644
--- a/kresources/blogging/API_Blogger.h
+++ b/kresources/blogging/API_Blogger.h
@@ -32,7 +32,7 @@ namespace KBlog {
 class APIBlogger : public APIBlog
 {
   public:
-    APIBlogger( const KURL &server, TQObject *parent = 0L, const char *name = 0L ) : APIBlog( server, parent, name ) {}
+    APIBlogger( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L ) : APIBlog( server, tqparent, name ) {}
     TQString getFunctionName( blogFunctions type );
     TQString interfaceName() const { return "Blogger API 1.0"; }
 
diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h
index 2b7a4899..9baedfda 100644
--- a/kresources/blogging/bloggingcalendaradaptor.h
+++ b/kresources/blogging/bloggingcalendaradaptor.h
@@ -51,6 +51,7 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem
 class BloggingCalendarAdaptor : public CalendarAdaptor
 {
 Q_OBJECT
+  TQ_OBJECT
   public:
     BloggingCalendarAdaptor();
     TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
diff --git a/kresources/blogging/bloggingglobals.cpp b/kresources/blogging/bloggingglobals.cpp
index 247ed901..b6b4c422 100644
--- a/kresources/blogging/bloggingglobals.cpp
+++ b/kresources/blogging/bloggingglobals.cpp
@@ -35,7 +35,7 @@ TQString BloggingGlobals::getFunctionName( blogFunctions type )
     case bloggerGetPost:        return "blogger.getPost";
     case bloggerGetTemplate:    return "blogger.getTemplate";
     case bloggerSetTemplate:    return "blogger.setTemplate";
-    default: return TQString::null;
+    default: return TQString();
   }
 }
 
diff --git a/kresources/blogging/bloggingglobals.h b/kresources/blogging/bloggingglobals.h
index b55029f1..004ed4d9 100644
--- a/kresources/blogging/bloggingglobals.h
+++ b/kresources/blogging/bloggingglobals.h
@@ -43,7 +43,7 @@ class BloggingGlobals
     };
     
     static TQString getFunctionName( blogFunctions type );
-    static TQValueList<TQVariant> defaultArgs( const TQString &user, const TQString &pw, const TQString &id = TQString::null );
+    static TQValueList<TQVariant> defaultArgs( const TQString &user, const TQString &pw, const TQString &id = TQString() );
     static TQString mAppID;
 };
 
diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h
index 2563b66e..ac3820ab 100644
--- a/kresources/blogging/kcal_resourceblogging.h
+++ b/kresources/blogging/kcal_resourceblogging.h
@@ -36,6 +36,7 @@ namespace KCal {
 class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceBlogging();
     ResourceBlogging( const KConfig * );
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp
index d68584a2..04f62cf9 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.cpp
+++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp
@@ -25,7 +25,7 @@
 
 using namespace KCal;
 
-ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *parent, const char *name ) : ResourceGroupwareBaseConfig( parent, name )
+ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *tqparent, const char *name ) : ResourceGroupwareBaseConfig( tqparent, name )
 {
 }
 
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h
index 8495595b..d15c8975 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.h
+++ b/kresources/blogging/kcal_resourcebloggingconfig.h
@@ -28,8 +28,9 @@ namespace KCal {
 class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceBloggingConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void saveSettings( KRES::Resource *resource );
diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui
index 15f2ab9b..e896ae4e 100644
--- a/kresources/blogging/resourcebloggingsettings.ui
+++ b/kresources/blogging/resourcebloggingsettings.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ResourceBloggingSettings</class>
 <author>Ian Reinhart Geiser &lt;geiseri@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ResourceBloggingSettings</cstring>
     </property>
@@ -17,7 +17,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>tqlayout12</cstring>
             </property>
@@ -25,7 +25,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_4</cstring>
                     </property>
@@ -64,7 +64,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>URL:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel9</cstring>
                     </property>
@@ -104,7 +104,7 @@
                         <cstring>mUser</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel10</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <enum>Password</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel4_2</cstring>
                     </property>
@@ -177,7 +177,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -204,7 +204,7 @@
                         <string>&lt;/TITLE&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel7_2</cstring>
                     </property>
@@ -247,7 +247,7 @@
                         <string>&lt;CATEGORY&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1">
+                <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>textLabel8_2</cstring>
                     </property>
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index d99e8add..e2a3adc3 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -72,7 +72,7 @@ XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method,
                  showProgressInfo )
 {
   d = new XmlrpcJobPrivate;
-  // We couldn't set the args when calling the parent constructor,
+  // We couldn't set the args when calling the tqparent constructor,
   // so do it now.
   TQDataStream stream( m_packedArgs, IO_WriteOnly );
    stream << (int)1 << url;
@@ -262,7 +262,7 @@ TQString XmlrpcJob::marshal( const TQVariant &arg )
              "</base64></value>\r\n";
     case TQVariant::DateTime:
       return "<value><datetime.iso8601>" +
-             arg.toDateTime().toString( Qt::ISODate ) +
+             arg.toDateTime().toString( TQt::ISODate ) +
              "</datetime.iso8601></value>\r\n";
     case TQVariant::List:
       {
@@ -295,7 +295,7 @@ TQString XmlrpcJob::marshal( const TQVariant &arg )
       kdWarning() << "Failed to marshal unknown variant type: "
                   << arg.type() << endl;
   };
-  return TQString::null;
+  return TQString();
 }
 
 TQVariant XmlrpcJob::demarshal( const TQDomElement &elem )
@@ -337,13 +337,13 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl;
   else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) {
 
     TQString text( typeElement.text() );
-    if ( text.find( TQRegExp("^[0-9]{8,8}T") ) >= 0 ) {
+    if ( text.tqfind( TQRegExp("^[0-9]{8,8}T") ) >= 0 ) {
       // It's in the format 20041120T...., so adjust it to correct
       // ISO 8601 Format 2004-11-20T..., else TQDateTime::fromString won't work:
       text = text.insert( 6, '-' );
       text = text.insert( 4, '-' );
     }
-    return TQVariant( TQDateTime::fromString( text, Qt::ISODate ) );
+    return TQVariant( TQDateTime::fromString( text, TQt::ISODate ) );
 
   } else if ( typeName == "array" ) {
 
diff --git a/kresources/blogging/xmlrpcjob.h b/kresources/blogging/xmlrpcjob.h
index 7bb18b15..349d7617 100644
--- a/kresources/blogging/xmlrpcjob.h
+++ b/kresources/blogging/xmlrpcjob.h
@@ -46,6 +46,7 @@ namespace KIO {
  */
 class XmlrpcJob : public TransferJob {
 Q_OBJECT
+  TQ_OBJECT
 
   public:
     /** Indicates the response type of the call
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index d6b9fdc7..c86cdd1a 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -70,8 +70,8 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) {
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent )
-    : KRES::ConfigWidget( parent )
+ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *tqparent )
+    : KRES::ConfigWidget( tqparent )
 {
     setupUI();
 }
diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index 78067428..ccda9234 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -40,10 +40,11 @@ class CalDavSaveConfig;
 class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ResourceCalDavConfig(TQWidget *parent = 0);
+    ResourceCalDavConfig(TQWidget *tqparent = 0);
 
 public slots:
 
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index 4a7072b5..e986c338 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -74,8 +74,8 @@ class CalDavSaveConfig::Private
 };
 //@endcond
 
-CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
-  : TQWidget( parent ), d( new KCal::CalDavReloadConfig::Private() )
+CalDavReloadConfig::CalDavReloadConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), d( new KCal::CalDavReloadConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setRange( 1, 900 );
   d->mIntervalSpin->setEnabled( false );
 
-  groupBox->setColumnLayout(1, Qt::Vertical);
+  groupBox->setColumnLayout(1, TQt::Vertical);
   TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
@@ -148,8 +148,8 @@ void CalDavReloadConfig::slotIntervalToggled( bool checked )
   }
 }
 
-CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
-  : TQWidget( parent ), d( new KCal::CalDavSaveConfig::Private() )
+CalDavSaveConfig::CalDavSaveConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), d( new KCal::CalDavSaveConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
   intervalRadio->hide();
   intervalBox->hide();
 
-  groupBox->setColumnLayout(1, Qt::Vertical);
+  groupBox->setColumnLayout(1, TQt::Vertical);
   TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h
index 64ae7832..2c9dcb6d 100644
--- a/kresources/caldav/configwidgets.h
+++ b/kresources/caldav/configwidgets.h
@@ -47,11 +47,12 @@ class ResourceCached;
 
   @see ResourceCached
 */
-class KDE_EXPORT CalDavReloadConfig : public QWidget
+class KDE_EXPORT CalDavReloadConfig : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit CalDavReloadConfig( TQWidget *parent = 0 );
+    explicit CalDavReloadConfig( TQWidget *tqparent = 0 );
     ~CalDavReloadConfig();
   public slots:
     void loadSettings( ResourceCached *resource );
@@ -62,7 +63,7 @@ class KDE_EXPORT CalDavReloadConfig : public QWidget
 
   private:
     //@cond PRIVATE
-    //Q_DISABLE_COPY( CalDavReloadConfig )
+    //TQ_DISABLE_COPY( CalDavReloadConfig )
     class Private;
     Private *const d;
     //@endcond
@@ -73,11 +74,12 @@ class KDE_EXPORT CalDavReloadConfig : public QWidget
 
   @see ResourceCached
 */
-class KDE_EXPORT CalDavSaveConfig : public QWidget
+class KDE_EXPORT CalDavSaveConfig : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit CalDavSaveConfig( TQWidget *parent = 0 );
+    explicit CalDavSaveConfig( TQWidget *tqparent = 0 );
     ~CalDavSaveConfig();
 
   public slots:
@@ -89,7 +91,7 @@ class KDE_EXPORT CalDavSaveConfig : public QWidget
 
   private:
     //@cond PRIVATE
-    //Q_DISABLE_COPY( CalDavSaveConfig )
+    //TQ_DISABLE_COPY( CalDavSaveConfig )
     class Private;
     Private *const d;
     //@endcond
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index 8e49041f..f32864f6 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -166,8 +166,8 @@ void CalDavJob::run() {
 
     // Signal done
     // 1000 is read, 1001 is write
-    if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
-    if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
+    if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+    if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
 }
 
 // EOF ========================================================================
diff --git a/kresources/caldav/job.h b/kresources/caldav/job.h
index 7d312d90..c19f2bf2 100644
--- a/kresources/caldav/job.h
+++ b/kresources/caldav/job.h
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * Sets the parent qobject.
+     * Sets the tqparent qobject.
      */
     virtual void setParent(TQObject *s) {
         mParent = s;
@@ -103,9 +103,9 @@ public:
     }
 
     /**
-     * @return parent object
+     * @return tqparent object
      */
-    virtual TQObject *parent() {
+    virtual TQObject *tqparent() {
         return mParent;
     }
 
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 5259d987..11de07e9 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -218,9 +218,9 @@ TQString CalDavPrefs::getFullUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.find("@") + 1;
-    while (safeURL.find("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
+    firstAt = safeURL.tqfind("@") + 1;
+    while (safeURL.tqfind("@", firstAt) != -1) {
+        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
@@ -245,9 +245,9 @@ TQString CalDavPrefs::getFullTasksUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.find("@") + 1;
-    while (safeURL.find("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
+    firstAt = safeURL.tqfind("@") + 1;
+    while (safeURL.tqfind("@", firstAt) != -1) {
+        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
@@ -272,9 +272,9 @@ TQString CalDavPrefs::getFullJournalsUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.find("@") + 1;
-    while (safeURL.find("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
+    firstAt = safeURL.tqfind("@") + 1;
+    while (safeURL.tqfind("@", firstAt) != -1) {
+        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index ea391139..7d7e2a48 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -246,8 +246,8 @@ void ResourceCalDav::init() {
     mWriter = new CalDavWriter;
 
     // creating jobs
-    // Qt4 handles this quite differently, as shown below,
-    // whereas Qt3 needs events (see ::event())
+    // TQt4 handles this quite differently, as shown below,
+    // whereas TQt3 needs events (see ::event())
 //     connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
 //     connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
 
@@ -726,7 +726,7 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
 
     // Get the iCal header and footer
     header = ical.toString(&loc);
-    int location = header.find("END:VCALENDAR", 0, true);
+    int location = header.tqfind("END:VCALENDAR", 0, true);
     footer = header.mid(location, 0xffffffff);
     header.remove("END:VCALENDAR");
 
@@ -740,8 +740,8 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
     data = data + footer;
 
     // Remove any line feeds/carriage returns/white spaces from the UID field as they WILL break libcaldav
-    int uidPos = data.find("UID:", 0) + 4;
-    int nextPos = data.findRev("\n", data.find(":", uidPos));
+    int uidPos = data.tqfind("UID:", 0) + 4;
+    int nextPos = data.findRev("\n", data.tqfind(":", uidPos));
     TQString uidField = data.mid(uidPos, nextPos-uidPos);
     data.remove(uidPos, nextPos-uidPos);
     uidField.tqreplace("\n", "");
diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index 033a19ce..66eb21d0 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -44,6 +44,7 @@ class CalDavWriter;
 class KDE_EXPORT ResourceCalDav : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index 337a4cda..a33519c9 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -69,8 +69,8 @@ CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) {
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *parent )
-    : KRES::ConfigWidget( parent )
+ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *tqparent )
+    : KRES::ConfigWidget( tqparent )
 {
     setupUI();
 }
diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h
index 7ea95aa9..4fd95511 100644
--- a/kresources/carddav/config.h
+++ b/kresources/carddav/config.h
@@ -39,10 +39,11 @@ class CardDavSaveConfig;
 class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ResourceCardDavConfig(TQWidget *parent = 0);
+    ResourceCardDavConfig(TQWidget *tqparent = 0);
 
 public slots:
 
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index b159a021..84d97938 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -73,8 +73,8 @@ class CardDavSaveConfig::Private
 };
 //@endcond
 
-CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
-  : TQWidget( parent ), d( new KABC::CardDavReloadConfig::Private() )
+CardDavReloadConfig::CardDavReloadConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), d( new KABC::CardDavReloadConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -112,7 +112,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setRange( 1, 900 );
   d->mIntervalSpin->setEnabled( false );
 
-  groupBox->setColumnLayout(1, Qt::Vertical);
+  groupBox->setColumnLayout(1, TQt::Vertical);
   TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
@@ -147,8 +147,8 @@ void CardDavReloadConfig::slotIntervalToggled( bool checked )
   }
 }
 
-CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
-  : TQWidget( parent ), d( new KABC::CardDavSaveConfig::Private() )
+CardDavSaveConfig::CardDavSaveConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), d( new KABC::CardDavSaveConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -205,7 +205,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
   intervalRadio->hide();
   intervalBox->hide();
 
-  groupBox->setColumnLayout(1, Qt::Vertical);
+  groupBox->setColumnLayout(1, TQt::Vertical);
   TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
diff --git a/kresources/carddav/configwidgets.h b/kresources/carddav/configwidgets.h
index f50c58dd..47b92bfa 100644
--- a/kresources/carddav/configwidgets.h
+++ b/kresources/carddav/configwidgets.h
@@ -46,11 +46,12 @@ class ResourceCached;
 
   @see ResourceCached
 */
-class KDE_EXPORT CardDavReloadConfig : public QWidget
+class KDE_EXPORT CardDavReloadConfig : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit CardDavReloadConfig( TQWidget *parent = 0 );
+    explicit CardDavReloadConfig( TQWidget *tqparent = 0 );
     ~CardDavReloadConfig();
   public slots:
     void loadSettings( ResourceCached *resource );
@@ -61,7 +62,7 @@ class KDE_EXPORT CardDavReloadConfig : public QWidget
 
   private:
     //@cond PRIVATE
-    //Q_DISABLE_COPY( CardDavReloadConfig )
+    //TQ_DISABLE_COPY( CardDavReloadConfig )
     class Private;
     Private *const d;
     //@endcond
@@ -72,11 +73,12 @@ class KDE_EXPORT CardDavReloadConfig : public QWidget
 
   @see ResourceCached
 */
-class KDE_EXPORT CardDavSaveConfig : public QWidget
+class KDE_EXPORT CardDavSaveConfig : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    explicit CardDavSaveConfig( TQWidget *parent = 0 );
+    explicit CardDavSaveConfig( TQWidget *tqparent = 0 );
     ~CardDavSaveConfig();
 
   public slots:
@@ -88,7 +90,7 @@ class KDE_EXPORT CardDavSaveConfig : public QWidget
 
   private:
     //@cond PRIVATE
-    //Q_DISABLE_COPY( CardDavSaveConfig )
+    //TQ_DISABLE_COPY( CardDavSaveConfig )
     class Private;
     Private *const d;
     //@endcond
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index 994964af..d2795d68 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -103,8 +103,8 @@ void CardDavJob::run() {
 
     // Signal done
     // 1000 is read, 1001 is write
-    if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
-    if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
+    if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+    if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
 }
 
 // EOF ========================================================================
diff --git a/kresources/carddav/job.h b/kresources/carddav/job.h
index 52a04bc7..e40604b9 100644
--- a/kresources/carddav/job.h
+++ b/kresources/carddav/job.h
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * Sets the parent qobject.
+     * Sets the tqparent qobject.
      */
     virtual void setParent(TQObject *s) {
         mParent = s;
@@ -88,9 +88,9 @@ public:
     }
 
     /**
-     * @return parent object
+     * @return tqparent object
      */
-    virtual TQObject *parent() {
+    virtual TQObject *tqparent() {
         return mParent;
     }
 
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index 61d17e30..6511cfcb 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -221,9 +221,9 @@ TQString CardDavPrefs::getFullUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.find("@") + 1;
-    while (safeURL.find("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
+    firstAt = safeURL.tqfind("@") + 1;
+    while (safeURL.tqfind("@", firstAt) != -1) {
+        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index b8a2525e..5cd95c3f 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -251,8 +251,8 @@ void ResourceCardDav::init() {
     mWriter = new CardDavWriter;
 
     // creating jobs
-    // Qt4 handles this quite differently, as shown below,
-    // whereas Qt3 needs events (see ::event())
+    // TQt4 handles this quite differently, as shown below,
+    // whereas TQt3 needs events (see ::event())
 //     connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
 //     connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
 
diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h
index b2300813..fca215aa 100644
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@@ -43,6 +43,7 @@ class CardDavWriter;
 class KDE_EXPORT ResourceCardDav : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kresources/carddav/writer.cpp b/kresources/carddav/writer.cpp
index 837fca66..aed9ddb6 100644
--- a/kresources/carddav/writer.cpp
+++ b/kresources/carddav/writer.cpp
@@ -59,7 +59,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
         if (OK == res) {
             kdDebug() << "pushing deleted objects";
             while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
-                int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
+                int endLocation = mDeleted.tqfind("END:VCARD", 0, TRUE);
                 TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                 mDeleted = mDeleted.remove(0, endLocation+9);
                 if (getUseURI() == false)
@@ -83,7 +83,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
             if (OK == res) {
                 kdDebug() << "pushing deleted objects";
                 while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
-                    int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
+                    int endLocation = mDeleted.tqfind("END:VCARD", 0, TRUE);
                     TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                     mDeleted = mDeleted.remove(0, endLocation+9);
                     if (getUseURI() == false)
diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h
index c2898771..52ddb227 100644
--- a/kresources/egroupware/debugdialog.h
+++ b/kresources/egroupware/debugdialog.h
@@ -32,6 +32,7 @@ class KTextBrowser;
 class DebugDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 115484c6..ae789ef6 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -479,7 +479,7 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::ConstIterator it = mCategoryMap.find( *catIt );
+    TQMap<TQString, int>::ConstIterator it = mCategoryMap.tqfind( *catIt );
     if ( it == mCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -575,9 +575,9 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   const TQStringList customFields = addr.customs();
   TQStringList::ConstIterator it;
   for ( it = customFields.begin(); it != customFields.end(); ++it ) {
-    int colon = (*it).find( ":" );
+    int colon = (*it).tqfind( ":" );
     TQString identifier = (*it).left( colon );
-    int dash = identifier.find( "-" );
+    int dash = identifier.tqfind( "-" );
     TQString app = identifier.left( dash );
     TQString name = identifier.mid( dash + 1 );
     TQString value = (*it).mid( colon + 1 );
@@ -752,7 +752,7 @@ void ResourceXMLRPC::loadCategoriesFinished( const TQValueList<TQVariant> &mapLi
     mCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
     TQStringList categories = prefs->customCategories();
-    if ( categories.find( it.data().toString() ) == categories.end() )
+    if ( categories.tqfind( it.data().toString() ) == categories.end() )
       categories.append( it.data().toString() );
 
     prefs->mCustomCategories = categories;
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 0ce56a03..e7ae1c53 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -40,6 +40,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index 02a2f1ad..459a6b6f 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KABC;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index f73b2e0a..a680cfb0 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -32,9 +32,10 @@ namespace KABC {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 15864a37..6bbdc234 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -250,7 +250,7 @@ bool ResourceXMLRPC::doLoad()
   columns.insert( "type", "task" );
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_parent" );
+  args.insert( "order", "id_tqparent" );
 
   mServer->call( SearchTodosCommand, args,
                  this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
@@ -651,7 +651,7 @@ void ResourceXMLRPC::loadEventCategoriesFinished( const TQValueList<TQVariant> &
   for ( it = map.begin(); it != map.end(); ++it ) {
     mEventCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -756,7 +756,7 @@ void ResourceXMLRPC::loadTodoCategoriesFinished( const TQValueList<TQVariant> &m
   for ( it = map.begin(); it != map.end(); ++it ) {
     mTodoCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -964,7 +964,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mEventCategoryMap.find( *catIt );
+    TQMap<TQString, int>::Iterator it = mEventCategoryMap.tqfind( *catIt );
     if ( it == mEventCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -1099,7 +1099,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   TQStringList::ConstIterator catIt;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.find( *catIt );
+    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.tqfind( *catIt );
     if ( it == mTodoCategoryMap.end() )
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -1114,8 +1114,8 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   // SUBTODO
   Incidence *inc = todo->relatedTo();
   if ( inc ) {
-    TQString parentUid = idMapper().remoteId( inc->uid() );
-    args.insert( "id_parent", parentUid );
+    TQString tqparentUid = idMapper().remoteId( inc->uid() );
+    args.insert( "id_tqparent", tqparentUid );
   }
 
   // STATE
@@ -1172,13 +1172,13 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod
   }
 
   // SUBTODO
-  TQString parentId = args[ "id_parent" ].toString();
-  if ( parentId != "0" ) { // we are a sub todo
-    TQString localParentUid = idMapper().localId( parentId );
-    if ( !localParentUid.isEmpty() ) { // found parent todo
-      Todo *parent = mCalendar.todo( localParentUid );
-      if ( parent )
-        todo->setRelatedTo( parent );
+  TQString tqparentId = args[ "id_tqparent" ].toString();
+  if ( tqparentId != "0" ) { // we are a sub todo
+    TQString localParentUid = idMapper().localId( tqparentId );
+    if ( !localParentUid.isEmpty() ) { // found tqparent todo
+      Todo *tqparent = mCalendar.todo( localParentUid );
+      if ( tqparent )
+        todo->setRelatedTo( tqparent );
     }
   }
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index 76316411..6d538d73 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -53,6 +53,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 36e3b948..740602b5 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KCal;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index f71359aa..d070eebf 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -33,9 +33,10 @@ namespace KCal {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 6446a833..ada19144 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -132,7 +132,7 @@ bool ResourceXMLRPC::load()
   args.clear();
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_parent" );
+  args.insert( "order", "id_tqparent" );
 
   mServer->call( SearchNotesCommand, args,
                  this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index 7301ef90..eeb47e13 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -49,6 +49,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 224cb991..0e2816b1 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KNotes;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index 63119ab7..70201f60 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -33,9 +33,10 @@ namespace KNotes {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 5c8fcf84..0793bd60 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -114,7 +114,7 @@ void TodoStateMapper::addTodoState( const TQString &uid, int localState, const T
 
 TQString TodoStateMapper::remoteState( const TQString &uid, int localState )
 {
-  if ( mTodoStateMap.find( uid ) == mTodoStateMap.end() )
+  if ( mTodoStateMap.tqfind( uid ) == mTodoStateMap.end() )
     kdError() << "TodoStateMapper: no entry for " << uid << " found" << endl;
 
   TodoStateMapEntry entry = mTodoStateMap[ uid ];
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 68bade03..bd31a194 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -54,9 +54,9 @@ namespace KXMLRPC
   };
 }
 
-Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name )
 {
-  return new Query( id, parent, name );
+  return new Query( id, tqparent, name );
 }
 
 void Query::call( const TQString &server, const TQString &method,
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::ByteArray:
       return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
       case TQVariant::DateTime:
-      return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
+      return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
       case TQVariant::List:
       {
         TQString markup = "<value><array><data>\r\n";
@@ -253,7 +253,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       default:
       kdWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl;
   };
-  return TQString::null;
+  return TQString();
 }
 
 TQVariant Query::demarshal( const TQDomElement &elem ) const
@@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   else if ( typeName == "base64" )
     return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
   else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
-    return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
+    return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
   else if ( typeName == "array" )
   {
     TQValueList<TQVariant> values;
@@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   return TQVariant();
 }
 
-Query::Query( const TQVariant &id, TQObject *parent, const char *name )
-  : TQObject( parent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), m_id( id )
 {}
 
 Query::~Query()
@@ -321,8 +321,8 @@ Query::~Query()
     (*it)->kill();
 }
 
-Server::Server( const KURL &url, TQObject *parent, const char *name )
-    : TQObject( parent, name )
+Server::Server( const KURL &url, TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
   if ( url.isValid() )
     m_url = url;
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index a1460c21..5c49eee8 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -30,14 +30,15 @@ namespace KXMLRPC
   class Server;
   class Result;
 
-  class Query : public QObject
+  class Query : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
 
       static Query *create( const TQVariant &id = TQVariant(),
-                            TQObject *parent = 0, const char *name = 0 );
+                            TQObject *tqparent = 0, const char *name = 0 );
 
     public slots:
       void call( const TQString &server, const TQString &method,
@@ -65,7 +66,7 @@ namespace KXMLRPC
       TQString marshal( const TQVariant &v ) const;
       TQVariant demarshal( const TQDomElement &e ) const;
 
-      Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 );
+      Query( const TQVariant &id, TQObject *tqparent = 0, const char *name = 0 );
       ~Query();
 
       TQByteArray m_buffer;
@@ -74,12 +75,13 @@ namespace KXMLRPC
       TQValueList<KIO::Job*> m_pendingJobs;
   };
 
-  class Server : public QObject
+  class Server : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
       Server( const KURL &url = KURL(),
-              TQObject *parent = 0, const char *name = 0 );
+              TQObject *tqparent = 0, const char *name = 0 );
       ~Server();
 
       const KURL &url() const { return m_url; }
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index 2fed82af..d28409a9 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -45,11 +45,11 @@ DateSet::~DateSet()
 void DateSet::add( TQDate const& date )
 {
   if (mDates->isEmpty()) {
-    mDates->insert( 0, new QPair<TQDate,TQDate>( date, date ) );
+    mDates->insert( 0, new TQPair<TQDate,TQDate>( date, date ) );
     return;
   } 
-  int i = find( date );
-  mDates->insert( i, new QPair<TQDate,TQDate>( date, date ) );
+  int i = tqfind( date );
+  mDates->insert( i, new TQPair<TQDate,TQDate>( date, date ) );
   tryMerge( i );
   tryMerge( i-1 );
 }
@@ -57,19 +57,19 @@ void DateSet::add( TQDate const& date )
 void DateSet::add( TQDate const& from, TQDate const& to )
 {
   if (mDates->isEmpty()) {
-    mDates->insert( 0, new QPair<TQDate,TQDate>( from, to ) );
+    mDates->insert( 0, new TQPair<TQDate,TQDate>( from, to ) );
     return;
   } 
-  uint i = find( from );
+  uint i = tqfind( from );
   kdDebug() << "Adding range at position " << i << endl;
-  mDates->insert( i, new QPair<TQDate,TQDate>( from, to ) );
+  mDates->insert( i, new TQPair<TQDate,TQDate>( from, to ) );
 
   do {
   } while ( tryMerge( i ) );
   do {
   } while ( tryMerge( i-1 ) );
 /*  
-  QPair<TQDate,TQDate>* item = mDates->at( i );
+  TQPair<TQDate,TQDate>* item = mDates->at( i );
 
   if (to >= item->first)
     return;
@@ -77,7 +77,7 @@ void DateSet::add( TQDate const& from, TQDate const& to )
   if (to.daysTo( item->first ) == 1 )
     item->first = from;
   else
-    mDates->insert( i, new QPair<TQDate,TQDate>( from, to ) );
+    mDates->insert( i, new TQPair<TQDate,TQDate>( from, to ) );
 */
 }
 
@@ -87,11 +87,11 @@ void DateSet::remove( TQDate const& date )
     return;
   } 
 
-  uint i = find( date );
+  uint i = tqfind( date );
   if ( i == mDates->count() )
     return;
 
-  QPair<TQDate,TQDate>* item = mDates->at( i );
+  TQPair<TQDate,TQDate>* item = mDates->at( i );
   if ( date < item->first )
     return;
   if ( date == item->first ) {
@@ -106,7 +106,7 @@ void DateSet::remove( TQDate const& date )
   if ( date == item->second ) {
     item->second = item->second.addDays( -1 );
   } else {
-    mDates->insert( i, new QPair<TQDate,TQDate>(item->first, date.addDays( -1 ) ) );
+    mDates->insert( i, new TQPair<TQDate,TQDate>(item->first, date.addDays( -1 ) ) );
     item->first = date.addDays( 1 );
   }
 }
@@ -117,12 +117,12 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
     return;
   } 
   
-  uint i = find( from );
+  uint i = tqfind( from );
   if ( i == mDates->count() )
     return;
   
   while( i < mDates->count() ) {
-    QPair<TQDate,TQDate>* item = mDates->at( i );
+    TQPair<TQDate,TQDate>* item = mDates->at( i );
     // Check if we're done: next item is later dan removal period
     if ( to < item->first )
       break;
@@ -136,7 +136,7 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
 
     // Check if we should take a slice out of the middle of the item
     if ( from > item->first && to < item->second ) {
-      mDates->insert( i, new QPair<TQDate,TQDate>( item->first, from.addDays( -1 ) ) );
+      mDates->insert( i, new TQPair<TQDate,TQDate>( item->first, from.addDays( -1 ) ) );
       item->first = to.addDays( 1 );
       break; // We're done
     }
@@ -161,13 +161,13 @@ bool DateSet::tqcontains( TQDate const& date )
     return false;
   } 
 
-  uint i = find( date );
-//  kdDebug() << "tqcontains looking for " << date.toString() << " at range " << i << endl;
+  uint i = tqfind( date );
+//  kdDebug() << "contains looking for " << date.toString() << " at range " << i << endl;
   if ( i == mDates->count() )
     return false;
 
-  QPair<TQDate,TQDate>* item = mDates->at( i );
-  // kdDebug() << "tqcontains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
+  TQPair<TQDate,TQDate>* item = mDates->at( i );
+  // kdDebug() << "contains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
   return ( item->first <= date );
 }
 
@@ -178,11 +178,11 @@ bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
     return false;
   } 
 
-  uint i = find( from );
+  uint i = tqfind( from );
   if ( i == mDates->count() )
     return false;
 
-  QPair<TQDate,TQDate>* item = mDates->at( i );
+  TQPair<TQDate,TQDate>* item = mDates->at( i );
 
   return ( from >= item->first && to <= item->second );
 }
@@ -192,7 +192,7 @@ bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
 // If mDates is empty, return 0.
 // If date is later than the last item in mDates, return mDates->count()
 
-int DateSet::find( TQDate const& date )
+int DateSet::tqfind( TQDate const& date )
 {
   if ( mDates->isEmpty() )
     return 0;
@@ -202,7 +202,7 @@ int DateSet::find( TQDate const& date )
   while ( start < end ) {
     int i = start + (end-start) / 2;
     // kdDebug() << start << ", " << i << ", " << end << endl;
-    QPair<TQDate,TQDate> *item = mDates->at( i );
+    TQPair<TQDate,TQDate> *item = mDates->at( i );
     if ( item->first <= date && date <= item->second )
       return i;
     if ( date > item->second ) {
@@ -246,8 +246,8 @@ bool DateSet::tryMerge( int i )
   if ( i < 0 || i+1 >= (int)(mDates->count()) )
     return false;
 
-  QPair<TQDate,TQDate>* item1 = mDates->at( i );
-  QPair<TQDate,TQDate>* item2 = mDates->at( i+1 );
+  TQPair<TQDate,TQDate>* item1 = mDates->at( i );
+  TQPair<TQDate,TQDate>* item2 = mDates->at( i+1 );
 
   // First case: item1 starts before or on the same date as item2
   if ( item1->first <= item2->first ) {
diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h
index d4e9a9fe..99c02a5c 100644
--- a/kresources/exchange/dateset.h
+++ b/kresources/exchange/dateset.h
@@ -46,11 +46,11 @@ class DateRange {
 }
 */
 
-class RangeList : public TQPtrList< QPair<TQDate, TQDate> > {
+class RangeList : public TQPtrList< TQPair<TQDate, TQDate> > {
   protected:
     virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) {
-       QPair<TQDate,TQDate> *i1 = static_cast<QPair<TQDate,TQDate> *> (item1);
-       QPair<TQDate,TQDate> *i2 = static_cast<QPair<TQDate,TQDate> *> (item2);
+       TQPair<TQDate,TQDate> *i1 = static_cast<TQPair<TQDate,TQDate> *> (item1);
+       TQPair<TQDate,TQDate> *i2 = static_cast<TQPair<TQDate,TQDate> *> (item2);
        if ( *i1 < *i2 ) return -1;
        if ( *i2 < *i1 ) return 1;
        return 0;
@@ -72,7 +72,7 @@ class DateSet {
     // returns true if and only if the whole range is in the set
     bool tqcontains( TQDate const& from, TQDate const& to );
 
-    int find( TQDate const &date );
+    int tqfind( TQDate const &date );
     void print();
 
   protected:
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index ec203b9c..234907fc 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -233,7 +233,7 @@ void ResourceExchange::slotMonitorNotify( const TQValueList<long>& IDs, const TQ
    * 3. Event modified that we have in cache
    * 4. Something else happened that isn't relevant to us
    * Update cache, then notify whoever's watching us
-   * We may be able to find (1) and (3) by looking at the
+   * We may be able to tqfind (1) and (3) by looking at the
    *   DAV:getlastmodified property
    * (2) is trickier: we might have to resort to checking
    * all uids in the cache
@@ -298,7 +298,7 @@ void ResourceExchange::changeIncidence( Incidence *incidence )
   kdDebug() << "ResourceExchange::changeIncidence(): "
             << incidence->summary() << endl;
 
-  if ( mChangedIncidences.find( incidence ) == mChangedIncidences.end() ) {
+  if ( mChangedIncidences.tqfind( incidence ) == mChangedIncidences.end() ) {
     mChangedIncidences.append( incidence );
   }
 }
@@ -505,7 +505,7 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
     // are really new.
     Event::List eventsAfter = mCache->rawEvents();
     for ( it = eventsAfter.begin(); it != eventsAfter.end(); ++it ) {
-      if ( eventsBefore.find( *it ) == eventsBefore.end() ) {
+      if ( eventsBefore.tqfind( *it ) == eventsBefore.end() ) {
         // it's a new event downloaded by downloadSynchronous -> install observer
         (*it)->registerObserver( this );
       }
diff --git a/kresources/exchange/resourceexchange.h b/kresources/exchange/resourceexchange.h
index 7328a27b..d6a092f2 100644
--- a/kresources/exchange/resourceexchange.h
+++ b/kresources/exchange/resourceexchange.h
@@ -48,6 +48,7 @@ class CalFormat;
 class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceExchange( const KConfig * );
diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp
index 5bb9677b..5a20dba0 100644
--- a/kresources/exchange/resourceexchangeconfig.cpp
+++ b/kresources/exchange/resourceexchangeconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KCal;
 
-ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 8, 3 );
@@ -101,7 +101,7 @@ void ResourceExchangeConfig::saveSettings( KRES::Resource *resource )
   ResourceExchange* res = dynamic_cast<ResourceExchange*>( resource );
   if (res) {
     if ( mAutoMailbox->isChecked() ) {
-      mMailboxEdit->setText( TQString::null );
+      mMailboxEdit->setText( TQString() );
       slotFindClicked();
       if ( mMailboxEdit->text().isNull() ) {
         kdWarning() << "Could not find Exchange mailbox URL, incomplete settings!" << endl;
diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h
index 870317af..9e4af871 100644
--- a/kresources/exchange/resourceexchangeconfig.h
+++ b/kresources/exchange/resourceexchangeconfig.h
@@ -37,9 +37,10 @@ namespace KCal {
 class ResourceExchangeConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 );
+  ResourceExchangeConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
 public slots:
   virtual void loadSettings( KRES::Resource *resource);
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index cce88495..692a8584 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -100,7 +100,7 @@ bool ResourceFeaturePlan::doLoad()
 }
 
 void ResourceFeaturePlan::insertCategories( const Category::List &categories,
-                                            Todo *parent )
+                                            Todo *tqparent )
 {
   Category::List::ConstIterator it;
   for( it = categories.begin(); it != categories.end(); ++it ) {
@@ -108,7 +108,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories,
   
     Todo *categoryTodo = new Todo;
     categoryTodo->setSummary( c->name() );
-    categoryTodo->setRelatedTo( parent );
+    categoryTodo->setRelatedTo( tqparent );
 
     insertCategories( c->categoryList(), categoryTodo );  
   
@@ -119,7 +119,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories,
       Todo *todo = new Todo;
 
       TQString summary = f->summary();
-      int pos = summary.find( '\n' );
+      int pos = summary.tqfind( '\n' );
       if ( pos > 0 ) summary = summary.left( pos ) + "...";
       todo->setSummary( summary );
       
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h
index 976d82af..68f719a5 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.h
+++ b/kresources/featureplan/kcal_resourcefeatureplan.h
@@ -40,6 +40,7 @@ namespace KCal {
 class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceFeaturePlan( const KConfig * );
     virtual ~ResourceFeaturePlan();
@@ -55,7 +56,7 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
     KABC::Lock *lock();
 
   protected:
-    void insertCategories( const Category::List &categories, Todo *parent );
+    void insertCategories( const Category::List &categories, Todo *tqparent );
 
   private:
     Prefs *mPrefs;
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
index 42043a5d..6478a213 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
@@ -35,9 +35,9 @@
 
 using namespace KCal;
 
-ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *parent,
+ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *tqparent,
                                                       const char *name )
-  : KRES::ConfigWidget( parent, name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0,
                                             KDialog::spacingHint() );
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index ee210ad9..97da46be 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -34,9 +34,10 @@ namespace KCal {
 class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceFeaturePlanConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource * );
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 10716000..ed1ad09b 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -96,7 +96,7 @@ bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:displayname" );
   WebdavHandler::addElement( doc, prop, "d:resourcetype" );
@@ -110,7 +110,7 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement(  doc, root, "prop" );
   WebdavHandler::addDavElement( doc, prop, "getetag" );
 //  WebdavHandler::addDavElement( doc, prop, "getcontenttype" );
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index e6765758..c3724424 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -30,6 +30,7 @@ namespace KABC {
 class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupDav( const KConfig * );
diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h
index 5ca3e3b6..2ff54695 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.h
+++ b/kresources/groupdav/kcal_resourcegroupdav.h
@@ -34,6 +34,7 @@ namespace KCal {
 class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceGroupDav();
     ResourceGroupDav( const KConfig * );
diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp
index c9fef7a0..f82b0c75 100644
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@@ -241,7 +241,7 @@ bool ResourceGroupware::asyncLoad()
 
   kdDebug() << "Download URL: " << url << endl;
 
-  mJobData = TQString::null;
+  mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
   connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index 46547fc6..564a3b1f 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -35,6 +35,7 @@ class GroupwarePrefs;
 class ResourceGroupware : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupware( const KConfig * );
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index cfe6ba98..7232fd1e 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -36,11 +36,11 @@
 
 using namespace KABC;
 
-class AddressBookItem : public QCheckListItem
+class AddressBookItem : public TQCheckListItem
 {
   public:
-    AddressBookItem( KListView *parent, const TQString &id )
-      : TQCheckListItem( parent, "", CheckBox ),
+    AddressBookItem( KListView *tqparent, const TQString &id )
+      : TQCheckListItem( tqparent, "", CheckBox ),
         mId( id )
     {
       setText( 0, mId );
@@ -58,8 +58,8 @@ class AddressBookItem : public QCheckListItem
     TQString mId;
 };
 
-ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
@@ -193,7 +193,7 @@ void ResourceGroupwareConfig::updateAddressBookView()
   Groupware::AddressBook::List::ConstIterator abIt;
   for ( abIt = addressBooks.begin(); abIt != addressBooks.end(); ++abIt ) {
     AddressBookItem *item = new AddressBookItem( mAddressBookView, *abIt );
-    if ( selectedRead.find( (*abIt).id ) != selectedRead.end() )
+    if ( selectedRead.tqfind( (*abIt).id ) != selectedRead.end() )
       item->setOn( true );
 
     mAddressBookBox->insertItem( (*abIt).name );
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h
index 32bcfa71..220575c2 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.h
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.h
@@ -36,9 +36,10 @@ class ResourceGroupware;
 class ResourceGroupwareConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceGroupwareConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp
index 01a51684..1dc1bf7c 100644
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@@ -156,7 +156,7 @@ bool ResourceGroupware::doLoad()
 
   kdDebug() << "Download URL: " << url << endl;
 
-  mJobData = TQString::null;
+  mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
   connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 610203fc..030d9499 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -42,6 +42,7 @@ namespace KCal {
 class ResourceGroupware : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceGroupware();
   
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
index 2d5cffe0..dbb76f33 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index c3085471..761a6aa0 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -41,8 +41,9 @@ class ResourceCachedSaveConfig;
 class ResourceGroupwareConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceGroupwareConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp
index 60d04712..53f3b095 100644
--- a/kresources/groupwise/groupwisesettingswidget.cpp
+++ b/kresources/groupwise/groupwisesettingswidget.cpp
@@ -24,8 +24,8 @@
 
 #include "groupwisesettingswidget.h"
 
-GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
-: GroupWiseSettingsWidgetBase( parent )
+GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * tqparent )
+: GroupWiseSettingsWidgetBase( tqparent )
 {
   connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
           this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index 68adee24..37027c64 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -31,8 +31,9 @@ class TQListViewItem;
 class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  GroupWiseSettingsWidget( TQWidget * parent );
+  GroupWiseSettingsWidget( TQWidget * tqparent );
   TQMap<TQString, TQString> dirtySettings();
   void reset();
 protected slots:
diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/kresources/groupwise/groupwisesettingswidgetbase.ui
index eee04f6f..48c75875 100644
--- a/kresources/groupwise/groupwisesettingswidgetbase.ui
+++ b/kresources/groupwise/groupwisesettingswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GroupWiseSettingsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GroupWiseSettingsWidgetBase</cstring>
     </property>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 7c87508e..d1300f9c 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad()
   if ( !mProgress )
   {
     mProgress = KPIM::ProgressManager::instance()->createProgressItem(
-      KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString::null, true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+      KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
     connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
                TQT_SLOT( cancelLoad() ) );
   }
@@ -338,7 +338,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
 
   mState = ( bookType == System ? FetchingSAB : FetchingUAB );
-  mJobData = TQString::null;
+  mJobData = TQString();
 
   if ( mJob )
   {
@@ -347,7 +347,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
 
   mJob = KIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
-                                         // tqcontains no address book IDs
+                                         // contains no address book IDs
   kdDebug() << "  Job address: " << mJob << endl;
   connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
            TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
@@ -360,7 +360,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
            TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
     mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
-        i18n( "Fetching System Address Book" ), TQString::null,
+        i18n( "Fetching System Address Book" ), TQString(),
         false /*CannotBeCancelled*/,
         mPrefs->url().startsWith("https" ) );
   }
@@ -370,7 +370,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
            TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
     mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
-        i18n( "Fetching User Address Books" ), TQString::null,
+        i18n( "Fetching User Address Books" ), TQString(),
         false /*CannotBeCancelled*/,
         mPrefs->url().startsWith("https" ) );
   }
@@ -437,10 +437,10 @@ void ResourceGroupwise::updateSystemAddressBook()
   KURL url = createAccessUrl( System, Update, mPrefs->lastSequenceNumber(), mPrefs->lastTimePORebuild() );
   kdDebug() << "  Update URL: " << url << endl;
 
-  mJobData = TQString::null;
+  mJobData = TQString();
   mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
       mProgress, KPIM::ProgressManager::getUniqueID(),
-      i18n( "Updating System Address Book" ), TQString::null,
+      i18n( "Updating System Address Book" ), TQString(),
       false /*CannotBeCancelled*/,
       mPrefs->url().startsWith("https" ) );
 
@@ -517,7 +517,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data
       clearChange( addr );
     }
   }
-  mJobData = TQString::null;
+  mJobData = TQString();
 }
 
 void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
@@ -558,7 +558,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
           if ( !local.isEmpty() )
           {
             idMapper().removeRemoteId( remote );
-            KABC::Addressee addrToDelete = tqfindByUid( local );
+            KABC::Addressee addrToDelete = findByUid( local );
             removeAddressee( addrToDelete );
           }
         }
@@ -567,7 +567,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
       }
     }
   }
-  mJobData = TQString::null;
+  mJobData = TQString();
 }
 
 void ResourceGroupwise::loadCompleted()
@@ -665,13 +665,13 @@ bool ResourceGroupwise::shouldFetchSystemAddressBook()
 {
   
   TQStringList ids = mPrefs->readAddressBooks();
-  return ( appIsWhiteListedForSAB() && ids.find( mPrefs->systemAddressBook() ) != ids.end() );
+  return ( appIsWhiteListedForSAB() && ids.tqfind( mPrefs->systemAddressBook() ) != ids.end() );
 }
 
 bool ResourceGroupwise::shouldFetchUserAddressBooks()
 {
   TQStringList ids = mPrefs->readAddressBooks();
-  return ( ids.count() > 1 || ids.find( mPrefs->systemAddressBook() ) == ids.end() );
+  return ( ids.count() > 1 || ids.tqfind( mPrefs->systemAddressBook() ) == ids.end() );
 }
 
 KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, unsigned long lastSequenceNumber, unsigned long lastPORebuildTime )
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index cd634a01..4cdfe551 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -42,6 +42,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
   friend class ResourceGroupwiseConfig;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupwise( const KConfig * );
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index f195700c..91b0380a 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -36,11 +36,11 @@
 
 using namespace KABC;
 
-class AddressBookItem : public QCheckListItem
+class AddressBookItem : public TQCheckListItem
 {
   public:
-    AddressBookItem( KListView *parent, GroupWise::AddressBook ab )
-      : TQCheckListItem( parent, "", CheckBox ),
+    AddressBookItem( KListView *tqparent, GroupWise::AddressBook ab )
+      : TQCheckListItem( tqparent, "", CheckBox ),
         mId( ab.id )
     {
       setText( 0, ab.name );
@@ -56,8 +56,8 @@ class AddressBookItem : public QCheckListItem
     TQString mId;
 };
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
@@ -168,7 +168,7 @@ void ResourceGroupwiseConfig::saveAddressBookSettings()
   // if so, clear the resource to clear the SAB data that is no longer required.
   // also, set the sequence numbers to 0 so that we know the SAB should be re-fetched in its entirety the next time we do load it
   TQString sab = mResource->prefs()->systemAddressBook();
-  if ( ( mReadAddressBookIds.find( sab ) != mReadAddressBookIds.end() ) && ( selectedRead.find( sab ) == selectedRead.end() ) )
+  if ( ( mReadAddressBookIds.tqfind( sab ) != mReadAddressBookIds.end() ) && ( selectedRead.tqfind( sab ) == selectedRead.end() ) )
   {
     mResource->clearCache();
     mResource->prefs()->setLastSequenceNumber( 0 );
@@ -195,7 +195,7 @@ void ResourceGroupwiseConfig::updateAddressBookView()
   GroupWise::AddressBook::List::ConstIterator abIt;
   for ( abIt = addressBooks.begin(); abIt != addressBooks.end(); ++abIt ) {
     AddressBookItem *item = new AddressBookItem( mAddressBookView, *abIt );
-    if ( selectedRead.find( (*abIt).id ) != selectedRead.end() )
+    if ( selectedRead.tqfind( (*abIt).id ) != selectedRead.end() )
       item->setOn( true );
 
     mAddressBookBox->insertItem( (*abIt).name );
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index d5bec19a..d120f316 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -39,9 +39,10 @@ class ResourceGroupwise;
 class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceGroupwiseConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 3f8c08ef..dadf5b31 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -155,7 +155,7 @@ bool ResourceGroupwise::doLoad()
 
   kdDebug() << "Download URL: " << url << endl;
 
-  mJobData = TQString::null;
+  mJobData = TQString();
 
   mDownloadJob = KIO::get( url, false, false );
   connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index e808da0e..66011aa9 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -44,6 +44,7 @@ class GroupwisePrefsBase;
 class KDE_EXPORT ResourceGroupwise : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupwise();
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index f9e28008..8e579f8c 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -41,8 +41,8 @@
 
 using namespace KCal;
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
@@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
 
     if ( s )
     {
-      KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+      KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
 //       TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
       GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
       dialog->setMainWidget( settingsWidget );
@@ -155,7 +155,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
             locked = *((*it2)->locked);
 
           kdDebug() << "  SETTING: " << setting  << "   value : " << value <<  (locked ? "locked" : " not locked " ) << endl;
-          KListViewItem * settingLVI = new KListViewItem( groupLVI, TQString::null, setting, value, (locked ? "locked" : " not locked " ) ); 
+          KListViewItem * settingLVI = new KListViewItem( groupLVI, TQString(), setting, value, (locked ? "locked" : " not locked " ) ); 
           if ( !locked )
             settingLVI->setRenameEnabled( 2, true );
         }
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index c2ae218b..1687095c 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -42,8 +42,9 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceGroupwiseConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h
index 9a816ad8..72b57971 100644
--- a/kresources/groupwise/kioslave/groupwise.h
+++ b/kresources/groupwise/kioslave/groupwise.h
@@ -27,6 +27,7 @@
 class Groupwise : public TQObject, public KIO::SlaveBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     void get( const KURL &url );
     Groupwise( const TQCString &protocol, const TQCString &pool,
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index f0f02bca..97aff84f 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -223,11 +223,11 @@ KABC::Addressee ContactConverter::convertFromAddressBookItem( ngwt__AddressBookI
     return addr;
   }
   // gwt:Item
-  addr.insertCustom( "GWRESOURCE", "UID", stringToQString( addrBkItem->id ) );
-  addr.setFormattedName( stringToQString( addrBkItem->name ) );
+  addr.insertCustom( "GWRESOURCE", "UID", stringToTQString( addrBkItem->id ) );
+  addr.setFormattedName( stringToTQString( addrBkItem->name ) );
   // gwt::AddressBookItem
-  addr.insertCustom( "GWRESOURCE", "UUID", stringToQString( addrBkItem->uuid ) );
-  addr.setNote( stringToQString( addrBkItem->comment ) );
+  addr.insertCustom( "GWRESOURCE", "UUID", stringToTQString( addrBkItem->uuid ) );
+  addr.setNote( stringToTQString( addrBkItem->comment ) );
   
   return addr;
 }
@@ -242,11 +242,11 @@ KABC::Addressee ContactConverter::convertFromResource( ngwt__Resource* resource
     return addr;
   }
   if ( resource->phone )
-    addr.insertPhoneNumber( KABC::PhoneNumber( stringToQString( resource->phone ), KABC::PhoneNumber::Work ) );
+    addr.insertPhoneNumber( KABC::PhoneNumber( stringToTQString( resource->phone ), KABC::PhoneNumber::Work ) );
   if ( resource->email )
-    addr.insertEmail( stringToQString( resource->email ), true );
+    addr.insertEmail( stringToTQString( resource->email ), true );
   if ( resource->owner )
-    addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", stringToQString( resource->owner->__item ) );
+    addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", stringToTQString( resource->owner->__item ) );
 
   addr.insertCategory( i18n( "Resource" ) );
   return addr;
@@ -282,24 +282,24 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
 
   if ( fullName ) {
     if ( fullName->displayName )
-      addr.setFormattedName( stringToQString( fullName->displayName ) );
+      addr.setFormattedName( stringToTQString( fullName->displayName ) );
     else
-      addr.setFormattedName( TQString::null );
+      addr.setFormattedName( TQString() );
     
     if ( fullName->namePrefix )
-      addr.setPrefix( stringToQString( fullName->namePrefix ) );
+      addr.setPrefix( stringToTQString( fullName->namePrefix ) );
 
     if ( fullName->firstName )
-      addr.setGivenName( stringToQString( fullName->firstName ) );
+      addr.setGivenName( stringToTQString( fullName->firstName ) );
 
     if ( fullName->middleName )
-      addr.setAdditionalName( stringToQString( fullName->middleName ) );
+      addr.setAdditionalName( stringToTQString( fullName->middleName ) );
 
     if ( fullName->lastName )
-      addr.setFamilyName( stringToQString( fullName->lastName ) );
+      addr.setFamilyName( stringToTQString( fullName->lastName ) );
 
     if ( fullName->nameSuffix )
-      addr.setSuffix( stringToQString( fullName->nameSuffix ) );
+      addr.setSuffix( stringToTQString( fullName->nameSuffix ) );
   }
 
   // Emails
@@ -307,14 +307,14 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
      TQStringList emails;
 
      if ( contact->emailList->primary )
-         emails.append( stringToQString( contact->emailList->primary ) );
+         emails.append( stringToTQString( contact->emailList->primary ) );
 
      if ( !contact->emailList->email.empty() ) {
        std::vector<std::string> list = contact->emailList->email;
        std::vector<std::string>::const_iterator it;
        for ( it = list.begin(); it != list.end(); ++it ) {
-         if ( emails.find( stringToQString( *it ) ) == emails.end() )
-           emails.append( stringToQString( *it ) );
+         if ( emails.tqfind( stringToTQString( *it ) ) == emails.end() )
+           emails.append( stringToTQString( *it ) );
        }
      }
 
@@ -324,7 +324,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
 
   // Phone numbers
   if ( contact->phoneList && !contact->phoneList->phone.empty() ) {
-    TQString defaultNumber = stringToQString( contact->phoneList->default_ );
+    TQString defaultNumber = stringToTQString( contact->phoneList->default_ );
 
     std::vector<class ngwt__PhoneNumber*> list = contact->phoneList->phone;
     std::vector<class ngwt__PhoneNumber*>::const_iterator it;
@@ -354,16 +354,16 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
     ngwt__OfficeInfo* info = contact->officeInfo;
 
     if ( info->organization )
-      addr.setOrganization( stringToQString( info->organization->__item ) );
+      addr.setOrganization( stringToTQString( info->organization->__item ) );
 
     if ( info->department )
-      addr.insertCustom( "KADDRESSBOOK", "X-Department", stringToQString( info->department ) );
+      addr.insertCustom( "KADDRESSBOOK", "X-Department", stringToTQString( info->department ) );
 
     if ( info->title )
-      addr.setTitle( stringToQString( info->title ) );
+      addr.setTitle( stringToTQString( info->title ) );
 
     if ( info->website )
-      addr.setUrl( KURL( stringToQString( info->website ) ) );
+      addr.setUrl( KURL( stringToTQString( info->website ) ) );
   }
 
   // Personal information
@@ -371,13 +371,13 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
     ngwt__PersonalInfo* info = contact->personalInfo;
 
     if ( info->birthday ) {
-      TQDate date = stringToQDate( info->birthday );
+      TQDate date = stringToTQDate( info->birthday );
       if ( date.isValid() )
         addr.setBirthday( date );
     }
 
     if ( info->website ) // we might overwrite the office info website here... :(
-      addr.setUrl( KURL( stringToQString( info->website ) ) );
+      addr.setUrl( KURL( stringToTQString( info->website ) ) );
   }
 
   // IM addresses
@@ -387,9 +387,9 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
     std::vector<ngwt__ImAddress*> list = contact->imList->im;
     std::vector<ngwt__ImAddress*>::const_iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
-      TQStringList addressesForService = addressMap[ stringToQString( (*it)->service ) ];
-      addressesForService.append( stringToQString( (*it)->address ) );
-      addressMap.insert( stringToQString( (*it)->service ), addressesForService );
+      TQStringList addressesForService = addressMap[ stringToTQString( (*it)->service ) ];
+      addressesForService.append( stringToTQString( (*it)->address ) );
+      addressMap.insert( stringToTQString( (*it)->service ), addressesForService );
     }
 
     // then construct a custom field from each qstringlist
@@ -432,7 +432,7 @@ KABC::PhoneNumber ContactConverter::convertPhoneNumber( ngwt__PhoneNumber *phone
   if ( !phone )
     return phoneNumber;
 
-  phoneNumber.setNumber( stringToQString( phone->__item ) );
+  phoneNumber.setNumber( stringToTQString( phone->__item ) );
   if ( phone->type == Fax ) {
     phoneNumber.setType( KABC::PhoneNumber::Fax );
   } else if ( phone->type == Home ) {
@@ -483,22 +483,22 @@ KABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *addr
     return address;
 
   if ( addr->streetAddress )
-    address.setStreet( stringToQString( addr->streetAddress ) );
+    address.setStreet( stringToTQString( addr->streetAddress ) );
 
   if ( addr->location )
-    address.setExtended( stringToQString( addr->location ) );
+    address.setExtended( stringToTQString( addr->location ) );
 
   if ( addr->city ) // isn't city the same like location?
-    address.setLocality( stringToQString( addr->city ) );
+    address.setLocality( stringToTQString( addr->city ) );
 
   if ( addr->state )
-    address.setRegion( stringToQString( addr->state ) );
+    address.setRegion( stringToTQString( addr->state ) );
 
   if ( addr->postalCode )
-    address.setPostalCode( stringToQString( addr->postalCode ) );
+    address.setPostalCode( stringToTQString( addr->postalCode ) );
 
   if ( addr->country )
-    address.setCountry( stringToQString( addr->country ) );
+    address.setCountry( stringToTQString( addr->country ) );
 
   if ( addr->type == Home_ ) {
     address.setType( KABC::Address::Home );
@@ -573,7 +573,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
   std::vector<class ngwt__ImAddress*> *list = soap_new_std__vectorTemplateOfPointerTongwt__ImAddress( soap(), -1 );
 
   // for each custom
-  // if it tqcontains IM addresses
+  // if it contains IM addresses
   // extract each one and add it to imList
 
   const TQStringList customs = addr.customs();
@@ -618,12 +618,12 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
 
 void ContactConverter::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
 {
-  int colon = str.find( ':' );
+  int colon = str.tqfind( ':' );
   if ( colon != -1 ) {
     TQString tmp = str.left( colon );
     value = str.mid( colon + 1 );
 
-    int dash = tmp.find( '-' );
+    int dash = tmp.tqfind( '-' );
     if ( dash != -1 ) {
       app = tmp.left( dash );
       name = tmp.mid( dash + 1 );
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 83a75f6b..bd908c44 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -60,7 +60,7 @@ static TQMap<struct soap *,GroupwiseServer *> mServerMap;
 int myOpen( struct soap *soap, const char *endpoint, const char *host, int port )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.find( soap );
+  it = mServerMap.tqfind( soap );
   if ( it == mServerMap.end() ) {
     soap->error = SOAP_FAULT;
     return SOAP_INVALID_SOCKET;
@@ -72,7 +72,7 @@ int myOpen( struct soap *soap, const char *endpoint, const char *host, int port
 int myClose( struct soap *soap )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.find( soap );
+  it = mServerMap.tqfind( soap );
   if ( it == mServerMap.end() ) return SOAP_FAULT;
 
   return (*it)->gSoapClose( soap );
@@ -81,7 +81,7 @@ int myClose( struct soap *soap )
 int mySendCallback( struct soap *soap, const char *s, size_t n )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.find( soap );
+  it = mServerMap.tqfind( soap );
   if ( it == mServerMap.end() ) return SOAP_FAULT;
 
   return (*it)->gSoapSendCallback( soap, s, n );
@@ -90,7 +90,7 @@ int mySendCallback( struct soap *soap, const char *s, size_t n )
 size_t myReceiveCallback( struct soap *soap, char *s, size_t n )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.find( soap );
+  it = mServerMap.tqfind( soap );
   if ( it == mServerMap.end() ) {
     kdDebug() << "No soap object found" << endl;
     soap->error = SOAP_FAULT;
@@ -118,7 +118,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
   } else {
     m_sock = new KExtendedSocket();
   }
-  mErrorText = TQString::null;
+  mErrorText = TQString();
 
   m_sock->reset();
   m_sock->setBlockingMode( false );
@@ -264,8 +264,8 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
 }
 
 GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
-                                  const TQString &password, TQObject *parent )
-  : TQObject( parent, "GroupwiseServer" ),
+                                  const TQString &password, TQObject *tqparent )
+  : TQObject( tqparent, "GroupwiseServer" ),
     mUrl( url ), mUser( user ), mPassword( password ),
     mSSL( url.left(6)=="https:" ), m_sock( 0 ),
     mError( 0 )
@@ -354,9 +354,9 @@ bool GroupwiseServer::login()
   ngwt__UserInfo *userinfo = loginResp.userinfo;
   if ( userinfo ) {
     kdDebug() << "HAS USERINFO" << endl;
-    mUserName = conv.stringToQString( userinfo->name );
-    if ( userinfo->email ) mUserEmail = conv.stringToQString( userinfo->email );
-    if ( userinfo->uuid ) mUserUuid = conv.stringToQString( userinfo->uuid );
+    mUserName = conv.stringToTQString( userinfo->name );
+    if ( userinfo->email ) mUserEmail = conv.stringToTQString( userinfo->email );
+    if ( userinfo->uuid ) mUserUuid = conv.stringToTQString( userinfo->uuid );
     // can also get userid here in GW7 (userinfo->userid)
   }
 
@@ -477,7 +477,7 @@ void GroupwiseServer::dumpFolderList()
 {
   mSoap->header->ngwt__session = mSession;
   _ngwm__getFolderListRequest folderListReq;
-  folderListReq.parent = "folders";
+  folderListReq.tqparent = "folders";
   folderListReq.recurse = true;
   _ngwm__getFolderListResponse folderListRes;
   soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0,
@@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id )
   itemsRequest.container = soap_new_std__string( mSoap, -1 );
   *(itemsRequest.container) = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "recipients message recipienStatus" );
+  str->append( "recipients message recipientqStatus" );
   itemsRequest.view = str;
 
   itemsRequest.filter = 0;
@@ -589,7 +589,7 @@ void GroupwiseServer::dumpAppointment( ngwt__Appointment *a )
 void GroupwiseServer::dumpFolder( ngwt__Folder *f )
 {
   dumpItem( f );
-  kdDebug() << "  PARENT: " << f->parent.c_str() << endl;
+  kdDebug() << "  PARENT: " << f->tqparent.c_str() << endl;
   if ( f->description ) {
     kdDebug() << "  DESCRIPTION: " << f->description->c_str() << endl;
   }
@@ -705,9 +705,9 @@ GroupWise::AddressBook::List GroupwiseServer::addressBookList()
     std::vector<class ngwt__AddressBook * >::const_iterator it;
     for ( it = addressBooks->begin(); it != addressBooks->end(); ++it ) {
       GroupWise::AddressBook ab;
-      ab.id = GWConverter::stringToQString( (*it)->id );
-      ab.name = GWConverter::stringToQString( (*it)->name );
-      ab.description = GWConverter::stringToQString( (*it)->description );
+      ab.id = GWConverter::stringToTQString( (*it)->id );
+      ab.name = GWConverter::stringToTQString( (*it)->name );
+      ab.description = GWConverter::stringToTQString( (*it)->description );
       if ( (*it)->isPersonal ) ab.isPersonal = (*it)->isPersonal;
       if ( (*it)->isFrequentContacts ) {
         ab.isFrequentContacts = (*it)->isFrequentContacts;
@@ -763,7 +763,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal )
   std::string calendarFolderID;
   _ngwm__getFolderListRequest folderListReq;
   _ngwm__getFolderListResponse folderListRes;
-  folderListReq.parent = "folders";
+  folderListReq.tqparent = "folders";
   folderListReq.view = soap_new_std__string( mSoap, -1 );
   folderListReq.view->append( "id type" );
   folderListReq.recurse = false;
@@ -953,7 +953,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence,
   converter.setFrom( mUserName, mUserEmail, mUserUuid );
 
   incidence->setCustomProperty( "GWRESOURCE", "CONTAINER",
-                                converter.stringToQString( mCalendarFolder ) );
+                                converter.stringToTQString( mCalendarFolder ) );
 
   ngwt__Item *item;
   if ( incidence->type() == "Event" ) {
@@ -1007,7 +1007,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence )
   converter.setFrom( mUserName, mUserEmail, mUserUuid );
 
   incidence->setCustomProperty( "GWRESOURCE", "CONTAINER",
-                                converter.stringToQString( mCalendarFolder ) );
+                                converter.stringToTQString( mCalendarFolder ) );
 
   ngwt__Item *item;
   if ( incidence->type() == "Event" ) {
@@ -1097,7 +1097,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence )
   return success;
 }
 
-bool GroupwiseServer::checkResponse( int result, ngwt__Status *status )
+bool GroupwiseServer::checkResponse( int result, ngwt__tqStatus *status )
 {
   if ( result != 0 ) {
     soap_print_fault( mSoap, stderr );
@@ -1106,7 +1106,7 @@ bool GroupwiseServer::checkResponse( int result, ngwt__Status *status )
     kdDebug() << "SOAP call succeeded" << endl;
   }
   if ( status && status->code != 0 ) {
-    TQString msg = "SOAP Response Status: " + TQString::number( status->code );
+    TQString msg = "SOAP Response tqStatus: " + TQString::number( status->code );
     if ( status->description ) {
       msg += " ";
       msg += status->description->c_str();
@@ -1184,7 +1184,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c
   converter.setFrom( mUserName, mUserEmail, mUserUuid );
 
   incidence->setCustomProperty( "GWRESOURCE", "CONTAINER",
-								converter.stringToQString( mCalendarFolder ) );
+								converter.stringToTQString( mCalendarFolder ) );
 
   ngwt__Item *item;
   if ( incidence->type() == "Event" ) {
@@ -1408,8 +1408,8 @@ bool GroupwiseServer::readFreeBusy( const TQString &email,
         if ( blocks ) {
           std::vector<class ngwt__FreeBusyBlock *>::const_iterator it2;
           for( it2 = blocks->begin(); it2 != blocks->end(); ++it2 ) {
-            TQDateTime blockStart = conv.charToQDateTime( (*it2)->startDate );
-            TQDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate );
+            TQDateTime blockStart = conv.charToTQDateTime( (*it2)->startDate );
+            TQDateTime blockEnd = conv.charToTQDateTime( (*it2)->endDate );
             ngwt__AcceptLevel acceptLevel = *(*it2)->acceptLevel;
 
             /* TODO: show Free/Busy subject in diagram - we need to support these as people use it for checking others' calendars */ 
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 8117ebb2..373c94e4 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -59,7 +59,7 @@ class ngwt__Item;
 class ngwt__Appointment;
 class ngwt__Mail;
 class ngwt__Task;
-class ngwt__Status;
+class ngwt__tqStatus;
 class GroupWiseBinding;
 
 namespace GroupWise {
@@ -91,15 +91,16 @@ class DeltaInfo
 };
 }
 
-class GroupwiseServer : public QObject
+class GroupwiseServer : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    bool checkResponse( int result, ngwt__Status *status );
+    bool checkResponse( int result, ngwt__tqStatus *status );
     enum RetractCause { DueToResend, Other };
     GroupwiseServer( const TQString &url, const TQString &user,
-                     const TQString &password, TQObject *parent );
+                     const TQString &password, TQObject *tqparent );
     ~GroupwiseServer();
 
     int error() const { return mError; }
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index f51f16b7..5ca7c332 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -43,14 +43,14 @@ std::string* GWConverter::qStringToString( const TQString &string )
   return str;
 }
 
-TQString GWConverter::stringToQString( const std::string &str )
+TQString GWConverter::stringToTQString( const std::string &str )
 {
   return TQString::fromUtf8( str.c_str() );
 }
 
-TQString GWConverter::stringToQString( std::string *str )
+TQString GWConverter::stringToTQString( std::string *str )
 {
-  if ( !str ) return TQString::null;
+  if ( !str ) return TQString();
   return TQString::fromUtf8( str->c_str() );
 }
 
@@ -65,10 +65,10 @@ char* GWConverter::qStringToChar( const TQString &string )
   return charStr;
 }
 
-TQDate GWConverter::charToQDate( const char *str )
+TQDate GWConverter::charToTQDate( const char *str )
 {
-  if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd 
-  return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate );
+  if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd 
+  return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate );
 }
 
 char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
@@ -92,9 +92,9 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
   return qStringToString( dt.toString( "yyyyMMddThhmmZ" ) );
 }
 
-TQDateTime GWConverter::stringToQDateTime( const std::string* str )
+TQDateTime GWConverter::stringToTQDateTime( const std::string* str )
 {
-  TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
+  TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate );
   return dt;
 }
 
@@ -108,27 +108,27 @@ std::string* GWConverter::qDateToString( const TQDate &date )
   return qStringToString( date.toString( "yyyyMMdd" ) );
 }
 
-TQDate GWConverter::stringToQDate( std::string* str )
+TQDate GWConverter::stringToTQDate( std::string* str )
 {
   //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
-  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
+  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), TQt::ISODate );
 }
 
-TQDateTime GWConverter::charToQDateTime( const char *str )
+TQDateTime GWConverter::charToTQDateTime( const char *str )
 {
   if ( !str ) return TQDateTime();
-//  kdDebug() << "charToQDateTime(): " << str << endl;
-  // as above re Qt::ISODate
-  TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
+//  kdDebug() << "charToTQDateTime(): " << str << endl;
+  // as above re TQt::ISODate
+  TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate );
 //  kdDebug() << "  " << dt.toString() << endl;
   return dt;
 }
 
-TQDateTime GWConverter::charToQDateTime( const char *str,
+TQDateTime GWConverter::charToTQDateTime( const char *str,
                                         const TQString &timezone )
 {
   if ( !str ) return TQDateTime();
-  TQDateTime utc = charToQDateTime( str );
+  TQDateTime utc = charToTQDateTime( str );
   return KPimPrefs::utcToLocalTime( utc, timezone );
 }
 
diff --git a/kresources/groupwise/soap/gwconverter.h b/kresources/groupwise/soap/gwconverter.h
index 08d5220f..f57171dc 100644
--- a/kresources/groupwise/soap/gwconverter.h
+++ b/kresources/groupwise/soap/gwconverter.h
@@ -33,28 +33,28 @@ class GWConverter
 
     struct soap* soap() const;
 
-    static TQString stringToQString( const std::string& );
-    static TQString stringToQString( std::string* );
+    static TQString stringToTQString( const std::string& );
+    static TQString stringToTQString( std::string* );
 
     std::string* qStringToString( const TQString& );
     char* qStringToChar( const TQString& );
 
     char* qDateToChar( const TQDate& );
-    TQDate charToQDate( const char * );
+    TQDate charToTQDate( const char * );
 
     std::string* qDateToString( const TQDate &string );
-    TQDate stringToQDate( std::string* );
+    TQDate stringToTQDate( std::string* );
 
     char *qDateTimeToChar( const TQDateTime &dt, const TQString &timezone );
     char *qDateTimeToChar( const TQDateTime &dt );
 
-    TQDateTime charToQDateTime( const char *str );
-    TQDateTime charToQDateTime( const char *str, const TQString &timezone );
+    TQDateTime charToTQDateTime( const char *str );
+    TQDateTime charToTQDateTime( const char *str, const TQString &timezone );
 
     std::string* qDateTimeToString( const TQDateTime &string, const TQString &timezone );
     std::string* qDateTimeToString( const TQDateTime &string );
     
-    TQDateTime stringToQDateTime( const std::string* );
+    TQDateTime stringToTQDateTime( const std::string* );
 
     bool emailsMatch( const TQString & email1, const TQString & email2 );
   private:
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index d093497c..bd2f908e 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -82,9 +82,9 @@ void ReadAddressBooksJob::run()
       if ( !(*it)->id ) {
         kdError() << "No addressbook id" << endl;
       } else {
-        TQString id = GWConverter::stringToQString( (*it)->id );
+        TQString id = GWConverter::stringToTQString( (*it)->id );
         kdDebug() << "Reading ID: " << id << endl;
-        if ( mAddressBookIds.find( id ) != mAddressBookIds.end() ) {
+        if ( mAddressBookIds.tqfind( id ) != mAddressBookIds.end() ) {
           readAddressBook( *(*it)->id );
           mProgress += 100;
         }
@@ -156,11 +156,11 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
       if ( !addr.isEmpty() ) {
         addr.setResource( mResource );
       
-        addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToQString( id ) );
+        addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToTQString( id ) );
 
-        TQString remoteUid = converter.stringToQString( (*it)->id );
+        TQString remoteUid = converter.stringToTQString( (*it)->id );
 
-        KABC::Addressee oldAddressee = mResource->tqfindByUid( mResource->idMapper().localId( remoteUid ) );
+        KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
         if ( oldAddressee.isEmpty() ) // new addressee
           mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
         else {
@@ -192,7 +192,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
 
   cursorRequest.container = id;
   cursorRequest.view = 0;
-  if ( id.find( "GroupWiseSystemAddressBook" ) == 0 )
+  if ( id.tqfind( "GroupWiseSystemAddressBook" ) == 0 )
   {
     kdDebug() << "  Book: " << id.c_str() << " is a SAB " << endl;
     // filter for Contacts until we support Groups
@@ -223,7 +223,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
   {
     if ( cursorResponse.status && cursorResponse.status->code != 0 )
     {
-      kdDebug() << "  Couldn't read " << GWConverter::stringToQString(id ) << " : " << GWConverter::stringToQString(cursorResponse.status->description) << endl;
+      kdDebug() << "  Couldn't read " << GWConverter::stringToTQString(id ) << " : " << GWConverter::stringToTQString(cursorResponse.status->description) << endl;
       //mError = GroupWise::RefreshNeeded;
     }
   return;
@@ -252,7 +252,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
       kdDebug() << "Faults according to GSOAP:" << endl;
       soap_print_fault(mSoap, stderr);
       kdDebug() << "Unable to read " << *( readCursorRequest.count ) << " items at once, halving number and retrying request" << endl;
-      *( readCursorRequest.count ) = QMAX( 1, *( readCursorRequest.count )/2 );
+      *( readCursorRequest.count ) = TQMAX( 1, *( readCursorRequest.count )/2 );
       continue;
     }
   
@@ -351,7 +351,7 @@ void ReadCalendarJob::run()
 
   mSoap->header->ngwt__session = mSession;
   _ngwm__getFolderListRequest folderListReq;
-  folderListReq.parent = "folders";
+  folderListReq.tqparent = "folders";
   folderListReq.view = 0;
   folderListReq.recurse = true;
   _ngwm__getFolderListResponse folderListRes;
@@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
 
   itemsRequest.container = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
+  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientqStatus recurrenceKey" );
   itemsRequest.view = str;
   itemsRequest.filter = 0;
   itemsRequest.items = 0;
@@ -507,7 +507,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
       }
 
       if ( i ) {
-        i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToQString( id ) );
+        i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToTQString( id ) );
 
         mCalendar->addIncidence( i );
       }
@@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   cursorRequest.container = id;
 #if 1
   cursorRequest.view = soap_new_std__string( mSoap, -1 );
-  cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
+  cursorRequest.view->append( "default message recipients attachments recipientqStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
 
 #else
   cursorRequest.view = 0;
@@ -600,7 +600,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
           }
         }
         if ( i ) {
-          i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToQString( id ) );
+          i->setCustomProperty( "GWRESOURCE", "CONTAINER", conv.stringToTQString( id ) );
   
           mCalendar->addIncidence( i );
         }
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index a6a171b8..b7a360ee 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -65,10 +65,10 @@ KCal::Event* IncidenceConverter::convertFromAppointment( ngwt__Appointment* appo
     event->setFloats( true );
 
     if ( appointment->startDay != 0 )
-      event->setDtStart( stringToQDate( appointment->startDay ).addDays( 1 ) );
+      event->setDtStart( stringToTQDate( appointment->startDay ).addDays( 1 ) );
 
     if ( appointment->endDay != 0 )
-      event->setDtEnd( stringToQDate( appointment->endDay) );
+      event->setDtEnd( stringToTQDate( appointment->endDay) );
     
     kdDebug() << " all day event." << endl;
   }
@@ -77,11 +77,11 @@ KCal::Event* IncidenceConverter::convertFromAppointment( ngwt__Appointment* appo
     event->setFloats( false );
 
     if ( appointment->startDate != 0 ) {
-      event->setDtStart( charToQDateTime( appointment->startDate, mTimezone ) );
+      event->setDtStart( charToTQDateTime( appointment->startDate, mTimezone ) );
     }
     
     if ( appointment->endDate != 0 )
-      event->setDtEnd( charToQDateTime( appointment->endDate, mTimezone ) );
+      event->setDtEnd( charToTQDateTime( appointment->endDate, mTimezone ) );
   }
 
   kdDebug() << "start date: " << event->dtStart() << endl;
@@ -94,7 +94,7 @@ KCal::Event* IncidenceConverter::convertFromAppointment( ngwt__Appointment* appo
   }
 
   if ( appointment->place )
-    event->setLocation( stringToQString( appointment->place ) );
+    event->setLocation( stringToTQString( appointment->place ) );
 
   if ( appointment->acceptLevel ) {
     if ( *appointment->acceptLevel == Tentative )
@@ -206,16 +206,16 @@ KCal::Todo* IncidenceConverter::convertFromTask( ngwt__Task* task )
 
   if ( task->startDate ) {
     todo->setHasStartDate( true );
-    todo->setDtStart( stringToQDateTime( task->startDate ) );
+    todo->setDtStart( stringToTQDateTime( task->startDate ) );
   }
 
   if ( task->dueDate ) {
     todo->setHasDueDate( true );
-    todo->setDtDue( stringToQDateTime( task->dueDate ) );
+    todo->setDtDue( stringToTQDateTime( task->dueDate ) );
   }
 
   if ( task->taskPriority ) {
-    TQString priority = stringToQString( task->taskPriority );
+    TQString priority = stringToTQString( task->taskPriority );
 
     // FIXME: Store priority string somewhere
 
@@ -284,7 +284,7 @@ KCal::Journal* IncidenceConverter::convertFromNote( ngwt__Note* note)
 
   if ( note->startDate ) {
     kdDebug() << "Journal start date is: " << note->startDate->c_str() << endl;
-    journal->setDtStart( stringToQDate( note->startDate ) );
+    journal->setDtStart( stringToTQDate( note->startDate ) );
   }
 
   return journal;
@@ -489,7 +489,7 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
 {
   ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
 
-  recipient->recipienStatus = 0;
+  recipient->recipientqStatus = 0;
   if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid );
   else recipient->uuid = 0;
   if ( !name.isEmpty() ) {
@@ -514,20 +514,20 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
   KCal::Incidence* incidence )
 {
   incidence->setCustomProperty( "GWRESOURCE", "UID",
-                                stringToQString( item->id ) );
+                                stringToTQString( item->id ) );
 
   if ( item->subject && !item->subject->empty() )
-    incidence->setSummary( stringToQString( item->subject ) );
+    incidence->setSummary( stringToTQString( item->subject ) );
 
   kdDebug() << "SUMMARY: " << incidence->summary() << endl;
 
   if ( item->created ) {
     kdDebug() << "item created at " << item->created << endl;
-    incidence->setCreated( charToQDateTime( item->created, mTimezone ) );
+    incidence->setCreated( charToTQDateTime( item->created, mTimezone ) );
   }
   if ( item->modified != 0 ) {
     kdDebug() << "item modified at " << item->created << endl;
-    incidence->setLastModified( charToQDateTime( item->modified, mTimezone ) );
+    incidence->setLastModified( charToTQDateTime( item->modified, mTimezone ) );
   }
 
   getItemDescription( item, incidence );
@@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
 
     std::vector<xsd__date>::const_iterator it;
     for ( it = dateList->begin(); it != dateList->end(); ++it ) {
-      TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
+      TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate );
       if ( date.isValid() )
     }
   }
@@ -567,7 +567,7 @@ void IncidenceConverter::getItemDescription( ngwt__CalendarItem *item, KCal::Inc
       xsd__base64Binary data = (*it)->__item;
 
       // text/plain should be the description
-      if ( stringToQString( (*it)->contentType ) == "text/plain" ) {
+      if ( stringToTQString( (*it)->contentType ) == "text/plain" ) {
         TQString description = TQString::fromUtf8( (char*)data.__ptr, data.__size );
         incidence->setDescription( description );
         kdDebug() << "Incidence description decodes to: " << description << endl;
@@ -615,8 +615,8 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
 
   if ( item->distribution && item->distribution->from ) {
     kdDebug() << "-- from" << endl;
-    KCal::Person organizer( stringToQString( item->distribution->from->displayName ),
-                            stringToQString( item->distribution->from->email ) );
+    KCal::Person organizer( stringToTQString( item->distribution->from->displayName ),
+                            stringToTQString( item->distribution->from->email ) );
     incidence->setOrganizer( organizer );
   }
 
@@ -629,13 +629,13 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
       ngwt__Recipient *recipient = *it;
       kdDebug() << "---- recipient " << recipient->email->c_str() << endl;
       KCal::Attendee *attendee = new KCal::Attendee(
-        stringToQString( recipient->displayName ),
-        stringToQString( recipient->email ) );
+        stringToTQString( recipient->displayName ),
+        stringToTQString( recipient->email ) );
 
       // set our status
-      if ( emailsMatch( stringToQString(recipient->email), mFromEmail ) )
+      if ( emailsMatch( stringToTQString(recipient->email), mFromEmail ) )
         if ( item->status->accepted )
-          attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
+          attendee->setqStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
         else 
           kdDebug() << "---- found ourselves, but not accepted" << endl;
       else
@@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
 
     // recurrence date - try setting it using the recurrence start date - didn't help
 /*    std::string startDate;
-    startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() );
+    startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() );
     item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 );
     item->rdate->date.push_back( startDate );*/
     // exceptions list - try sending empty list even if no exceptions
@@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
       for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it )
       {
         std::string startDate;
-        startDate.append( (*it).toString( Qt::ISODate ).utf8() );
+        startDate.append( (*it).toString( TQt::ISODate ).utf8() );
         item->exdate->date.push_back( startDate );
       }
     }
diff --git a/kresources/groupwise/soap/incidenceconverter.h b/kresources/groupwise/soap/incidenceconverter.h
index 6f2ced84..305f1925 100644
--- a/kresources/groupwise/soap/incidenceconverter.h
+++ b/kresources/groupwise/soap/incidenceconverter.h
@@ -64,7 +64,7 @@ class IncidenceConverter : public GWConverter
 //     TQBitArray getDayBitArray( ngwt__DayOfWeekList * );
 
     ngwt__Recipient *createRecipient( const TQString &name,
-      const TQString &email, const TQString &uuid = TQString::null );
+      const TQString &email, const TQString &uuid = TQString() );
 
     TQString mTimezone;
 
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index e1e48831..eef6a5bf 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -109,7 +109,7 @@ void KSSLSocket::slotConnected()
 			d->kssl->reInitialize();
 		}
 		d->kssl->setPeerHost(host());
-//        kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl;
+//        kdDebug() << "SOCKET STATUS: " << socketqStatus() << endl;
 		int rc = d->kssl->connect( sockfd );
                 if ( rc <= 0 ) {
                   kdError() << "Error connecting KSSL: " << rc << endl;
@@ -157,7 +157,7 @@ TQString KSSLSocket::metaData( const TQString &key )
 {
 	if( d->metaData.tqcontains(key) )
 		return d->metaData[key];
-	return TQString::null;
+	return TQString();
 }
 
 /*
@@ -279,9 +279,9 @@ int KSSLSocket::verifyCertificate()
 		setMetaData("ssl_action", "accept");
 	}
 
-	// Since we're the parent, we need to teach the child.
-	setMetaData("ssl_parent_ip", ourIp );
-	setMetaData("ssl_parent_cert", pc.toString());
+	// Since we're the tqparent, we need to teach the child.
+	setMetaData("ssl_tqparent_ip", ourIp );
+	setMetaData("ssl_tqparent_cert", pc.toString());
 
 	//  - Read from cache and see if there is a policy for this
 	KSSLCertificateCache::KSSLCertificatePolicy cp = d->cc->getPolicyByCertificate(pc);
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index 854cf8f4..5158d001 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -28,6 +28,7 @@ class KSSLSocketPrivate;
 class KSSLSocket : public KExtendedSocket
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		KSSLSocket();
diff --git a/kresources/groupwise/soap/patches/utf8_entities.diff b/kresources/groupwise/soap/patches/utf8_entities.diff
index b8600a9d..85d7283a 100644
--- a/kresources/groupwise/soap/patches/utf8_entities.diff
+++ b/kresources/groupwise/soap/patches/utf8_entities.diff
@@ -3,7 +3,7 @@
 @@ -6470,7 +6470,11 @@
        }
  #endif
-       if (c & mask)
+       if (c & tqmask)
 -      { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
 +      {
 +        char S[2];
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index f426729b..17c52d60 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -164,8 +164,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwe__EventType(soap, NULL, NULL, "ngwe:EventType");
 	case SOAP_TYPE_ngwt__WeekDay:
 		return soap_in_ngwt__WeekDay(soap, NULL, NULL, "ngwt:WeekDay");
-	case SOAP_TYPE_ngwt__VersionStatus:
-		return soap_in_ngwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus");
+	case SOAP_TYPE_ngwt__VersiontqStatus:
+		return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersiontqStatus");
 	case SOAP_TYPE_ngwt__VersionEventType:
 		return soap_in_ngwt__VersionEventType(soap, NULL, NULL, "ngwt:VersionEventType");
 	case SOAP_TYPE_ngwt__StatusTrackingOptions:
@@ -206,8 +206,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__Frequency(soap, NULL, NULL, "ngwt:Frequency");
 	case SOAP_TYPE_ngwt__FolderType:
 		return soap_in_ngwt__FolderType(soap, NULL, NULL, "ngwt:FolderType");
-	case SOAP_TYPE_ngwt__FolderACLStatus:
-		return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_ngwt__FolderACLtqStatus:
+		return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLtqStatus");
 	case SOAP_TYPE_ngwt__FilterOp:
 		return soap_in_ngwt__FilterOp(soap, NULL, NULL, "ngwt:FilterOp");
 	case SOAP_TYPE_ngwt__FilterDate:
@@ -610,8 +610,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__UserInfo(soap, NULL, NULL, "ngwt:UserInfo");
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, "ngwt:TrustedApplication");
-	case SOAP_TYPE_ngwt__TransferFailedStatus:
-		return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
+		return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedtqStatus");
 	case SOAP_TYPE_ngwt__TimezoneList:
 		return soap_in_ngwt__TimezoneList(soap, NULL, NULL, "ngwt:TimezoneList");
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -624,8 +624,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__SystemFolder(soap, NULL, NULL, "ngwt:SystemFolder");
 	case SOAP_TYPE_ngwt__StatusTracking:
 		return soap_in_ngwt__StatusTracking(soap, NULL, NULL, "ngwt:StatusTracking");
-	case SOAP_TYPE_ngwt__Status:
-		return soap_in_ngwt__Status(soap, NULL, NULL, "ngwt:Status");
+	case SOAP_TYPE_ngwt__tqStatus:
+		return soap_in_ngwt__tqStatus(soap, NULL, NULL, "ngwt:tqStatus");
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return soap_in_ngwt__SMimeOperation(soap, NULL, NULL, "ngwt:SMimeOperation");
 	case SOAP_TYPE_ngwt__SignatureData:
@@ -672,8 +672,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__RecurrenceRule(soap, NULL, NULL, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipienStatus:
-		return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
+	case SOAP_TYPE_ngwt__RecipientqStatus:
+		return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipientqStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return soap_in_ngwt__RecipientList(soap, NULL, NULL, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -738,8 +738,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__JunkHandlingList(soap, NULL, NULL, "ngwt:JunkHandlingList");
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return soap_in_ngwt__JunkEntry(soap, NULL, NULL, "ngwt:JunkEntry");
-	case SOAP_TYPE_ngwt__ItemStatus:
-		return soap_in_ngwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
+	case SOAP_TYPE_ngwt__ItemtqStatus:
+		return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemtqStatus");
 	case SOAP_TYPE_ngwt__Items:
 		return soap_in_ngwt__Items(soap, NULL, NULL, "ngwt:Items");
 	case SOAP_TYPE_ngwt__ItemRefList:
@@ -812,10 +812,10 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__Distribution(soap, NULL, NULL, "ngwt:Distribution");
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, "ngwt:DeltaInfo");
-	case SOAP_TYPE_ngwt__DelegateeStatus:
-		return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_ngwt__DelegatedStatus:
-		return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
+	case SOAP_TYPE_ngwt__DelegateetqStatus:
+		return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateetqStatus");
+	case SOAP_TYPE_ngwt__DelegatedtqStatus:
+		return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedtqStatus");
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		return soap_in_ngwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_ngwt__DayOfYearWeek:
@@ -838,8 +838,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__ContactFolder(soap, NULL, NULL, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return soap_in_ngwt__Contact(soap, NULL, NULL, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommenStatus:
-		return soap_in_ngwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
+	case SOAP_TYPE_ngwt__CommentqStatus:
+		return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommentqStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return soap_in_ngwt__CategoryRefList(soap, NULL, NULL, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -1262,8 +1262,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__EmailAddressList(soap, NULL, NULL, "ngwt:EmailAddressList");
 	case SOAP_TYPE_PointerTongwt__FullName:
 		return soap_in_PointerTongwt__FullName(soap, NULL, NULL, "ngwt:FullName");
-	case SOAP_TYPE_PointerTongwt__VersionStatus:
-		return soap_in_PointerTongwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus");
+	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
+		return soap_in_PointerTongwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersiontqStatus");
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		return soap_in_PointerTongwt__FolderACL(soap, NULL, NULL, "ngwt:FolderACL");
 	case SOAP_TYPE_PointerTongwt__RuleActionList:
@@ -1272,8 +1272,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__Execution(soap, NULL, NULL, "ngwt:Execution");
 	case SOAP_TYPE_PointerTongwt__Query:
 		return soap_in_PointerTongwt__Query(soap, NULL, NULL, "ngwt:Query");
-	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
-		return soap_in_PointerTongwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
+		return soap_in_PointerTongwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLtqStatus");
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		return soap_in_PointerTongwt__AccessControlList(soap, NULL, NULL, "ngwt:AccessControlList");
 	case SOAP_TYPE_PointerTongwt__WeekOfYear:
@@ -1286,12 +1286,12 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__ItemClass(soap, NULL, NULL, "ngwt:ItemClass");
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		return soap_in_PointerTongwt__ItemSource(soap, NULL, NULL, "ngwt:ItemSource");
-	case SOAP_TYPE_PointerTongwt__ItemStatus:
-		return soap_in_PointerTongwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
+	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
+		return soap_in_PointerTongwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemtqStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_in_PointerTongwt__DeltaSyncType(soap, NULL, NULL, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipienStatus:
-		return soap_in_PointerTongwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
+	case SOAP_TYPE_PointerTongwt__RecipientqStatus:
+		return soap_in_PointerTongwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipientqStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_in_PointerTongwt__FreeBusyBlockList(soap, NULL, NULL, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -1394,8 +1394,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__Distribution(soap, NULL, NULL, "ngwt:Distribution");
 	case SOAP_TYPE_PointerTongwt__View:
 		return soap_in_PointerTongwt__View(soap, NULL, NULL, "ngwt:View");
-	case SOAP_TYPE_PointerTongwt__Status:
-		return soap_in_PointerTongwt__Status(soap, NULL, NULL, "ngwt:Status");
+	case SOAP_TYPE_PointerTongwt__tqStatus:
+		return soap_in_PointerTongwt__tqStatus(soap, NULL, NULL, "ngwt:tqStatus");
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		return soap_in_PointerTongwt__ItemRefList(soap, NULL, NULL, "ngwt:ItemRefList");
 	case SOAP_TYPE_PointerTongwt__UserInfo:
@@ -1450,14 +1450,14 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		return soap_in_PointerTongwt__Frequency(soap, NULL, NULL, "ngwt:Frequency");
-	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
-		return soap_in_PointerTongwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
-		return soap_in_PointerTongwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommenStatus:
-		return soap_in_PointerTongwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
-	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
-		return soap_in_PointerTongwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
+		return soap_in_PointerTongwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateetqStatus");
+	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
+		return soap_in_PointerTongwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedtqStatus");
+	case SOAP_TYPE_PointerTongwt__CommentqStatus:
+		return soap_in_PointerTongwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommentqStatus");
+	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
+		return soap_in_PointerTongwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedtqStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
 		return soap_in_PointerTongwt__Recipient(soap, NULL, NULL, "ngwt:Recipient");
 	case SOAP_TYPE_PointerTongwt__Filter:
@@ -1554,9 +1554,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__AccessControlListEntry(soap, NULL, NULL, "ngwt:AccessControlListEntry");
 	case SOAP_TYPE_PointerTounsignedByte:
 		return soap_in_PointerTounsignedByte(soap, NULL, NULL, "xsd:unsignedByte");
-	case SOAP_TYPE__QName:
+	case SOAP_TYPE__TQName:
 	{	char **s;
-		s = soap_in__QName(soap, NULL, NULL, "QName");
+		s = soap_in__TQName(soap, NULL, NULL, "TQName");
 		return s ? *s : NULL;
 	}
 	case SOAP_TYPE_string:
@@ -1648,9 +1648,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__WeekDay;
 			return soap_in_ngwt__WeekDay(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:VersionStatus"))
-		{	*type = SOAP_TYPE_ngwt__VersionStatus;
-			return soap_in_ngwt__VersionStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:VersiontqStatus"))
+		{	*type = SOAP_TYPE_ngwt__VersiontqStatus;
+			return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:VersionEventType"))
 		{	*type = SOAP_TYPE_ngwt__VersionEventType;
@@ -1732,9 +1732,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__FolderType;
 			return soap_in_ngwt__FolderType(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:FolderACLStatus"))
-		{	*type = SOAP_TYPE_ngwt__FolderACLStatus;
-			return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:FolderACLtqStatus"))
+		{	*type = SOAP_TYPE_ngwt__FolderACLtqStatus;
+			return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:FilterOp"))
 		{	*type = SOAP_TYPE_ngwt__FilterOp;
@@ -2540,9 +2540,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__TrustedApplication;
 			return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:TransferFailedStatus"))
-		{	*type = SOAP_TYPE_ngwt__TransferFailedStatus;
-			return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:TransferFailedtqStatus"))
+		{	*type = SOAP_TYPE_ngwt__TransferFailedtqStatus;
+			return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:TimezoneList"))
 		{	*type = SOAP_TYPE_ngwt__TimezoneList;
@@ -2568,9 +2568,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__StatusTracking;
 			return soap_in_ngwt__StatusTracking(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:Status"))
-		{	*type = SOAP_TYPE_ngwt__Status;
-			return soap_in_ngwt__Status(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:tqStatus"))
+		{	*type = SOAP_TYPE_ngwt__tqStatus;
+			return soap_in_ngwt__tqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:SMimeOperation"))
 		{	*type = SOAP_TYPE_ngwt__SMimeOperation;
@@ -2664,9 +2664,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__RecurrenceDateType;
 			return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:RecipienStatus"))
-		{	*type = SOAP_TYPE_ngwt__RecipienStatus;
-			return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:RecipientqStatus"))
+		{	*type = SOAP_TYPE_ngwt__RecipientqStatus;
+			return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:RecipientList"))
 		{	*type = SOAP_TYPE_ngwt__RecipientList;
@@ -2796,9 +2796,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__JunkEntry;
 			return soap_in_ngwt__JunkEntry(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:ItemStatus"))
-		{	*type = SOAP_TYPE_ngwt__ItemStatus;
-			return soap_in_ngwt__ItemStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:ItemtqStatus"))
+		{	*type = SOAP_TYPE_ngwt__ItemtqStatus;
+			return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:Items"))
 		{	*type = SOAP_TYPE_ngwt__Items;
@@ -2944,13 +2944,13 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__DeltaInfo;
 			return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:DelegateeStatus"))
-		{	*type = SOAP_TYPE_ngwt__DelegateeStatus;
-			return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:DelegateetqStatus"))
+		{	*type = SOAP_TYPE_ngwt__DelegateetqStatus;
+			return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:DelegatedStatus"))
-		{	*type = SOAP_TYPE_ngwt__DelegatedStatus;
-			return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:DelegatedtqStatus"))
+		{	*type = SOAP_TYPE_ngwt__DelegatedtqStatus;
+			return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:DayOfYearWeekList"))
 		{	*type = SOAP_TYPE_ngwt__DayOfYearWeekList;
@@ -2996,9 +2996,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__Contact;
 			return soap_in_ngwt__Contact(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:CommenStatus"))
-		{	*type = SOAP_TYPE_ngwt__CommenStatus;
-			return soap_in_ngwt__CommenStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:CommentqStatus"))
+		{	*type = SOAP_TYPE_ngwt__CommentqStatus;
+			return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:CategoryRefList"))
 		{	*type = SOAP_TYPE_ngwt__CategoryRefList;
@@ -3112,10 +3112,10 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_xsd__base64Binary;
 			return soap_in_xsd__base64Binary(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "QName"))
+		if (!soap_match_tag(soap, t, "TQName"))
 		{	char **s;
-			*type = SOAP_TYPE__QName;
-			s = soap_in__QName(soap, NULL, NULL, NULL);
+			*type = SOAP_TYPE__TQName;
+			s = soap_in__TQName(soap, NULL, NULL, NULL);
 			return s ? *s : NULL;
 		}
 		if (!soap_match_tag(soap, t, "xsd:string"))
@@ -3218,8 +3218,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_ngwe__EventType(soap, tag, id, (const enum ngwe__EventType *)ptr, "ngwe:EventType");
 	case SOAP_TYPE_ngwt__WeekDay:
 		return soap_out_ngwt__WeekDay(soap, tag, id, (const enum ngwt__WeekDay *)ptr, "ngwt:WeekDay");
-	case SOAP_TYPE_ngwt__VersionStatus:
-		return soap_out_ngwt__VersionStatus(soap, tag, id, (const enum ngwt__VersionStatus *)ptr, "ngwt:VersionStatus");
+	case SOAP_TYPE_ngwt__VersiontqStatus:
+		return soap_out_ngwt__VersiontqStatus(soap, tag, id, (const enum ngwt__VersiontqStatus *)ptr, "ngwt:VersiontqStatus");
 	case SOAP_TYPE_ngwt__VersionEventType:
 		return soap_out_ngwt__VersionEventType(soap, tag, id, (const enum ngwt__VersionEventType *)ptr, "ngwt:VersionEventType");
 	case SOAP_TYPE_ngwt__StatusTrackingOptions:
@@ -3260,8 +3260,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_ngwt__Frequency(soap, tag, id, (const enum ngwt__Frequency *)ptr, "ngwt:Frequency");
 	case SOAP_TYPE_ngwt__FolderType:
 		return soap_out_ngwt__FolderType(soap, tag, id, (const enum ngwt__FolderType *)ptr, "ngwt:FolderType");
-	case SOAP_TYPE_ngwt__FolderACLStatus:
-		return soap_out_ngwt__FolderACLStatus(soap, tag, id, (const enum ngwt__FolderACLStatus *)ptr, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_ngwt__FolderACLtqStatus:
+		return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, (const enum ngwt__FolderACLtqStatus *)ptr, "ngwt:FolderACLtqStatus");
 	case SOAP_TYPE_ngwt__FilterOp:
 		return soap_out_ngwt__FilterOp(soap, tag, id, (const enum ngwt__FilterOp *)ptr, "ngwt:FilterOp");
 	case SOAP_TYPE_ngwt__FilterDate:
@@ -3664,8 +3664,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__UserInfo *)ptr)->soap_out(soap, tag, id, "ngwt:UserInfo");
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return ((ngwt__TrustedApplication *)ptr)->soap_out(soap, tag, id, "ngwt:TrustedApplication");
-	case SOAP_TYPE_ngwt__TransferFailedStatus:
-		return ((ngwt__TransferFailedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
+		return ((ngwt__TransferFailedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedtqStatus");
 	case SOAP_TYPE_ngwt__TimezoneList:
 		return ((ngwt__TimezoneList *)ptr)->soap_out(soap, tag, id, "ngwt:TimezoneList");
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -3678,8 +3678,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__SystemFolder *)ptr)->soap_out(soap, tag, id, "ngwt:SystemFolder");
 	case SOAP_TYPE_ngwt__StatusTracking:
 		return ((ngwt__StatusTracking *)ptr)->soap_out(soap, tag, id, "ngwt:StatusTracking");
-	case SOAP_TYPE_ngwt__Status:
-		return ((ngwt__Status *)ptr)->soap_out(soap, tag, id, "ngwt:Status");
+	case SOAP_TYPE_ngwt__tqStatus:
+		return ((ngwt__tqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:tqStatus");
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return ((ngwt__SMimeOperation *)ptr)->soap_out(soap, tag, id, "ngwt:SMimeOperation");
 	case SOAP_TYPE_ngwt__SignatureData:
@@ -3726,8 +3726,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__RecurrenceRule *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return ((ngwt__RecurrenceDateType *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipienStatus:
-		return ((ngwt__RecipienStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus");
+	case SOAP_TYPE_ngwt__RecipientqStatus:
+		return ((ngwt__RecipientqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientqStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return ((ngwt__RecipientList *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -3792,8 +3792,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__JunkHandlingList *)ptr)->soap_out(soap, tag, id, "ngwt:JunkHandlingList");
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return ((ngwt__JunkEntry *)ptr)->soap_out(soap, tag, id, "ngwt:JunkEntry");
-	case SOAP_TYPE_ngwt__ItemStatus:
-		return ((ngwt__ItemStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemStatus");
+	case SOAP_TYPE_ngwt__ItemtqStatus:
+		return ((ngwt__ItemtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemtqStatus");
 	case SOAP_TYPE_ngwt__Items:
 		return ((ngwt__Items *)ptr)->soap_out(soap, tag, id, "ngwt:Items");
 	case SOAP_TYPE_ngwt__ItemRefList:
@@ -3866,10 +3866,10 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__Distribution *)ptr)->soap_out(soap, tag, id, "ngwt:Distribution");
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		return ((ngwt__DeltaInfo *)ptr)->soap_out(soap, tag, id, "ngwt:DeltaInfo");
-	case SOAP_TYPE_ngwt__DelegateeStatus:
-		return ((ngwt__DelegateeStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_ngwt__DelegatedStatus:
-		return ((ngwt__DelegatedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedStatus");
+	case SOAP_TYPE_ngwt__DelegateetqStatus:
+		return ((ngwt__DelegateetqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateetqStatus");
+	case SOAP_TYPE_ngwt__DelegatedtqStatus:
+		return ((ngwt__DelegatedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedtqStatus");
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		return ((ngwt__DayOfYearWeekList *)ptr)->soap_out(soap, tag, id, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_ngwt__DayOfYearWeek:
@@ -3892,8 +3892,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__ContactFolder *)ptr)->soap_out(soap, tag, id, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return ((ngwt__Contact *)ptr)->soap_out(soap, tag, id, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommenStatus:
-		return ((ngwt__CommenStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus");
+	case SOAP_TYPE_ngwt__CommentqStatus:
+		return ((ngwt__CommentqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommentqStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return ((ngwt__CategoryRefList *)ptr)->soap_out(soap, tag, id, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -4316,8 +4316,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__EmailAddressList(soap, tag, id, (ngwt__EmailAddressList *const*)ptr, "ngwt:EmailAddressList");
 	case SOAP_TYPE_PointerTongwt__FullName:
 		return soap_out_PointerTongwt__FullName(soap, tag, id, (ngwt__FullName *const*)ptr, "ngwt:FullName");
-	case SOAP_TYPE_PointerTongwt__VersionStatus:
-		return soap_out_PointerTongwt__VersionStatus(soap, tag, id, (enum ngwt__VersionStatus *const*)ptr, "ngwt:VersionStatus");
+	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
+		return soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, (enum ngwt__VersiontqStatus *const*)ptr, "ngwt:VersiontqStatus");
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		return soap_out_PointerTongwt__FolderACL(soap, tag, id, (ngwt__FolderACL *const*)ptr, "ngwt:FolderACL");
 	case SOAP_TYPE_PointerTongwt__RuleActionList:
@@ -4326,8 +4326,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__Execution(soap, tag, id, (enum ngwt__Execution *const*)ptr, "ngwt:Execution");
 	case SOAP_TYPE_PointerTongwt__Query:
 		return soap_out_PointerTongwt__Query(soap, tag, id, (ngwt__Query *const*)ptr, "ngwt:Query");
-	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
-		return soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, (enum ngwt__FolderACLStatus *const*)ptr, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
+		return soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, (enum ngwt__FolderACLtqStatus *const*)ptr, "ngwt:FolderACLtqStatus");
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		return soap_out_PointerTongwt__AccessControlList(soap, tag, id, (ngwt__AccessControlList *const*)ptr, "ngwt:AccessControlList");
 	case SOAP_TYPE_PointerTongwt__WeekOfYear:
@@ -4340,12 +4340,12 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__ItemClass(soap, tag, id, (enum ngwt__ItemClass *const*)ptr, "ngwt:ItemClass");
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		return soap_out_PointerTongwt__ItemSource(soap, tag, id, (enum ngwt__ItemSource *const*)ptr, "ngwt:ItemSource");
-	case SOAP_TYPE_PointerTongwt__ItemStatus:
-		return soap_out_PointerTongwt__ItemStatus(soap, tag, id, (ngwt__ItemStatus *const*)ptr, "ngwt:ItemStatus");
+	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
+		return soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, (ngwt__ItemtqStatus *const*)ptr, "ngwt:ItemtqStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_out_PointerTongwt__DeltaSyncType(soap, tag, id, (enum ngwt__DeltaSyncType *const*)ptr, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipienStatus:
-		return soap_out_PointerTongwt__RecipienStatus(soap, tag, id, (ngwt__RecipienStatus *const*)ptr, "ngwt:RecipienStatus");
+	case SOAP_TYPE_PointerTongwt__RecipientqStatus:
+		return soap_out_PointerTongwt__RecipientqStatus(soap, tag, id, (ngwt__RecipientqStatus *const*)ptr, "ngwt:RecipientqStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_out_PointerTongwt__FreeBusyBlockList(soap, tag, id, (ngwt__FreeBusyBlockList *const*)ptr, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -4448,8 +4448,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__Distribution(soap, tag, id, (ngwt__Distribution *const*)ptr, "ngwt:Distribution");
 	case SOAP_TYPE_PointerTongwt__View:
 		return soap_out_PointerTongwt__View(soap, tag, id, (std::string *const*)ptr, "ngwt:View");
-	case SOAP_TYPE_PointerTongwt__Status:
-		return soap_out_PointerTongwt__Status(soap, tag, id, (ngwt__Status *const*)ptr, "ngwt:Status");
+	case SOAP_TYPE_PointerTongwt__tqStatus:
+		return soap_out_PointerTongwt__tqStatus(soap, tag, id, (ngwt__tqStatus *const*)ptr, "ngwt:tqStatus");
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		return soap_out_PointerTongwt__ItemRefList(soap, tag, id, (ngwt__ItemRefList *const*)ptr, "ngwt:ItemRefList");
 	case SOAP_TYPE_PointerTongwt__UserInfo:
@@ -4504,14 +4504,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__DayOfYearWeekList(soap, tag, id, (ngwt__DayOfYearWeekList *const*)ptr, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		return soap_out_PointerTongwt__Frequency(soap, tag, id, (enum ngwt__Frequency *const*)ptr, "ngwt:Frequency");
-	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
-		return soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, (ngwt__DelegateeStatus *const*)ptr, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
-		return soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, (ngwt__DelegatedStatus *const*)ptr, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommenStatus:
-		return soap_out_PointerTongwt__CommenStatus(soap, tag, id, (ngwt__CommenStatus *const*)ptr, "ngwt:CommenStatus");
-	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
-		return soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, (ngwt__TransferFailedStatus *const*)ptr, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
+		return soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, (ngwt__DelegateetqStatus *const*)ptr, "ngwt:DelegateetqStatus");
+	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
+		return soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, (ngwt__DelegatedtqStatus *const*)ptr, "ngwt:DelegatedtqStatus");
+	case SOAP_TYPE_PointerTongwt__CommentqStatus:
+		return soap_out_PointerTongwt__CommentqStatus(soap, tag, id, (ngwt__CommentqStatus *const*)ptr, "ngwt:CommentqStatus");
+	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
+		return soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, (ngwt__TransferFailedtqStatus *const*)ptr, "ngwt:TransferFailedtqStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
 		return soap_out_PointerTongwt__Recipient(soap, tag, id, (ngwt__Recipient *const*)ptr, "ngwt:Recipient");
 	case SOAP_TYPE_PointerTongwt__Filter:
@@ -4608,8 +4608,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__AccessControlListEntry(soap, tag, id, (ngwt__AccessControlListEntry *const*)ptr, "ngwt:AccessControlListEntry");
 	case SOAP_TYPE_PointerTounsignedByte:
 		return soap_out_PointerTounsignedByte(soap, tag, id, (unsigned char *const*)ptr, "xsd:unsignedByte");
-	case SOAP_TYPE__QName:
-		return soap_out_string(soap, "QName", id, (char**)&ptr, NULL);
+	case SOAP_TYPE__TQName:
+		return soap_out_string(soap, "TQName", id, (char**)&ptr, NULL);
 	case SOAP_TYPE_string:
 		return soap_out_string(soap, tag, id, (char**)&ptr, "xsd:string");
 	}
@@ -5175,8 +5175,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		((ngwt__TrustedApplication *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__TransferFailedStatus:
-		((ngwt__TransferFailedStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
+		((ngwt__TransferFailedtqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__TimezoneList:
 		((ngwt__TimezoneList *)ptr)->soap_serialize(soap);
@@ -5196,8 +5196,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__StatusTracking:
 		((ngwt__StatusTracking *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__Status:
-		((ngwt__Status *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__tqStatus:
+		((ngwt__tqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		((ngwt__SMimeOperation *)ptr)->soap_serialize(soap);
@@ -5268,8 +5268,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		((ngwt__RecurrenceDateType *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__RecipienStatus:
-		((ngwt__RecipienStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__RecipientqStatus:
+		((ngwt__RecipientqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__RecipientList:
 		((ngwt__RecipientList *)ptr)->soap_serialize(soap);
@@ -5367,8 +5367,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__JunkEntry:
 		((ngwt__JunkEntry *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__ItemStatus:
-		((ngwt__ItemStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__ItemtqStatus:
+		((ngwt__ItemtqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__Items:
 		((ngwt__Items *)ptr)->soap_serialize(soap);
@@ -5478,11 +5478,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		((ngwt__DeltaInfo *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__DelegateeStatus:
-		((ngwt__DelegateeStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__DelegateetqStatus:
+		((ngwt__DelegateetqStatus *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__DelegatedStatus:
-		((ngwt__DelegatedStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__DelegatedtqStatus:
+		((ngwt__DelegatedtqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		((ngwt__DayOfYearWeekList *)ptr)->soap_serialize(soap);
@@ -5517,8 +5517,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__Contact:
 		((ngwt__Contact *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__CommenStatus:
-		((ngwt__CommenStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__CommentqStatus:
+		((ngwt__CommentqStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		((ngwt__CategoryRefList *)ptr)->soap_serialize(soap);
@@ -6402,8 +6402,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__FullName:
 		soap_serialize_PointerTongwt__FullName(soap, (ngwt__FullName *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__VersionStatus:
-		soap_serialize_PointerTongwt__VersionStatus(soap, (enum ngwt__VersionStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
+		soap_serialize_PointerTongwt__VersiontqStatus(soap, (enum ngwt__VersiontqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		soap_serialize_PointerTongwt__FolderACL(soap, (ngwt__FolderACL *const*)ptr);
@@ -6417,8 +6417,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__Query:
 		soap_serialize_PointerTongwt__Query(soap, (ngwt__Query *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
-		soap_serialize_PointerTongwt__FolderACLStatus(soap, (enum ngwt__FolderACLStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
+		soap_serialize_PointerTongwt__FolderACLtqStatus(soap, (enum ngwt__FolderACLtqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		soap_serialize_PointerTongwt__AccessControlList(soap, (ngwt__AccessControlList *const*)ptr);
@@ -6438,14 +6438,14 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		soap_serialize_PointerTongwt__ItemSource(soap, (enum ngwt__ItemSource *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__ItemStatus:
-		soap_serialize_PointerTongwt__ItemStatus(soap, (ngwt__ItemStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
+		soap_serialize_PointerTongwt__ItemtqStatus(soap, (ngwt__ItemtqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__RecipienStatus:
-		soap_serialize_PointerTongwt__RecipienStatus(soap, (ngwt__RecipienStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__RecipientqStatus:
+		soap_serialize_PointerTongwt__RecipientqStatus(soap, (ngwt__RecipientqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		soap_serialize_PointerTongwt__FreeBusyBlockList(soap, (ngwt__FreeBusyBlockList *const*)ptr);
@@ -6600,8 +6600,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__View:
 		soap_serialize_PointerTongwt__View(soap, (std::string *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__Status:
-		soap_serialize_PointerTongwt__Status(soap, (ngwt__Status *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__tqStatus:
+		soap_serialize_PointerTongwt__tqStatus(soap, (ngwt__tqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		soap_serialize_PointerTongwt__ItemRefList(soap, (ngwt__ItemRefList *const*)ptr);
@@ -6684,17 +6684,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		soap_serialize_PointerTongwt__Frequency(soap, (enum ngwt__Frequency *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
-		soap_serialize_PointerTongwt__DelegateeStatus(soap, (ngwt__DelegateeStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
+		soap_serialize_PointerTongwt__DelegateetqStatus(soap, (ngwt__DelegateetqStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
-		soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
+		soap_serialize_PointerTongwt__DelegatedtqStatus(soap, (ngwt__DelegatedtqStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__CommenStatus:
-		soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__CommentqStatus:
+		soap_serialize_PointerTongwt__CommentqStatus(soap, (ngwt__CommentqStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
-		soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
+		soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, (ngwt__TransferFailedtqStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__Recipient:
 		soap_serialize_PointerTongwt__Recipient(soap, (ngwt__Recipient *const*)ptr);
@@ -6840,7 +6840,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTounsignedByte:
 		soap_serialize_PointerTounsignedByte(soap, (unsigned char *const*)ptr);
 		break;
-	case SOAP_TYPE__QName:
+	case SOAP_TYPE__TQName:
 		soap_serialize_string(soap, (char**)&ptr);
 		break;
 	case SOAP_TYPE_string:
@@ -6944,8 +6944,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__ItemRefList(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Items:
 		return (void*)soap_instantiate_ngwt__Items(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__ItemStatus:
-		return (void*)soap_instantiate_ngwt__ItemStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__ItemtqStatus:
+		return (void*)soap_instantiate_ngwt__ItemtqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return (void*)soap_instantiate_ngwt__JunkEntry(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__JunkHandlingList:
@@ -6986,8 +6986,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__QueryTarget(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecipientList:
 		return (void*)soap_instantiate_ngwt__RecipientList(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__RecipienStatus:
-		return (void*)soap_instantiate_ngwt__RecipienStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__RecipientqStatus:
+		return (void*)soap_instantiate_ngwt__RecipientqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return (void*)soap_instantiate_ngwt__RecurrenceDateType(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceRule:
@@ -7026,8 +7026,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__SignatureData(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return (void*)soap_instantiate_ngwt__SMimeOperation(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__Status:
-		return (void*)soap_instantiate_ngwt__Status(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__tqStatus:
+		return (void*)soap_instantiate_ngwt__tqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Timezone:
 		return (void*)soap_instantiate_ngwt__Timezone(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -7400,16 +7400,16 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__Alarm(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Category:
 		return (void*)soap_instantiate_ngwt__Category(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__CommenStatus:
-		return (void*)soap_instantiate_ngwt__CommenStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__CommentqStatus:
+		return (void*)soap_instantiate_ngwt__CommentqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerItem:
 		return (void*)soap_instantiate_ngwt__ContainerItem(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerRef:
 		return (void*)soap_instantiate_ngwt__ContainerRef(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__DelegatedStatus:
-		return (void*)soap_instantiate_ngwt__DelegatedStatus(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__DelegateeStatus:
-		return (void*)soap_instantiate_ngwt__DelegateeStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__DelegatedtqStatus:
+		return (void*)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__DelegateetqStatus:
+		return (void*)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__FilterEntry:
 		return (void*)soap_instantiate_ngwt__FilterEntry(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__FilterGroup:
@@ -7436,8 +7436,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__ProxyUser(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Recipient:
 		return (void*)soap_instantiate_ngwt__Recipient(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__TransferFailedStatus:
-		return (void*)soap_instantiate_ngwt__TransferFailedStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
+		return (void*)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return (void*)soap_instantiate_ngwt__TrustedApplication(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__AddressBookItem:
@@ -7540,8 +7540,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__RuleAction(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfxsd__date:
 		return (void*)soap_instantiate_std__vectorTemplateOfxsd__date(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
-		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
+		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__Recipient(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__ProxyUser:
@@ -7879,11 +7879,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Items*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__ItemStatus:
+	case SOAP_TYPE_ngwt__ItemtqStatus:
 		if (p->size < 0)
-			delete (ngwt__ItemStatus*)p->ptr;
+			delete (ngwt__ItemtqStatus*)p->ptr;
 		else
-			delete[] (ngwt__ItemStatus*)p->ptr;
+			delete[] (ngwt__ItemtqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__JunkEntry:
 		if (p->size < 0)
@@ -8005,11 +8005,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__RecipientList*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__RecipienStatus:
+	case SOAP_TYPE_ngwt__RecipientqStatus:
 		if (p->size < 0)
-			delete (ngwt__RecipienStatus*)p->ptr;
+			delete (ngwt__RecipientqStatus*)p->ptr;
 		else
-			delete[] (ngwt__RecipienStatus*)p->ptr;
+			delete[] (ngwt__RecipientqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		if (p->size < 0)
@@ -8125,11 +8125,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__SMimeOperation*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__Status:
+	case SOAP_TYPE_ngwt__tqStatus:
 		if (p->size < 0)
-			delete (ngwt__Status*)p->ptr;
+			delete (ngwt__tqStatus*)p->ptr;
 		else
-			delete[] (ngwt__Status*)p->ptr;
+			delete[] (ngwt__tqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__Timezone:
 		if (p->size < 0)
@@ -9247,11 +9247,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Category*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__CommenStatus:
+	case SOAP_TYPE_ngwt__CommentqStatus:
 		if (p->size < 0)
-			delete (ngwt__CommenStatus*)p->ptr;
+			delete (ngwt__CommentqStatus*)p->ptr;
 		else
-			delete[] (ngwt__CommenStatus*)p->ptr;
+			delete[] (ngwt__CommentqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__ContainerItem:
 		if (p->size < 0)
@@ -9265,17 +9265,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__ContainerRef*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__DelegatedStatus:
+	case SOAP_TYPE_ngwt__DelegatedtqStatus:
 		if (p->size < 0)
-			delete (ngwt__DelegatedStatus*)p->ptr;
+			delete (ngwt__DelegatedtqStatus*)p->ptr;
 		else
-			delete[] (ngwt__DelegatedStatus*)p->ptr;
+			delete[] (ngwt__DelegatedtqStatus*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__DelegateeStatus:
+	case SOAP_TYPE_ngwt__DelegateetqStatus:
 		if (p->size < 0)
-			delete (ngwt__DelegateeStatus*)p->ptr;
+			delete (ngwt__DelegateetqStatus*)p->ptr;
 		else
-			delete[] (ngwt__DelegateeStatus*)p->ptr;
+			delete[] (ngwt__DelegateetqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__FilterEntry:
 		if (p->size < 0)
@@ -9355,11 +9355,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Recipient*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__TransferFailedStatus:
+	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
 		if (p->size < 0)
-			delete (ngwt__TransferFailedStatus*)p->ptr;
+			delete (ngwt__TransferFailedtqStatus*)p->ptr;
 		else
-			delete[] (ngwt__TransferFailedStatus*)p->ptr;
+			delete[] (ngwt__TransferFailedtqStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		if (p->size < 0)
@@ -9667,11 +9667,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (std::vector<std::string >*)p->ptr;
 		break;
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
 		if (p->size < 0)
-			delete (std::vector<ngwt__DelegateeStatus * >*)p->ptr;
+			delete (std::vector<ngwt__DelegateetqStatus * >*)p->ptr;
 		else
-			delete[] (std::vector<ngwt__DelegateeStatus * >*)p->ptr;
+			delete[] (std::vector<ngwt__DelegateetqStatus * >*)p->ptr;
 		break;
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		if (p->size < 0)
@@ -9927,9 +9927,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_container_insert(struct soap *soap, int st, int
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
 		((std::vector<std::string >*)p)->insert(((std::vector<std::string >*)p)->end(), *(std::string *)q);
 		break;
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
-		((std::vector<ngwt__DelegateeStatus * >*)p)->insert(((std::vector<ngwt__DelegateeStatus * >*)p)->end(), *(ngwt__DelegateeStatus **)q);
+		((std::vector<ngwt__DelegateetqStatus * >*)p)->insert(((std::vector<ngwt__DelegateetqStatus * >*)p)->end(), *(ngwt__DelegateetqStatus **)q);
 		break;
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
@@ -10751,7 +10751,7 @@ static const struct soap_code_map soap_codes_ngwe__Field[] =
 	{ (long)PhoneNumber_, "PhoneNumber" },
 	{ (long)Place_, "Place" },
 	{ (long)PostalAddress_, "PostalAddress" },
-	{ (long)RecipienStatus_, "RecipienStatus" },
+	{ (long)RecipienStatus_, "RecipientqStatus" },
 	{ (long)Rights_, "Rights" },
 	{ (long)Security_, "Security" },
 	{ (long)SendPriority_, "SendPriority" },
@@ -11031,25 +11031,25 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap *so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *a)
 {
 (void)soap; /* appease -Wall -Werror */
-#ifdef SOAP_DEFAULT_ngwt__VersionStatus
-	*a = SOAP_DEFAULT_ngwt__VersionStatus;
+#ifdef SOAP_DEFAULT_ngwt__VersiontqStatus
+	*a = SOAP_DEFAULT_ngwt__VersiontqStatus;
 #else
-	*a = (enum ngwt__VersionStatus)0;
+	*a = (enum ngwt__VersiontqStatus)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap *soap, const enum ngwt__VersionStatus *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap *soap, const enum ngwt__VersiontqStatus *a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersionStatus);
-	if (soap_out_ngwt__VersionStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersiontqStatus);
+	if (soap_out_ngwt__VersiontqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-static const struct soap_code_map soap_codes_ngwt__VersionStatus[] =
+static const struct soap_code_map soap_codes_ngwt__VersiontqStatus[] =
 {	{ (long)available, "available" },
 	{ (long)checkedOut, "checkedOut" },
 	{ (long)inUse, "inUse" },
@@ -11060,44 +11060,44 @@ static const struct soap_code_map soap_codes_ngwt__VersionStatus[] =
 	{ 0, NULL }
 };
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap *soap, enum ngwt__VersionStatus n)
-{	const char *s = soap_str_code(soap_codes_ngwt__VersionStatus, (long)n);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap *soap, enum ngwt__VersiontqStatus n)
+{	const char *s = soap_str_code(soap_codes_ngwt__VersiontqStatus, (long)n);
 	if (s)
 		return s;
 	return soap_long2s(soap, (long)n);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersionStatus *a, const char *type)
-{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersionStatus), type);
-	soap_send(soap, soap_ngwt__VersionStatus2s(soap, *a));
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersiontqStatus *a, const char *type)
+{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersiontqStatus), type);
+	soap_send(soap, soap_ngwt__VersiontqStatus2s(soap, *a));
 	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__VersionStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__VersiontqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap *soap, const char *s, enum ngwt__VersionStatus *a)
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap *soap, const char *s, enum ngwt__VersiontqStatus *a)
 {
 	const struct soap_code_map *map;
 	if (!s)
 		return SOAP_OK;
-	map = soap_code(soap_codes_ngwt__VersionStatus, s);
+	map = soap_code(soap_codes_ngwt__VersiontqStatus, s);
 	if (map)
-		*a = (enum ngwt__VersionStatus)map->code;
+		*a = (enum ngwt__VersiontqStatus)map->code;
 	else
 	{	long n;
 		if (soap_s2long(soap, s, &n))
 			return soap->error;
-		*a = (enum ngwt__VersionStatus)n;
+		*a = (enum ngwt__VersiontqStatus)n;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus *a, const char *type)
+SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
@@ -11105,15 +11105,15 @@ SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(str
 	{	soap->error = SOAP_TYPE;
 		return NULL;
 	}
-	a = (enum ngwt__VersionStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0, NULL, NULL, NULL);
+	a = (enum ngwt__VersiontqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0, NULL, NULL, NULL);
 	if (!a)
 		return NULL;
 	if (soap->body && !*soap->href)
-	{	if (!a || soap_s2ngwt__VersionStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
+	{	if (!a || soap_s2ngwt__VersiontqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__VersionStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, 0, sizeof(enum ngwt__VersionStatus), 0, NULL);
+	{	a = (enum ngwt__VersiontqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, 0, sizeof(enum ngwt__VersiontqStatus), 0, NULL);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
 	{ (long)created, "created" },
 	{ (long)deleteVersion, "deleteVersion" },
 	{ (long)endAccess, "endAccess" },
-	{ (long)reseStatus, "reseStatus" },
+	{ (long)resetqStatus, "resetqStatus" },
 	{ (long)restore, "restore" },
 	{ (long)retrieve, "retrieve" },
 	{ (long)securityModified, "securityModified" },
@@ -11973,7 +11973,7 @@ SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__MessageType(struct soap *soap, const ch
 	char *t;
 	if (!s)
 		return SOAP_OK;
-	soap_s2QName(soap, s, &t);
+	soap_s2TQName(soap, s, &t);
 	map = soap_code(soap_codes_ngwt__MessageType, t);
 	if (map)
 		*a = (enum ngwt__MessageType)map->code;
@@ -12487,7 +12487,7 @@ SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__ItemSecurity(struct soap *soap, const c
 	char *t;
 	if (!s)
 		return SOAP_OK;
-	//soap_s2QName(soap, s, &t);
+	//soap_s2TQName(soap, s, &t);
 	map = soap_code(soap_codes_ngwt__ItemSecurity, s);
 	if (map)
 		*a = (enum ngwt__ItemSecurity)map->code;
@@ -12877,25 +12877,25 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *a)
 {
 (void)soap; /* appease -Wall -Werror */
-#ifdef SOAP_DEFAULT_ngwt__FolderACLStatus
-	*a = SOAP_DEFAULT_ngwt__FolderACLStatus;
+#ifdef SOAP_DEFAULT_ngwt__FolderACLtqStatus
+	*a = SOAP_DEFAULT_ngwt__FolderACLtqStatus;
 #else
-	*a = (enum ngwt__FolderACLStatus)0;
+	*a = (enum ngwt__FolderACLtqStatus)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap *soap, const enum ngwt__FolderACLStatus *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap *soap, const enum ngwt__FolderACLtqStatus *a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLStatus);
-	if (soap_out_ngwt__FolderACLStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLtqStatus);
+	if (soap_out_ngwt__FolderACLtqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-static const struct soap_code_map soap_codes_ngwt__FolderACLStatus[] =
+static const struct soap_code_map soap_codes_ngwt__FolderACLtqStatus[] =
 {	{ (long)pending, "pending" },
 	{ (long)accepted, "accepted" },
 	{ (long)deleted, "deleted" },
@@ -12904,44 +12904,44 @@ static const struct soap_code_map soap_codes_ngwt__FolderACLStatus[] =
 	{ 0, NULL }
 };
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap *soap, enum ngwt__FolderACLStatus n)
-{	const char *s = soap_str_code(soap_codes_ngwt__FolderACLStatus, (long)n);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap *soap, enum ngwt__FolderACLtqStatus n)
+{	const char *s = soap_str_code(soap_codes_ngwt__FolderACLtqStatus, (long)n);
 	if (s)
 		return s;
 	return soap_long2s(soap, (long)n);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLStatus *a, const char *type)
-{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLStatus), type);
-	soap_send(soap, soap_ngwt__FolderACLStatus2s(soap, *a));
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLtqStatus *a, const char *type)
+{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLtqStatus), type);
+	soap_send(soap, soap_ngwt__FolderACLtqStatus2s(soap, *a));
 	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__FolderACLStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__FolderACLtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap *soap, const char *s, enum ngwt__FolderACLStatus *a)
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap *soap, const char *s, enum ngwt__FolderACLtqStatus *a)
 {
 	const struct soap_code_map *map;
 	if (!s)
 		return SOAP_OK;
-	map = soap_code(soap_codes_ngwt__FolderACLStatus, s);
+	map = soap_code(soap_codes_ngwt__FolderACLtqStatus, s);
 	if (map)
-		*a = (enum ngwt__FolderACLStatus)map->code;
+		*a = (enum ngwt__FolderACLtqStatus)map->code;
 	else
 	{	long n;
 		if (soap_s2long(soap, s, &n))
 			return soap->error;
-		*a = (enum ngwt__FolderACLStatus)n;
+		*a = (enum ngwt__FolderACLtqStatus)n;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus *a, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
@@ -12949,15 +12949,15 @@ SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus
 	{	soap->error = SOAP_TYPE;
 		return NULL;
 	}
-	a = (enum ngwt__FolderACLStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0, NULL, NULL, NULL);
+	a = (enum ngwt__FolderACLtqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL, NULL, NULL);
 	if (!a)
 		return NULL;
 	if (soap->body && !*soap->href)
-	{	if (!a || soap_s2ngwt__FolderACLStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
+	{	if (!a || soap_s2ngwt__FolderACLtqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__FolderACLStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, 0, sizeof(enum ngwt__FolderACLStatus), 0, NULL);
+	{	a = (enum ngwt__FolderACLtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, 0, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -12993,7 +12993,7 @@ static const struct soap_code_map soap_codes_ngwt__FilterOp[] =
 	{ (long)gte, "gte" },
 	{ (long)lte, "lte" },
 	{ (long)tqcontains, "tqcontains" },
-	{ (long)tqcontainsWord, "tqcontainsWord" },
+	{ (long)containsWord, "containsWord" },
 	{ (long)begins, "begins" },
 	{ (long)exists, "exists" },
 	{ (long)notExist, "notExist" },
@@ -13639,7 +13639,7 @@ SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__ContactType(struct soap *soap, const ch
 	char *t;
 	if (!s)
 		return SOAP_OK;
-	soap_s2QName(soap, s, &t);
+	soap_s2TQName(soap, s, &t);
 	map = soap_code(soap_codes_ngwt__ContactType, t);
 	if (map)
 		*a = (enum ngwt__ContactType)map->code;
@@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] =
 	{ (long)PhoneNumber, "PhoneNumber" },
 	{ (long)Place, "Place" },
 	{ (long)PostalAddress, "PostalAddress" },
-	{ (long)RecipienStatus, "RecipienStatus" },
+	{ (long)RecipientqStatus, "RecipientqStatus" },
 	{ (long)Rights, "Rights" },
 	{ (long)Security, "Security" },
 	{ (long)SendPriority, "SendPriority" },
@@ -14299,7 +14299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwe__FieldList(struct soap *soap, const char
 			case 262144: soap_send(soap, "PhoneNumber "); break;
 			case 524288: soap_send(soap, "Place "); break;
 			case 1048576: soap_send(soap, "PostalAddress "); break;
-			case 2097152: soap_send(soap, "RecipienStatus "); break;
+			case 2097152: soap_send(soap, "RecipientqStatus "); break;
 			case 4194304: soap_send(soap, "Rights "); break;
 			case 8388608: soap_send(soap, "Security "); break;
 			case 16777216: soap_send(soap, "SendPriority "); break;
@@ -14376,8 +14376,8 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap
 				i |= (LONG64)Place;
 			else if (!strcmp(s, "PostalAddress"))
 				i |= (LONG64)PostalAddress;
-			else if (!strcmp(s, "RecipienStatus"))
-				i |= (LONG64)RecipienStatus;
+			else if (!strcmp(s, "RecipientqStatus"))
+				i |= (LONG64)RecipientqStatus;
 			else if (!strcmp(s, "Rights"))
 				i |= (LONG64)Rights;
 			else if (!strcmp(s, "Security"))
@@ -14873,8 +14873,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__View(struct soap *soap, int st, int t
 void _ngwe__removeEventsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -14901,7 +14901,7 @@ int _ngwe__removeEventsResponse::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -14944,7 +14944,7 @@ SOAP_FMAC3 _ngwe__removeEventsResponse * SOAP_FMAC4 soap_in__ngwe__removeEventsR
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15167,8 +15167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__removeEventsRequest(struct soap *soa
 void _ngwe__removeEventConfigurationResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15195,7 +15195,7 @@ int _ngwe__removeEventConfigurationResponse::soap_out(struct soap *soap, const c
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventConfigurationResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventConfigurationResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15238,7 +15238,7 @@ SOAP_FMAC3 _ngwe__removeEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__r
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15445,8 +15445,8 @@ void _ngwe__getEventsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventList);
 	soap_serialize_PointerTongwe__EventList(soap, &((_ngwe__getEventsResponse*)this)->events);
-	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15475,7 +15475,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventsResponse(struct soap *soap, c
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventsResponse), type);
 	soap_out_PointerTongwe__EventList(soap, "ngwe:events", -1, &(((_ngwe__getEventsResponse*)a)->events), "");
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15523,7 +15523,7 @@ SOAP_FMAC3 _ngwe__getEventsResponse * SOAP_FMAC4 soap_in__ngwe__getEventsRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15781,8 +15781,8 @@ void _ngwe__getEventConfigurationResponse::soap_serialize(struct soap *soap) con
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventsList);
 	soap_serialize_PointerTongwe__EventsList(soap, &((_ngwe__getEventConfigurationResponse*)this)->events);
-	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15811,7 +15811,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventConfigurationResponse(struct s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventConfigurationResponse), type);
 	soap_out_PointerTongwe__EventsList(soap, "ngwe:events", -1, &(((_ngwe__getEventConfigurationResponse*)a)->events), "");
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15859,7 +15859,7 @@ SOAP_FMAC3 _ngwe__getEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__getE
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -16060,8 +16060,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__getEventConfigurationRequest(struct
 void _ngwe__configureEventsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__configureEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__configureEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -16088,7 +16088,7 @@ int _ngwe__configureEventsResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__configureEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__configureEventsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__configureEventsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -16131,7 +16131,7 @@ SOAP_FMAC3 _ngwe__configureEventsResponse * SOAP_FMAC4 soap_in__ngwe__configureE
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -16332,8 +16332,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__configureEventsRequest(struct soap *
 void _ngwe__cleanEventConfigurationResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -16360,7 +16360,7 @@ int _ngwe__cleanEventConfigurationResponse::soap_out(struct soap *soap, const ch
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__cleanEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__cleanEventConfigurationResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__cleanEventConfigurationResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -16403,7 +16403,7 @@ SOAP_FMAC3 _ngwe__cleanEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__cl
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -17867,8 +17867,8 @@ void _ngwm__updateVersionStatusResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->part, SOAP_TYPE_PointerTongwt__SignatureData);
 	soap_serialize_PointerTongwt__SignatureData(soap, &((_ngwm__updateVersionStatusResponse*)this)->part);
-	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__updateVersionStatusResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__updateVersionStatusResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -17897,7 +17897,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__updateVersionStatusResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__updateVersionStatusResponse), type);
 	soap_out_PointerTongwt__SignatureData(soap, "ngwm:part", -1, &(((_ngwm__updateVersionStatusResponse*)a)->part), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -17945,7 +17945,7 @@ SOAP_FMAC3 _ngwm__updateVersionStatusResponse * SOAP_FMAC4 soap_in__ngwm__update
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18167,8 +18167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__updateVersionStatusRequest(struct so
 void _ngwm__uncompleteResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__uncompleteResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__uncompleteResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18195,7 +18195,7 @@ int _ngwm__uncompleteResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__uncompleteResponse(struct soap *soap, const char *tag, int id, const _ngwm__uncompleteResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__uncompleteResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18238,7 +18238,7 @@ SOAP_FMAC3 _ngwm__uncompleteResponse * SOAP_FMAC4 soap_in__ngwm__uncompleteRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18443,8 +18443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__uncompleteRequest(struct soap *soap,
 void _ngwm__unacceptResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__unacceptResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__unacceptResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18471,7 +18471,7 @@ int _ngwm__unacceptResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__unacceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__unacceptResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__unacceptResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18514,7 +18514,7 @@ SOAP_FMAC3 _ngwm__unacceptResponse * SOAP_FMAC4 soap_in__ngwm__unacceptResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18721,8 +18721,8 @@ void _ngwm__startFreeBusySessionResponse::soap_serialize(struct soap *soap) cons
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId, SOAP_TYPE_PointerToint);
 	soap_serialize_PointerToint(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId);
-	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18751,7 +18751,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__startFreeBusySessionResponse(struct so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__startFreeBusySessionResponse), type);
 	soap_out_PointerToint(soap, "ngwm:freeBusySessionId", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->freeBusySessionId), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18799,7 +18799,7 @@ SOAP_FMAC3 _ngwm__startFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__start
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19022,8 +19022,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__startFreeBusySessionRequest(struct s
 void _ngwm__setTimestampResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__setTimestampResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__setTimestampResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19050,7 +19050,7 @@ int _ngwm__setTimestampResponse::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__setTimestampResponse(struct soap *soap, const char *tag, int id, const _ngwm__setTimestampResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__setTimestampResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19093,7 +19093,7 @@ SOAP_FMAC3 _ngwm__setTimestampResponse * SOAP_FMAC4 soap_in__ngwm__setTimestampR
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19304,8 +19304,8 @@ void _ngwm__sendItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__sendItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__sendItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__sendItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19334,7 +19334,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__sendItemResponse(struct soap *soap, co
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__sendItemResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__sendItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19380,7 +19380,7 @@ SOAP_FMAC3 _ngwm__sendItemResponse * SOAP_FMAC4 soap_in__ngwm__sendItemResponse(
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__sendItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19585,8 +19585,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__sendItemRequest(struct soap *soap, i
 void _ngwm__retractResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__retractResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__retractResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19613,7 +19613,7 @@ int _ngwm__retractResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__retractResponse(struct soap *soap, const char *tag, int id, const _ngwm__retractResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__retractResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19656,7 +19656,7 @@ SOAP_FMAC3 _ngwm__retractResponse * SOAP_FMAC4 soap_in__ngwm__retractResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19897,8 +19897,8 @@ void _ngwm__replyResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__replyResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__replyResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__replyResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__replyResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19927,7 +19927,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__replyResponse(struct soap *soap, const
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__replyResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__replyResponse*)a)->item), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19975,7 +19975,7 @@ SOAP_FMAC3 _ngwm__replyResponse * SOAP_FMAC4 soap_in__ngwm__replyResponse(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20189,8 +20189,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__replyRequest(struct soap *soap, int
 void _ngwm__removeSignatureResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeSignatureResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeSignatureResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20217,7 +20217,7 @@ int _ngwm__removeSignatureResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeSignatureResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeSignatureResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20260,7 +20260,7 @@ SOAP_FMAC3 _ngwm__removeSignatureResponse * SOAP_FMAC4 soap_in__ngwm__removeSign
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20478,8 +20478,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeSignatureRequest(struct soap *
 void _ngwm__removeProxyUserResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyUserResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyUserResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20506,7 +20506,7 @@ int _ngwm__removeProxyUserResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyUserResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyUserResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyUserResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20549,7 +20549,7 @@ SOAP_FMAC3 _ngwm__removeProxyUserResponse * SOAP_FMAC4 soap_in__ngwm__removeProx
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20754,8 +20754,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyUserRequest(struct soap *
 void _ngwm__removeProxyAccessResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20782,7 +20782,7 @@ int _ngwm__removeProxyAccessResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyAccessResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyAccessResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20825,7 +20825,7 @@ SOAP_FMAC3 _ngwm__removeProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__removePr
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21030,8 +21030,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyAccessRequest(struct soap
 void _ngwm__removeMembersResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeMembersResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeMembersResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21058,7 +21058,7 @@ int _ngwm__removeMembersResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeMembersResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeMembersResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21101,7 +21101,7 @@ SOAP_FMAC3 _ngwm__removeMembersResponse * SOAP_FMAC4 soap_in__ngwm__removeMember
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21315,8 +21315,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeMembersRequest(struct soap *so
 void _ngwm__removeJunkEntryResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21343,7 +21343,7 @@ int _ngwm__removeJunkEntryResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeJunkEntryResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeJunkEntryResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21386,7 +21386,7 @@ SOAP_FMAC3 _ngwm__removeJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__removeJunk
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21591,8 +21591,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeJunkEntryRequest(struct soap *
 void _ngwm__removeItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21619,7 +21619,7 @@ int _ngwm__removeItemsResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21662,7 +21662,7 @@ SOAP_FMAC3 _ngwm__removeItemsResponse * SOAP_FMAC4 soap_in__ngwm__removeItemsRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21876,8 +21876,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemsRequest(struct soap *soap
 void _ngwm__removeItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21904,7 +21904,7 @@ int _ngwm__removeItemResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21947,7 +21947,7 @@ SOAP_FMAC3 _ngwm__removeItemResponse * SOAP_FMAC4 soap_in__ngwm__removeItemRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22161,8 +22161,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemRequest(struct soap *soap,
 void _ngwm__removeCustomDefinitionResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22189,7 +22189,7 @@ int _ngwm__removeCustomDefinitionResponse::soap_out(struct soap *soap, const cha
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeCustomDefinitionResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeCustomDefinitionResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeCustomDefinitionResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22232,7 +22232,7 @@ SOAP_FMAC3 _ngwm__removeCustomDefinitionResponse * SOAP_FMAC4 soap_in__ngwm__rem
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22451,8 +22451,8 @@ void _ngwm__readCursorResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->items, SOAP_TYPE_PointerTongwt__ItemList);
 	soap_serialize_PointerTongwt__ItemList(soap, &((_ngwm__readCursorResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__readCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__readCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22481,7 +22481,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__readCursorResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__readCursorResponse), type);
 	soap_out_PointerTongwt__ItemList(soap, "ngwm:items", -1, &(((_ngwm__readCursorResponse*)a)->items), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22529,7 +22529,7 @@ SOAP_FMAC3 _ngwm__readCursorResponse * SOAP_FMAC4 soap_in__ngwm__readCursorRespo
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22768,8 +22768,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__readCursorRequest(struct soap *soap,
 void _ngwm__purgeResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22796,7 +22796,7 @@ int _ngwm__purgeResponse::soap_out(struct soap *soap, const char *tag, int id, c
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22839,7 +22839,7 @@ SOAP_FMAC3 _ngwm__purgeResponse * SOAP_FMAC4 soap_in__ngwm__purgeResponse(struct
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23044,8 +23044,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeRequest(struct soap *soap, int
 void _ngwm__purgeDeletedItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23072,7 +23072,7 @@ int _ngwm__purgeDeletedItemsResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeDeletedItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeDeletedItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeDeletedItemsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23115,7 +23115,7 @@ SOAP_FMAC3 _ngwm__purgeDeletedItemsResponse * SOAP_FMAC4 soap_in__ngwm__purgeDel
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23306,8 +23306,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeDeletedItemsRequest(struct soap
 void _ngwm__positionCursorResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__positionCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__positionCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23334,7 +23334,7 @@ int _ngwm__positionCursorResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__positionCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__positionCursorResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__positionCursorResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23377,7 +23377,7 @@ SOAP_FMAC3 _ngwm__positionCursorResponse * SOAP_FMAC4 soap_in__ngwm__positionCur
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23606,8 +23606,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__positionCursorRequest(struct soap *s
 void _ngwm__moveItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__moveItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__moveItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23634,7 +23634,7 @@ int _ngwm__moveItemResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__moveItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__moveItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__moveItemResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23677,7 +23677,7 @@ SOAP_FMAC3 _ngwm__moveItemResponse * SOAP_FMAC4 soap_in__ngwm__moveItemResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23900,8 +23900,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__moveItemRequest(struct soap *soap, i
 void _ngwm__modifySignaturesResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySignaturesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySignaturesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23928,7 +23928,7 @@ int _ngwm__modifySignaturesResponse::soap_out(struct soap *soap, const char *tag
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySignaturesResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySignaturesResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySignaturesResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23971,7 +23971,7 @@ SOAP_FMAC3 _ngwm__modifySignaturesResponse * SOAP_FMAC4 soap_in__ngwm__modifySig
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24176,8 +24176,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySignaturesRequest(struct soap
 void _ngwm__modifySettingsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24204,7 +24204,7 @@ int _ngwm__modifySettingsResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySettingsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySettingsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24247,7 +24247,7 @@ SOAP_FMAC3 _ngwm__modifySettingsResponse * SOAP_FMAC4 soap_in__ngwm__modifySetti
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24452,8 +24452,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySettingsRequest(struct soap *s
 void _ngwm__modifyProxyAccessResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24480,7 +24480,7 @@ int _ngwm__modifyProxyAccessResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyProxyAccessResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyProxyAccessResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24523,7 +24523,7 @@ SOAP_FMAC3 _ngwm__modifyProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__modifyPr
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24737,8 +24737,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyProxyAccessRequest(struct soap
 void _ngwm__modifyPasswordResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyPasswordResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyPasswordResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24765,7 +24765,7 @@ int _ngwm__modifyPasswordResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyPasswordResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyPasswordResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyPasswordResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24808,7 +24808,7 @@ SOAP_FMAC3 _ngwm__modifyPasswordResponse * SOAP_FMAC4 soap_in__ngwm__modifyPassw
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25018,8 +25018,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyPasswordRequest(struct soap *s
 void _ngwm__modifyJunkMailSettingsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25046,7 +25046,7 @@ int _ngwm__modifyJunkMailSettingsResponse::soap_out(struct soap *soap, const cha
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkMailSettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkMailSettingsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25089,7 +25089,7 @@ SOAP_FMAC3 _ngwm__modifyJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__mod
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25294,8 +25294,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyJunkMailSettingsRequest(struct
 void _ngwm__modifyJunkEntryResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25322,7 +25322,7 @@ int _ngwm__modifyJunkEntryResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkEntryResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkEntryResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25365,7 +25365,7 @@ SOAP_FMAC3 _ngwm__modifyJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__modifyJunk
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25572,8 +25572,8 @@ void _ngwm__modifyItemsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfstring(soap, &((_ngwm__modifyItemsResponse*)this)->ngwt__modified);
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemsResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25604,7 +25604,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemsResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemsResponse), type);
 	soap_out_std__vectorTemplateOfstring(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemsResponse*)a)->ngwt__modified), "");
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemsResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25653,7 +25653,7 @@ SOAP_FMAC3 _ngwm__modifyItemsResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemsRes
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemsResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25853,8 +25853,8 @@ void _ngwm__modifyItemResponse::soap_serialize(struct soap *soap) const
 	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified);
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25885,7 +25885,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemResponse), type);
 	soap_out_string(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemResponse*)a)->ngwt__modified), "");
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25936,7 +25936,7 @@ SOAP_FMAC3 _ngwm__modifyItemResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemRespo
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26167,8 +26167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyItemRequest(struct soap *soap,
 void _ngwm__markUnReadResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnReadResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnReadResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26195,7 +26195,7 @@ int _ngwm__markUnReadResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnReadResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnReadResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26238,7 +26238,7 @@ SOAP_FMAC3 _ngwm__markUnReadResponse * SOAP_FMAC4 soap_in__ngwm__markUnReadRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26443,8 +26443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnReadRequest(struct soap *soap,
 void _ngwm__markUnPrivateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnPrivateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnPrivateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26471,7 +26471,7 @@ int _ngwm__markUnPrivateResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnPrivateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnPrivateResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26514,7 +26514,7 @@ SOAP_FMAC3 _ngwm__markUnPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markUnPrivat
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26719,8 +26719,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnPrivateRequest(struct soap *so
 void _ngwm__markReadResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markReadResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markReadResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26747,7 +26747,7 @@ int _ngwm__markReadResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markReadResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markReadResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26790,7 +26790,7 @@ SOAP_FMAC3 _ngwm__markReadResponse * SOAP_FMAC4 soap_in__ngwm__markReadResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26995,8 +26995,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markReadRequest(struct soap *soap, i
 void _ngwm__markPrivateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markPrivateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markPrivateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27023,7 +27023,7 @@ int _ngwm__markPrivateResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markPrivateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markPrivateResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27066,7 +27066,7 @@ SOAP_FMAC3 _ngwm__markPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markPrivateRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27271,8 +27271,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markPrivateRequest(struct soap *soap
 void _ngwm__logoutResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__logoutResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__logoutResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27299,7 +27299,7 @@ int _ngwm__logoutResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__logoutResponse(struct soap *soap, const char *tag, int id, const _ngwm__logoutResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__logoutResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27342,7 +27342,7 @@ SOAP_FMAC3 _ngwm__logoutResponse * SOAP_FMAC4 soap_in__ngwm__logoutResponse(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27546,8 +27546,8 @@ void _ngwm__loginResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_std__vectorTemplateOfPointerTongwt__Host(soap, &((_ngwm__loginResponse*)this)->redirectToHost);
 	soap_embedded(soap, &((_ngwm__loginResponse*)this)->serverUTCTime, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__loginResponse*)this)->serverUTCTime);
-	soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__loginResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__loginResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27588,7 +27588,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__loginResponse(struct soap *soap, const
 	soap_out_PointerTostd__string(soap, "ngwm:build", -1, &(((_ngwm__loginResponse*)a)->build), "");
 	soap_out_std__vectorTemplateOfPointerTongwt__Host(soap, "ngwm:redirectToHost", -1, &(((_ngwm__loginResponse*)a)->redirectToHost), "");
 	soap_out_string(soap, "ngwm:serverUTCTime", -1, &(((_ngwm__loginResponse*)a)->serverUTCTime), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27664,7 +27664,7 @@ SOAP_FMAC3 _ngwm__loginResponse * SOAP_FMAC4 soap_in__ngwm__loginResponse(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27898,8 +27898,8 @@ void _ngwm__getUserListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->users, SOAP_TYPE_PointerTongwt__UserList);
 	soap_serialize_PointerTongwt__UserList(soap, &((_ngwm__getUserListResponse*)this)->users);
-	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getUserListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getUserListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27928,7 +27928,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getUserListResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getUserListResponse), type);
 	soap_out_PointerTongwt__UserList(soap, "ngwm:users", -1, &(((_ngwm__getUserListResponse*)a)->users), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27976,7 +27976,7 @@ SOAP_FMAC3 _ngwm__getUserListResponse * SOAP_FMAC4 soap_in__ngwm__getUserListRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28188,8 +28188,8 @@ void _ngwm__getTimezoneListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones, SOAP_TYPE_PointerTongwt__TimezoneList);
 	soap_serialize_PointerTongwt__TimezoneList(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones);
-	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimezoneListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimezoneListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28218,7 +28218,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimezoneListResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimezoneListResponse), type);
 	soap_out_PointerTongwt__TimezoneList(soap, "ngwm:timezones", -1, &(((_ngwm__getTimezoneListResponse*)a)->timezones), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28266,7 +28266,7 @@ SOAP_FMAC3 _ngwm__getTimezoneListResponse * SOAP_FMAC4 soap_in__ngwm__getTimezon
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28461,8 +28461,8 @@ void _ngwm__getTimestampResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->backup);
 	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->retention, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->retention);
-	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimestampResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimestampResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28493,7 +28493,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimestampResponse(struct soap *soap
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimestampResponse), type);
 	soap_out_string(soap, "ngwm:backup", -1, &(((_ngwm__getTimestampResponse*)a)->backup), "");
 	soap_out_string(soap, "ngwm:retention", -1, &(((_ngwm__getTimestampResponse*)a)->retention), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28546,7 +28546,7 @@ SOAP_FMAC3 _ngwm__getTimestampResponse * SOAP_FMAC4 soap_in__ngwm__getTimestampR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28767,8 +28767,8 @@ void _ngwm__getSignaturesResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->signatures, SOAP_TYPE_PointerTongwt__Signatures);
 	soap_serialize_PointerTongwt__Signatures(soap, &((_ngwm__getSignaturesResponse*)this)->signatures);
-	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSignaturesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSignaturesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28797,7 +28797,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSignaturesResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSignaturesResponse), type);
 	soap_out_PointerTongwt__Signatures(soap, "ngwm:signatures", -1, &(((_ngwm__getSignaturesResponse*)a)->signatures), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28845,7 +28845,7 @@ SOAP_FMAC3 _ngwm__getSignaturesResponse * SOAP_FMAC4 soap_in__ngwm__getSignature
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29047,8 +29047,8 @@ void _ngwm__getSettingsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__Settings);
 	soap_serialize_PointerTongwt__Settings(soap, &((_ngwm__getSettingsResponse*)this)->settings);
-	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29077,7 +29077,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSettingsResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSettingsResponse), type);
 	soap_out_PointerTongwt__Settings(soap, "ngwm:settings", -1, &(((_ngwm__getSettingsResponse*)a)->settings), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29125,7 +29125,7 @@ SOAP_FMAC3 _ngwm__getSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getSettingsRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29328,8 +29328,8 @@ void _ngwm__getRuleListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->rules, SOAP_TYPE_PointerTongwt__RuleList);
 	soap_serialize_PointerTongwt__RuleList(soap, &((_ngwm__getRuleListResponse*)this)->rules);
-	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getRuleListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getRuleListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29358,7 +29358,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getRuleListResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getRuleListResponse), type);
 	soap_out_PointerTongwt__RuleList(soap, "ngwm:rules", -1, &(((_ngwm__getRuleListResponse*)a)->rules), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29406,7 +29406,7 @@ SOAP_FMAC3 _ngwm__getRuleListResponse * SOAP_FMAC4 soap_in__ngwm__getRuleListRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29599,8 +29599,8 @@ void _ngwm__getProxyListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->proxies, SOAP_TYPE_PointerTongwt__ProxyList);
 	soap_serialize_PointerTongwt__ProxyList(soap, &((_ngwm__getProxyListResponse*)this)->proxies);
-	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29629,7 +29629,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyListResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyListResponse), type);
 	soap_out_PointerTongwt__ProxyList(soap, "ngwm:proxies", -1, &(((_ngwm__getProxyListResponse*)a)->proxies), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29677,7 +29677,7 @@ SOAP_FMAC3 _ngwm__getProxyListResponse * SOAP_FMAC4 soap_in__ngwm__getProxyListR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29870,8 +29870,8 @@ void _ngwm__getProxyAccessListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights, SOAP_TYPE_PointerTongwt__AccessRightList);
 	soap_serialize_PointerTongwt__AccessRightList(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights);
-	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyAccessListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyAccessListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29900,7 +29900,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyAccessListResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyAccessListResponse), type);
 	soap_out_PointerTongwt__AccessRightList(soap, "ngwm:accessRights", -1, &(((_ngwm__getProxyAccessListResponse*)a)->accessRights), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29948,7 +29948,7 @@ SOAP_FMAC3 _ngwm__getProxyAccessListResponse * SOAP_FMAC4 soap_in__ngwm__getProx
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30143,8 +30143,8 @@ void _ngwm__getQuickMessagesResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_string(soap, &((_ngwm__getQuickMessagesResponse*)this)->ngwt__startDate);
 	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items);
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getQuickMessagesResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getQuickMessagesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getQuickMessagesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30175,7 +30175,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getQuickMessagesResponse(struct soap *
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getQuickMessagesResponse), type);
 	soap_out_string(soap, "ngwt:startDate", -1, &(((_ngwm__getQuickMessagesResponse*)a)->ngwt__startDate), "");
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getQuickMessagesResponse*)a)->items), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30228,7 +30228,7 @@ SOAP_FMAC3 _ngwm__getQuickMessagesResponse * SOAP_FMAC4 soap_in__ngwm__getQuickM
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30487,8 +30487,8 @@ void _ngwm__getLibraryListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->libraries, SOAP_TYPE_PointerTongwt__LibraryList);
 	soap_serialize_PointerTongwt__LibraryList(soap, &((_ngwm__getLibraryListResponse*)this)->libraries);
-	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30517,7 +30517,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryListResponse(struct soap *so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryListResponse), type);
 	soap_out_PointerTongwt__LibraryList(soap, "ngwm:libraries", -1, &(((_ngwm__getLibraryListResponse*)a)->libraries), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30565,7 +30565,7 @@ SOAP_FMAC3 _ngwm__getLibraryListResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryL
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30758,8 +30758,8 @@ void _ngwm__getLibraryItemResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getLibraryItemResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30788,7 +30788,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryItemResponse(struct soap *so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryItemResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getLibraryItemResponse*)a)->item), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30836,7 +30836,7 @@ SOAP_FMAC3 _ngwm__getLibraryItemResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryI
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31061,8 +31061,8 @@ void _ngwm__getJunkMailSettingsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__SettingsList);
 	soap_serialize_PointerTongwt__SettingsList(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings);
-	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31091,7 +31091,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkMailSettingsResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getJunkMailSettingsResponse), type);
 	soap_out_PointerTongwt__SettingsList(soap, "ngwm:settings", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->settings), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31139,7 +31139,7 @@ SOAP_FMAC3 _ngwm__getJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getJun
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31336,8 +31336,8 @@ void _ngwm__getJunkEntriesResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->block);
 	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust, SOAP_TYPE_PointerTongwt__JunkHandlingList);
 	soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust);
-	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkEntriesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkEntriesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31370,7 +31370,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkEntriesResponse(struct soap *so
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:junk", -1, &(((_ngwm__getJunkEntriesResponse*)a)->junk), "");
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:block", -1, &(((_ngwm__getJunkEntriesResponse*)a)->block), "");
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:trust", -1, &(((_ngwm__getJunkEntriesResponse*)a)->trust), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31428,7 +31428,7 @@ SOAP_FMAC3 _ngwm__getJunkEntriesResponse * SOAP_FMAC4 soap_in__ngwm__getJunkEntr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31631,8 +31631,8 @@ void _ngwm__getItemsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items);
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getItemsResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31661,7 +31661,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemsResponse(struct soap *soap, co
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemsResponse), type);
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getItemsResponse*)a)->items), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31709,7 +31709,7 @@ SOAP_FMAC3 _ngwm__getItemsResponse * SOAP_FMAC4 soap_in__ngwm__getItemsResponse(
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31947,8 +31947,8 @@ void _ngwm__getItemResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getItemResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31977,7 +31977,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemResponse(struct soap *soap, con
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getItemResponse*)a)->item), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32025,7 +32025,7 @@ SOAP_FMAC3 _ngwm__getItemResponse * SOAP_FMAC4 soap_in__ngwm__getItemResponse(st
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32243,8 +32243,8 @@ void _ngwm__getFreeBusyResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FreeBusyStats(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyStats);
 	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo, SOAP_TYPE_PointerTongwt__FreeBusyInfoList);
 	soap_serialize_PointerTongwt__FreeBusyInfoList(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo);
-	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFreeBusyResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFreeBusyResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32275,7 +32275,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFreeBusyResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFreeBusyResponse), type);
 	soap_out_PointerTongwt__FreeBusyStats(soap, "ngwm:freeBusyStats", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyStats), "");
 	soap_out_PointerTongwt__FreeBusyInfoList(soap, "ngwm:freeBusyInfo", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyInfo), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32328,7 +32328,7 @@ SOAP_FMAC3 _ngwm__getFreeBusyResponse * SOAP_FMAC4 soap_in__ngwm__getFreeBusyRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32535,8 +32535,8 @@ void _ngwm__getFolderListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->folders, SOAP_TYPE_PointerTongwt__FolderList);
 	soap_serialize_PointerTongwt__FolderList(soap, &((_ngwm__getFolderListResponse*)this)->folders);
-	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32565,7 +32565,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListResponse), type);
 	soap_out_PointerTongwt__FolderList(soap, "ngwm:folders", -1, &(((_ngwm__getFolderListResponse*)a)->folders), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32613,7 +32613,7 @@ SOAP_FMAC3 _ngwm__getFolderListResponse * SOAP_FMAC4 soap_in__ngwm__getFolderLis
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32680,8 +32680,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__getFolderListResponse(struct soap *s
 void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
+	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
 	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->view, SOAP_TYPE_PointerTongwt__View);
 	soap_serialize_PointerTongwt__View(soap, &((_ngwm__getFolderListRequest*)this)->view);
 	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->recurse, SOAP_TYPE_bool);
@@ -32693,7 +32693,7 @@ void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
 void _ngwm__getFolderListRequest::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
+	soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
 	((_ngwm__getFolderListRequest*)this)->view = NULL;
 	soap_default_bool(soap, &((_ngwm__getFolderListRequest*)this)->recurse);
 	((_ngwm__getFolderListRequest*)this)->imap = (bool)0;
@@ -32717,7 +32717,7 @@ int _ngwm__getFolderListRequest::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListRequest(struct soap *soap, const char *tag, int id, const _ngwm__getFolderListRequest *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListRequest), type);
-	soap_out_ngwt__uid(soap, "ngwm:parent", -1, &(((_ngwm__getFolderListRequest*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwm:tqparent", -1, &(((_ngwm__getFolderListRequest*)a)->tqparent), "");
 	soap_out_PointerTongwt__View(soap, "ngwm:view", -1, &(((_ngwm__getFolderListRequest*)a)->view), "");
 	soap_out_bool(soap, "ngwm:recurse", -1, &(((_ngwm__getFolderListRequest*)a)->recurse), "");
 	soap_out_bool(soap, "ngwm:imap", -1, &(((_ngwm__getFolderListRequest*)a)->imap), "");
@@ -32758,14 +32758,14 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
 			return (_ngwm__getFolderListRequest *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_parent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
+	short soap_flag_tqparent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
-			if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwm:parent", &(((_ngwm__getFolderListRequest*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent1 = 0;
+			if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwm:tqparent", &(((_ngwm__getFolderListRequest*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent1 = 0;
 					continue;
 				}
 			if (soap_flag_view1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -32796,7 +32796,7 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1 || soap_flag_recurse1))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1 || soap_flag_recurse1))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -32853,8 +32853,8 @@ void _ngwm__getFolderResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->folder, SOAP_TYPE_PointerTongwt__Folder);
 	soap_serialize_PointerTongwt__Folder(soap, &((_ngwm__getFolderResponse*)this)->folder);
-	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32883,7 +32883,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderResponse(struct soap *soap, c
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderResponse), type);
 	soap_out_PointerTongwt__Folder(soap, "ngwm:folder", -1, &(((_ngwm__getFolderResponse*)a)->folder), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32931,7 +32931,7 @@ SOAP_FMAC3 _ngwm__getFolderResponse * SOAP_FMAC4 soap_in__ngwm__getFolderRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33170,8 +33170,8 @@ void _ngwm__getDocumentTypeListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items, SOAP_TYPE_PointerTongwt__DocumentTypeList);
 	soap_serialize_PointerTongwt__DocumentTypeList(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33200,7 +33200,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDocumentTypeListResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDocumentTypeListResponse), type);
 	soap_out_PointerTongwt__DocumentTypeList(soap, "ngwm:items", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->items), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33248,7 +33248,7 @@ SOAP_FMAC3 _ngwm__getDocumentTypeListResponse * SOAP_FMAC4 soap_in__ngwm__getDoc
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33455,8 +33455,8 @@ void _ngwm__getDeltaInfoResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo);
 	soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo);
-	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltaInfoResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltaInfoResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33485,7 +33485,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltaInfoResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltaInfoResponse), type);
 	soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltaInfoResponse*)a)->deltaInfo), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33533,7 +33533,7 @@ SOAP_FMAC3 _ngwm__getDeltaInfoResponse * SOAP_FMAC4 soap_in__ngwm__getDeltaInfoR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33742,8 +33742,8 @@ void _ngwm__getDeltasResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getDeltasResponse*)this)->items);
 	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo);
 	soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo);
-	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltasResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltasResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33774,7 +33774,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltasResponse(struct soap *soap, c
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltasResponse), type);
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getDeltasResponse*)a)->items), "");
 	soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltasResponse*)a)->deltaInfo), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33827,7 +33827,7 @@ SOAP_FMAC3 _ngwm__getDeltasResponse * SOAP_FMAC4 soap_in__ngwm__getDeltasRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34052,8 +34052,8 @@ void _ngwm__getCustomListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->customs, SOAP_TYPE_PointerTongwt__CustomList);
 	soap_serialize_PointerTongwt__CustomList(soap, &((_ngwm__getCustomListResponse*)this)->customs);
-	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCustomListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCustomListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34082,7 +34082,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCustomListResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCustomListResponse), type);
 	soap_out_PointerTongwt__CustomList(soap, "ngwm:customs", -1, &(((_ngwm__getCustomListResponse*)a)->customs), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34130,7 +34130,7 @@ SOAP_FMAC3 _ngwm__getCustomListResponse * SOAP_FMAC4 soap_in__ngwm__getCustomLis
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34323,8 +34323,8 @@ void _ngwm__getCategoryListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->categories, SOAP_TYPE_PointerTongwt__CategoryList);
 	soap_serialize_PointerTongwt__CategoryList(soap, &((_ngwm__getCategoryListResponse*)this)->categories);
-	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCategoryListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCategoryListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34353,7 +34353,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCategoryListResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCategoryListResponse), type);
 	soap_out_PointerTongwt__CategoryList(soap, "ngwm:categories", -1, &(((_ngwm__getCategoryListResponse*)a)->categories), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34401,7 +34401,7 @@ SOAP_FMAC3 _ngwm__getCategoryListResponse * SOAP_FMAC4 soap_in__ngwm__getCategor
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34594,8 +34594,8 @@ void _ngwm__getAttachmentResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->part, SOAP_TYPE_PointerTongwt__MessagePart);
 	soap_serialize_PointerTongwt__MessagePart(soap, &((_ngwm__getAttachmentResponse*)this)->part);
-	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAttachmentResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAttachmentResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34624,7 +34624,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAttachmentResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAttachmentResponse), type);
 	soap_out_PointerTongwt__MessagePart(soap, "ngwm:part", -1, &(((_ngwm__getAttachmentResponse*)a)->part), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34672,7 +34672,7 @@ SOAP_FMAC3 _ngwm__getAttachmentResponse * SOAP_FMAC4 soap_in__ngwm__getAttachmen
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34895,8 +34895,8 @@ void _ngwm__getAddressBookListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->books, SOAP_TYPE_PointerTongwt__AddressBookList);
 	soap_serialize_PointerTongwt__AddressBookList(soap, &((_ngwm__getAddressBookListResponse*)this)->books);
-	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAddressBookListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAddressBookListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34925,7 +34925,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAddressBookListResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAddressBookListResponse), type);
 	soap_out_PointerTongwt__AddressBookList(soap, "ngwm:books", -1, &(((_ngwm__getAddressBookListResponse*)a)->books), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34973,7 +34973,7 @@ SOAP_FMAC3 _ngwm__getAddressBookListResponse * SOAP_FMAC4 soap_in__ngwm__getAddr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35166,8 +35166,8 @@ void _ngwm__forwardResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__forwardResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__forwardResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__forwardResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35196,7 +35196,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__forwardResponse(struct soap *soap, con
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__forwardResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__forwardResponse*)a)->item), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35244,7 +35244,7 @@ SOAP_FMAC3 _ngwm__forwardResponse * SOAP_FMAC4 soap_in__ngwm__forwardResponse(st
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35466,8 +35466,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__forwardRequest(struct soap *soap, in
 void _ngwm__executeRuleResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__executeRuleResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__executeRuleResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35494,7 +35494,7 @@ int _ngwm__executeRuleResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__executeRuleResponse(struct soap *soap, const char *tag, int id, const _ngwm__executeRuleResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__executeRuleResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35537,7 +35537,7 @@ SOAP_FMAC3 _ngwm__executeRuleResponse * SOAP_FMAC4 soap_in__ngwm__executeRuleRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35742,8 +35742,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__executeRuleRequest(struct soap *soap
 void _ngwm__destroyCursorResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__destroyCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__destroyCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35770,7 +35770,7 @@ int _ngwm__destroyCursorResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__destroyCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__destroyCursorResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__destroyCursorResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35813,7 +35813,7 @@ SOAP_FMAC3 _ngwm__destroyCursorResponse * SOAP_FMAC4 soap_in__ngwm__destroyCurso
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36026,8 +36026,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__destroyCursorRequest(struct soap *so
 void _ngwm__delegateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__delegateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__delegateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36054,7 +36054,7 @@ int _ngwm__delegateResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__delegateResponse(struct soap *soap, const char *tag, int id, const _ngwm__delegateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__delegateResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36097,7 +36097,7 @@ SOAP_FMAC3 _ngwm__delegateResponse * SOAP_FMAC4 soap_in__ngwm__delegateResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36337,8 +36337,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__delegateRequest(struct soap *soap, i
 void _ngwm__declineResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__declineResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__declineResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36365,7 +36365,7 @@ int _ngwm__declineResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__declineResponse(struct soap *soap, const char *tag, int id, const _ngwm__declineResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__declineResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36408,7 +36408,7 @@ SOAP_FMAC3 _ngwm__declineResponse * SOAP_FMAC4 soap_in__ngwm__declineResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36630,8 +36630,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__declineRequest(struct soap *soap, in
 void _ngwm__createSignatureResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createSignatureResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createSignatureResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36658,7 +36658,7 @@ int _ngwm__createSignatureResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__createSignatureResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createSignatureResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36701,7 +36701,7 @@ SOAP_FMAC3 _ngwm__createSignatureResponse * SOAP_FMAC4 soap_in__ngwm__createSign
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36908,8 +36908,8 @@ void _ngwm__createProxyAccessResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createProxyAccessResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36938,7 +36938,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createProxyAccessResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createProxyAccessResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createProxyAccessResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36986,7 +36986,7 @@ SOAP_FMAC3 _ngwm__createProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__createPr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37193,8 +37193,8 @@ void _ngwm__createJunkEntryResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createJunkEntryResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37223,7 +37223,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createJunkEntryResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createJunkEntryResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createJunkEntryResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37271,7 +37271,7 @@ SOAP_FMAC3 _ngwm__createJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__createJunk
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37477,8 +37477,8 @@ void _ngwm__createItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemsResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37507,7 +37507,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemsResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemsResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemsResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37553,7 +37553,7 @@ SOAP_FMAC3 _ngwm__createItemsResponse * SOAP_FMAC4 soap_in__ngwm__createItemsRes
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemsResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37751,8 +37751,8 @@ void _ngwm__createItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37781,7 +37781,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37827,7 +37827,7 @@ SOAP_FMAC3 _ngwm__createItemResponse * SOAP_FMAC4 soap_in__ngwm__createItemRespo
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38043,8 +38043,8 @@ void _ngwm__createCursorResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->cursor, SOAP_TYPE_PointerToint);
 	soap_serialize_PointerToint(soap, &((_ngwm__createCursorResponse*)this)->cursor);
-	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38073,7 +38073,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createCursorResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createCursorResponse), type);
 	soap_out_PointerToint(soap, "ngwm:cursor", -1, &(((_ngwm__createCursorResponse*)a)->cursor), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38121,7 +38121,7 @@ SOAP_FMAC3 _ngwm__createCursorResponse * SOAP_FMAC4 soap_in__ngwm__createCursorR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38344,8 +38344,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__createCursorRequest(struct soap *soa
 void _ngwm__completeResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__completeResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__completeResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38372,7 +38372,7 @@ int _ngwm__completeResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__completeResponse(struct soap *soap, const char *tag, int id, const _ngwm__completeResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__completeResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38415,7 +38415,7 @@ SOAP_FMAC3 _ngwm__completeResponse * SOAP_FMAC4 soap_in__ngwm__completeResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38620,8 +38620,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__completeRequest(struct soap *soap, i
 void _ngwm__closeFreeBusySessionResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38648,7 +38648,7 @@ int _ngwm__closeFreeBusySessionResponse::soap_out(struct soap *soap, const char
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__closeFreeBusySessionResponse(struct soap *soap, const char *tag, int id, const _ngwm__closeFreeBusySessionResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__closeFreeBusySessionResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38691,7 +38691,7 @@ SOAP_FMAC3 _ngwm__closeFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__close
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38895,8 +38895,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__closeFreeBusySessionRequest(struct s
 void _ngwm__addMembersResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addMembersResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addMembersResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38923,7 +38923,7 @@ int _ngwm__addMembersResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__addMembersResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addMembersResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38966,7 +38966,7 @@ SOAP_FMAC3 _ngwm__addMembersResponse * SOAP_FMAC4 soap_in__ngwm__addMembersRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39180,8 +39180,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addMembersRequest(struct soap *soap,
 void _ngwm__addItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39208,7 +39208,7 @@ int _ngwm__addItemsResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemsResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39251,7 +39251,7 @@ SOAP_FMAC3 _ngwm__addItemsResponse * SOAP_FMAC4 soap_in__ngwm__addItemsResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39465,8 +39465,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addItemsRequest(struct soap *soap, i
 void _ngwm__addItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39493,7 +39493,7 @@ int _ngwm__addItemResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39536,7 +39536,7 @@ SOAP_FMAC3 _ngwm__addItemResponse * SOAP_FMAC4 soap_in__ngwm__addItemResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39752,8 +39752,8 @@ void _ngwm__acceptShareResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__acceptShareResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptShareResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptShareResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39782,7 +39782,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptShareResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptShareResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__acceptShareResponse*)a)->id), "");
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39830,7 +39830,7 @@ SOAP_FMAC3 _ngwm__acceptShareResponse * SOAP_FMAC4 soap_in__ngwm__acceptShareRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -40062,8 +40062,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__acceptShareRequest(struct soap *soap
 void _ngwm__acceptResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
-	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
+	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -40090,7 +40090,7 @@ int _ngwm__acceptResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__acceptResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptResponse), type);
-	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), "");
+	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -40133,7 +40133,7 @@ SOAP_FMAC3 _ngwm__acceptResponse * SOAP_FMAC4 soap_in__ngwm__acceptResponse(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:tqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -40644,8 +40644,8 @@ void ngwt__Version::soap_serialize(struct soap *soap) const
 	soap_embedded(soap, &((ngwt__Version*)this)->versionNumber, SOAP_TYPE_unsignedLong);
 	soap_embedded(soap, &((ngwt__Version*)this)->versionDescription, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Version*)this)->versionDescription);
-	soap_embedded(soap, &((ngwt__Version*)this)->versionStatus, SOAP_TYPE_PointerTongwt__VersionStatus);
-	soap_serialize_PointerTongwt__VersionStatus(soap, &((ngwt__Version*)this)->versionStatus);
+	soap_embedded(soap, &((ngwt__Version*)this)->versiontqStatus, SOAP_TYPE_PointerTongwt__VersiontqStatus);
+	soap_serialize_PointerTongwt__VersiontqStatus(soap, &((ngwt__Version*)this)->versiontqStatus);
 	soap_embedded(soap, &((ngwt__Version*)this)->life, SOAP_TYPE_PointerTounsignedLong);
 	soap_serialize_PointerTounsignedLong(soap, &((ngwt__Version*)this)->life);
 	soap_embedded(soap, &((ngwt__Version*)this)->ageAction, SOAP_TYPE_PointerTongwt__AgeAction);
@@ -40684,7 +40684,7 @@ void ngwt__Version::soap_default(struct soap *soap)
 	soap_default_string(soap, &((ngwt__Version*)this)->retrievedDate);
 	soap_default_unsignedLong(soap, &((ngwt__Version*)this)->versionNumber);
 	((ngwt__Version*)this)->versionDescription = NULL;
-	((ngwt__Version*)this)->versionStatus = NULL;
+	((ngwt__Version*)this)->versiontqStatus = NULL;
 	((ngwt__Version*)this)->life = NULL;
 	((ngwt__Version*)this)->ageAction = NULL;
 	((ngwt__Version*)this)->fileSize = NULL;
@@ -40734,7 +40734,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Version(struct soap *soap, const char *
 	soap_out_string(soap, "ngwt:retrievedDate", -1, &(((ngwt__Version*)a)->retrievedDate), "");
 	soap_out_unsignedLong(soap, "ngwt:versionNumber", -1, &(((ngwt__Version*)a)->versionNumber), "");
 	soap_out_PointerTostd__string(soap, "ngwt:versionDescription", -1, &(((ngwt__Version*)a)->versionDescription), "");
-	soap_out_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", -1, &(((ngwt__Version*)a)->versionStatus), "");
+	soap_out_PointerTongwt__VersiontqStatus(soap, "ngwt:versiontqStatus", -1, &(((ngwt__Version*)a)->versiontqStatus), "");
 	soap_out_PointerTounsignedLong(soap, "ngwt:life", -1, &(((ngwt__Version*)a)->life), "");
 	soap_out_PointerTongwt__AgeAction(soap, "ngwt:ageAction", -1, &(((ngwt__Version*)a)->ageAction), "");
 	soap_out_PointerTounsignedLong(soap, "ngwt:fileSize", -1, &(((ngwt__Version*)a)->fileSize), "");
@@ -40774,7 +40774,7 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c
 			return (ngwt__Version *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versionStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versiontqStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -40858,9 +40858,9 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c
 				{	soap_flag_versionDescription1 = 0;
 					continue;
 				}
-			if (soap_flag_versionStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", &(((ngwt__Version*)a)->versionStatus), ""))
-				{	soap_flag_versionStatus1 = 0;
+			if (soap_flag_versiontqStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__VersiontqStatus(soap, "ngwt:versiontqStatus", &(((ngwt__Version*)a)->versiontqStatus), ""))
+				{	soap_flag_versiontqStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_life1 && soap->error == SOAP_TAG_MISMATCH)
@@ -41402,167 +41402,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap,
 	*(ngwt__TrustedApplication*)p = *(ngwt__TrustedApplication*)q;
 }
 
-void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const
+void ngwt__TransferFailedtqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__TransferFailedStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
+	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
+	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__TransferFailedtqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__TransferFailedStatus*)this)->FailureReason = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	((ngwt__RecipienStatus*)this)->accepted = NULL;
-	((ngwt__RecipienStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	((ngwt__RecipienStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__TransferFailedStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__TransferFailedStatus);
+	((ngwt__TransferFailedtqStatus*)this)->FailureReason = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	((ngwt__RecipientqStatus*)this)->accepted = NULL;
+	((ngwt__RecipientqStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	((ngwt__RecipientqStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__TransferFailedtqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__TransferFailedtqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__TransferFailedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__TransferFailedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__TransferFailedStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__TransferFailedtqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedtqStatus *a, const char *type)
 {
-	if (((ngwt__TransferFailedStatus *)a)->FailureReason)
-		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedStatus *)a)->FailureReason->c_str());
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedStatus), "ngwt:TransferFailedStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
+	if (((ngwt__TransferFailedtqStatus *)a)->FailureReason)
+		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedtqStatus *)a)->FailureReason->c_str());
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus), "ngwt:TransferFailedtqStatus");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__TransferFailedStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__TransferFailedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__TransferFailedStatus(soap, this, tag, type);
+	return soap_get_ngwt__TransferFailedtqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__TransferFailedStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__TransferFailedtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__TransferFailedStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__TransferFailedStatus(soap, tag, this, type);
+void *ngwt__TransferFailedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__TransferFailedtqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus *a, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__TransferFailedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), soap->type, soap->arrayType);
+	a = (ngwt__TransferFailedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedtqStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__TransferFailedStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__TransferFailedtqStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	{	const char *t = soap_attr_value(soap, "FailureReason", 0);
 		if (t)
-		{	if (!(((ngwt__TransferFailedStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__TransferFailedtqStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -41570,8 +41570,8 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__TransferFailedStatus *)a)->FailureReason = soap_new_std__string(soap, -1);
-			((ngwt__TransferFailedStatus *)a)->FailureReason->assign(s);
+		{	((ngwt__TransferFailedtqStatus *)a)->FailureReason = soap_new_std__string(soap, -1);
+			((ngwt__TransferFailedtqStatus *)a)->FailureReason->assign(s);
 		}
 		}
 	}
@@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedtqStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommentqStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommentqStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedtqStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateetqStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -41705,48 +41705,48 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 			return NULL;
 	}
 	else
-	{	a = (ngwt__TransferFailedStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, 0, sizeof(ngwt__TransferFailedStatus), 0, soap_copy_ngwt__TransferFailedStatus);
+	{	a = (ngwt__TransferFailedtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, 0, sizeof(ngwt__TransferFailedtqStatus), 0, soap_copy_ngwt__TransferFailedtqStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__TransferFailedStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__TransferFailedtqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedtqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__TransferFailedStatus;
+	{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus;
 		if (size)
-			*size = sizeof(ngwt__TransferFailedStatus);
-		((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__TransferFailedtqStatus);
+		((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__TransferFailedStatus[n];
+	{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__TransferFailedStatus);
+			*size = n * sizeof(ngwt__TransferFailedtqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__TransferFailedStatus*)cp->ptr;
+	return (ngwt__TransferFailedtqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedStatus %p -> %p\n", q, p));
-	*(ngwt__TransferFailedStatus*)p = *(ngwt__TransferFailedStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedtqStatus %p -> %p\n", q, p));
+	*(ngwt__TransferFailedtqStatus*)p = *(ngwt__TransferFailedtqStatus*)q;
 }
 
 void ngwt__TimezoneList::soap_serialize(struct soap *soap) const
@@ -42278,8 +42278,8 @@ void ngwt__Task::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -42392,7 +42392,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Task(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -42510,7 +42510,7 @@ SOAP_FMAC3 ngwt__Task * SOAP_FMAC4 soap_in_ngwt__Task(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -42744,8 +42744,8 @@ void ngwt__SystemFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
 	soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -42780,7 +42780,7 @@ void ngwt__SystemFolder::soap_default(struct soap *soap)
 	((ngwt__SystemFolder*)this)->folderType = NULL;
 	((ngwt__SystemFolder*)this)->acl = NULL;
 	((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -42818,7 +42818,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SystemFolder(struct soap *soap, const c
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -42865,7 +42865,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 			return (ngwt__SystemFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -42896,9 +42896,9 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent2 = 0;
+			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -42963,7 +42963,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -43151,83 +43151,83 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap *soap, int
 	*(ngwt__StatusTracking*)p = *(ngwt__StatusTracking*)q;
 }
 
-void ngwt__Status::soap_serialize(struct soap *soap) const
+void ngwt__tqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__Status*)this)->code, SOAP_TYPE_int);
-	soap_embedded(soap, &((ngwt__Status*)this)->description, SOAP_TYPE_PointerTostd__string);
-	soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->description);
-	soap_embedded(soap, &((ngwt__Status*)this)->info, SOAP_TYPE_PointerTostd__string);
-	soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->info);
-	soap_embedded(soap, &((ngwt__Status*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList);
-	soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__Status*)this)->problems);
+	soap_embedded(soap, &((ngwt__tqStatus*)this)->code, SOAP_TYPE_int);
+	soap_embedded(soap, &((ngwt__tqStatus*)this)->description, SOAP_TYPE_PointerTostd__string);
+	soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->description);
+	soap_embedded(soap, &((ngwt__tqStatus*)this)->info, SOAP_TYPE_PointerTostd__string);
+	soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->info);
+	soap_embedded(soap, &((ngwt__tqStatus*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList);
+	soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__tqStatus*)this)->problems);
 	/* transient soap skipped */
 }
 
-void ngwt__Status::soap_default(struct soap *soap)
+void ngwt__tqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_int(soap, &((ngwt__Status*)this)->code);
-	((ngwt__Status*)this)->description = NULL;
-	((ngwt__Status*)this)->info = NULL;
-	((ngwt__Status*)this)->problems = NULL;
+	soap_default_int(soap, &((ngwt__tqStatus*)this)->code);
+	((ngwt__tqStatus*)this)->description = NULL;
+	((ngwt__tqStatus*)this)->info = NULL;
+	((ngwt__tqStatus*)this)->problems = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__Status::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__tqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__Status);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__tqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__Status::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__tqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__Status(soap, tag, id, this, type);
+	return soap_out_ngwt__tqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap *soap, const char *tag, int id, const ngwt__Status *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap *soap, const char *tag, int id, const ngwt__tqStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__Status), type);
-	soap_out_int(soap, "ngwt:code", -1, &(((ngwt__Status*)a)->code), "");
-	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Status*)a)->description), "");
-	soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__Status*)a)->info), "");
-	soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__Status*)a)->problems), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__tqStatus), type);
+	soap_out_int(soap, "ngwt:code", -1, &(((ngwt__tqStatus*)a)->code), "");
+	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__tqStatus*)a)->description), "");
+	soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__tqStatus*)a)->info), "");
+	soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__tqStatus*)a)->problems), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__Status::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__tqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__Status(soap, this, tag, type);
+	return soap_get_ngwt__tqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap *soap, ngwt__Status *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__Status(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__tqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__Status::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__Status(soap, tag, this, type);
+void *ngwt__tqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__tqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap *soap, const char *tag, ngwt__Status *a, const char *type)
+SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__Status *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), soap->type, soap->arrayType);
+	a = (ngwt__tqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__Status)
+		if (soap->clist->type != SOAP_TYPE_ngwt__tqStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__Status *)a->soap_in(soap, tag, type);
+			return (ngwt__tqStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_code1 = 1, soap_flag_description1 = 1, soap_flag_info1 = 1, soap_flag_problems1 = 1;
@@ -43236,22 +43236,22 @@ SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap *soap, con
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_code1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_int(soap, "ngwt:code", &(((ngwt__Status*)a)->code), ""))
+				if (soap_in_int(soap, "ngwt:code", &(((ngwt__tqStatus*)a)->code), ""))
 				{	soap_flag_code1 = 0;
 					continue;
 				}
 			if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__Status*)a)->description), ""))
+				if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__tqStatus*)a)->description), ""))
 				{	soap_flag_description1 = 0;
 					continue;
 				}
 			if (soap_flag_info1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__Status*)a)->info), ""))
+				if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__tqStatus*)a)->info), ""))
 				{	soap_flag_info1 = 0;
 					continue;
 				}
 			if (soap_flag_problems1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__Status*)a)->problems), "ngwt:ProblemList"))
+				if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__tqStatus*)a)->problems), "ngwt:ProblemList"))
 				{	soap_flag_problems1 = 0;
 					continue;
 				}
@@ -43271,48 +43271,48 @@ SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap *soap, con
 			return NULL;
 	}
 	else
-	{	a = (ngwt__Status *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, 0, sizeof(ngwt__Status), 0, soap_copy_ngwt__Status);
+	{	a = (ngwt__tqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, 0, sizeof(ngwt__tqStatus), 0, soap_copy_ngwt__tqStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__Status(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__tqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap *soap, ngwt__Status *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__Status(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__Status, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__tqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__tqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__Status;
+	{	cp->ptr = (void*)new ngwt__tqStatus;
 		if (size)
-			*size = sizeof(ngwt__Status);
-		((ngwt__Status*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__tqStatus);
+		((ngwt__tqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__Status[n];
+	{	cp->ptr = (void*)new ngwt__tqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__Status);
+			*size = n * sizeof(ngwt__tqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__Status*)cp->ptr)[i].soap = soap;
+			((ngwt__tqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__Status*)cp->ptr;
+	return (ngwt__tqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__Status %p -> %p\n", q, p));
-	*(ngwt__Status*)p = *(ngwt__Status*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__tqStatus %p -> %p\n", q, p));
+	*(ngwt__tqStatus*)p = *(ngwt__tqStatus*)q;
 }
 
 void ngwt__SMimeOperation::soap_serialize(struct soap *soap) const
@@ -43931,8 +43931,8 @@ void ngwt__SharedNotification::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -44038,7 +44038,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedNotification(struct soap *soap, c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -44149,7 +44149,7 @@ SOAP_FMAC3 ngwt__SharedNotification * SOAP_FMAC4 soap_in_ngwt__SharedNotificatio
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -44502,8 +44502,8 @@ void ngwt__SharedFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedByMe);
 	soap_embedded(soap, &((ngwt__SharedFolder*)this)->isSharedToMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedToMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -44539,7 +44539,7 @@ void ngwt__SharedFolder::soap_default(struct soap *soap)
 	((ngwt__SharedFolder*)this)->owner = NULL;
 	((ngwt__SharedFolder*)this)->isSharedByMe = NULL;
 	((ngwt__SharedFolder*)this)->isSharedToMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -44577,7 +44577,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedFolder(struct soap *soap, const c
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -44625,7 +44625,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 			return (ngwt__SharedFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -44656,9 +44656,9 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent2 = 0;
+			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -44728,7 +44728,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap,
 	*(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q;
 }
 
-void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const
+void ngwt__RecipientqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__RecipienStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
+	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
+	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__RecipientqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	((ngwt__RecipienStatus*)this)->accepted = NULL;
-	((ngwt__RecipienStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	((ngwt__RecipienStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__RecipienStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipienStatus);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	((ngwt__RecipientqStatus*)this)->accepted = NULL;
+	((ngwt__RecipientqStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	((ngwt__RecipientqStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__RecipientqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipientqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__RecipienStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__RecipientqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__RecipientqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipienStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientqStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipienStatus), type);
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipientqStatus), type);
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__RecipienStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__RecipientqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__RecipienStatus(soap, this, tag, type);
+	return soap_get_ngwt__RecipientqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__RecipientqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__RecipienStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__RecipienStatus(soap, tag, this, type);
+void *ngwt__RecipientqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__RecipientqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus *a, const char *type)
+SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__RecipienStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), soap->type, soap->arrayType);
+	a = (ngwt__RecipientqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__RecipientqStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__RecipienStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__RecipientqStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_delivered1 = 1, soap_flag_undeliverable1 = 1, soap_flag_transferred1 = 1, soap_flag_transferDelayed1 = 1, soap_flag_transferFailed1 = 1, soap_flag_downloaded1 = 1, soap_flag_downloadedByThirdParty1 = 1, soap_flag_retractRequested1 = 1, soap_flag_retracted1 = 1, soap_flag_opened1 = 1, soap_flag_deleted1 = 1, soap_flag_undeleted1 = 1, soap_flag_purged1 = 1, soap_flag_accepted1 = 1, soap_flag_declined1 = 1, soap_flag_replied1 = 1, soap_flag_forwarded1 = 1, soap_flag_shared1 = 1, soap_flag_started1 = 1, soap_flag_completed1 = 1, soap_flag_incomplete1 = 1, soap_flag_delegated1 = 1;
@@ -47647,117 +47647,117 @@ SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), ""))
 				{	soap_flag_delivered1 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable1 = 0;
 					continue;
 				}
 			if (soap_flag_transferred1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), ""))
 				{	soap_flag_transferred1 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed1 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedtqStatus"))
 				{	soap_flag_transferFailed1 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded1 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty1 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested1 = 0;
 					continue;
 				}
 			if (soap_flag_retracted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), ""))
 				{	soap_flag_retracted1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted1 = 0;
 					continue;
 				}
 			if (soap_flag_purged1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), ""))
 				{	soap_flag_purged1 = 0;
 					continue;
 				}
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommentqStatus"))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_declined1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommentqStatus"))
 				{	soap_flag_declined1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_shared1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), ""))
 				{	soap_flag_shared1 = 0;
 					continue;
 				}
 			if (soap_flag_started1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), ""))
 				{	soap_flag_started1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedtqStatus"))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateetqStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47771,84 +47771,84 @@ SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipienStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, 0, sizeof(ngwt__RecipienStatus), 0, soap_copy_ngwt__RecipienStatus);
+	{	a = (ngwt__RecipientqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, 0, sizeof(ngwt__RecipientqStatus), 0, soap_copy_ngwt__RecipientqStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__RecipienStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__RecipientqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipienStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipienStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipientqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
-	if (type && !soap_match_tag(soap, type, "ngwt:DelegateeStatus"))
-	{	cp->type = SOAP_TYPE_ngwt__DelegateeStatus;
+	if (type && !soap_match_tag(soap, type, "ngwt:DelegateetqStatus"))
+	{	cp->type = SOAP_TYPE_ngwt__DelegateetqStatus;
 		if (n < 0)
-		{	cp->ptr = (void*)new ngwt__DelegateeStatus;
+		{	cp->ptr = (void*)new ngwt__DelegateetqStatus;
 			if (size)
-				*size = sizeof(ngwt__DelegateeStatus);
-			((ngwt__DelegateeStatus*)cp->ptr)->soap = soap;
+				*size = sizeof(ngwt__DelegateetqStatus);
+			((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap;
 		}
 		else
-		{	cp->ptr = (void*)new ngwt__DelegateeStatus[n];
+		{	cp->ptr = (void*)new ngwt__DelegateetqStatus[n];
 			if (size)
-				*size = n * sizeof(ngwt__DelegateeStatus);
+				*size = n * sizeof(ngwt__DelegateetqStatus);
 			for (int i = 0; i < n; i++)
-				((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap;
+				((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap;
 		}
 	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-		return (ngwt__DelegateeStatus*)cp->ptr;
+		return (ngwt__DelegateetqStatus*)cp->ptr;
 	}
-	if (type && !soap_match_tag(soap, type, "ngwt:TransferFailedStatus"))
-	{	cp->type = SOAP_TYPE_ngwt__TransferFailedStatus;
+	if (type && !soap_match_tag(soap, type, "ngwt:TransferFailedtqStatus"))
+	{	cp->type = SOAP_TYPE_ngwt__TransferFailedtqStatus;
 		if (n < 0)
-		{	cp->ptr = (void*)new ngwt__TransferFailedStatus;
+		{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus;
 			if (size)
-				*size = sizeof(ngwt__TransferFailedStatus);
-			((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap;
+				*size = sizeof(ngwt__TransferFailedtqStatus);
+			((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap;
 		}
 		else
-		{	cp->ptr = (void*)new ngwt__TransferFailedStatus[n];
+		{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n];
 			if (size)
-				*size = n * sizeof(ngwt__TransferFailedStatus);
+				*size = n * sizeof(ngwt__TransferFailedtqStatus);
 			for (int i = 0; i < n; i++)
-				((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap;
+				((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap;
 		}
 	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-		return (ngwt__TransferFailedStatus*)cp->ptr;
+		return (ngwt__TransferFailedtqStatus*)cp->ptr;
 	}
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__RecipienStatus;
+	{	cp->ptr = (void*)new ngwt__RecipientqStatus;
 		if (size)
-			*size = sizeof(ngwt__RecipienStatus);
-		((ngwt__RecipienStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__RecipientqStatus);
+		((ngwt__RecipientqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__RecipienStatus[n];
+	{	cp->ptr = (void*)new ngwt__RecipientqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__RecipienStatus);
+			*size = n * sizeof(ngwt__RecipientqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__RecipienStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__RecipientqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__RecipienStatus*)cp->ptr;
+	return (ngwt__RecipientqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipienStatus %p -> %p\n", q, p));
-	*(ngwt__RecipienStatus*)p = *(ngwt__RecipienStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipientqStatus %p -> %p\n", q, p));
+	*(ngwt__RecipientqStatus*)p = *(ngwt__RecipientqStatus*)q;
 }
 
 void ngwt__RecipientList::soap_serialize(struct soap *soap) const
@@ -47986,8 +47986,8 @@ void ngwt__Recipient::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((ngwt__Recipient*)this)->distType, SOAP_TYPE_ngwt__DistributionType);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->recipType, SOAP_TYPE_ngwt__RecipientType);
-	soap_embedded(soap, &((ngwt__Recipient*)this)->recipienStatus, SOAP_TYPE_PointerTongwt__RecipienStatus);
-	soap_serialize_PointerTongwt__RecipienStatus(soap, &((ngwt__Recipient*)this)->recipienStatus);
+	soap_embedded(soap, &((ngwt__Recipient*)this)->recipientqStatus, SOAP_TYPE_PointerTongwt__RecipientqStatus);
+	soap_serialize_PointerTongwt__RecipientqStatus(soap, &((ngwt__Recipient*)this)->recipientqStatus);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->acceptLevel, SOAP_TYPE_PointerTongwt__AcceptLevel);
 	soap_serialize_PointerTongwt__AcceptLevel(soap, &((ngwt__Recipient*)this)->acceptLevel);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -48004,7 +48004,7 @@ void ngwt__Recipient::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__Recipient*)this)->distType = (enum ngwt__DistributionType)0;
 	((ngwt__Recipient*)this)->recipType = (enum ngwt__RecipientType)0;
-	((ngwt__Recipient*)this)->recipienStatus = NULL;
+	((ngwt__Recipient*)this)->recipientqStatus = NULL;
 	((ngwt__Recipient*)this)->acceptLevel = NULL;
 	((ngwt__NameAndEmail*)this)->displayName = NULL;
 	((ngwt__NameAndEmail*)this)->email = NULL;
@@ -48034,7 +48034,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Recipient(struct soap *soap, const char
 	/* transient soap skipped */
 	soap_out_ngwt__DistributionType(soap, "ngwt:distType", -1, &(((ngwt__Recipient*)a)->distType), "");
 	soap_out_ngwt__RecipientType(soap, "ngwt:recipType", -1, &(((ngwt__Recipient*)a)->recipType), "");
-	soap_out_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipienStatus), "");
+	soap_out_PointerTongwt__RecipientqStatus(soap, "ngwt:recipientqStatus", -1, &(((ngwt__Recipient*)a)->recipientqStatus), "");
 	soap_out_PointerTongwt__AcceptLevel(soap, "ngwt:acceptLevel", -1, &(((ngwt__Recipient*)a)->acceptLevel), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -48071,7 +48071,7 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 			return (ngwt__Recipient *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipienStatus1 = 1, soap_flag_acceptLevel1 = 1;
+	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipientqStatus1 = 1, soap_flag_acceptLevel1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48102,9 +48102,9 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 				{	soap_flag_recipType1 = 0;
 					continue;
 				}
-			if (soap_flag_recipienStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipienStatus), "ngwt:RecipienStatus"))
-				{	soap_flag_recipienStatus1 = 0;
+			if (soap_flag_recipientqStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__RecipientqStatus(soap, "ngwt:recipientqStatus", &(((ngwt__Recipient*)a)->recipientqStatus), "ngwt:RecipientqStatus"))
+				{	soap_flag_recipientqStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_acceptLevel1 && soap->error == SOAP_TAG_MISMATCH)
@@ -48314,8 +48314,8 @@ void ngwt__QueryFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderType(soap, &((ngwt__QueryFolder*)this)->folderType);
 	soap_embedded(soap, &((ngwt__QueryFolder*)this)->query, SOAP_TYPE_PointerTongwt__Query);
 	soap_serialize_PointerTongwt__Query(soap, &((ngwt__QueryFolder*)this)->query);
-	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -48348,7 +48348,7 @@ void ngwt__QueryFolder::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__QueryFolder*)this)->folderType = NULL;
 	((ngwt__QueryFolder*)this)->query = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -48386,7 +48386,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__QueryFolder(struct soap *soap, const ch
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -48431,7 +48431,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 			return (ngwt__QueryFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48462,9 +48462,9 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent2 = 0;
+			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -48519,7 +48519,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -50061,8 +50061,8 @@ void ngwt__PhoneMessage::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -50169,7 +50169,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__PhoneMessage(struct soap *soap, const c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -50281,7 +50281,7 @@ SOAP_FMAC3 ngwt__PhoneMessage * SOAP_FMAC4 soap_in_ngwt__PhoneMessage(struct soa
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -51464,8 +51464,8 @@ void ngwt__Note::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -51574,7 +51574,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Note(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -51688,7 +51688,7 @@ SOAP_FMAC3 ngwt__Note * SOAP_FMAC4 soap_in_ngwt__Note(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -52798,8 +52798,8 @@ void ngwt__Mail::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -52902,7 +52902,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Mail(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -53010,7 +53010,7 @@ SOAP_FMAC3 ngwt__Mail * SOAP_FMAC4 soap_in_ngwt__Mail(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status2 = 0;
 					continue;
 				}
@@ -54112,104 +54112,104 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap *soap, int st,
 	*(ngwt__JunkEntry*)p = *(ngwt__JunkEntry*)q;
 }
 
-void ngwt__ItemStatus::soap_serialize(struct soap *soap) const
+void ngwt__ItemtqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->accepted, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->completed, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->delegated, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->delegated);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->deleted, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->forwarded, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->private_, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->private_);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->opened, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->read, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->read);
-	soap_embedded(soap, &((ngwt__ItemStatus*)this)->replied, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->replied);
-	/* transient soap skipped */
-}
-
-void ngwt__ItemStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->accepted, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->completed, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->delegated, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->delegated);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->deleted, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->forwarded, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->private_, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->private_);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->opened, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->read, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->read);
+	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->replied, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->replied);
+	/* transient soap skipped */
+}
+
+void ngwt__ItemtqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__ItemStatus*)this)->accepted = NULL;
-	((ngwt__ItemStatus*)this)->completed = NULL;
-	((ngwt__ItemStatus*)this)->delegated = NULL;
-	((ngwt__ItemStatus*)this)->deleted = NULL;
-	((ngwt__ItemStatus*)this)->forwarded = NULL;
-	((ngwt__ItemStatus*)this)->private_ = NULL;
-	((ngwt__ItemStatus*)this)->opened = NULL;
-	((ngwt__ItemStatus*)this)->read = NULL;
-	((ngwt__ItemStatus*)this)->replied = NULL;
+	((ngwt__ItemtqStatus*)this)->accepted = NULL;
+	((ngwt__ItemtqStatus*)this)->completed = NULL;
+	((ngwt__ItemtqStatus*)this)->delegated = NULL;
+	((ngwt__ItemtqStatus*)this)->deleted = NULL;
+	((ngwt__ItemtqStatus*)this)->forwarded = NULL;
+	((ngwt__ItemtqStatus*)this)->private_ = NULL;
+	((ngwt__ItemtqStatus*)this)->opened = NULL;
+	((ngwt__ItemtqStatus*)this)->read = NULL;
+	((ngwt__ItemtqStatus*)this)->replied = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__ItemStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__ItemtqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__ItemStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__ItemtqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__ItemStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__ItemtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__ItemStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__ItemtqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemtqStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemStatus), type);
-	soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemStatus*)a)->accepted), "");
-	soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemStatus*)a)->completed), "");
-	soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemStatus*)a)->delegated), "");
-	soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemStatus*)a)->deleted), "");
-	soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemStatus*)a)->forwarded), "");
-	soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemStatus*)a)->private_), "");
-	soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemStatus*)a)->opened), "");
-	soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemStatus*)a)->read), "");
-	soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemStatus*)a)->replied), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemtqStatus), type);
+	soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemtqStatus*)a)->accepted), "");
+	soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemtqStatus*)a)->completed), "");
+	soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemtqStatus*)a)->delegated), "");
+	soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemtqStatus*)a)->deleted), "");
+	soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemtqStatus*)a)->forwarded), "");
+	soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemtqStatus*)a)->private_), "");
+	soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemtqStatus*)a)->opened), "");
+	soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemtqStatus*)a)->read), "");
+	soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemtqStatus*)a)->replied), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__ItemStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__ItemtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__ItemStatus(soap, this, tag, type);
+	return soap_get_ngwt__ItemtqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__ItemStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__ItemtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__ItemStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__ItemStatus(soap, tag, this, type);
+void *ngwt__ItemtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__ItemtqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus *a, const char *type)
+SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__ItemStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), soap->type, soap->arrayType);
+	a = (ngwt__ItemtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__ItemStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__ItemtqStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__ItemStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__ItemtqStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_accepted1 = 1, soap_flag_completed1 = 1, soap_flag_delegated1 = 1, soap_flag_deleted1 = 1, soap_flag_forwarded1 = 1, soap_flag_private_1 = 1, soap_flag_opened1 = 1, soap_flag_read1 = 1, soap_flag_replied1 = 1;
@@ -54218,47 +54218,47 @@ SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap *s
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemStatus*)a)->accepted), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemtqStatus*)a)->accepted), ""))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemStatus*)a)->completed), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemtqStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemStatus*)a)->delegated), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemtqStatus*)a)->delegated), ""))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemStatus*)a)->deleted), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemtqStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemStatus*)a)->forwarded), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemtqStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_private_1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemStatus*)a)->private_), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemtqStatus*)a)->private_), ""))
 				{	soap_flag_private_1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemStatus*)a)->opened), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemtqStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_read1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemStatus*)a)->read), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemtqStatus*)a)->read), ""))
 				{	soap_flag_read1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemStatus*)a)->replied), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemtqStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
@@ -54274,48 +54274,48 @@ SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap *s
 			return NULL;
 	}
 	else
-	{	a = (ngwt__ItemStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, 0, sizeof(ngwt__ItemStatus), 0, soap_copy_ngwt__ItemStatus);
+	{	a = (ngwt__ItemtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, 0, sizeof(ngwt__ItemtqStatus), 0, soap_copy_ngwt__ItemtqStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__ItemStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__ItemtqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemtqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__ItemStatus;
+	{	cp->ptr = (void*)new ngwt__ItemtqStatus;
 		if (size)
-			*size = sizeof(ngwt__ItemStatus);
-		((ngwt__ItemStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__ItemtqStatus);
+		((ngwt__ItemtqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__ItemStatus[n];
+	{	cp->ptr = (void*)new ngwt__ItemtqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__ItemStatus);
+			*size = n * sizeof(ngwt__ItemtqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__ItemStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__ItemtqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__ItemStatus*)cp->ptr;
+	return (ngwt__ItemtqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemStatus %p -> %p\n", q, p));
-	*(ngwt__ItemStatus*)p = *(ngwt__ItemStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemtqStatus %p -> %p\n", q, p));
+	*(ngwt__ItemtqStatus*)p = *(ngwt__ItemtqStatus*)q;
 }
 
 void ngwt__Items::soap_serialize(struct soap *soap) const
@@ -58192,8 +58192,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderList(struct soap *soap, int st,
 void ngwt__FolderACLEntry::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLStatus);
-	soap_serialize_PointerTongwt__FolderACLStatus(soap, &((ngwt__FolderACLEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLtqStatus);
+	soap_serialize_PointerTongwt__FolderACLtqStatus(soap, &((ngwt__FolderACLEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__AccessControlListEntry*)this)->rights, SOAP_TYPE_PointerTongwt__Rights);
 	soap_serialize_PointerTongwt__Rights(soap, &((ngwt__AccessControlListEntry*)this)->rights);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -58237,7 +58237,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLEntry(struct soap *soap, const
 	soap_out_PointerTongwt__UUID(soap, "ngwt:uuid", -1, &(((ngwt__NameAndEmail*)a)->uuid), "");
 	/* transient soap skipped */
 	soap_out_PointerTongwt__Rights(soap, "ngwt:rights", -1, &(((ngwt__AccessControlListEntry*)a)->rights), "");
-	soap_out_PointerTongwt__FolderACLStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), "");
+	soap_out_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
@@ -58300,7 +58300,7 @@ SOAP_FMAC3 ngwt__FolderACLEntry * SOAP_FMAC4 soap_in_ngwt__FolderACLEntry(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__FolderACLStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), ""))
+				if (soap_in_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), ""))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -58496,8 +58496,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderACL(struct soap *soap, int st,
 void ngwt__Folder::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -58528,7 +58528,7 @@ void ngwt__Folder::soap_serialize(struct soap *soap) const
 void ngwt__Folder::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -58566,7 +58566,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Folder(struct soap *soap, const char *t
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -58609,7 +58609,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 			return (ngwt__Folder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_parent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
+	short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_tqparent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -58640,9 +58640,9 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent1 = 0;
+			if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent1 = 0;
 					continue;
 				}
 			if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -58687,7 +58687,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -59926,8 +59926,8 @@ void ngwt__DocumentRef::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -60042,7 +60042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DocumentRef(struct soap *soap, const ch
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -60162,7 +60162,7 @@ SOAP_FMAC3 ngwt__DocumentRef * SOAP_FMAC4 soap_in_ngwt__DocumentRef(struct soap
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -61040,167 +61040,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st,
 	*(ngwt__DeltaInfo*)p = *(ngwt__DeltaInfo*)q;
 }
 
-void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const
+void ngwt__DelegateetqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__DelegateeStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
+	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
+	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__DelegateetqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__DelegateeStatus*)this)->userid = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
-	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
-	((ngwt__RecipienStatus*)this)->accepted = NULL;
-	((ngwt__RecipienStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
-	((ngwt__RecipienStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__DelegateeStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegateeStatus);
+	((ngwt__DelegateetqStatus*)this)->userid = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
+	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
+	((ngwt__RecipientqStatus*)this)->accepted = NULL;
+	((ngwt__RecipientqStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
+	((ngwt__RecipientqStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__DelegateetqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegateetqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__DelegateeStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__DelegateetqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__DelegateeStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__DelegateetqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateeStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateetqStatus *a, const char *type)
 {
-	if (((ngwt__DelegateeStatus *)a)->userid)
-		soap_set_attr(soap, "userid", ((ngwt__DelegateeStatus *)a)->userid->c_str());
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateeStatus), "ngwt:DelegateeStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
+	if (((ngwt__DelegateetqStatus *)a)->userid)
+		soap_set_attr(soap, "userid", ((ngwt__DelegateetqStatus *)a)->userid->c_str());
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateetqStatus), "ngwt:DelegateetqStatus");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__DelegateeStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__DelegateetqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__DelegateeStatus(soap, this, tag, type);
+	return soap_get_ngwt__DelegateetqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__DelegateeStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__DelegateetqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__DelegateeStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__DelegateeStatus(soap, tag, this, type);
+void *ngwt__DelegateetqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__DelegateetqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus *a, const char *type)
+SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__DelegateeStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), soap->type, soap->arrayType);
+	a = (ngwt__DelegateetqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__DelegateeStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__DelegateetqStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__DelegateeStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__DelegateetqStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	{	const char *t = soap_attr_value(soap, "userid", 0);
 		if (t)
-		{	if (!(((ngwt__DelegateeStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__DelegateetqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -61208,8 +61208,8 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__DelegateeStatus *)a)->userid = soap_new_std__string(soap, -1);
-			((ngwt__DelegateeStatus *)a)->userid->assign(s);
+		{	((ngwt__DelegateetqStatus *)a)->userid = soap_new_std__string(soap, -1);
+			((ngwt__DelegateetqStatus *)a)->userid->assign(s);
 		}
 		}
 	}
@@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedtqStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommentqStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
+				if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommentqStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedtqStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateetqStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateetqStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -61343,120 +61343,120 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 			return NULL;
 	}
 	else
-	{	a = (ngwt__DelegateeStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, 0, sizeof(ngwt__DelegateeStatus), 0, soap_copy_ngwt__DelegateeStatus);
+	{	a = (ngwt__DelegateetqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, 0, sizeof(ngwt__DelegateetqStatus), 0, soap_copy_ngwt__DelegateetqStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__DelegateeStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__DelegateetqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateeStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateetqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__DelegateeStatus;
+	{	cp->ptr = (void*)new ngwt__DelegateetqStatus;
 		if (size)
-			*size = sizeof(ngwt__DelegateeStatus);
-		((ngwt__DelegateeStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__DelegateetqStatus);
+		((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__DelegateeStatus[n];
+	{	cp->ptr = (void*)new ngwt__DelegateetqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__DelegateeStatus);
+			*size = n * sizeof(ngwt__DelegateetqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__DelegateeStatus*)cp->ptr;
+	return (ngwt__DelegateetqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateeStatus %p -> %p\n", q, p));
-	*(ngwt__DelegateeStatus*)p = *(ngwt__DelegateeStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateetqStatus %p -> %p\n", q, p));
+	*(ngwt__DelegateetqStatus*)p = *(ngwt__DelegateetqStatus*)q;
 }
 
-void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const
+void ngwt__DelegatedtqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommenStatus);
-	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__DelegatedtqStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__DelegatedtqStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
-void ngwt__DelegatedStatus::soap_default(struct soap *soap)
+void ngwt__DelegatedtqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__DelegatedStatus*)this)->__item = NULL;
-	((ngwt__DelegatedStatus*)this)->userid = NULL;
+	((ngwt__DelegatedtqStatus*)this)->__item = NULL;
+	((ngwt__DelegatedtqStatus*)this)->userid = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__DelegatedStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__DelegatedtqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegatedStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegatedtqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__DelegatedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__DelegatedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__DelegatedStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__DelegatedtqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedtqStatus *a, const char *type)
 {
-	if (((ngwt__DelegatedStatus *)a)->userid)
-		soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str());
-	soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
+	if (((ngwt__DelegatedtqStatus *)a)->userid)
+		soap_set_attr(soap, "userid", ((ngwt__DelegatedtqStatus *)a)->userid->c_str());
+	soap_out_PointerTongwt__CommentqStatus(soap, tag, id, &(((ngwt__DelegatedtqStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__DelegatedStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__DelegatedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__DelegatedStatus(soap, this, tag, type);
+	return soap_get_ngwt__DelegatedtqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__DelegatedStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__DelegatedtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__DelegatedStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__DelegatedStatus(soap, tag, this, type);
+void *ngwt__DelegatedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__DelegatedtqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus *a, const char *type)
+SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__DelegatedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__DelegatedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), soap->type, soap->arrayType)))
 	{	soap->error = SOAP_TAG_MISMATCH;
 		return NULL;
 	}
 	*soap->id = '\0';
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__DelegatedStatus)
-			return (ngwt__DelegatedStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__DelegatedtqStatus)
+			return (ngwt__DelegatedtqStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "userid", 0);
 		if (t)
-		{	if (!(((ngwt__DelegatedStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__DelegatedtqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -61464,51 +61464,51 @@ SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(stru
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__DelegatedStatus *)a)->userid = soap_new_std__string(soap, -1);
-			((ngwt__DelegatedStatus *)a)->userid->assign(s);
+		{	((ngwt__DelegatedtqStatus *)a)->userid = soap_new_std__string(soap, -1);
+			((ngwt__DelegatedtqStatus *)a)->userid->assign(s);
 		}
 		}
 	}
-	if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
+	if (!soap_in_PointerTongwt__CommentqStatus(soap, tag, &(((ngwt__DelegatedtqStatus*)a)->__item), "ngwt:DelegatedtqStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__DelegatedStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__DelegatedtqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedtqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__DelegatedStatus;
+	{	cp->ptr = (void*)new ngwt__DelegatedtqStatus;
 		if (size)
-			*size = sizeof(ngwt__DelegatedStatus);
-		((ngwt__DelegatedStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__DelegatedtqStatus);
+		((ngwt__DelegatedtqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__DelegatedStatus[n];
+	{	cp->ptr = (void*)new ngwt__DelegatedtqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__DelegatedStatus);
+			*size = n * sizeof(ngwt__DelegatedtqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__DelegatedStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__DelegatedtqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__DelegatedStatus*)cp->ptr;
+	return (ngwt__DelegatedtqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedStatus %p -> %p\n", q, p));
-	*(ngwt__DelegatedStatus*)p = *(ngwt__DelegatedStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedtqStatus %p -> %p\n", q, p));
+	*(ngwt__DelegatedtqStatus*)p = *(ngwt__DelegatedtqStatus*)q;
 }
 
 void ngwt__DayOfYearWeekList::soap_serialize(struct soap *soap) const
@@ -63087,8 +63087,8 @@ void ngwt__ContactFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
 	soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -63124,7 +63124,7 @@ void ngwt__ContactFolder::soap_default(struct soap *soap)
 	((ngwt__SystemFolder*)this)->folderType = NULL;
 	((ngwt__SystemFolder*)this)->acl = NULL;
 	((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -63162,7 +63162,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ContactFolder(struct soap *soap, const
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
+	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -63210,7 +63210,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 			return (ngwt__ContactFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_parent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
+	short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_tqparent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -63241,9 +63241,9 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_parent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
-				{	soap_flag_parent3 = 0;
+			if (soap_flag_tqparent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
+				{	soap_flag_tqparent3 = 0;
 					continue;
 				}
 			if (soap_flag_description3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -63313,7 +63313,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent3))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent3))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -63703,76 +63703,76 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap *soap, int st, in
 	*(ngwt__Contact*)p = *(ngwt__Contact*)q;
 }
 
-void ngwt__CommenStatus::soap_serialize(struct soap *soap) const
+void ngwt__CommentqStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__CommenStatus*)this)->__item, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__CommenStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__CommentqStatus*)this)->__item, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__CommentqStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
-void ngwt__CommenStatus::soap_default(struct soap *soap)
+void ngwt__CommentqStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item);
-	((ngwt__CommenStatus*)this)->comment = NULL;
+	soap_default_string(soap, &((ngwt__CommentqStatus*)this)->__item);
+	((ngwt__CommentqStatus*)this)->comment = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__CommenStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__CommentqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommenStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommentqStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__CommenStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__CommentqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__CommenStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__CommentqStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap *soap, const char *tag, int id, const ngwt__CommenStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentqStatus *a, const char *type)
 {
-	if (((ngwt__CommenStatus *)a)->comment)
-		soap_set_attr(soap, "comment", ((ngwt__CommenStatus *)a)->comment->c_str());
-	soap_out_string(soap, tag, id, &(((ngwt__CommenStatus*)a)->__item), "");
+	if (((ngwt__CommentqStatus *)a)->comment)
+		soap_set_attr(soap, "comment", ((ngwt__CommentqStatus *)a)->comment->c_str());
+	soap_out_string(soap, tag, id, &(((ngwt__CommentqStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__CommenStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__CommentqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__CommenStatus(soap, this, tag, type);
+	return soap_get_ngwt__CommentqStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__CommentqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__CommenStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__CommenStatus(soap, tag, this, type);
+void *ngwt__CommentqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__CommentqStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus *a, const char *type)
+SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__CommenStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__CommentqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), soap->type, soap->arrayType)))
 	{	soap->error = SOAP_TAG_MISMATCH;
 		return NULL;
 	}
 	*soap->id = '\0';
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__CommenStatus)
-			return (ngwt__CommenStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__CommentqStatus)
+			return (ngwt__CommentqStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "comment", 0);
 		if (t)
-		{	if (!(((ngwt__CommenStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__CommentqStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -63780,51 +63780,51 @@ SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soa
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__CommenStatus *)a)->comment = soap_new_std__string(soap, -1);
-			((ngwt__CommenStatus *)a)->comment->assign(s);
+		{	((ngwt__CommentqStatus *)a)->comment = soap_new_std__string(soap, -1);
+			((ngwt__CommentqStatus *)a)->comment->assign(s);
 		}
 		}
 	}
-	if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus"))
+	if (!soap_in_string(soap, tag, &(((ngwt__CommentqStatus*)a)->__item), "ngwt:CommentqStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__CommenStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__CommentqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommenStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommenStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommentqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__CommenStatus;
+	{	cp->ptr = (void*)new ngwt__CommentqStatus;
 		if (size)
-			*size = sizeof(ngwt__CommenStatus);
-		((ngwt__CommenStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__CommentqStatus);
+		((ngwt__CommentqStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__CommenStatus[n];
+	{	cp->ptr = (void*)new ngwt__CommentqStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__CommenStatus);
+			*size = n * sizeof(ngwt__CommentqStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__CommenStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__CommentqStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__CommenStatus*)cp->ptr;
+	return (ngwt__CommentqStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommenStatus %p -> %p\n", q, p));
-	*(ngwt__CommenStatus*)p = *(ngwt__CommenStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommentqStatus %p -> %p\n", q, p));
+	*(ngwt__CommentqStatus*)p = *(ngwt__CommentqStatus*)q;
 }
 
 void ngwt__CategoryRefList::soap_serialize(struct soap *soap) const
@@ -64330,8 +64330,8 @@ void ngwt__CalendarItem::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -64439,7 +64439,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CalendarItem(struct soap *soap, const c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -64552,7 +64552,7 @@ SOAP_FMAC3 ngwt__CalendarItem * SOAP_FMAC4 soap_in_ngwt__CalendarItem(struct soa
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -64951,8 +64951,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CalendarFolderAttribute(struct soap *
 void ngwt__BoxEntry::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -65042,7 +65042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__BoxEntry(struct soap *soap, const char
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -65137,7 +65137,7 @@ SOAP_FMAC3 ngwt__BoxEntry * SOAP_FMAC4 soap_in_ngwt__BoxEntry(struct soap *soap,
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -66068,8 +66068,8 @@ void ngwt__Appointment::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
-	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -66186,7 +66186,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Appointment(struct soap *soap, const ch
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -66308,7 +66308,7 @@ SOAP_FMAC3 ngwt__Appointment * SOAP_FMAC4 soap_in_ngwt__Appointment(struct soap
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemtqStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -69019,8 +69019,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_xsd__base64Binary(struct soap *soap, int st
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap *soap, const struct SOAP_ENV__Fault *a)
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_embedded(soap, &a->faultcode, SOAP_TYPE__QName);
-	soap_serialize__QName(soap, &a->faultcode);
+	soap_embedded(soap, &a->faultcode, SOAP_TYPE__TQName);
+	soap_serialize__TQName(soap, &a->faultcode);
 	soap_embedded(soap, &a->faultstring, SOAP_TYPE_string);
 	soap_serialize_string(soap, &a->faultstring);
 	soap_embedded(soap, &a->faultactor, SOAP_TYPE_string);
@@ -69042,7 +69042,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap *soap, con
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *a)
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_default__QName(soap, &a->faultcode);
+	soap_default__TQName(soap, &a->faultcode);
 	soap_default_string(soap, &a->faultstring);
 	soap_default_string(soap, &a->faultactor);
 	a->detail = NULL;
@@ -69063,9 +69063,9 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap *soap, const stru
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Fault *a, const char *type)
 {
-	const char *soap_tmp_faultcode = soap_QName2s(soap, a->faultcode);
+	const char *soap_tmp_faultcode = soap_TQName2s(soap, a->faultcode);
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Fault), type);
-	soap_out__QName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, "");
+	soap_out__TQName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, "");
 	soap_out_string(soap, "faultstring", -1, &a->faultstring, "");
 	soap_out_string(soap, "faultactor", -1, &a->faultactor, "");
 	soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, "");
@@ -69103,7 +69103,7 @@ SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct so
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_faultcode && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in__QName(soap, "faultcode", &a->faultcode, ""))
+				if (soap_in__TQName(soap, "faultcode", &a->faultcode, ""))
 				{	soap_flag_faultcode = 0;
 					continue;
 				}
@@ -69259,8 +69259,8 @@ SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Code(struct soap *soap, const struct SOAP_ENV__Code *a)
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_embedded(soap, &a->SOAP_ENV__Value, SOAP_TYPE__QName);
-	soap_serialize__QName(soap, &a->SOAP_ENV__Value);
+	soap_embedded(soap, &a->SOAP_ENV__Value, SOAP_TYPE__TQName);
+	soap_serialize__TQName(soap, &a->SOAP_ENV__Value);
 	soap_embedded(soap, &a->SOAP_ENV__Subcode, SOAP_TYPE_PointerToSOAP_ENV__Code);
 	soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Subcode);
 }
@@ -69268,7 +69268,7 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Code(struct soap *soap, cons
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *a)
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_default__QName(soap, &a->SOAP_ENV__Value);
+	soap_default__TQName(soap, &a->SOAP_ENV__Value);
 	a->SOAP_ENV__Subcode = NULL;
 }
 
@@ -69282,9 +69282,9 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap *soap, const struc
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Code *a, const char *type)
 {
-	const char *soap_tmp_SOAP_ENV__Value = soap_QName2s(soap, a->SOAP_ENV__Value);
+	const char *soap_tmp_SOAP_ENV__Value = soap_TQName2s(soap, a->SOAP_ENV__Value);
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Code), type);
-	soap_out__QName(soap, "SOAP-ENV:Value", -1, (char*const*)&soap_tmp_SOAP_ENV__Value, "");
+	soap_out__TQName(soap, "SOAP-ENV:Value", -1, (char*const*)&soap_tmp_SOAP_ENV__Value, "");
 	soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", -1, &a->SOAP_ENV__Subcode, "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -69315,7 +69315,7 @@ SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_SOAP_ENV__Value && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in__QName(soap, "SOAP-ENV:Value", &a->SOAP_ENV__Value, ""))
+				if (soap_in__TQName(soap, "SOAP-ENV:Value", &a->SOAP_ENV__Value, ""))
 				{	soap_flag_SOAP_ENV__Value = 0;
 					continue;
 				}
@@ -84091,49 +84091,49 @@ SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a)
 {
-	soap_reference(soap, *a, SOAP_TYPE_ngwt__VersionStatus);
+	soap_reference(soap, *a, SOAP_TYPE_ngwt__VersiontqStatus);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersionStatus);
-	if (soap_out_PointerTongwt__VersionStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersiontqStatus);
+	if (soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersionStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersiontqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersionStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersiontqStatus);
 	if (id < 0)
 		return soap->error;
-	return soap_out_ngwt__VersionStatus(soap, tag, id, *a, type);
+	return soap_out_ngwt__VersiontqStatus(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__VersionStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__VersiontqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus **a, const char *type)
+SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (enum ngwt__VersionStatus **)soap_malloc(soap, sizeof(enum ngwt__VersionStatus *))))
+		if (!(a = (enum ngwt__VersiontqStatus **)soap_malloc(soap, sizeof(enum ngwt__VersiontqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = soap_in_ngwt__VersionStatus(soap, tag, *a, type)))
+		if (!(*a = soap_in_ngwt__VersiontqStatus(soap, tag, *a, type)))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__VersionStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0);
+	{	a = (enum ngwt__VersiontqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -84348,49 +84348,49 @@ SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap *s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a)
 {
-	soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLStatus);
+	soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLtqStatus);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLStatus);
-	if (soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLtqStatus);
+	if (soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLtqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLtqStatus);
 	if (id < 0)
 		return soap->error;
-	return soap_out_ngwt__FolderACLStatus(soap, tag, id, *a, type);
+	return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__FolderACLStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__FolderACLtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus **a, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (enum ngwt__FolderACLStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLStatus *))))
+		if (!(a = (enum ngwt__FolderACLtqStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLtqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = soap_in_ngwt__FolderACLStatus(soap, tag, *a, type)))
+		if (!(*a = soap_in_ngwt__FolderACLtqStatus(soap, tag, *a, type)))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__FolderACLStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0);
+	{	a = (enum ngwt__FolderACLtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -84695,53 +84695,53 @@ SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemtqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemStatus);
-	if (soap_out_PointerTongwt__ItemStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemtqStatus);
+	if (soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, int id, ngwt__ItemStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, int id, ngwt__ItemtqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemtqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__ItemStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__ItemtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus **a, const char *type)
+SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__ItemStatus **)soap_malloc(soap, sizeof(ngwt__ItemStatus *))))
+		if (!(a = (ngwt__ItemtqStatus **)soap_malloc(soap, sizeof(ngwt__ItemtqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__ItemStatus *)soap_instantiate_ngwt__ItemStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__ItemtqStatus *)soap_instantiate_ngwt__ItemtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__ItemStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), 0);
+	{	a = (ngwt__ItemtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -84797,53 +84797,53 @@ SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSy
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipientqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipienStatus);
-	if (soap_out_PointerTongwt__RecipienStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipientqStatus);
+	if (soap_out_PointerTongwt__RecipientqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, int id, ngwt__RecipienStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientqStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipienStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipientqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__RecipientqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus **a, const char *type)
+SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__RecipienStatus **)soap_malloc(soap, sizeof(ngwt__RecipienStatus *))))
+		if (!(a = (ngwt__RecipientqStatus **)soap_malloc(soap, sizeof(ngwt__RecipientqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__RecipienStatus *)soap_instantiate_ngwt__RecipienStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__RecipientqStatus *)soap_instantiate_ngwt__RecipientqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipienStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), 0);
+	{	a = (ngwt__RecipientqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -87507,53 +87507,53 @@ SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap *so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__Status))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__tqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__Status);
-	if (soap_out_PointerTongwt__Status(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__tqStatus);
+	if (soap_out_PointerTongwt__tqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap *soap, const char *tag, int id, ngwt__Status *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap *soap, const char *tag, int id, ngwt__tqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__Status);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__tqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap *soap, ngwt__Status **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__Status(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__tqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap *soap, const char *tag, ngwt__Status **a, const char *type)
+SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__Status **)soap_malloc(soap, sizeof(ngwt__Status *))))
+		if (!(a = (ngwt__tqStatus **)soap_malloc(soap, sizeof(ngwt__tqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__Status *)soap_instantiate_ngwt__Status(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__tqStatus *)soap_instantiate_ngwt__tqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__Status **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), 0);
+	{	a = (ngwt__tqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -88967,212 +88967,212 @@ SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateeStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateetqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateeStatus);
-	if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateetqStatus);
+	if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateeStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateetqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateeStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateetqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus **a, const char *type)
+SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__DelegateeStatus **)soap_malloc(soap, sizeof(ngwt__DelegateeStatus *))))
+		if (!(a = (ngwt__DelegateetqStatus **)soap_malloc(soap, sizeof(ngwt__DelegateetqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__DelegateeStatus *)soap_instantiate_ngwt__DelegateeStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__DelegateetqStatus *)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__DelegateeStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 0);
+	{	a = (ngwt__DelegateetqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedtqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	if (soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
+	if (soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedtqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedtqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__DelegatedStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__DelegatedtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus **a, const char *type)
+SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__DelegatedStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedStatus *))))
+		if (!(a = (ngwt__DelegatedtqStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedtqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__DelegatedStatus *)soap_instantiate_ngwt__DelegatedStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__DelegatedtqStatus *)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__DelegatedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), 0);
+	{	a = (ngwt__DelegatedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommentqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommenStatus);
-	if (soap_out_PointerTongwt__CommenStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommentqStatus);
+	if (soap_out_PointerTongwt__CommentqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, int id, ngwt__CommenStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentqStatus(struct soap *soap, const char *tag, int id, ngwt__CommentqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommenStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommentqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__CommentqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus **a, const char *type)
+SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__CommenStatus **)soap_malloc(soap, sizeof(ngwt__CommenStatus *))))
+		if (!(a = (ngwt__CommentqStatus **)soap_malloc(soap, sizeof(ngwt__CommentqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__CommenStatus *)soap_instantiate_ngwt__CommenStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__CommentqStatus *)soap_instantiate_ngwt__CommentqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__CommenStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), 0);
+	{	a = (ngwt__CommentqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedtqStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	if (soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
+	if (soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedtqStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedtqStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__TransferFailedStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__TransferFailedtqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus **a, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__TransferFailedStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedStatus *))))
+		if (!(a = (ngwt__TransferFailedtqStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedtqStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__TransferFailedStatus *)soap_instantiate_ngwt__TransferFailedStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__TransferFailedtqStatus *)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__TransferFailedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), 0);
+	{	a = (ngwt__TransferFailedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -91679,37 +91679,37 @@ SOAP_FMAC3 unsigned char ** SOAP_FMAC4 soap_in_PointerTounsignedByte(struct soap
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default__QName(struct soap *soap, char **a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default__TQName(struct soap *soap, char **a)
 {	soap_default_string(soap, a);
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__QName(struct soap *soap, char *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__TQName(struct soap *soap, char *const*a)
 {	soap_serialize_string(soap, a);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap *soap, char *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put__TQName(struct soap *soap, char *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE__QName);
-	if (soap_out__QName(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE__TQName);
+	if (soap_out__TQName(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out__TQName(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
 {
-	return soap_outstring(soap, tag, id, a, type, SOAP_TYPE__QName);
+	return soap_outstring(soap, tag, id, a, type, SOAP_TYPE__TQName);
 }
 
-SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__QName(struct soap *soap, char **p, const char *tag, const char *type)
+SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__TQName(struct soap *soap, char **p, const char *tag, const char *type)
 {
-	if ((p = soap_in__QName(soap, tag, p, type)))
+	if ((p = soap_in__TQName(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type)
+SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__TQName(struct soap *soap, const char *tag, char **a, const char *type)
 {
-	return soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, 0, -1);
+	return soap_instring(soap, tag, a, type, SOAP_TYPE__TQName, 2, 0, -1);
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap *soap, char **a)
@@ -93265,61 +93265,61 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap
 	*(std::vector<std::string >*)p = *(std::vector<std::string >*)q;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a)
 {
-	for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
-		soap_serialize_PointerTongwt__DelegateeStatus(soap, &(*i));
+	for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
+		soap_serialize_PointerTongwt__DelegateetqStatus(soap, &(*i));
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p)
 {
 	p->clear();
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus);
-	if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus);
+	if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateeStatus * >*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateetqStatus * >*a, const char *type)
 {
-	for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
+	for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
 	{
-		if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, &(*i), ""))
+		if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, &(*i), ""))
 			return soap->error;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p, const char *tag, const char *type)
+SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p, const char *tag, const char *type)
 {
-	if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, p, type)))
+	if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateeStatus * >*a, const char *type)
+SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateetqStatus * >*a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
-	if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1)))
+	if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1)))
 		return NULL;
-	ngwt__DelegateeStatus *n;
-	ngwt__DelegateeStatus **p;
+	ngwt__DelegateetqStatus *n;
+	ngwt__DelegateetqStatus **p;
 	do
 	{	soap_revert(soap);
 		if (*soap->id || *soap->href)
-		{	if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateeStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 1))
+		{	if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateetqStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 1))
 				break;
-			if (!(p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, NULL, "ngwt:DelegateeStatus")))
+			if (!(p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, NULL, "ngwt:DelegateetqStatus")))
 				break;
 		}
 		else
 		{	n = NULL;
-			if (!soap_in_PointerTongwt__DelegateeStatus(soap, tag, &n, "ngwt:DelegateeStatus"))
+			if (!soap_in_PointerTongwt__DelegateetqStatus(soap, tag, &n, "ngwt:DelegateetqStatus"))
 				break;
 			a->insert(a->end(), n);
 		}
@@ -93332,38 +93332,38 @@ SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vector
 	return NULL;
 }
 
-SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n)
-{	return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n)
+{	return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >;
+	{	cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >;
 		if (size)
-			*size = sizeof(std::vector<ngwt__DelegateeStatus * >);
+			*size = sizeof(std::vector<ngwt__DelegateetqStatus * >);
 	}
 	else
-	{	cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >[n];
+	{	cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >[n];
 		if (size)
-			*size = n * sizeof(std::vector<ngwt__DelegateeStatus * >);
+			*size = n * sizeof(std::vector<ngwt__DelegateetqStatus * >);
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (std::vector<ngwt__DelegateeStatus * >*)cp->ptr;
+	return (std::vector<ngwt__DelegateetqStatus * >*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateeStatus * > %p -> %p\n", q, p));
-	*(std::vector<ngwt__DelegateeStatus * >*)p = *(std::vector<ngwt__DelegateeStatus * >*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateetqStatus * > %p -> %p\n", q, p));
+	*(std::vector<ngwt__DelegateetqStatus * >*)p = *(std::vector<ngwt__DelegateetqStatus * >*)q;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__Recipient(struct soap *soap, const std::vector<ngwt__Recipient * >*a)
diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h
index 75055459..175b5952 100644
--- a/kresources/groupwise/soap/soapH.h
+++ b/kresources/groupwise/soap/soapH.h
@@ -225,18 +225,18 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap*, c
 
 SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__WeekDay(struct soap*, const char*, enum ngwt__WeekDay *);
 
-#ifndef SOAP_TYPE_ngwt__VersionStatus
-#define SOAP_TYPE_ngwt__VersionStatus (385)
+#ifndef SOAP_TYPE_ngwt__VersiontqStatus
+#define SOAP_TYPE_ngwt__VersiontqStatus (385)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap*, const enum ngwt__VersionStatus *, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap*, const char*, int, const enum ngwt__VersionStatus *, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap*, const enum ngwt__VersiontqStatus *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap*, const char*, int, const enum ngwt__VersiontqStatus *, const char*);
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap*, enum ngwt__VersionStatus);
-SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *, const char*, const char*);
-SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *, const char*);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap*, enum ngwt__VersiontqStatus);
+SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *, const char*, const char*);
+SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *, const char*);
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *);
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *);
 
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
@@ -498,18 +498,18 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so
 
 SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderType(struct soap*, const char*, enum ngwt__FolderType *);
 
-#ifndef SOAP_TYPE_ngwt__FolderACLStatus
-#define SOAP_TYPE_ngwt__FolderACLStatus (358)
+#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus
+#define SOAP_TYPE_ngwt__FolderACLtqStatus (358)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap*, const enum ngwt__FolderACLStatus *, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap*, const char*, int, const enum ngwt__FolderACLStatus *, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap*, const enum ngwt__FolderACLtqStatus *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap*, const char*, int, const enum ngwt__FolderACLtqStatus *, const char*);
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap*, enum ngwt__FolderACLStatus);
-SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *, const char*, const char*);
-SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *, const char*);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap*, enum ngwt__FolderACLtqStatus);
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *, const char*, const char*);
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *, const char*);
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *);
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *);
 
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
@@ -2930,17 +2930,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TrustedApplication(struct soap*, ng
 SOAP_FMAC5 ngwt__TrustedApplication * SOAP_FMAC6 soap_instantiate_ngwt__TrustedApplication(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__TransferFailedStatus
-#define SOAP_TYPE_ngwt__TransferFailedStatus (154)
+#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus
+#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap*, const char*, int, const ngwt__TransferFailedStatus *, const char*);
-SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus *, const char*);
-SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus*);
-SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap*, const char*, int, const ngwt__TransferFailedtqStatus *, const char*);
+SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus *, const char*);
+SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus*);
+SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__TimezoneList
 #define SOAP_TYPE_ngwt__TimezoneList (153)
@@ -3014,17 +3014,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__StatusTracking(struct soap*, ngwt__
 SOAP_FMAC5 ngwt__StatusTracking * SOAP_FMAC6 soap_instantiate_ngwt__StatusTracking(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__Status
-#define SOAP_TYPE_ngwt__Status (147)
+#ifndef SOAP_TYPE_ngwt__tqStatus
+#define SOAP_TYPE_ngwt__tqStatus (147)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap*, const char*, int, const ngwt__Status *, const char*);
-SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap*, ngwt__Status *, const char*, const char*);
-SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap*, const char*, ngwt__Status *, const char*);
-SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap*, ngwt__Status*);
-SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap*, const char*, int, const ngwt__tqStatus *, const char*);
+SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap*, ngwt__tqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap*, const char*, ngwt__tqStatus *, const char*);
+SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap*, ngwt__tqStatus*);
+SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__SMimeOperation
 #define SOAP_TYPE_ngwt__SMimeOperation (146)
@@ -3302,17 +3302,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecurrenceDateType(struct soap*, ng
 SOAP_FMAC5 ngwt__RecurrenceDateType * SOAP_FMAC6 soap_instantiate_ngwt__RecurrenceDateType(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__RecipienStatus
-#define SOAP_TYPE_ngwt__RecipienStatus (123)
+#ifndef SOAP_TYPE_ngwt__RecipientqStatus
+#define SOAP_TYPE_ngwt__RecipientqStatus (123)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap*, const char*, int, const ngwt__RecipienStatus *, const char*);
-SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus *, const char*);
-SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus*);
-SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap*, const char*, int, const ngwt__RecipientqStatus *, const char*);
+SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus *, const char*);
+SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus*);
+SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__RecipientList
 #define SOAP_TYPE_ngwt__RecipientList (122)
@@ -3698,17 +3698,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__JunkEntry(struct soap*, ngwt__JunkE
 SOAP_FMAC5 ngwt__JunkEntry * SOAP_FMAC6 soap_instantiate_ngwt__JunkEntry(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__ItemStatus
-#define SOAP_TYPE_ngwt__ItemStatus (90)
+#ifndef SOAP_TYPE_ngwt__ItemtqStatus
+#define SOAP_TYPE_ngwt__ItemtqStatus (90)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap*, const char*, int, const ngwt__ItemStatus *, const char*);
-SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus *, const char*);
-SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus*);
-SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap*, const char*, int, const ngwt__ItemtqStatus *, const char*);
+SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus *, const char*);
+SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus*);
+SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__Items
 #define SOAP_TYPE_ngwt__Items (89)
@@ -4142,29 +4142,29 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DeltaInfo(struct soap*, ngwt__Delta
 SOAP_FMAC5 ngwt__DeltaInfo * SOAP_FMAC6 soap_instantiate_ngwt__DeltaInfo(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__DelegateeStatus
-#define SOAP_TYPE_ngwt__DelegateeStatus (53)
+#ifndef SOAP_TYPE_ngwt__DelegateetqStatus
+#define SOAP_TYPE_ngwt__DelegateetqStatus (53)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap*, const char*, int, const ngwt__DelegateeStatus *, const char*);
-SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus *, const char*);
-SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus*);
-SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap*, const char*, int, const ngwt__DelegateetqStatus *, const char*);
+SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus *, const char*);
+SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus*);
+SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__DelegatedStatus
-#define SOAP_TYPE_ngwt__DelegatedStatus (52)
+#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus
+#define SOAP_TYPE_ngwt__DelegatedtqStatus (52)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap*, const char*, int, const ngwt__DelegatedStatus *, const char*);
-SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus *, const char*);
-SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus*);
-SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap*, const char*, int, const ngwt__DelegatedtqStatus *, const char*);
+SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus *, const char*);
+SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus*);
+SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__DayOfYearWeekList
 #define SOAP_TYPE_ngwt__DayOfYearWeekList (51)
@@ -4298,17 +4298,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Contact(struct soap*, ngwt__Contact
 SOAP_FMAC5 ngwt__Contact * SOAP_FMAC6 soap_instantiate_ngwt__Contact(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__CommenStatus
-#define SOAP_TYPE_ngwt__CommenStatus (40)
+#ifndef SOAP_TYPE_ngwt__CommentqStatus
+#define SOAP_TYPE_ngwt__CommentqStatus (40)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap*, const char*, int, const ngwt__CommenStatus *, const char*);
-SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus *, const char*);
-SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus*);
-SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap*, const char*, int, const ngwt__CommentqStatus *, const char*);
+SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus *, const char*);
+SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus*);
+SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__CategoryRefList
 #define SOAP_TYPE_ngwt__CategoryRefList (39)
@@ -7218,14 +7218,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FullName(struct soap*, const c
 SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_get_PointerTongwt__FullName(struct soap*, ngwt__FullName **, const char*, const char*);
 SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct soap*, const char*, ngwt__FullName **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__VersionStatus
-#define SOAP_TYPE_PointerTongwt__VersionStatus (584)
+#ifndef SOAP_TYPE_PointerTongwt__VersiontqStatus
+#define SOAP_TYPE_PointerTongwt__VersiontqStatus (584)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap*, const char *, int, enum ngwt__VersionStatus *const*, const char *);
-SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus **, const char*, const char*);
-SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap*, const char *, int, enum ngwt__VersiontqStatus *const*, const char *);
+SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus **, const char*, const char*);
+SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FolderACL
 #define SOAP_TYPE_PointerTongwt__FolderACL (583)
@@ -7263,14 +7263,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Query(struct soap*, const char
 SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_get_PointerTongwt__Query(struct soap*, ngwt__Query **, const char*, const char*);
 SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap*, const char*, ngwt__Query **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__FolderACLStatus
-#define SOAP_TYPE_PointerTongwt__FolderACLStatus (579)
+#ifndef SOAP_TYPE_PointerTongwt__FolderACLtqStatus
+#define SOAP_TYPE_PointerTongwt__FolderACLtqStatus (579)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap*, const char *, int, enum ngwt__FolderACLStatus *const*, const char *);
-SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus **, const char*, const char*);
-SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap*, const char *, int, enum ngwt__FolderACLtqStatus *const*, const char *);
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus **, const char*, const char*);
+SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__AccessControlList
 #define SOAP_TYPE_PointerTongwt__AccessControlList (578)
@@ -7326,14 +7326,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemSource(struct soap*, const
 SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_get_PointerTongwt__ItemSource(struct soap*, enum ngwt__ItemSource **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource(struct soap*, const char*, enum ngwt__ItemSource **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__ItemStatus
-#define SOAP_TYPE_PointerTongwt__ItemStatus (572)
+#ifndef SOAP_TYPE_PointerTongwt__ItemtqStatus
+#define SOAP_TYPE_PointerTongwt__ItemtqStatus (572)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap*, const char *, int, ngwt__ItemStatus *const*, const char *);
-SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap*, const char *, int, ngwt__ItemtqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__DeltaSyncType
 #define SOAP_TYPE_PointerTongwt__DeltaSyncType (571)
@@ -7344,14 +7344,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DeltaSyncType(struct soap*, co
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_get_PointerTongwt__DeltaSyncType(struct soap*, enum ngwt__DeltaSyncType **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSyncType(struct soap*, const char*, enum ngwt__DeltaSyncType **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus
-#define SOAP_TYPE_PointerTongwt__RecipienStatus (570)
+#ifndef SOAP_TYPE_PointerTongwt__RecipientqStatus
+#define SOAP_TYPE_PointerTongwt__RecipientqStatus (570)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap*, const char *, int, ngwt__RecipienStatus *const*, const char *);
-SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientqStatus(struct soap*, const char *, int, ngwt__RecipientqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FreeBusyBlockList
 #define SOAP_TYPE_PointerTongwt__FreeBusyBlockList (569)
@@ -7812,14 +7812,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__View(struct soap*, const char
 SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_get_PointerTongwt__View(struct soap*, std::string **, const char*, const char*);
 SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap*, const char*, std::string **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__Status
-#define SOAP_TYPE_PointerTongwt__Status (510)
+#ifndef SOAP_TYPE_PointerTongwt__tqStatus
+#define SOAP_TYPE_PointerTongwt__tqStatus (510)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap*, ngwt__Status *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap*, ngwt__Status *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap*, const char *, int, ngwt__Status *const*, const char *);
-SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap*, ngwt__Status **, const char*, const char*);
-SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap*, const char*, ngwt__Status **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap*, const char *, int, ngwt__tqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap*, const char*, ngwt__tqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__ItemRefList
 #define SOAP_TYPE_PointerTongwt__ItemRefList (509)
@@ -8064,41 +8064,41 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Frequency(struct soap*, const
 SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_get_PointerTongwt__Frequency(struct soap*, enum ngwt__Frequency **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(struct soap*, const char*, enum ngwt__Frequency **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__DelegateeStatus
-#define SOAP_TYPE_PointerTongwt__DelegateeStatus (474)
+#ifndef SOAP_TYPE_PointerTongwt__DelegateetqStatus
+#define SOAP_TYPE_PointerTongwt__DelegateetqStatus (474)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap*, const char *, int, ngwt__DelegateeStatus *const*, const char *);
-SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap*, const char *, int, ngwt__DelegateetqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__DelegatedStatus
-#define SOAP_TYPE_PointerTongwt__DelegatedStatus (473)
+#ifndef SOAP_TYPE_PointerTongwt__DelegatedtqStatus
+#define SOAP_TYPE_PointerTongwt__DelegatedtqStatus (473)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*, const char *, int, ngwt__DelegatedStatus *const*, const char *);
-SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap*, const char *, int, ngwt__DelegatedtqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__CommenStatus
-#define SOAP_TYPE_PointerTongwt__CommenStatus (472)
+#ifndef SOAP_TYPE_PointerTongwt__CommentqStatus
+#define SOAP_TYPE_PointerTongwt__CommentqStatus (472)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap*, const char *, int, ngwt__CommenStatus *const*, const char *);
-SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentqStatus(struct soap*, const char *, int, ngwt__CommentqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus
-#define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471)
+#ifndef SOAP_TYPE_PointerTongwt__TransferFailedtqStatus
+#define SOAP_TYPE_PointerTongwt__TransferFailedtqStatus (471)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap*, const char *, int, ngwt__TransferFailedStatus *const*, const char *);
-SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap*, const char *, int, ngwt__TransferFailedtqStatus *const*, const char *);
+SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__Recipient
 #define SOAP_TYPE_PointerTongwt__Recipient (469)
@@ -8532,15 +8532,15 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTounsignedByte(struct soap*, const cha
 SOAP_FMAC3 unsigned char ** SOAP_FMAC4 soap_get_PointerTounsignedByte(struct soap*, unsigned char **, const char*, const char*);
 SOAP_FMAC3 unsigned char ** SOAP_FMAC4 soap_in_PointerTounsignedByte(struct soap*, const char*, unsigned char **, const char*);
 
-#ifndef SOAP_TYPE__QName
-#define SOAP_TYPE__QName (5)
+#ifndef SOAP_TYPE__TQName
+#define SOAP_TYPE__TQName (5)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default__QName(struct soap*, char **);
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__QName(struct soap*, char *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap*, char *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap*, const char*, int, char*const*, const char*);
-SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__QName(struct soap*, char **, const char*, const char*);
-SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap*, const char*, char **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default__TQName(struct soap*, char **);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__TQName(struct soap*, char *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put__TQName(struct soap*, char *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out__TQName(struct soap*, const char*, int, char*const*, const char*);
+SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__TQName(struct soap*, char **, const char*, const char*);
+SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__TQName(struct soap*, const char*, char **, const char*);
 
 #ifndef SOAP_TYPE_string
 #define SOAP_TYPE_string (3)
@@ -8762,19 +8762,19 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfxsd__date(struct soa
 SOAP_FMAC5 std::vector<std::string > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfxsd__date(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus
-#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus (475)
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*);
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateeStatus * >*, const char*);
-SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*, const char*, const char*);
-SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, std::vector<ngwt__DelegateeStatus * >*, const char*);
-SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*);
-SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t);
+#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus
+#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus (475)
+#endif
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateetqStatus * >*, const char*);
+SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*);
+SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, std::vector<ngwt__DelegateetqStatus * >*, const char*);
+SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*);
+SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient
 #define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient (470)
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index a5977c1c..7ba6692e 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -31,7 +31,7 @@ enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
 /* Bitqmask ngwe:FieldList */
-enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipienStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
+enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientqStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemTypeList
@@ -115,13 +115,13 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
 /* ngwt:FilterOp */
-enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, tqcontainsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
+enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
 #endif
 
-#ifndef SOAP_TYPE_ngwt__FolderACLStatus
-#define SOAP_TYPE_ngwt__FolderACLStatus (358)
-/* ngwt:FolderACLStatus */
-enum ngwt__FolderACLStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4};
+#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus
+#define SOAP_TYPE_ngwt__FolderACLtqStatus (358)
+/* ngwt:FolderACLtqStatus */
+enum ngwt__FolderACLtqStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderType
@@ -241,13 +241,13 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened =
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
 /* ngwt:VersionEventType */
-enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
+enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetqStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
 #endif
 
-#ifndef SOAP_TYPE_ngwt__VersionStatus
-#define SOAP_TYPE_ngwt__VersionStatus (385)
-/* ngwt:VersionStatus */
-enum ngwt__VersionStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6};
+#ifndef SOAP_TYPE_ngwt__VersiontqStatus
+#define SOAP_TYPE_ngwt__VersiontqStatus (385)
+/* ngwt:VersiontqStatus */
+enum ngwt__VersiontqStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__WeekDay
@@ -1278,10 +1278,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__ItemStatus
-#define SOAP_TYPE_ngwt__ItemStatus (90)
-/* ngwt:ItemStatus */
-class SOAP_CMAC ngwt__ItemStatus
+#ifndef SOAP_TYPE_ngwt__ItemtqStatus
+#define SOAP_TYPE_ngwt__ItemtqStatus (90)
+/* ngwt:ItemtqStatus */
+class SOAP_CMAC ngwt__ItemtqStatus
 {
 public:
 	bool *accepted;	/* optional element of type xsd:boolean */
@@ -1295,15 +1295,15 @@ public:
 	bool *replied;	/* optional element of type xsd:boolean */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemStatus */
+	virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemtqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__ItemStatus() { }
-	virtual ~ngwt__ItemStatus() { }
+	         ngwt__ItemtqStatus() { }
+	virtual ~ngwt__ItemtqStatus() { }
 };
 #endif
 
@@ -1764,17 +1764,17 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__RecipienStatus
-#define SOAP_TYPE_ngwt__RecipienStatus (123)
-/* ngwt:RecipienStatus */
-class SOAP_CMAC ngwt__RecipienStatus
+#ifndef SOAP_TYPE_ngwt__RecipientqStatus
+#define SOAP_TYPE_ngwt__RecipientqStatus (123)
+/* ngwt:RecipientqStatus */
+class SOAP_CMAC ngwt__RecipientqStatus
 {
 public:
 	char *delivered;	/* optional element of type xsd:string */
 	char *undeliverable;	/* optional element of type xsd:string */
 	char *transferred;	/* optional element of type xsd:string */
 	char *transferDelayed;	/* optional element of type xsd:string */
-	class ngwt__TransferFailedStatus *transferFailed;	/* optional element of type ngwt:TransferFailedStatus */
+	class ngwt__TransferFailedtqStatus *transferFailed;	/* optional element of type ngwt:TransferFailedtqStatus */
 	char *downloaded;	/* optional element of type xsd:string */
 	char *downloadedByThirdParty;	/* optional element of type xsd:string */
 	char *retractRequested;	/* optional element of type xsd:string */
@@ -1783,27 +1783,27 @@ public:
 	char *deleted;	/* optional element of type xsd:string */
 	char *undeleted;	/* optional element of type xsd:string */
 	char *purged;	/* optional element of type xsd:string */
-	class ngwt__CommenStatus *accepted;	/* optional element of type ngwt:CommenStatus */
-	ngwt__CommenStatus *declined;	/* optional element of type ngwt:CommenStatus */
+	class ngwt__CommentqStatus *accepted;	/* optional element of type ngwt:CommentqStatus */
+	ngwt__CommentqStatus *declined;	/* optional element of type ngwt:CommentqStatus */
 	char *replied;	/* optional element of type xsd:string */
 	char *forwarded;	/* optional element of type xsd:string */
 	char *shared;	/* optional element of type xsd:string */
 	char *started;	/* optional element of type xsd:string */
 	char *completed;	/* optional element of type xsd:string */
 	char *incomplete;	/* optional element of type xsd:string */
-	class ngwt__DelegatedStatus *delegated;	/* optional element of type ngwt:DelegatedStatus */
-	std::vector<class ngwt__DelegateeStatus * >delegateeStatus;	/* optional element of type ngwt:DelegateeStatus */
+	class ngwt__DelegatedtqStatus *delegated;	/* optional element of type ngwt:DelegatedtqStatus */
+	std::vector<class ngwt__DelegateetqStatus * >delegateetqStatus;	/* optional element of type ngwt:DelegateetqStatus */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipienStatus */
+	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipientqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__RecipienStatus() { }
-	virtual ~ngwt__RecipienStatus() { }
+	         ngwt__RecipientqStatus() { }
+	virtual ~ngwt__RecipientqStatus() { }
 };
 #endif
 
@@ -2244,10 +2244,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__Status
-#define SOAP_TYPE_ngwt__Status (147)
-/* ngwt:Status */
-class SOAP_CMAC ngwt__Status
+#ifndef SOAP_TYPE_ngwt__tqStatus
+#define SOAP_TYPE_ngwt__tqStatus (147)
+/* ngwt:tqStatus */
+class SOAP_CMAC ngwt__tqStatus
 {
 public:
 	int code;	/* required element of type xsd:int */
@@ -2256,15 +2256,15 @@ public:
 	ngwt__ProblemList *problems;	/* optional element of type ngwt:ProblemList */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__Status */
+	virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__tqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__Status() { }
-	virtual ~ngwt__Status() { }
+	         ngwt__tqStatus() { }
+	virtual ~ngwt__tqStatus() { }
 };
 #endif
 
@@ -2418,7 +2418,7 @@ public:
 class SOAP_CMAC _ngwm__acceptResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 161; } /* = unique id SOAP_TYPE__ngwm__acceptResponse */
@@ -2465,7 +2465,7 @@ class SOAP_CMAC _ngwm__acceptShareResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 163; } /* = unique id SOAP_TYPE__ngwm__acceptShareResponse */
@@ -2509,7 +2509,7 @@ public:
 class SOAP_CMAC _ngwm__addItemResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 165; } /* = unique id SOAP_TYPE__ngwm__addItemResponse */
@@ -2553,7 +2553,7 @@ public:
 class SOAP_CMAC _ngwm__addItemsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 167; } /* = unique id SOAP_TYPE__ngwm__addItemsResponse */
@@ -2597,7 +2597,7 @@ public:
 class SOAP_CMAC _ngwm__addMembersResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 169; } /* = unique id SOAP_TYPE__ngwm__addMembersResponse */
@@ -2639,7 +2639,7 @@ public:
 class SOAP_CMAC _ngwm__closeFreeBusySessionResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 171; } /* = unique id SOAP_TYPE__ngwm__closeFreeBusySessionResponse */
@@ -2681,7 +2681,7 @@ public:
 class SOAP_CMAC _ngwm__completeResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 173; } /* = unique id SOAP_TYPE__ngwm__completeResponse */
@@ -2727,7 +2727,7 @@ class SOAP_CMAC _ngwm__createCursorResponse
 {
 public:
 	int *cursor;	/* RPC return element */	/* optional element of type xsd:int */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 175; } /* = unique id SOAP_TYPE__ngwm__createCursorResponse */
@@ -2771,7 +2771,7 @@ class SOAP_CMAC _ngwm__createItemResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 177; } /* = unique id SOAP_TYPE__ngwm__createItemResponse */
@@ -2814,7 +2814,7 @@ class SOAP_CMAC _ngwm__createItemsResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 179; } /* = unique id SOAP_TYPE__ngwm__createItemsResponse */
@@ -2857,7 +2857,7 @@ class SOAP_CMAC _ngwm__createJunkEntryResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 181; } /* = unique id SOAP_TYPE__ngwm__createJunkEntryResponse */
@@ -2900,7 +2900,7 @@ class SOAP_CMAC _ngwm__createProxyAccessResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 183; } /* = unique id SOAP_TYPE__ngwm__createProxyAccessResponse */
@@ -2942,7 +2942,7 @@ public:
 class SOAP_CMAC _ngwm__createSignatureResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 185; } /* = unique id SOAP_TYPE__ngwm__createSignatureResponse */
@@ -2986,7 +2986,7 @@ public:
 class SOAP_CMAC _ngwm__declineResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 187; } /* = unique id SOAP_TYPE__ngwm__declineResponse */
@@ -3033,7 +3033,7 @@ public:
 class SOAP_CMAC _ngwm__delegateResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 189; } /* = unique id SOAP_TYPE__ngwm__delegateResponse */
@@ -3077,7 +3077,7 @@ public:
 class SOAP_CMAC _ngwm__destroyCursorResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 191; } /* = unique id SOAP_TYPE__ngwm__destroyCursorResponse */
@@ -3120,7 +3120,7 @@ public:
 class SOAP_CMAC _ngwm__executeRuleResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 193; } /* = unique id SOAP_TYPE__ngwm__executeRuleResponse */
@@ -3166,7 +3166,7 @@ class SOAP_CMAC _ngwm__forwardResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 195; } /* = unique id SOAP_TYPE__ngwm__forwardResponse */
@@ -3208,7 +3208,7 @@ class SOAP_CMAC _ngwm__getAddressBookListResponse
 {
 public:
 	ngwt__AddressBookList *books;	/* RPC return element */	/* optional element of type ngwt:AddressBookList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 197; } /* = unique id SOAP_TYPE__ngwm__getAddressBookListResponse */
@@ -3254,7 +3254,7 @@ class SOAP_CMAC _ngwm__getAttachmentResponse
 {
 public:
 	ngwt__MessagePart *part;	/* RPC return element */	/* optional element of type ngwt:MessagePart */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 199; } /* = unique id SOAP_TYPE__ngwm__getAttachmentResponse */
@@ -3296,7 +3296,7 @@ class SOAP_CMAC _ngwm__getCategoryListResponse
 {
 public:
 	ngwt__CategoryList *categories;	/* RPC return element */	/* optional element of type ngwt:CategoryList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 201; } /* = unique id SOAP_TYPE__ngwm__getCategoryListResponse */
@@ -3338,7 +3338,7 @@ class SOAP_CMAC _ngwm__getCustomListResponse
 {
 public:
 	ngwt__CustomList *customs;	/* RPC return element */	/* optional element of type ngwt:CustomList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 203; } /* = unique id SOAP_TYPE__ngwm__getCustomListResponse */
@@ -3385,7 +3385,7 @@ class SOAP_CMAC _ngwm__getDeltasResponse
 public:
 	ngwt__Items *items;	/* RPC return element */	/* optional element of type ngwt:Items */
 	ngwt__DeltaInfo *deltaInfo;	/* required element of type ngwt:DeltaInfo */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 205; } /* = unique id SOAP_TYPE__ngwm__getDeltasResponse */
@@ -3429,7 +3429,7 @@ class SOAP_CMAC _ngwm__getDeltaInfoResponse
 {
 public:
 	ngwt__DeltaInfo *deltaInfo;	/* RPC return element */	/* required element of type ngwt:DeltaInfo */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 207; } /* = unique id SOAP_TYPE__ngwm__getDeltaInfoResponse */
@@ -3473,7 +3473,7 @@ class SOAP_CMAC _ngwm__getDocumentTypeListResponse
 {
 public:
 	ngwt__DocumentTypeList *items;	/* RPC return element */	/* optional element of type ngwt:DocumentTypeList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 209; } /* = unique id SOAP_TYPE__ngwm__getDocumentTypeListResponse */
@@ -3520,7 +3520,7 @@ class SOAP_CMAC _ngwm__getFolderResponse
 {
 public:
 	ngwt__Folder *folder;	/* RPC return element */	/* optional element of type ngwt:Folder */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 211; } /* = unique id SOAP_TYPE__ngwm__getFolderResponse */
@@ -3541,7 +3541,7 @@ public:
 class SOAP_CMAC _ngwm__getFolderListRequest
 {
 public:
-	std::string parent;	/* required element of type ngwt:uid */
+	std::string tqparent;	/* required element of type ngwt:uid */
 public:
 	std::string *view;	/* optional element of type ngwt:View */
 	bool recurse;	/* required element of type xsd:boolean */
@@ -3568,7 +3568,7 @@ class SOAP_CMAC _ngwm__getFolderListResponse
 {
 public:
 	ngwt__FolderList *folders;	/* RPC return element */	/* optional element of type ngwt:FolderList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 213; } /* = unique id SOAP_TYPE__ngwm__getFolderListResponse */
@@ -3613,7 +3613,7 @@ class SOAP_CMAC _ngwm__getFreeBusyResponse
 public:
 	ngwt__FreeBusyStats *freeBusyStats;	/* RPC return element */	/* optional element of type ngwt:FreeBusyStats */
 	ngwt__FreeBusyInfoList *freeBusyInfo;	/* optional element of type ngwt:FreeBusyInfoList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 215; } /* = unique id SOAP_TYPE__ngwm__getFreeBusyResponse */
@@ -3658,7 +3658,7 @@ class SOAP_CMAC _ngwm__getItemResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 217; } /* = unique id SOAP_TYPE__ngwm__getItemResponse */
@@ -3705,7 +3705,7 @@ class SOAP_CMAC _ngwm__getItemsResponse
 {
 public:
 	ngwt__Items *items;	/* RPC return element */	/* optional element of type ngwt:Items */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 219; } /* = unique id SOAP_TYPE__ngwm__getItemsResponse */
@@ -3750,7 +3750,7 @@ public:
 	ngwt__JunkHandlingList *junk;	/* RPC return element */	/* optional element of type ngwt:JunkHandlingList */
 	ngwt__JunkHandlingList *block;	/* optional element of type ngwt:JunkHandlingList */
 	ngwt__JunkHandlingList *trust;	/* optional element of type ngwt:JunkHandlingList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 221; } /* = unique id SOAP_TYPE__ngwm__getJunkEntriesResponse */
@@ -3792,7 +3792,7 @@ class SOAP_CMAC _ngwm__getJunkMailSettingsResponse
 {
 public:
 	ngwt__SettingsList *settings;	/* RPC return element */	/* optional element of type ngwt:SettingsList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 223; } /* = unique id SOAP_TYPE__ngwm__getJunkMailSettingsResponse */
@@ -3838,7 +3838,7 @@ class SOAP_CMAC _ngwm__getLibraryItemResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 225; } /* = unique id SOAP_TYPE__ngwm__getLibraryItemResponse */
@@ -3880,7 +3880,7 @@ class SOAP_CMAC _ngwm__getLibraryListResponse
 {
 public:
 	ngwt__LibraryList *libraries;	/* RPC return element */	/* optional element of type ngwt:LibraryList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 227; } /* = unique id SOAP_TYPE__ngwm__getLibraryListResponse */
@@ -3930,7 +3930,7 @@ class SOAP_CMAC _ngwm__getQuickMessagesResponse
 public:
 	char *ngwt__startDate;	/* RPC return element */	/* optional element of type xsd:string */
 	ngwt__Items *items;	/* optional element of type ngwt:Items */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 229; } /* = unique id SOAP_TYPE__ngwm__getQuickMessagesResponse */
@@ -3972,7 +3972,7 @@ class SOAP_CMAC _ngwm__getProxyAccessListResponse
 {
 public:
 	ngwt__AccessRightList *accessRights;	/* RPC return element */	/* optional element of type ngwt:AccessRightList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 231; } /* = unique id SOAP_TYPE__ngwm__getProxyAccessListResponse */
@@ -4014,7 +4014,7 @@ class SOAP_CMAC _ngwm__getProxyListResponse
 {
 public:
 	ngwt__ProxyList *proxies;	/* RPC return element */	/* optional element of type ngwt:ProxyList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 233; } /* = unique id SOAP_TYPE__ngwm__getProxyListResponse */
@@ -4056,7 +4056,7 @@ class SOAP_CMAC _ngwm__getRuleListResponse
 {
 public:
 	ngwt__RuleList *rules;	/* RPC return element */	/* optional element of type ngwt:RuleList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 235; } /* = unique id SOAP_TYPE__ngwm__getRuleListResponse */
@@ -4099,7 +4099,7 @@ class SOAP_CMAC _ngwm__getSettingsResponse
 {
 public:
 	ngwt__Settings *settings;	/* RPC return element */	/* optional element of type ngwt:Settings */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 237; } /* = unique id SOAP_TYPE__ngwm__getSettingsResponse */
@@ -4142,7 +4142,7 @@ class SOAP_CMAC _ngwm__getSignaturesResponse
 {
 public:
 	ngwt__Signatures *signatures;	/* RPC return element */	/* optional element of type ngwt:Signatures */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 239; } /* = unique id SOAP_TYPE__ngwm__getSignaturesResponse */
@@ -4188,7 +4188,7 @@ class SOAP_CMAC _ngwm__getTimestampResponse
 public:
 	char *backup;	/* RPC return element */	/* optional element of type xsd:string */
 	char *retention;	/* optional element of type xsd:string */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 241; } /* = unique id SOAP_TYPE__ngwm__getTimestampResponse */
@@ -4230,7 +4230,7 @@ class SOAP_CMAC _ngwm__getTimezoneListResponse
 {
 public:
 	ngwt__TimezoneList *timezones;	/* RPC return element */	/* optional element of type ngwt:TimezoneList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 243; } /* = unique id SOAP_TYPE__ngwm__getTimezoneListResponse */
@@ -4274,7 +4274,7 @@ class SOAP_CMAC _ngwm__getUserListResponse
 {
 public:
 	ngwt__UserList *users;	/* RPC return element */	/* optional element of type ngwt:UserList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 245; } /* = unique id SOAP_TYPE__ngwm__getUserListResponse */
@@ -4327,7 +4327,7 @@ public:
 	std::string *build;	/* optional element of type xsd:string */
 	std::vector<ngwt__Host * >redirectToHost;	/* optional element of type ngwt:Host */
 	char *serverUTCTime;	/* optional element of type xsd:string */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 247; } /* = unique id SOAP_TYPE__ngwm__loginResponse */
@@ -4368,7 +4368,7 @@ public:
 class SOAP_CMAC _ngwm__logoutResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 249; } /* = unique id SOAP_TYPE__ngwm__logoutResponse */
@@ -4410,7 +4410,7 @@ public:
 class SOAP_CMAC _ngwm__markPrivateResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 251; } /* = unique id SOAP_TYPE__ngwm__markPrivateResponse */
@@ -4452,7 +4452,7 @@ public:
 class SOAP_CMAC _ngwm__markReadResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 253; } /* = unique id SOAP_TYPE__ngwm__markReadResponse */
@@ -4494,7 +4494,7 @@ public:
 class SOAP_CMAC _ngwm__markUnPrivateResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 255; } /* = unique id SOAP_TYPE__ngwm__markUnPrivateResponse */
@@ -4536,7 +4536,7 @@ public:
 class SOAP_CMAC _ngwm__markUnReadResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 257; } /* = unique id SOAP_TYPE__ngwm__markUnReadResponse */
@@ -4584,7 +4584,7 @@ class SOAP_CMAC _ngwm__modifyItemResponse
 public:
 	char *ngwt__modified;	/* RPC return element */	/* optional element of type xsd:string */
 	std::vector<std::string >id;	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 259; } /* = unique id SOAP_TYPE__ngwm__modifyItemResponse */
@@ -4628,7 +4628,7 @@ class SOAP_CMAC _ngwm__modifyItemsResponse
 public:
 	std::vector<char * >ngwt__modified;	/* optional element of type xsd:string */
 	std::vector<std::string >id;	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 261; } /* = unique id SOAP_TYPE__ngwm__modifyItemsResponse */
@@ -4670,7 +4670,7 @@ public:
 class SOAP_CMAC _ngwm__modifyJunkEntryResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 263; } /* = unique id SOAP_TYPE__ngwm__modifyJunkEntryResponse */
@@ -4712,7 +4712,7 @@ public:
 class SOAP_CMAC _ngwm__modifyJunkMailSettingsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 265; } /* = unique id SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse */
@@ -4755,7 +4755,7 @@ public:
 class SOAP_CMAC _ngwm__modifyPasswordResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 267; } /* = unique id SOAP_TYPE__ngwm__modifyPasswordResponse */
@@ -4799,7 +4799,7 @@ public:
 class SOAP_CMAC _ngwm__modifyProxyAccessResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 269; } /* = unique id SOAP_TYPE__ngwm__modifyProxyAccessResponse */
@@ -4841,7 +4841,7 @@ public:
 class SOAP_CMAC _ngwm__modifySettingsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 271; } /* = unique id SOAP_TYPE__ngwm__modifySettingsResponse */
@@ -4883,7 +4883,7 @@ public:
 class SOAP_CMAC _ngwm__modifySignaturesResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 273; } /* = unique id SOAP_TYPE__ngwm__modifySignaturesResponse */
@@ -4928,7 +4928,7 @@ public:
 class SOAP_CMAC _ngwm__moveItemResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 275; } /* = unique id SOAP_TYPE__ngwm__moveItemResponse */
@@ -4974,7 +4974,7 @@ public:
 class SOAP_CMAC _ngwm__positionCursorResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 277; } /* = unique id SOAP_TYPE__ngwm__positionCursorResponse */
@@ -5015,7 +5015,7 @@ public:
 class SOAP_CMAC _ngwm__purgeDeletedItemsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 279; } /* = unique id SOAP_TYPE__ngwm__purgeDeletedItemsResponse */
@@ -5057,7 +5057,7 @@ public:
 class SOAP_CMAC _ngwm__purgeResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 281; } /* = unique id SOAP_TYPE__ngwm__purgeResponse */
@@ -5105,7 +5105,7 @@ class SOAP_CMAC _ngwm__readCursorResponse
 {
 public:
 	ngwt__ItemList *items;	/* RPC return element */	/* optional element of type ngwt:ItemList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 283; } /* = unique id SOAP_TYPE__ngwm__readCursorResponse */
@@ -5149,7 +5149,7 @@ public:
 class SOAP_CMAC _ngwm__removeCustomDefinitionResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 285; } /* = unique id SOAP_TYPE__ngwm__removeCustomDefinitionResponse */
@@ -5193,7 +5193,7 @@ public:
 class SOAP_CMAC _ngwm__removeItemResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 287; } /* = unique id SOAP_TYPE__ngwm__removeItemResponse */
@@ -5237,7 +5237,7 @@ public:
 class SOAP_CMAC _ngwm__removeItemsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 289; } /* = unique id SOAP_TYPE__ngwm__removeItemsResponse */
@@ -5280,7 +5280,7 @@ public:
 class SOAP_CMAC _ngwm__removeJunkEntryResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 291; } /* = unique id SOAP_TYPE__ngwm__removeJunkEntryResponse */
@@ -5324,7 +5324,7 @@ public:
 class SOAP_CMAC _ngwm__removeMembersResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 293; } /* = unique id SOAP_TYPE__ngwm__removeMembersResponse */
@@ -5367,7 +5367,7 @@ public:
 class SOAP_CMAC _ngwm__removeProxyAccessResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 295; } /* = unique id SOAP_TYPE__ngwm__removeProxyAccessResponse */
@@ -5410,7 +5410,7 @@ public:
 class SOAP_CMAC _ngwm__removeProxyUserResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 297; } /* = unique id SOAP_TYPE__ngwm__removeProxyUserResponse */
@@ -5454,7 +5454,7 @@ public:
 class SOAP_CMAC _ngwm__removeSignatureResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 299; } /* = unique id SOAP_TYPE__ngwm__removeSignatureResponse */
@@ -5499,7 +5499,7 @@ class SOAP_CMAC _ngwm__replyResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 301; } /* = unique id SOAP_TYPE__ngwm__replyResponse */
@@ -5545,7 +5545,7 @@ public:
 class SOAP_CMAC _ngwm__retractResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 303; } /* = unique id SOAP_TYPE__ngwm__retractResponse */
@@ -5588,7 +5588,7 @@ class SOAP_CMAC _ngwm__sendItemResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 305; } /* = unique id SOAP_TYPE__ngwm__sendItemResponse */
@@ -5631,7 +5631,7 @@ public:
 class SOAP_CMAC _ngwm__setTimestampResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 307; } /* = unique id SOAP_TYPE__ngwm__setTimestampResponse */
@@ -5676,7 +5676,7 @@ class SOAP_CMAC _ngwm__startFreeBusySessionResponse
 {
 public:
 	int *freeBusySessionId;	/* RPC return element */	/* optional element of type xsd:int */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 309; } /* = unique id SOAP_TYPE__ngwm__startFreeBusySessionResponse */
@@ -5718,7 +5718,7 @@ public:
 class SOAP_CMAC _ngwm__unacceptResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 311; } /* = unique id SOAP_TYPE__ngwm__unacceptResponse */
@@ -5760,7 +5760,7 @@ public:
 class SOAP_CMAC _ngwm__uncompleteResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 313; } /* = unique id SOAP_TYPE__ngwm__uncompleteResponse */
@@ -5806,7 +5806,7 @@ class SOAP_CMAC _ngwm__updateVersionStatusResponse
 {
 public:
 	ngwt__SignatureData *part;	/* RPC return element */	/* optional element of type ngwt:SignatureData */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 315; } /* = unique id SOAP_TYPE__ngwm__updateVersionStatusResponse */
@@ -6038,7 +6038,7 @@ public:
 class SOAP_CMAC _ngwe__cleanEventConfigurationResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 325; } /* = unique id SOAP_TYPE__ngwe__cleanEventConfigurationResponse */
@@ -6080,7 +6080,7 @@ public:
 class SOAP_CMAC _ngwe__configureEventsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 327; } /* = unique id SOAP_TYPE__ngwe__configureEventsResponse */
@@ -6123,7 +6123,7 @@ class SOAP_CMAC _ngwe__getEventConfigurationResponse
 {
 public:
 	ngwe__EventsList *events;	/* RPC return element */	/* optional element of type ngwe:EventsList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 329; } /* = unique id SOAP_TYPE__ngwe__getEventConfigurationResponse */
@@ -6173,7 +6173,7 @@ class SOAP_CMAC _ngwe__getEventsResponse
 {
 public:
 	ngwe__EventList *events;	/* RPC return element */	/* optional element of type ngwe:EventList */
-	ngwt__Status *status;	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 331; } /* = unique id SOAP_TYPE__ngwe__getEventsResponse */
@@ -6216,7 +6216,7 @@ public:
 class SOAP_CMAC _ngwe__removeEventConfigurationResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 333; } /* = unique id SOAP_TYPE__ngwe__removeEventConfigurationResponse */
@@ -6261,7 +6261,7 @@ public:
 class SOAP_CMAC _ngwe__removeEventsResponse
 {
 public:
-	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
+	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 335; } /* = unique id SOAP_TYPE__ngwe__removeEventsResponse */
@@ -6386,25 +6386,25 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__CommenStatus
-#define SOAP_TYPE_ngwt__CommenStatus (40)
-/* Primitive ngwt:CommenStatus schema type: */
-class SOAP_CMAC ngwt__CommenStatus
+#ifndef SOAP_TYPE_ngwt__CommentqStatus
+#define SOAP_TYPE_ngwt__CommentqStatus (40)
+/* Primitive ngwt:CommentqStatus schema type: */
+class SOAP_CMAC ngwt__CommentqStatus
 {
 public:
 	char *__item;
 	std::string *comment;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommenStatus */
+	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommentqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__CommenStatus() { }
-	virtual ~ngwt__CommenStatus() { }
+	         ngwt__CommentqStatus() { }
+	virtual ~ngwt__CommentqStatus() { }
 };
 #endif
 
@@ -6454,45 +6454,45 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__DelegatedStatus
-#define SOAP_TYPE_ngwt__DelegatedStatus (52)
-/* Primitive ngwt:DelegatedStatus schema type: */
-class SOAP_CMAC ngwt__DelegatedStatus
+#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus
+#define SOAP_TYPE_ngwt__DelegatedtqStatus (52)
+/* Primitive ngwt:DelegatedtqStatus schema type: */
+class SOAP_CMAC ngwt__DelegatedtqStatus
 {
 public:
-	ngwt__CommenStatus *__item;
+	ngwt__CommentqStatus *__item;
 	std::string *userid;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedStatus */
+	virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedtqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__DelegatedStatus() { }
-	virtual ~ngwt__DelegatedStatus() { }
+	         ngwt__DelegatedtqStatus() { }
+	virtual ~ngwt__DelegatedtqStatus() { }
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__DelegateeStatus
-#define SOAP_TYPE_ngwt__DelegateeStatus (53)
-/* ngwt:DelegateeStatus */
-class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus
+#ifndef SOAP_TYPE_ngwt__DelegateetqStatus
+#define SOAP_TYPE_ngwt__DelegateetqStatus (53)
+/* ngwt:DelegateetqStatus */
+class SOAP_CMAC ngwt__DelegateetqStatus : public ngwt__RecipientqStatus
 {
 public:
 	std::string *userid;	/* optional attribute */
 public:
-	virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateeStatus */
+	virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateetqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__DelegateeStatus() { }
-	virtual ~ngwt__DelegateeStatus() { }
+	         ngwt__DelegateetqStatus() { }
+	virtual ~ngwt__DelegateetqStatus() { }
 };
 #endif
 
@@ -6545,7 +6545,7 @@ public:
 class SOAP_CMAC ngwt__Folder : public ngwt__Item
 {
 public:
-	std::string parent;	/* required element of type ngwt:uid */
+	std::string tqparent;	/* required element of type ngwt:uid */
 public:
 	std::string *description;	/* optional element of type xsd:string */
 	int *count;	/* optional element of type xsd:int */
@@ -6774,7 +6774,7 @@ class SOAP_CMAC ngwt__Recipient : public ngwt__NameAndEmail
 public:
 	enum ngwt__DistributionType distType;	/* optional element of type ngwt:DistributionType */
 	enum ngwt__RecipientType recipType;	/* optional element of type ngwt:RecipientType */
-	ngwt__RecipienStatus *recipienStatus;	/* optional element of type ngwt:RecipienStatus */
+	ngwt__RecipientqStatus *recipientqStatus;	/* optional element of type ngwt:RecipientqStatus */
 	enum ngwt__AcceptLevel *acceptLevel;	/* optional element of type ngwt:AcceptLevel */
 public:
 	virtual int soap_type() const { return 121; } /* = unique id SOAP_TYPE_ngwt__Recipient */
@@ -6789,23 +6789,23 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__TransferFailedStatus
-#define SOAP_TYPE_ngwt__TransferFailedStatus (154)
-/* ngwt:TransferFailedStatus */
-class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus
+#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus
+#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154)
+/* ngwt:TransferFailedtqStatus */
+class SOAP_CMAC ngwt__TransferFailedtqStatus : public ngwt__RecipientqStatus
 {
 public:
 	std::string *FailureReason;	/* optional attribute */
 public:
-	virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedStatus */
+	virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedtqStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__TransferFailedStatus() { }
-	virtual ~ngwt__TransferFailedStatus() { }
+	         ngwt__TransferFailedtqStatus() { }
+	virtual ~ngwt__TransferFailedtqStatus() { }
 };
 #endif
 
@@ -6886,7 +6886,7 @@ public:
 class SOAP_CMAC ngwt__BoxEntry : public ngwt__ContainerItem
 {
 public:
-	ngwt__ItemStatus *status;	/* optional element of type ngwt:ItemStatus */
+	ngwt__ItemtqStatus *status;	/* optional element of type ngwt:ItemtqStatus */
 	std::string *thread;	/* optional element of type xsd:string */
 	std::string *msgId;	/* optional element of type xsd:string */
 	std::string *messageId;	/* optional element of type xsd:string */
@@ -6989,7 +6989,7 @@ public:
 class SOAP_CMAC ngwt__FolderACLEntry : public ngwt__AccessControlListEntry
 {
 public:
-	enum ngwt__FolderACLStatus *status;	/* optional element of type ngwt:FolderACLStatus */
+	enum ngwt__FolderACLtqStatus *status;	/* optional element of type ngwt:FolderACLtqStatus */
 public:
 	virtual int soap_type() const { return 67; } /* = unique id SOAP_TYPE_ngwt__FolderACLEntry */
 	virtual void soap_default(struct soap*);
@@ -7133,7 +7133,7 @@ public:
 	char *retrievedDate;	/* optional element of type xsd:string */
 	unsigned long versionNumber;	/* required element of type xsd:unsignedLong */
 	std::string *versionDescription;	/* optional element of type xsd:string */
-	enum ngwt__VersionStatus *versionStatus;	/* optional element of type ngwt:VersionStatus */
+	enum ngwt__VersiontqStatus *versiontqStatus;	/* optional element of type ngwt:VersiontqStatus */
 	unsigned long *life;	/* optional element of type xsd:unsignedLong */
 	enum ngwt__AgeAction *ageAction;	/* optional element of type ngwt:AgeAction */
 	unsigned long *fileSize;	/* optional element of type xsd:unsignedLong */
@@ -8257,7 +8257,7 @@ struct __ngw__removeEventsRequest
 /* SOAP Fault Code: */
 struct SOAP_ENV__Code
 {
-	char *SOAP_ENV__Value;	/* optional element of type QName */
+	char *SOAP_ENV__Value;	/* optional element of type TQName */
 	struct SOAP_ENV__Code *SOAP_ENV__Subcode;	/* optional element of type SOAP-ENV:Code */
 };
 #endif
@@ -8278,7 +8278,7 @@ struct SOAP_ENV__Detail
 /* SOAP Fault: */
 struct SOAP_ENV__Fault
 {
-	char *faultcode;	/* optional element of type QName */
+	char *faultcode;	/* optional element of type TQName */
 	char *faultstring;	/* optional element of type xsd:string */
 	char *faultactor;	/* optional element of type xsd:string */
 	struct SOAP_ENV__Detail *detail;	/* optional element of type SOAP-ENV:Detail */
@@ -8308,9 +8308,9 @@ struct SOAP_ENV__Fault
 typedef char *_XML;
 #endif
 
-#ifndef SOAP_TYPE__QName
-#define SOAP_TYPE__QName (5)
-typedef char *_QName;
+#ifndef SOAP_TYPE__TQName
+#define SOAP_TYPE__TQName (5)
+typedef char *_TQName;
 #endif
 
 #ifndef SOAP_TYPE_xsd__date
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 17538768..dd43419b 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -399,7 +399,7 @@ static const struct soap_code_map mime_codes[] =
 { { SOAP_MIME_7BIT,		"7bit" },
   { SOAP_MIME_8BIT,		"8bit" },
   { SOAP_MIME_BINARY,		"binary" },
-  { SOAP_MIME_QUOTED_PRINTABLE, "quoted-printable" },
+  { SOAP_MIME_TQUOTED_PRINTABLE, "quoted-printable" },
   { SOAP_MIME_BASE64,		"base64" },
   { SOAP_MIME_IETF_TOKEN,	"ietf-token" },
   { SOAP_MIME_X_TOKEN,		"x-token" },
@@ -2493,7 +2493,7 @@ soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *key
     soap->rsa = 1;
   }
   soap->randfile = randfile;
-  soap->require_client_auth = (flags & SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION);
+  soap->require_client_auth = (flags & SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION);
   if (!(err = soap->fsslauth(soap)))
     if (sid)
       SSL_CTX_set_session_id_context(soap->ctx, (unsigned char*)sid, strlen(sid));
@@ -2514,7 +2514,7 @@ soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *key
   soap->dhfile = NULL;
   soap->rsa = 0;
   soap->randfile = randfile;
-  soap->require_server_auth = (flags & SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION);
+  soap->require_server_auth = (flags & SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION);
   return soap->fsslauth(soap);
 }
 #endif
@@ -6460,7 +6460,7 @@ soap_attr_value(struct soap *soap, const char *name, int flag)
       return tp->value;
   }
   else if (flag == 1 && (soap->mode & SOAP_XML_STRICT))
-    soap->error = SOAP_REQUIRED;
+    soap->error = SOAP_RETQUIRED;
   return NULL;
 }
 #endif
@@ -7452,7 +7452,7 @@ end:
     return NULL;
   }
   if (flag == 2)
-    if (soap_s2QName(soap, t, &t))
+    if (soap_s2TQName(soap, t, &t))
       return NULL;
   if (soap->peeked && *soap->tag)
   { soap->peeked = 0;
@@ -8641,7 +8641,7 @@ soap_s2string(struct soap *soap, const char *s, char **t)
 SOAP_FMAC1
 int
 SOAP_FMAC2
-soap_s2QName(struct soap *soap, const char *s, char **t)
+soap_s2TQName(struct soap *soap, const char *s, char **t)
 { if (s)
   { struct soap_nlist *np;
     const char *p;
@@ -8692,7 +8692,7 @@ soap_s2QName(struct soap *soap, const char *s, char **t)
 SOAP_FMAC1
 const char*
 SOAP_FMAC2
-soap_QName2s(struct soap *soap, const char *s)
+soap_TQName2s(struct soap *soap, const char *s)
 { struct Namespace *p;
   char *t;
   int n;
@@ -11951,7 +11951,7 @@ http_response(struct soap *soap, int status, size_t count)
       if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
         return err;
     }
-    else if ((err = soap->fposthdr(soap, "Status", "200 OK")))
+    else if ((err = soap->fposthdr(soap, "tqStatus", "200 OK")))
       return err;
   }
   else if (status > 200 && status < 600)
@@ -11986,7 +11986,7 @@ http_response(struct soap *soap, int status, size_t count)
       if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
         return err;
     }
-    else if ((err = soap->fposthdr(soap, "Status", s)))
+    else if ((err = soap->fposthdr(soap, "tqStatus", s)))
       return err;
   }
   if ((err = soap->fposthdr(soap, "Server", "gSOAP/2.7"))
@@ -12185,7 +12185,7 @@ soap_set_fault(struct soap *soap)
       *s = "Zlib/gzip not installed for (de)compression: recompile with -DWITH_GZIP";
 #endif
       break;
-    case SOAP_REQUIRED:
+    case SOAP_RETQUIRED:
       *s = soap_set_validation_fault(soap, "missing required attribute", NULL);
       break;
     case SOAP_PROHIBITED:
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index fb801fb8..3a337402 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -380,8 +380,8 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 # endif
 #endif
 
-/* QNX does not have a working version of strtof */
-#if defined(__QNX__) || defined(QNX)
+/* TQNX does not have a working version of strtof */
+#if defined(__TQNX__) || defined(TQNX)
 # undef HAVE_STRTOF
 #endif
 
@@ -547,7 +547,7 @@ extern "C" {
 /* Portability: define SOAP_SOCKLEN_T */
 #if defined(SOCKLEN_T)
 # define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
 # define SOAP_SOCKLEN_T socklen_t
 #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS)
 # define SOAP_SOCKLEN_T int
@@ -849,12 +849,12 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 #define SOAP_VERSIONMISMATCH		32
 #define SOAP_PLUGIN_ERROR		33
 #define SOAP_DATAENCODINGUNKNOWN	34
-#define SOAP_REQUIRED			35
+#define SOAP_RETQUIRED			35
 #define SOAP_PROHIBITED			36
 #define SOAP_OCCURS			37
 #define SOAP_LENGTH			38
 
-#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_REQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF)
+#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_RETQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF)
 #define soap_soap_error_check(e) ((e) == SOAP_CLI_FAULT || (e) == SOAP_SVR_FAULT || (e) == SOAP_VERSIONMISMATCH || (e) == SOAP_MUSTUNDERSTAND || (e) == SOAP_FAULT || (e) == SOAP_NO_METHOD)
 #define soap_tcp_error_check(e) ((e) == SOAP_EOF || (e) == SOAP_TCP_ERROR)
 #define soap_ssl_error_check(e) ((e) == SOAP_SSL_ERROR)
@@ -936,10 +936,10 @@ typedef soap_int32 soap_mode;
 /* SSL client/server authentication settings */
 
 #define SOAP_SSL_NO_AUTHENTICATION		0x00	/* for testing purposes */
-#define SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION	0x01	/* client requires server to authenticate */
-#define SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION	0x02	/* server requires client to authenticate */
+#define SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION	0x01	/* client requires server to authenticate */
+#define SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION	0x02	/* server requires client to authenticate */
 
-#define SOAP_SSL_DEFAULT			SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION
+#define SOAP_SSL_DEFAULT			SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION
 
 /* */
 
@@ -1157,7 +1157,7 @@ enum soap_mime_encoding
   SOAP_MIME_7BIT,
   SOAP_MIME_8BIT,
   SOAP_MIME_BINARY,
-  SOAP_MIME_QUOTED_PRINTABLE,
+  SOAP_MIME_TQUOTED_PRINTABLE,
   SOAP_MIME_BASE64,
   SOAP_MIME_IETF_TOKEN,
   SOAP_MIME_X_TOKEN
@@ -1236,7 +1236,7 @@ class soap_dom_iterator
 #ifndef WITH_LEANER
 struct soap_dom_element
 { struct soap_dom_element *next;	/* next sibling */
-  struct soap_dom_element *prnt;	/* parent */
+  struct soap_dom_element *prnt;	/* tqparent */
   struct soap_dom_element *elts;	/* first child element */
   struct soap_dom_attribute *atts;	/* first child attribute */
   const char *nstr;			/* namespace string */
@@ -1257,8 +1257,8 @@ struct soap_dom_element
   struct soap_dom_element &add(struct soap_dom_attribute&);
   soap_dom_iterator begin();
   soap_dom_iterator end();
-  soap_dom_iterator find(const char *nstr, const char *name);
-  soap_dom_iterator find(int type);
+  soap_dom_iterator tqfind(const char *nstr, const char *name);
+  soap_dom_iterator tqfind(int type);
   void unlink();
   soap_dom_element();
   soap_dom_element(struct soap *soap);
@@ -1294,7 +1294,7 @@ struct soap
   int send_timeout;		/* when > 0, gives socket send timeout in seconds, < 0 in usec */
   int connect_timeout;		/* when > 0, gives socket connect() timeout in seconds, < 0 in usec */
   int accept_timeout;		/* when > 0, gives socket accept() timeout in seconds, < 0 in usec */
-  int socket_flags;		/* socket recv() and send() flags, e.g. set to MSG_NOQT_SIGNAL to disable sigpipe */
+  int socket_flags;		/* socket recv() and send() flags, e.g. set to MSG_NOTQT_SIGNAL to disable sigpipe */
   int connect_flags;		/* connect() SOL_SOCKET sockopt flags, e.g. set to SO_DEBUG to debug socket */
   int bind_flags;		/* bind() SOL_SOCKET sockopt flags, e.g. set to SO_REUSEADDR to enable reuse */
   int accept_flags;		/* accept() SOL_SOCKET sockopt flags */
@@ -1822,7 +1822,7 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_s2unsignedInt(struct soap*, const char*, unsigned
 SOAP_FMAC1 int SOAP_FMAC2 soap_s2unsignedLong(struct soap*, const char*, unsigned long*);
 SOAP_FMAC1 int SOAP_FMAC2 soap_s2ULONG64(struct soap*, const char*, ULONG64*);
 SOAP_FMAC1 int SOAP_FMAC2 soap_s2string(struct soap*, const char*, char**);
-SOAP_FMAC1 int SOAP_FMAC2 soap_s2QName(struct soap*, const char*, char**);
+SOAP_FMAC1 int SOAP_FMAC2 soap_s2TQName(struct soap*, const char*, char**);
 
 #ifndef WITH_LEAN
 SOAP_FMAC1 int SOAP_FMAC2 soap_s2dateTime(struct soap*, const char*, time_t*);
@@ -1842,7 +1842,7 @@ SOAP_FMAC1 const char* SOAP_FMAC2 soap_unsignedShort2s(struct soap*, unsigned sh
 SOAP_FMAC1 const char* SOAP_FMAC2 soap_unsignedInt2s(struct soap*, unsigned int);
 SOAP_FMAC1 const char* SOAP_FMAC2 soap_unsignedLong2s(struct soap*, unsigned long);
 SOAP_FMAC1 const char* SOAP_FMAC2 soap_ULONG642s(struct soap*, ULONG64);
-SOAP_FMAC1 const char* SOAP_FMAC2 soap_QName2s(struct soap*, const char*);
+SOAP_FMAC1 const char* SOAP_FMAC2 soap_TQName2s(struct soap*, const char*);
 
 #ifndef WITH_LEAN
 SOAP_FMAC1 const char* SOAP_FMAC2 soap_dateTime2s(struct soap*, time_t);
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index e3032d11..474eafa3 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
   return mAnniversary;
 }
 
-void Contact::setChildren( const TQString& children )
+void Contact::setChildren( const TQString& tqchildren )
 {
-  mChildren = children;
+  mChildren = tqchildren;
 }
 
-TQString Contact::children() const
+TQString Contact::tqchildren() const
 {
   return mChildren;
 }
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
     }
     break;
   case 'c':
-    if ( tagName == "children" ) {
+    if ( tagName == "tqchildren" ) {
       setChildren( element.text() );
       return true;
     }
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
       writeString( element, "x-logo", mLogoAttachmentName );
     if ( !sound().isNull() )
       writeString( element, "x-sound", mSoundAttachmentName );
-    writeString( element, "children", children() );
+    writeString( element, "tqchildren", tqchildren() );
     writeString( element, "gender", gender() );
     writeString( element, "language", language() );
     savePhoneAttributes( element );
@@ -1115,12 +1115,12 @@ void Contact::setFields( const KABC::Addressee* addressee )
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
     // The format is "app-name:value".
-    int pos = (*it).find( '-' );
+    int pos = (*it).tqfind( '-' );
     if ( pos == -1 ) continue;
     TQString app = (*it).left( pos );
     if ( app == "KOLAB" ) continue;
     TQString name = (*it).mid( pos + 1 );
-    pos = name.find( ':' );
+    pos = name.tqfind( ':' );
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   // mailer, timezone, productId, sortString, agent, rfc2426 name()
 
   // Things KAddressBook can't handle, so they are saved as unhandled tags:
-  // initials, children, gender, language
+  // initials, tqchildren, gender, language
 }
 
 // The loading is: xml -> Contact -> addressee, this is the second part
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 66a7c418..60c39933 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -154,8 +154,8 @@ public:
   TQString soundAttachmentName() const { return mSoundAttachmentName; }
   TQByteArray sound() const { return mSound; }
 
-  void setChildren( const TQString& children );
-  TQString children() const;
+  void setChildren( const TQString& tqchildren );
+  TQString tqchildren() const;
 
   void setGender( const TQString& gender );
   TQString gender() const;
diff --git a/kresources/kolab/kabc/kolab.desktop b/kresources/kolab/kabc/kolab.desktop
index 8339f9c2..c0c9c80d 100644
--- a/kresources/kolab/kabc/kolab.desktop
+++ b/kresources/kolab/kabc/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Książka adresowa na serwerze IMAP za pośrednictwem KMail
 Name[pt]=Livro de Endereços em Servidor IMAP via KMail
 Name[pt_BR]=Livro de Endereços em servidor IMAP via KMail
 Name[ru]=�дре�на� книга на �ервере IMAP через KMail
-Name[sk]=Adresár na IMAP-serveri pomocou KMail
+Name[sk]=Adresár na IMAP-serveri potqmocou KMail
 Name[sl]=Adresar na strežniku IMAP preko KMaila
 Name[sr]=�дре�ар на IMAP �ерверу преко KMail-а
 Name[sr@Latn]=Adresar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index e9c481bf..0acabb09 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -79,7 +79,7 @@ static const char* s_inlineMimeType = "text/x-vcard";
 KABC::ResourceKolab::ResourceKolab( const KConfig *config )
   : KPIM::ResourceABC( config ),
     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
-    mCachedSubresource( TQString::null ), mCachedSubresourceNotFound( false ), mLocked( false )
+    mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
 {
   setType( "imap" );
   if ( !config ) {
@@ -144,7 +144,7 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
 void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 {
   mLocked = false;
-  mCachedSubresource = TQString::null;
+  mCachedSubresource = TQString();
   mCachedSubresourceNotFound = false;
   delete ticket;
 }
@@ -185,7 +185,7 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
 bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
 {
   int count = 0;
-  if ( !kmailIncidencesCount( count, TQString::null, subResource ) ) {
+  if ( !kmailIncidencesCount( count, TQString(), subResource ) ) {
     kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
     return false;
   }
@@ -335,7 +335,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.find( uid ) != mUidMap.end() ) {
+  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -398,7 +398,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.find(addr.uid()), which would give the same :-(
+    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -431,7 +431,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
 void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -494,7 +494,7 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -633,7 +633,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
   }
 
   kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
-  return TQString::null;
+  return TQString();
 }
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
 
 
 /*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
 {
-  return kmailAddSubresource( label, parent, s_kmailContentsType );
+  return kmailAddSubresource( label, tqparent, s_kmailContentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 2288bf25..a3c8a9c3 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -53,6 +53,7 @@ class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
                      public Kolab::ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index c4f1b333..db69b896 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index f8309053..fedeca0c 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,7 +51,7 @@ KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::R
 
 TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz  )
 {
-  Event event( 0, TQString::null, 0, tz, kcalEvent );
+  Event event( 0, TQString(), 0, tz, kcalEvent );
   return event.saveXML();
 }
 
@@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingStatus == AllDay )
+  if ( mFloatingtqStatus == AllDay )
     kdDebug() << "ERROR: Time on end date but no time on the event\n";
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Event::setEndDate( const TQDate& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     kdDebug() << "ERROR: No time on end date but time on the event\n";
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 void Event::setEndDate( const TQString& endDate )
@@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const
   else
     writeString( element, "show-time-as", "busy" );
   if ( mHasEndDate ) {
-    if ( mFloatingStatus == HasTime )
+    if ( mFloatingtqStatus == HasTime )
       writeString( element, "end-date", dateTimeToString( endDate() ) );
     else
       writeString( element, "end-date", dateToString( endDate().date() ) );
@@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event )
   if ( event->hasEndDate() || event->hasDuration() ) {
     if ( event->doesFloat() ) {
       // This is a floating event. Don't timezone move this one
-      mFloatingStatus = AllDay;
+      mFloatingtqStatus = AllDay;
       setEndDate( event->dtEnd().date() );
     } else {
-      mFloatingStatus = HasTime;
+      mFloatingtqStatus = HasTime;
       setEndDate( localToUTC( event->dtEnd() ) );
     }
   } else {
@@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event )
 
   event->setHasEndDate( mHasEndDate );
   if ( mHasEndDate ) {
-    if ( mFloatingStatus == AllDay )
+    if ( mFloatingtqStatus == AllDay )
       // This is a floating event. Don't timezone move this one
       event->setDtEnd( endDate() );
     else
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index d9f1069a..57aa3358 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,7 +54,7 @@ public:
   /// Use this to parse an xml string to a event entry
   /// The caller is responsible for deleting the returned event
   static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
-                                  const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
+                                  const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this event entry
   static TQString eventToXML( KCal::Event*, const TQString& tz );
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 060b9b93..0d99780a 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,7 +51,7 @@ using namespace Kolab;
 
 Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
-  : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
+  : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
     mSubResource( subResource ),
     mSernum( sernum )
@@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const
 void Incidence::setStartDate( const TQDateTime& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingStatus == AllDay )
+  if ( mFloatingtqStatus == AllDay )
     kdDebug() << "ERROR: Time on start date but no time on the event\n";
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Incidence::setStartDate( const TQDate& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     kdDebug() << "ERROR: No time on start date but time on the event\n";
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 void Incidence::setStartDate( const TQString& startDate )
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
       TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it tqcontains commas or other quotable chars.
+        // Quote the text in case it contains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   // Save the base class elements
   KolabBase::saveAttributes( element );
 
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     writeString( element, "start-date", dateTimeToString( startDate() ) );
   else
     writeString( element, "start-date", dateToString( startDate().date() ) );
@@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element )
   mCustomList.append( custom );
 }
 
-static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s )
+static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s )
 {
   if ( s == "none" )
     return KCal::Attendee::NeedsAction;
@@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence )
 
   if ( incidence->doesFloat() ) {
     // This is a floating event. Don't timezone move this one
-    mFloatingStatus = AllDay;
+    mFloatingtqStatus = AllDay;
     setStartDate( incidence->dtStart().date() );
   } else {
-    mFloatingStatus = HasTime;
+    mFloatingtqStatus = HasTime;
     setStartDate( localToUTC( incidence->dtStart() ) );
   }
 
@@ -844,7 +844,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
   // Handle the scheduling ID
   if ( incidence->schedulingID() == incidence->uid() ) {
     // There is no scheduling ID
-    setInternalUID( TQString::null );
+    setInternalUID( TQString() );
   } else {
     // We've internally been using a different uid, so save that as the
     // temporary (internal) uid and restore the original uid, the one that
@@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
   if ( incidence->pilotId() != 0 )
     setPilotSyncId( incidence->pilotId() );
 
-  setPilotSyncStatus( incidence->syncStatus() );
+  setPilotSynctqStatus( incidence->synctqStatus() );
 
   // Unhandled tags and other custom properties (see libkcal/customproperties.h)
   const TQMap<TQCString, TQString> map = incidence->customProperties();
@@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 {
   KolabBase::saveTo( incidence );
 
-  if ( mFloatingStatus == AllDay ) {
+  if ( mFloatingtqStatus == AllDay ) {
     // This is a floating event. Don't timezone move this one
     incidence->setDtStart( startDate() );
     incidence->setFloats( true );
@@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   incidence->clearAttendees();
   TQValueList<Attendee>::ConstIterator it;
   for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) {
-    KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status );
+    KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status );
     KCal::Attendee::Role role = attendeeStringToRole( (*it).role );
     KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName,
                                                    (*it).smtpAddress,
@@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   }
   if ( hasPilotSyncId() )
     incidence->setPilotId( pilotSyncId() );
-  if ( hasPilotSyncStatus() )
-    incidence->setSyncStatus( pilotSyncStatus() );
+  if ( hasPilotSynctqStatus() )
+    incidence->setSynctqStatus( pilotSynctqStatus() );
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) {
     incidence->setNonKDECustomProperty( (*it).key, (*it).value );
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index b3de2f91..e5df2382 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -123,7 +123,7 @@ public:
   virtual bool saveAttributes( TQDomElement& ) const;
 
 protected:
-  enum FloatingStatus { Unset, AllDay, HasTime };
+  enum FloatingtqStatus { Unset, AllDay, HasTime };
 
   // Read all known fields from this ical incidence
   void setFields( const KCal::Incidence* );
@@ -150,7 +150,7 @@ protected:
   TQString mLocation;
   Email mOrganizer;
   TQDateTime mStartDate;
-  FloatingStatus mFloatingStatus;
+  FloatingtqStatus mFloatingtqStatus;
   float mAlarm;
   bool mHasAlarm;
   Recurrence mRecurrence;
diff --git a/kresources/kolab/kcal/journal.cpp b/kresources/kolab/kcal/journal.cpp
index 462cfe3c..4957927a 100644
--- a/kresources/kolab/kcal/journal.cpp
+++ b/kresources/kolab/kcal/journal.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/journal.h b/kresources/kolab/kcal/journal.h
index 57d614cc..cd583c6c 100644
--- a/kresources/kolab/kcal/journal.h
+++ b/kresources/kolab/kcal/journal.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/kolab.desktop b/kresources/kolab/kcal/kolab.desktop
index c0a7daa5..21b412ed 100644
--- a/kresources/kolab/kcal/kolab.desktop
+++ b/kresources/kolab/kcal/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Kalendarz na serwerze IMAP za pośrednictwem KMail
 Name[pt]=Calendário em Servidor IMAP via KMail
 Name[pt_BR]=Calendário em Servidor IMAP via KMail
 Name[ru]=Календарь на �ервере IMAP через KMail
-Name[sk]=Kalendár na IMAP serveri pomocou KMail
+Name[sk]=Kalendár na IMAP serveri potqmocou KMail
 Name[sl]=Koledar na strežniku IMAP preko KMaila
 Name[sr]=Календар на IMAP �ерверу преко KMail-а
 Name[sr@Latn]=Kalendar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 5bbae761..59f6a355 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -285,7 +285,7 @@ void ResourceKolab::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -726,7 +726,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
@@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
   while ( it != alarms.end() ) {
     KCal::Alarm *a = (*it);
     ++it;
-    const TQString &uid = a->parent()->uid();
+    const TQString &uid = a->tqparent()->uid();
      if ( mUidMap.tqcontains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
@@ -1009,15 +1009,15 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
-    mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
+  if ( mUidsPendingDeletion.tqfind( uid ) != mUidsPendingDeletion.end() ) {
+    mUidsPendingDeletion.remove( mUidsPendingDeletion.tqfind( uid ) );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
-    QPair<TQString, TQString> p( uid, subResource );
+    TQPair<TQString, TQString> p( uid, subResource );
     if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
@@ -1119,7 +1119,7 @@ TQStringList ResourceKolab::subresources() const
          + mJournalSubResources.keys() );
 }
 
-const QString
+const TQString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
   if ( mEventSubResources.tqcontains( subresource ) )
@@ -1231,22 +1231,22 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType
 
 
 /*virtual*/
-bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent )
 {
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
-   if ( !parent.isEmpty() ) {
-     if ( mEventSubResources.tqcontains( parent ) )
+   if ( !tqparent.isEmpty() ) {
+     if ( mEventSubResources.tqcontains( tqparent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.tqcontains( parent ) )
+     else if ( mTodoSubResources.tqcontains( tqparent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.tqcontains( parent ) )
+     else if ( mJournalSubResources.tqcontains( tqparent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
      contentTypeChoices << i18n("Calendar") << i18n("Tasks") << i18n("Journals");
      const TQString caption = i18n("Which kind of subresource should this be?");
-     const TQString choice = KInputDialog::getItem( caption, TQString::null, contentTypeChoices );
+     const TQString choice = KInputDialog::getItem( caption, TQString(), contentTypeChoices );
      if ( choice == contentTypeChoices[0] )
        contentsType = kmailCalendarContentsType;
      else if ( choice == contentTypeChoices[1] )
@@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
        contentsType = kmailJournalContentsType;
    }
 
-   return kmailAddSubresource( resource, parent, contentsType );
+   return kmailAddSubresource( resource, tqparent, contentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index fd4c3b57..1535403a 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,6 +52,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
                       public Kolab::ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
     friend struct TemporarySilencer;
 
 public:
@@ -139,7 +140,7 @@ public:
 
   virtual TQString subresourceIdentifier( Incidence *incidence );
 
-  virtual bool addSubresource( const TQString& resource, const TQString& parent );
+  virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
   virtual bool removeSubresource( const TQString& resource );
 
   virtual TQString subresourceType( const TQString &resource );
@@ -223,11 +224,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map tqcontains the association between a new added incidence
+    This map contains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
+    We can't trust on mUidMap here, because it contains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
@@ -245,7 +246,7 @@ private:
    *
    * The key is originalUID,subResource and the value is the fake UID.
    */
-  TQMap< QPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
+  TQMap< TQPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
 
   bool mBatchAddingInProgress;
   TQMap<Kolab::ResourceType,TQString> mLastUsedResources;
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index 14d09465..151fa9f3 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 33cc50ee..872e9b4a 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -86,7 +86,7 @@ KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::Reso
 
 TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
 {
-  Task task( 0, TQString::null, 0, tz, todo );
+  Task task( 0, TQString(), 0, tz, todo );
   return task.saveXML();
 }
 
@@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
-    mStatus( KCal::Incidence::StatusNone ),
+    mtqStatus( KCal::Incidence::StatusNone ),
     mHasStartDate( false ), mHasDueDate( false ),
     mHasCompletedDate( false )
 {
@@ -126,22 +126,22 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setqStatus( KCal::Incidence::tqStatus status )
 {
-  mStatus = status;
+  mtqStatus = status;
 }
 
-KCal::Incidence::Status Task::status() const
+KCal::Incidence::tqStatus Task::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
-void Task::setParent( const TQString& parentUid )
+void Task::setParent( const TQString& tqparentUid )
 {
-  mParent = parentUid;
+  mParent = tqparentUid;
 }
 
-TQString Task::parent() const
+TQString Task::tqparent() const
 {
   return mParent;
 }
@@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Task::setDueDate( const TQDate &date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 
@@ -234,20 +234,20 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      seStatus( KCal::Incidence::StatusInProcess );
+      setqStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      seStatus( KCal::Incidence::StatusCompleted );
+      setqStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      seStatus( KCal::Incidence::StatusNeedsAction );
+      setqStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      seStatus( KCal::Incidence::StatusCanceled );
+      setqStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      seStatus( KCal::Incidence::StatusNone );
+      setqStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
-  } else if ( tagName == "parent" ) {
+  } else if ( tagName == "tqparent" ) {
     setParent( element.text() );
   } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
@@ -300,15 +300,15 @@ bool Task::saveAttributes( TQDomElement& element ) const
   }
 
   if ( hasDueDate() ) {
-    if ( mFloatingStatus == HasTime ) {
+    if ( mFloatingtqStatus == HasTime ) {
       writeString( element, "due-date", dateTimeToString( dueDate() ) );
     } else {
       writeString( element, "due-date", dateToString( dueDate().date() ) );
     }
   }
 
-  if ( !parent().isNull() ) {
-    writeString( element, "parent", parent() );
+  if ( !tqparent().isNull() ) {
+    writeString( element, "tqparent", tqparent() );
   }
 
   if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  seStatus( task->status() );
+  setqStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
     setDueDate( localToUTC( task->dtDue() ) );
     if ( task->doesFloat() ) {
       // This is a floating task. Don't timezone move this one
-      mFloatingStatus = AllDay;
+      mFloatingtqStatus = AllDay;
       setDueDate( task->dtDue().date() );
     } else {
-      mFloatingStatus = HasTime;
+      mFloatingtqStatus = HasTime;
       setDueDate( localToUTC( task->dtDue() ) );
     }
   } else {
@@ -396,7 +396,7 @@ void Task::setFields( const KCal::Todo* task )
   } else if ( !task->relatedToUid().isEmpty() ) {
     setParent( task->relatedToUid( ) );
   } else {
-    setParent( TQString::null );
+    setParent( TQString() );
   }
 
   if ( task->hasCompletedDate() && task->percentComplete() == 100 ) {
@@ -447,14 +447,14 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->seStatus( status() );
+  task->setqStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
     task->setDtDue( utcToLocal( dueDate() ) );
 
-  if ( !parent().isNull() )
-    task->setRelatedToUid( parent() );
+  if ( !tqparent().isNull() )
+    task->setRelatedToUid( tqparent() );
 
   if ( hasCompletedDate() && task->percentComplete() == 100 )
     task->setCompleted( utcToLocal( mCompletedDate ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 6fe318e2..624605a2 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -58,7 +58,7 @@ public:
   /// Use this to parse an xml string to a task entry
   /// The caller is responsible for deleting the returned task
   static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
-                                const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
+                                const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this task entry
   static TQString taskToXML( KCal::Todo*, const TQString& tz );
@@ -77,11 +77,11 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void seStatus( KCal::Incidence::Status status );
-  virtual KCal::Incidence::Status status() const;
+  virtual void setqStatus( KCal::Incidence::tqStatus status );
+  virtual KCal::Incidence::tqStatus status() const;
 
-  virtual void setParent( const TQString& parentUid );
-  virtual TQString parent() const;
+  virtual void setParent( const TQString& tqparentUid );
+  virtual TQString tqparent() const;
 
   virtual void setHasStartDate( bool );
   virtual bool hasStartDate() const;
@@ -126,7 +126,7 @@ protected:
   int mKCalPriorityFromDom;
 
   int mPercentCompleted;
-  KCal::Incidence::Status mStatus;
+  KCal::Incidence::tqStatus mtqStatus;
   TQString mParent;
 
   bool mHasStartDate;
diff --git a/kresources/kolab/knotes/kolabresource.desktop b/kresources/kolab/knotes/kolabresource.desktop
index 317032d1..5a53529d 100644
--- a/kresources/kolab/knotes/kolabresource.desktop
+++ b/kresources/kolab/knotes/kolabresource.desktop
@@ -35,7 +35,7 @@ Name[pl]=Serwer IMAP za pośrednictwem KMail
 Name[pt]=Servidor IMAP via KMail
 Name[pt_BR]=Servidor IMAP via KMail
 Name[ru]=До�туп к �ерверу IMAP через KMail
-Name[sk]=IMAP-server pomocou KMail
+Name[sk]=IMAP-server potqmocou KMail
 Name[sl]=Strežnik IMAP preko KMaila
 Name[sr]=IMAP �ервер преко KMail-а
 Name[sr@Latn]=IMAP server preko KMail-a
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index 168dae56..e456e43b 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/knotes/note.h b/kresources/kolab/knotes/note.h
index 11f4749e..d61a2009 100644
--- a/kresources/kolab/knotes/note.h
+++ b/kresources/kolab/knotes/note.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index 38f67087..cf386218 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -160,7 +160,7 @@ bool ResourceKolab::save()
 
 bool ResourceKolab::addNote( KCal::Journal* journal )
 {
-  return addNote( journal, TQString::null, 0 );
+  return addNote( journal, TQString(), 0 );
 }
 
 KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index cfeeb0eb..3b61d6ec 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,6 +54,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
                       public ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceKolab( const KConfig* );
diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp
index 77218498..fa187d2b 100644
--- a/kresources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 5b2921b9..d9ffd98d 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -82,7 +82,7 @@ bool KMailConnection::connectToKMail()
       // someone, probably ourselves, already offers the interface, if not stop here
       const QCStringList services = kapp->dcopClient()->registeredApplications();
       for ( uint i = 0; i < services.count(); ++i ) {
-        if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
+        if ( services[i].tqfind( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
         if ( objs.tqcontains( dcopObjectId ) ) {
@@ -97,8 +97,8 @@ bool KMailConnection::connectToKMail()
     } else {
       TQString error;
       int result = KDCOPServiceStarter::self()->
-        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                        TQString::null, &error, &dcopService );
+        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                        TQString(), &error, &dcopService );
       if ( result != 0 ) {
         kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
         // TODO: You might want to show "error" (if not empty) here,
@@ -295,11 +295,11 @@ bool KMailConnection::kmailUpdate( const TQString& resource,
 }
 
 bool KMailConnection::kmailAddSubresource( const TQString& resource,
-                                           const TQString& parent,
+                                           const TQString& tqparent,
                                            const TQString& contentsType )
 {
   return connectToKMail()
-      && mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType )
+      && mKMailIcalIfaceStub->addSubresource( resource, tqparent, contentsType )
       && mKMailIcalIfaceStub->ok();
 }
 
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 3cf5b826..b7befb4d 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,6 +50,7 @@ class ResourceKolabBase;
 */
 class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
@@ -107,7 +108,7 @@ public:
 
   bool kmailTriggerSync( const TQString& contentsType );
   bool kmailAddSubresource( const TQString& resource,
-                            const TQString& parent,
+                            const TQString& tqparent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index 97848107..cb04d12b 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,7 +47,7 @@ KolabBase::KolabBase( const TQString& tz )
   : mCreationDate( TQDateTime::tqcurrentDateTime() ),
     mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
-    mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
+    mHasPilotSyncId( false ),  mHasPilotSynctqStatus( false )
 {
 }
 
@@ -58,7 +58,7 @@ KolabBase::~KolabBase()
 void KolabBase::setFields( const KCal::Incidence* incidence )
 {
   // So far unhandled KCal::IncidenceBase fields:
-  // mPilotID, mSyncStatus, mFloats
+  // mPilotID, mSynctqStatus, mFloats
 
   setUid( incidence->uid() );
   setBody( incidence->description() );
@@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const
   return mPilotSyncId;
 }
 
-void KolabBase::setPilotSyncStatus( int status )
+void KolabBase::setPilotSynctqStatus( int status )
 {
-  mHasPilotSyncStatus = true;
-  mPilotSyncStatus = status;
+  mHasPilotSynctqStatus = true;
+  mPilotSynctqStatus = status;
 }
 
-bool KolabBase::hasPilotSyncStatus() const
+bool KolabBase::hasPilotSynctqStatus() const
 {
-  return mHasPilotSyncStatus;
+  return mHasPilotSynctqStatus;
 }
 
-int KolabBase::pilotSyncStatus() const
+int KolabBase::pilotSynctqStatus() const
 {
-  return mPilotSyncStatus;
+  return mPilotSynctqStatus;
 }
 
 bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -259,7 +259,7 @@ bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
       const TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it tqcontains commas or other quotable chars.
+        // Quote the text in case it contains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element )
       return true;
     }
     if ( tagName == "pilot-sync-status" ) {
-      setPilotSyncStatus( element.text().toInt() );
+      setPilotSynctqStatus( element.text().toInt() );
       return true;
     }
     break;
@@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
     writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
-  if ( hasPilotSyncStatus() )
-    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
+  if ( hasPilotSynctqStatus() )
+    writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
   return true;
 }
 
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
 
 TQString KolabBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( Qt::ISODate ) + 'Z';
+  return time.toString( TQt::ISODate ) + 'Z';
 }
 
 TQString KolabBase::dateToString( const TQDate& date )
 {
-  return date.toString( Qt::ISODate );
+  return date.toString( TQt::ISODate );
 }
 
 TQDateTime KolabBase::stringToDateTime( const TQString& _date )
@@ -426,12 +426,12 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date )
   //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found.
   else if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, Qt::ISODate );
+  return TQDateTime::fromString( date, TQt::ISODate );
 }
 
 TQDate KolabBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, Qt::ISODate );
+  return TQDate::fromString( date, TQt::ISODate );
 }
 
 TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index ba6a1c85..d4621c72 100644
--- a/kresources/kolab/shared/kolabbase.h
+++ b/kresources/kolab/shared/kolabbase.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,8 +54,8 @@ class KolabBase {
 public:
   struct Email {
   public:
-    Email( const TQString& name = TQString::null,
-           const TQString& email = TQString::null )
+    Email( const TQString& name = TQString(),
+           const TQString& email = TQString() )
       : displayName( name ), smtpAddress( email )
     {
     }
@@ -66,7 +66,7 @@ public:
 
   enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
 
-  explicit KolabBase( const TQString& timezone = TQString::null );
+  explicit KolabBase( const TQString& timezone = TQString() );
   virtual ~KolabBase();
 
   // Return a string identifying this type
@@ -94,9 +94,9 @@ public:
   virtual bool hasPilotSyncId() const;
   virtual unsigned long pilotSyncId() const;
 
-  virtual void setPilotSyncStatus( int status );
-  virtual bool hasPilotSyncStatus() const;
-  virtual int pilotSyncStatus() const;
+  virtual void setPilotSynctqStatus( int status );
+  virtual bool hasPilotSynctqStatus() const;
+  virtual int pilotSynctqStatus() const;
 
   // String - Date conversion methods
   static TQString dateTimeToString( const TQDateTime& time );
@@ -116,7 +116,7 @@ public:
   bool load( const TQString& xml );
   bool load( TQFile& xml );
 
-  // Load this QDomDocument
+  // Load this TQDomDocument
   virtual bool loadXML( const TQDomDocument& xml ) = 0;
 
   // Serialize this object to an XML string
@@ -167,9 +167,9 @@ protected:
   TQString mTimeZoneId;
 
   // KPilot synchronization stuff
-  bool mHasPilotSyncId,  mHasPilotSyncStatus;
+  bool mHasPilotSyncId,  mHasPilotSynctqStatus;
   unsigned long mPilotSyncId;
-  int mPilotSyncStatus;
+  int mPilotSynctqStatus;
 };
 
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 26ef00db..cf81f451 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -199,10 +199,10 @@ bool ResourceKolabBase::connectToKMail() const
 }
 
 bool ResourceKolabBase::kmailAddSubresource( const TQString& resource,
-                                             const TQString& parent,
+                                             const TQString& tqparent,
                                              const TQString& contentsType )
 {
-  return mConnection->kmailAddSubresource( resource, parent, contentsType );
+  return mConnection->kmailAddSubresource( resource, tqparent, contentsType );
 }
 
 bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource )
@@ -257,7 +257,7 @@ TQString ResourceKolabBase::findWritableResource( const ResourceType &type,
 
     KMessageBox::error( 0, errorText );
     mErrorCode = NoWritableFound;
-    return TQString::null;
+    return TQString();
   }
   if ( possible.count() == 1 )
     // Just one found
@@ -274,7 +274,7 @@ TQString ResourceKolabBase::findWritableResource( const ResourceType &type,
   if ( chosenLabel.isEmpty() ) {
     // cancelled
     mErrorCode = UserCancel;
-    return TQString::null;
+    return TQString();
   }
   return possible[chosenLabel];
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 565be267..d16f2a57 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -162,7 +162,7 @@ protected:
                     const TQStringList& attachmentNames = TQStringList(),
                     const TQStringList& deletedAttachments = TQStringList() );
 
-  bool kmailAddSubresource( const TQString& resource, const TQString& parent,
+  bool kmailAddSubresource( const TQString& resource, const TQString& tqparent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
@@ -172,7 +172,7 @@ protected:
   /// If only one of these is writable, return that. Otherwise return null.
   TQString findWritableResource( const ResourceType &type,
                                 const ResourceMap& resources,
-                                const TQString& text = TQString::null );
+                                const TQString& text = TQString() );
 
   enum ErrorCode {
     NoError,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index a7ffb8f9..7520d275 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index de7a92e9..79104a74 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,7 +45,7 @@ namespace Kolab {
  */
 class SubResource {
 public:
-  // This is just for QMap
+  // This is just for TQMap
   SubResource() {}
 
   SubResource( bool active, bool writable, const TQString& label,
@@ -93,7 +93,7 @@ typedef TQMap<TQString, SubResource> ResourceMap;
  */
 class StorageReference {
 public:
-  // Just for QMap
+  // Just for TQMap
   StorageReference() {}
 
   StorageReference( const TQString& resource, TQ_UINT32 sernum );
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 65ca9629..80da3942 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -62,7 +62,7 @@ TQString AddressBookAdaptor::mimeType() const
 
 bool AddressBookAdaptor::localItemExists( const TQString &localId )
 {
-  KABC::Addressee a = mResource->tqfindByUid( localId );
+  KABC::Addressee a = mResource->findByUid( localId );
   return !a.isEmpty();
 }
 
@@ -85,7 +85,7 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
 
 void AddressBookAdaptor::deleteItem( const TQString &localId )
 {
-  KABC::Addressee a = mResource->tqfindByUid( localId );
+  KABC::Addressee a = mResource->findByUid( localId );
   if ( !a.isEmpty() ) {
     mResource->removeAddressee( a );
     mResource->clearChange( a.uid() );
diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp
index 88685bdf..9c6084b9 100644
--- a/kresources/lib/calendaradaptor.cpp
+++ b/kresources/lib/calendaradaptor.cpp
@@ -75,11 +75,11 @@ bool CalendarAdaptor::localItemHasChanged( const TQString &localId )
   if ( !i ) return false;
 
   if ( !mResource->deletedIncidences().isEmpty() &&
-      mResource->deletedIncidences().find( i )
+      mResource->deletedIncidences().tqfind( i )
    != mResource->deletedIncidences().end() )
     return true;
   if ( !mResource->changedIncidences().isEmpty() &&
-       mResource->changedIncidences().find( i )
+       mResource->changedIncidences().tqfind( i )
     != mResource->changedIncidences().end() )
     return true;
 
diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h
index fddcfd7a..b8df62f9 100644
--- a/kresources/lib/calendaradaptor.h
+++ b/kresources/lib/calendaradaptor.h
@@ -52,6 +52,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem
 class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     CalendarAdaptor();
 
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index a950e405..0bd64a83 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -30,7 +30,7 @@
 using namespace KCal;
 
 // TODO: This is exactly the same code as for the DavAddressBookAdaptor::interpretListFoldersJob!
-//       But as this emits a signal, it needs to be located inside a QObject
+//       But as this emits a signal, it needs to be located inside a TQObject
 void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
   KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 0a530361..06d9f9fc 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -41,8 +41,8 @@
 
 using namespace KPIM;
 
-FolderConfig::FolderConfig( TQWidget *parent )
-  : TQWidget( parent ), mFolderLister( 0 )
+FolderConfig::FolderConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), mFolderLister( 0 )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->addSpacing( KDialog::spacingHint() );
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 4a6959a1..538c1b47 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -35,11 +35,12 @@ namespace KPIM {
 
 class FolderLister;
 
-class KDE_EXPORT FolderConfig : public QWidget
+class KDE_EXPORT FolderConfig : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FolderConfig( TQWidget *parent );
+    FolderConfig( TQWidget *tqparent );
     ~FolderConfig();
 
     void setFolderLister( FolderLister * );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index a39b316a..a0ef5f0e 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -56,7 +56,7 @@ TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type
     return mWriteDestinationId[ KPIM::FolderLister::All ];
   } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
-  } else return TQString::null;
+  } else return TQString();
 }
 
 
@@ -151,7 +151,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
     for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
       e.type = (FolderLister::ContentType)( e.type | contentTypeFromString( *it ) );
     }
-    if ( active.find( e.id ) != active.end() ) e.active = true;
+    if ( active.tqfind( e.id ) != active.end() ) e.active = true;
     mFolders.append( e );
   }
 
@@ -198,7 +198,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
   #define writeDestination(type) \
     if ( mWriteDestinationId.tqcontains( type ) ) \
       defaultFolders << mWriteDestinationId[type]; \
-    else defaultFolders << TQString::null;
+    else defaultFolders << TQString();
   writeDestination( KPIM::FolderLister::Event );
   writeDestination( KPIM::FolderLister::Todo );
   writeDestination( KPIM::FolderLister::Journal );
@@ -230,8 +230,8 @@ void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
     doRetrieveFolder( url );
   else {
     KURL u( url ) ;
-    u.setUser( TQString::null );
-    u.setPass( TQString::null );
+    u.setUser( TQString() );
+    u.setPass( TQString() );
     mProcessedPathes.append( url.path(-1) );
   }
 }
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index f2f19d10..e2f55953 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -45,9 +45,10 @@ class GroupwareDataAdaptor;
 class GroupwarePrefsBase;
 
 
-class KDE_EXPORT FolderLister : public QObject
+class KDE_EXPORT FolderLister : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum Type { AddressBook, Calendar };
     enum ContentType {
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index d0a11f43..23e115c0 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -38,8 +38,8 @@ static const int BoxSize = 16;
 
 
 //BEGIN FolderListView
-FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types )
-    : KListView( parent )
+FolderListView::FolderListView( TQWidget *tqparent, const TQValueList<Property> &types )
+    : KListView( tqparent )
 {
   setEnabledTypes( types );
 
@@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z )
 void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
 {
   if ( dynamic_cast<FolderListItem*>(i) ) {
-    if ( btn == Qt::RightButton ) {
+    if ( btn == TQt::RightButton ) {
       showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ );
     }
-    else if ( btn == Qt::LeftButton && c > 0 ) {
+    else if ( btn == TQt::LeftButton && c > 0 ) {
       // map pos to item/column and call FolderListItem::activate(col, pos)
       ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
 //     } else {
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index 62766830..e4d5a56d 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -38,6 +38,7 @@ class FolderListCaption;
 class FolderListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class FolderListItem;
 
@@ -45,7 +46,7 @@ class FolderListView : public KListView
     /* mainly for readability */
     enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX };
     
-    FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() );
+    FolderListView( TQWidget *tqparent, const TQValueList<Property> &types = TQValueList<Property>() );
     ~FolderListView() {};
 
     /* Display a popupmenu for item i at the specified global position, eventually with a title,
@@ -77,13 +78,13 @@ class FolderListView : public KListView
     TQListViewItem subclass to display/edit a folder on a groupware server. 
     Selection of default destinations will be done via radio items.
 */
-class FolderListItem : public QCheckListItem
+class FolderListItem : public TQCheckListItem
 {
   typedef TQCheckListItem super;
   public:
-    FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder )
-      : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), 
-        mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 )
+    FolderListItem( FolderListItem *tqparent, const KPIM::FolderLister::Entry &folder )
+      : TQCheckListItem( tqparent, folder.name, TQCheckListItem::CheckBoxController ), 
+        mFolder( folder ), mFolderListView( tqparent?(tqparent->folderListView()):0 )
     {
       setOn( mFolder.active );
     }
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index 8703c441..18950618 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h
index e5901239..884b9132 100644
--- a/kresources/lib/folderselectdialog.h
+++ b/kresources/lib/folderselectdialog.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index 53b2ecdb..88ca09c1 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -203,8 +203,8 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*
       if ( error ) {
         emit itemDeletionError( *it, err );
       } else {
-        // FIXME: Don't use TQString::null here
-        emit itemDeleted( TQString::null, *it );
+        // FIXME: Don't use TQString() here
+        emit itemDeleted( TQString(), *it );
       }
     }
     return true;
@@ -266,7 +266,7 @@ kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 95119354..2216fa56 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -88,9 +88,10 @@ class KDE_EXPORT GroupwareUploadItem
 };
 
 
-class KDE_EXPORT GroupwareDataAdaptor : public QObject
+class KDE_EXPORT GroupwareDataAdaptor : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareDataAdaptor();
     virtual ~GroupwareDataAdaptor();
@@ -309,7 +310,7 @@ Q_OBJECT
     /** Return the default file name for a new item. */
     virtual TQString defaultNewItemName( GroupwareUploadItem * )
     {
-      return TQString::null; 
+      return TQString(); 
     }
     virtual TQString uidFromJob( KIO::Job *job ) const;
     virtual void setUidForJob( KIO::Job *job, const TQString &uid );
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 85f9c9f3..5cf494b9 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -102,7 +102,7 @@ void GroupwareDownloadJob::listItems()
 
     kdDebug(5800) << "OpenGroupware::listIncidences(): " << url << endl;
 
-    mListItemsData = TQString::null;
+    mListItemsData = TQString();
     mListEventsJob = adaptor()->createListItemsJob( url );
 
     connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
@@ -135,7 +135,7 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
     adaptor()->interpretListItemsJob( job, mListItemsData );
   }
 
-  mListItemsData = TQString::null;
+  mListItemsData = TQString();
   mListEventsJob = 0;
 
   listItems();
@@ -170,7 +170,7 @@ void GroupwareDownloadJob::downloadItem()
     success();
   } else {
     if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) {
-      mDownloadItemsData = TQString::null;
+      mDownloadItemsData = TQString();
       mDownloadJob = adaptor()->createDownloadJob( mItemsForDownload );
       mItemsDownloading = mItemsForDownload;
       mItemsForDownload.clear();
@@ -183,7 +183,7 @@ void GroupwareDownloadJob::downloadItem()
       mItemsForDownload.remove( it.key() );
  
       adaptor()->adaptDownloadUrl( href );
-      mDownloadItemsData = TQString::null;
+      mDownloadItemsData = TQString();
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
@@ -211,7 +211,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
     mProgress->incCompletedItems();
     mProgress->updateProgress();
   }
-  mDownloadItemsData = TQString::null;
+  mDownloadItemsData = TQString();
   mDownloadJob = 0;
 
   downloadItem();
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index a52413bd..58f473ef 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -42,6 +42,7 @@ class ProgressItem;
 class GroupwareDownloadJob : public GroupwareJob
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareDownloadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp
index a0094f6a..c1b23d16 100644
--- a/kresources/lib/groupwareresourcejob.cpp
+++ b/kresources/lib/groupwareresourcejob.cpp
@@ -45,7 +45,7 @@ TQString GroupwareJob::errorString() const
 
 void GroupwareJob::success()
 {
-  mErrorString = TQString::null;
+  mErrorString = TQString();
   emit( result( this ) );
 }
 
diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h
index 76cd2bbc..5260b485 100644
--- a/kresources/lib/groupwareresourcejob.h
+++ b/kresources/lib/groupwareresourcejob.h
@@ -35,9 +35,10 @@ class GroupwareDataAdaptor;
   This class provides a resource for accessing a Groupware kioslave-based
   calendar.
 */
-class GroupwareJob : public QObject
+class GroupwareJob : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index e4d6cb13..cde428d0 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -101,7 +101,7 @@ kdDebug() << "Not using batch delete " << endl;
     }
 
     if ( mDeletionJob ) {
-      mDeletionJobData = TQString::null;
+      mDeletionJobData = TQString();
       connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) );
 //       connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
@@ -158,7 +158,7 @@ kdDebug() << "Not using batch upload " << endl;
     }
 
     if ( mUploadJob ) {
-      mUploadJobData = TQString::null;
+      mUploadJobData = TQString();
       connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) );
       connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
@@ -216,7 +216,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
     }
 
     if ( mUploadJob ) {
-      mUploadNewJobData = TQString::null;
+      mUploadNewJobData = TQString();
       connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
       connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 5edbca9b..80816d15 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -47,6 +47,7 @@ class ProgressItem;
 class GroupwareUploadJob : public GroupwareJob
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareUploadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index d7381a92..b8d7fe71 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -43,6 +43,7 @@ class AddressBookAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupwareBase( const KConfig * );
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 80303734..ba16ccae 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -37,8 +37,8 @@
 
 using namespace KABC;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index 68e8fc0a..59c99f48 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -39,9 +39,10 @@ class ResourceGroupwareBase;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 808a1673..0d7e4248 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name )
-    : KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
+CacheSettingsDialog::CacheSettingsDialog( TQWidget* tqparent, const char* name )
+    : KDialogBase( tqparent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
 {
   TQWidget *mainWidget = new TQWidget( this );
   setMainWidget( mainWidget );
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index e50b2cad..07e8337f 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -42,8 +42,9 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT CacheSettingsDialog : public KDialogBase
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
+    CacheSettingsDialog( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index f0994a54..ac2bc330 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -52,6 +52,7 @@ class CalendarAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceGroupwareBase();
   
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 9ae91a0d..e3fc3f93 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -42,9 +42,9 @@
 
 using namespace KCal;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,
                                                           const char* name )
-    : KRES::ConfigWidget( parent, name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 );
 
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index 61e71b37..ee10fa5c 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -47,8 +47,9 @@ class CacheSettingsDialog;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index 18074066..0eb2144f 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e
 {
   TQDomElement element = node.namedItem( entry ).toElement();
   if ( !element.isNull() && !element.text().isEmpty() ) {
-    value = TQDateTime::fromString( element.text(), Qt::ISODate );
+    value = TQDateTime::fromString( element.text(), TQt::ISODate );
     return true;
   }
   return false;
@@ -154,10 +154,10 @@ bool WebdavHandler::extractStringList( const TQDomElement &node, const TQString
 
 const TQString WebdavHandler::getEtagFromHeaders( const TQString& headers )
 {
-  int start = headers.find( "etag:", 0, false );
+  int start = headers.tqfind( "etag:", 0, false );
   if ( start < 0 ) return TQString();
   start += 6;
-  return headers.mid( start, headers.find( "\n", start ) - start );
+  return headers.mid( start, headers.tqfind( "\n", start ) - start );
 }
 
 //TODO: should not call libical functions directly -- better to make
diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h
index 668f99fd..f978759f 100644
--- a/kresources/lib/webdavhandler.h
+++ b/kresources/lib/webdavhandler.h
@@ -39,11 +39,11 @@ class KDE_EXPORT WebdavHandler
 
     static TQDomElement addElementNS( TQDomDocument &doc, TQDomNode &node,
                                      const TQString &ns, const TQString &tag,
-                                     const TQString &value = TQString::null );
+                                     const TQString &value = TQString() );
     static TQDomElement addElement( TQDomDocument &, TQDomNode &,
-                         const TQString &tag, const TQString &value = TQString::null );
+                         const TQString &tag, const TQString &value = TQString() );
     static TQDomElement addDavElement( TQDomDocument &, TQDomNode &,
-                         const TQString &tag, const TQString &value = TQString::null );
+                         const TQString &tag, const TQString &value = TQString() );
 
     static bool extractBool( const TQDomElement &node, 
                          const TQString &entry, bool &value );
diff --git a/kresources/newexchange/Incidence.mapping b/kresources/newexchange/Incidence.mapping
index ef0914b5..145ca480 100644
--- a/kresources/newexchange/Incidence.mapping
+++ b/kresources/newexchange/Incidence.mapping
@@ -104,7 +104,7 @@ DAV:id
 
 
 Incidence::pilotId()
-Incidence::syncStatus()
+Incidence::synctqStatus()
 Incidence::relatedToUid()
 
 
@@ -156,7 +156,7 @@ h1:0x00008101 b:dt='int'                     |  status:  0_Open, 1_InProgress, 2
 No correspondence:
 ==================
 Incidence::pilotId()
-Incidence::syncStatus()
+Incidence::synctqStatus()
 Incidence::relatedToUid()
 Incidence::custom()
 
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index 423ac75a..13ad362d 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -84,7 +84,7 @@ void ExchangeAddressBookAdaptor::customAdaptUploadUrl( KURL &url )
 
 TQString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
   if ( item ) return item->uid()+".EML";
-  else return TQString::null;
+  else return TQString();
 }
 
 
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index ceec4412..43e1dfdb 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -117,7 +117,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
 
 TQString ExchangeCalendarAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
   if ( item ) return item->uid()+".EML";
-  else return TQString::null;
+  else return TQString();
 }
 
 KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Incidence*it,
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index d2a8d55c..d28e8b1c 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -34,7 +34,7 @@
 using namespace KCal;
 
 #define TaskNamespace1 "http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/"
-#define TaskProp_Status            "0x00008101"
+#define TaskProp_tqStatus            "0x00008101"
 #define TaskProp_PercentCompleted  "0x00008102"
 #define TaskProp_DtStart           "0x00008104"
 #define TaskProp_DtDue             "0x00008105"
@@ -164,7 +164,7 @@ void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElem
   propertyTask2( TaskProp_ReminderTime );
   propertyTask2( TaskProp_ReminderPlaySound );
   propertyTask2( TaskProp_ReminderSoundFile );
-  propertyTask1( TaskProp_Status );
+  propertyTask1( TaskProp_tqStatus );
 }
 #undef propertyTask1
 #undef propertyTask2
@@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
     TQStringList::Iterator it = tmplst.begin();
     KCal::DateList exdates;
     for ( ; it != tmplst.end(); ++it ) {
-      exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*,
+      exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, TQt::ISODate )/*,
           localTimeZoneId )*/.date() );
     }
     event->recurrence()->setExDates( exdates );
@@ -497,7 +497,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
   // What to do about recurrence rules?
 
   // FIXME: Reminders, use TaskProp_ReminderSet, TaskProp_ReminderTime,
-  //        TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_Status
+  //        TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_tqStatus
   //        But how do I get the offset?
 
   return true;
@@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
     void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); }
     void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); }
     void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); }
-    TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; }
+    TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; }
 
     bool visitIncidence( Incidence *incidence )
     {
@@ -605,9 +605,9 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
       domHTTPMailProperty( "textdescription", incidence->description() );
       // FIXME: timestampt, comments and categories
 //       domHTTPMailProperty( "date", ??? ); // timestamp not available in libkcal
-//       domDavProperty( "comment", incidence->comments() ); // libkcal has a QStringlist, not one string
+//       domDavProperty( "comment", incidence->comments() ); // libkcal has a TQStringlist, not one string
 //       domProperty( "urn:schemas-microsoft-com:office:office", "Keywords", ??? ); // It's a <v>entyr1</v><v>entry2</v> String list!
-      tmpstr = TQString::null;
+      tmpstr = TQString();
       switch ( incidence->secrecy() ) {
         case KCal::Incidence::SecrecyPublic: tmpstr = "0"; break;
         case KCal::Incidence::SecrecyPrivate: tmpstr = "2"; break;
@@ -622,7 +622,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
       domMailHeaderProperty( "from", incidence->organizer().fullName() );
 
       //  Attendees:
-      tmpstr = TQString::null;
+      tmpstr = TQString();
       TQStringList reqattnames;
       TQStringList optattnames;
       Attendee::List atts = incidence->attendees();
@@ -668,7 +668,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
 //       FIXME: domCalendarProperty( "sequence", event->sequence() );
       domCalendarProperty( "location", event->location() );
 
-      TQString tmpstr( TQString::null );
+      TQString tmpstr;
       switch ( event->transparency() ) {
         case KCal::Event::Transparent: tmpstr = "FREE"; break;
         case KCal::Event::Opaque: tmpstr = "BUSY"; break;
@@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
 
 /* FIXME:
       domCalendarProperty( "uid", todo->uid() );
-      domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
-      domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+      domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+      domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
       // TODO
 /*propertyTask1( TaskProp_Owner );
   propertyTask2( TaskProp_ContactNames );
@@ -747,7 +747,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
   propertyTask2( TaskProp_ReminderTime );
   propertyTask2( TaskProp_ReminderPlaySound );
   propertyTask2( TaskProp_ReminderSoundFile );
-  propertyTask1( TaskProp_Status );*/
+  propertyTask1( TaskProp_tqStatus );*/
       return true;
     }
     bool visit( Journal *journal )
@@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
                    "outlookmessageclass", "IPM.Journal" );
 /* FIXME:
       domCalendarProperty( "uid", todo->uid() );
-      domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
-      domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+      domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+      domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
       // TODO
       return true;
     }
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 88ad3a15..40e0498a 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -585,13 +585,13 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   // FIXME: Exchange uses the date in the form 8/13, i.e. possibly without a
   // year! How shall I deal with this?
 /*  TQDate dt = addr.birthday().date();
-  TQString str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
+  TQString str = (dt.isValid())?(dt.toString( TQt::ISODate )):(TQString());
   if ( !str.isEmpty() ) {
     TQDomElement el = domContactProperty( "bday", str );
     el.setAttribute( "b:dt", "date" );
   }
-  dt = TQDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
-  str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
+  dt = TQDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
+  str = (dt.isValid())?(dt.toString( TQt::ISODate )):(TQString());
   if ( !str.isEmpty() ) {
     TQDomElement el = domContactProperty( "weddinganniversary", str );
     el.setAttribute( "b:dt", "date" );
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index 54405166..b1730238 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -90,7 +90,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:displayname" );
   WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -104,7 +104,7 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
 KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:getetag" );
   WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -126,7 +126,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
   // Don't use an <allprop/> request!
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:proptqfind" );
   TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
   TQDomAttr att_h = doc.createAttribute( "xmlns:h" );
   att_h.setValue( "urn:schemas:mailheader:" );
@@ -242,7 +242,7 @@ bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *
   KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
   if ( !davjob || !adaptor ) return false;
 
-kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): QDomDocument="
+kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument="
           << endl << davjob->response().toString() << endl;
   KCal::ExchangeConverterCalendar conv;
   conv.setTimeZone( adaptor->resource()->timeZoneId() );
@@ -266,7 +266,7 @@ bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
   KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
   if ( !davjob || !adaptor ) return false;
 
-kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): QDomDocument="
+kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument="
           << endl << davjob->response().toString() << endl;
   KABC::ExchangeConverterContact conv;
   KABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() );
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 36f3ca2e..0ef4677a 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -28,6 +28,7 @@ namespace KABC {
 class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceExchange( const KConfig * );
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index 2a6d0167..94ef8901 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -32,6 +32,7 @@ namespace KCal {
 class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceExchange();
     ResourceExchange( const KConfig * );
diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 3cea7ef1..096a07de 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -51,6 +51,7 @@ namespace KCal {
 class KDE_EXPORT ResourceRemote : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ResourceRemoteConfig;
 
diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp
index 67d7f4b9..7ecb0983 100644
--- a/kresources/remote/resourceremoteconfig.cpp
+++ b/kresources/remote/resourceremoteconfig.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h
index 20ab3fcf..7fe6e862 100644
--- a/kresources/remote/resourceremoteconfig.h
+++ b/kresources/remote/resourceremoteconfig.h
@@ -45,8 +45,9 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceRemoteConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index 06c67442..b8abb42a 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -71,7 +71,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
   xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n";
   xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n";
   xml += "<subject>" + addr.formattedName() + "</subject>\n";
-  xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n";
+  xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n";
 
   xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n";
   xml += "<first_name>" + addr.givenName() + "</first_name>\n";
@@ -166,7 +166,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
   xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n";
   xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n";
 
-  xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n";
+  xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n";
   xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n";
 
   xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>";
@@ -235,7 +235,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
       else if ( element.tagName() == "send_rich_info" )
         setCustom( "send_rich_info", element.text(), addr );
       else if ( element.tagName() == "last_modification_time" )
-        addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) );
+        addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) );
 
       // name
       else if ( element.tagName() == "display_name_prefix" )
@@ -352,7 +352,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
         addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() );
 
       else if ( element.tagName() == "bday" )
-        addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) );
+        addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) );
       else if ( element.tagName() == "anniversary" )
         addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() );
       else
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 55b2ed2e..e9193c4b 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -80,7 +80,7 @@ static const char* s_inlineMimeType = "application/scalix-properties";
 KABC::ResourceScalix::ResourceScalix( const KConfig *config )
   : KPIM::ResourceABC( config ),
     Scalix::ResourceScalixBase( "ResourceScalix-KABC" ),
-    mCachedSubresource( TQString::null ), mLocked( false )
+    mCachedSubresource( TQString() ), mLocked( false )
 {
   setType( "scalix" );
 }
@@ -149,7 +149,7 @@ KABC::Ticket * KABC::ResourceScalix::requestSaveTicket()
 void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
 {
   mLocked = false;
-  mCachedSubresource = TQString::null;
+  mCachedSubresource = TQString();
   delete ticket;
 }
 
@@ -317,7 +317,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.find( uid ) != mUidMap.end() ) {
+  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -359,7 +359,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.find(addr.uid()), which would give the same :-(
+    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -392,7 +392,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
 void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -455,7 +455,7 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -593,7 +593,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
   }
 
   kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
-  return TQString::null;
+  return TQString();
 }
 
 void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 70eb7c92..b7dd6d5e 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,6 +54,7 @@ class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC,
                      public Scalix::ResourceScalixBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp
index a5f289a7..c6fe224c 100644
--- a/kresources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/scalix/kabc/scalix.desktop b/kresources/scalix/kabc/scalix.desktop
index b91af247..97212513 100644
--- a/kresources/scalix/kabc/scalix.desktop
+++ b/kresources/scalix/kabc/scalix.desktop
@@ -16,7 +16,7 @@ Name[nds]=Adressbook op Scalix-Server över KMail
 Name[nl]=Adresboek op Scalix-server via KMail
 Name[pl]=Książka adresowa na serwerze Scalix za pośrednictwem KMaila
 Name[ru]=�дре�на� книга на �ервере Scalix через KMail
-Name[sk]=Adresár na Scalix serveri pomocou KMail
+Name[sk]=Adresár na Scalix serveri potqmocou KMail
 Name[sr]=�дре�ар на Scalix �ерверу преко KMail-а
 Name[sr@Latn]=Adresar na Scalix serveru preko KMail-a
 Name[sv]=Adressbok på Scalix-server via Kmail
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 1d74c570..8c84977a 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -249,7 +249,7 @@ void ResourceScalix::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -268,7 +268,7 @@ bool ResourceScalix::doSave()
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
   if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
-  incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
+  incidencebase->setSynctqStatus( KCal::Event::SYNCMOD );
   incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -482,7 +482,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
@@ -507,7 +507,7 @@ bool ResourceScalix::addEvent( KCal::Event* event )
   if ( mUidMap.tqcontains( event->uid() ) )
     return true; //noop
   else
-    return addIncidence( event, TQString::null, 0 );
+    return addIncidence( event, TQString(), 0 );
 }
 
 bool ResourceScalix::addEvent( KCal::Event *event, const TQString &subresource )
@@ -575,7 +575,7 @@ bool ResourceScalix::addTodo( KCal::Todo* todo )
   if ( mUidMap.tqcontains( todo->uid() ) )
     return true; //noop
   else
-    return addIncidence( todo, TQString::null, 0 );
+    return addIncidence( todo, TQString(), 0 );
 }
 
 bool ResourceScalix::addTodo( KCal::Todo *todo, const TQString &subresource )
@@ -609,7 +609,7 @@ bool ResourceScalix::addJournal( KCal::Journal* journal )
   if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
-    return addIncidence( journal, TQString::null, 0 );
+    return addIncidence( journal, TQString(), 0 );
 }
 
 bool ResourceScalix::addJournal( KCal::Journal *journal, const TQString &subresource )
@@ -693,7 +693,7 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     KCal::Incidence* incidence = mCalendar.incidence( uid );
@@ -804,7 +804,7 @@ TQStringList ResourceScalix::subresources() const
          + mJournalSubResources.keys() );
 }
 
-const QString
+const TQString
 ResourceScalix::labelForSubresource( const TQString& subresource ) const
 {
   if ( mEventSubResources.tqcontains( subresource ) )
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index e00909c7..67ecac36 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,6 +51,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
                       public Scalix::ResourceScalixBase
 {
   Q_OBJECT
+  TQ_OBJECT
     friend struct TemporarySilencer;
 
 public:
@@ -194,11 +195,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map tqcontains the association between a new added incidence
+    This map contains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
+    We can't trust on mUidMap here, because it contains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp
index a36f5bf2..728dc280 100644
--- a/kresources/scalix/kcal/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/scalix/kcal/scalix.desktop b/kresources/scalix/kcal/scalix.desktop
index 1c468cca..2d87bfcb 100644
--- a/kresources/scalix/kcal/scalix.desktop
+++ b/kresources/scalix/kcal/scalix.desktop
@@ -17,7 +17,7 @@ Name[nl]=Agenda op Scalix-server via KMail
 Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila
 Name[pt_BR]=Calendário em Servidor Scalix via KMail
 Name[ru]=Календарь на �ервере Scalix через KMail
-Name[sk]=Kalendár na Scalix serveri pomocou KMail
+Name[sk]=Kalendár na Scalix serveri potqmocou KMail
 Name[sr]=Календар на Scalix �ерверу преко KMail-а
 Name[sr@Latn]=Kalendar na Scalix serveru preko KMail-a
 Name[sv]=Kalender på Scalix-server via Kmail
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 2a0c06cd..c3a8f99b 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -139,7 +139,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     requestUser = path.mid( lastSlash + 1 );
 
   // extract calendar name
-  int secondSlash = path.find( '/', 1 );
+  int secondSlash = path.tqfind( '/', 1 );
   if ( secondSlash != -1 )
     calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 );
 
diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h
index 25a2fdea..16f60be7 100644
--- a/kresources/scalix/kioslave/scalix.h
+++ b/kresources/scalix/kioslave/scalix.h
@@ -29,6 +29,7 @@
 class Scalix : public TQObject, public KIO::SlaveBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Scalix( const TQCString &protocol, const TQCString &pool, const TQCString &app );
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 5afd6402..b9d5b54c 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -154,7 +154,7 @@ bool ResourceScalix::save()
 
 bool ResourceScalix::addNote( KCal::Journal* journal )
 {
-  return addNote( journal, TQString::null, 0 );
+  return addNote( journal, TQString(), 0 );
 }
 
 KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index dc8517b6..fc1309b9 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -53,6 +53,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes,
                       public ResourceScalixBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceScalix( const KConfig* );
diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp
index 222d5ed6..1cb83556 100644
--- a/kresources/scalix/knotes/resourcescalix_plugin.cpp
+++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/scalix/knotes/scalix.desktop b/kresources/scalix/knotes/scalix.desktop
index a573bee8..82c34afa 100644
--- a/kresources/scalix/knotes/scalix.desktop
+++ b/kresources/scalix/knotes/scalix.desktop
@@ -16,7 +16,7 @@ Name[nds]=Notizen op Scalix-Server över KMail
 Name[nl]=Notities op Scalix-server via KMail
 Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila
 Name[ru]=Заметки на �ервере Scalix через KMail
-Name[sk]=Poznámky na Scalix serveri pomocou KMail
+Name[sk]=Poznámky na Scalix serveri potqmocou KMail
 Name[sr]=Белешке на Scalix �ерверу преко KMail-а
 Name[sr@Latn]=Beleške na Scalix serveru preko KMail-a
 Name[sv]=Anteckningar på Scalix-server via Kmail
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index d0a9644e..70ab3734 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -31,8 +31,8 @@
 
 #include "delegatedialog.h"
 
-DelegateDialog::DelegateDialog( TQWidget *parent )
-  : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
+DelegateDialog::DelegateDialog( TQWidget *tqparent )
+  : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
   TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index 1cadb592..a515fe89 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -35,9 +35,10 @@ class Delegate;
 class DelegateDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DelegateDialog( TQWidget *parent = 0 );
+    DelegateDialog( TQWidget *tqparent = 0 );
 
     void setDelegate( const Scalix::Delegate &delegate );
     Scalix::Delegate delegate() const;
diff --git a/kresources/scalix/scalixadmin/delegatemanager.h b/kresources/scalix/scalixadmin/delegatemanager.h
index 7f5e2e5a..2edff628 100644
--- a/kresources/scalix/scalixadmin/delegatemanager.h
+++ b/kresources/scalix/scalixadmin/delegatemanager.h
@@ -26,9 +26,10 @@
 
 #include "jobs.h"
 
-class DelegateManager : public QObject
+class DelegateManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     DelegateManager();
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 32b29d46..cdfef591 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -34,8 +34,8 @@
 
 #include "delegatepage.h"
 
-DelegatePage::DelegatePage( TQWidget *parent )
-  : TQWidget( parent )
+DelegatePage::DelegatePage( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index e62c89ee..3d266580 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -28,12 +28,13 @@
 class TQPushButton;
 class DelegateView;
 
-class DelegatePage : public QWidget
+class DelegatePage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DelegatePage( TQWidget *parent = 0 );
+    DelegatePage( TQWidget *tqparent = 0 );
     ~DelegatePage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/kresources/scalix/scalixadmin/delegateview.cpp
index e253f1f3..12f27b77 100644
--- a/kresources/scalix/scalixadmin/delegateview.cpp
+++ b/kresources/scalix/scalixadmin/delegateview.cpp
@@ -24,11 +24,11 @@
 
 #include "delegateview.h"
 
-class DelegateItem : public QListViewItem
+class DelegateItem : public TQListViewItem
 {
   public:
-    DelegateItem( TQListView *parent, const Scalix::Delegate &delegate )
-      : TQListViewItem( parent ), mDelegate( delegate )
+    DelegateItem( TQListView *tqparent, const Scalix::Delegate &delegate )
+      : TQListViewItem( tqparent ), mDelegate( delegate )
     {
       setText( 0, mDelegate.email() );
       setText( 1, Scalix::Delegate::rightsAsString( mDelegate.rights() ) );
@@ -40,8 +40,8 @@ class DelegateItem : public QListViewItem
     Scalix::Delegate mDelegate;
 };
 
-DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
-  : KListView( parent ), mManager( manager )
+DelegateView::DelegateView( DelegateManager *manager, TQWidget *tqparent )
+  : KListView( tqparent ), mManager( manager )
 {
   addColumn( i18n( "Delegate" ) );
   addColumn( i18n( "Rights" ) );
diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h
index 1e9e6300..243d3c8d 100644
--- a/kresources/scalix/scalixadmin/delegateview.h
+++ b/kresources/scalix/scalixadmin/delegateview.h
@@ -32,9 +32,10 @@ class DelegateManager;
 class DelegateView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DelegateView( DelegateManager *manager, TQWidget *parent = 0 );
+    DelegateView( DelegateManager *manager, TQWidget *tqparent = 0 );
 
     Scalix::Delegate selectedDelegate() const;
 
diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h
index 24ce1c02..84574456 100644
--- a/kresources/scalix/scalixadmin/jobs.h
+++ b/kresources/scalix/scalixadmin/jobs.h
@@ -133,6 +133,7 @@ namespace Scalix {
   class GetDelegatesJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -161,6 +162,7 @@ namespace Scalix {
   class GetOtherUsersJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -183,6 +185,7 @@ namespace Scalix {
   class GetOutOfOfficeJob : public KIO::SimpleJob
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/kresources/scalix/scalixadmin/ldapdialog.cpp
index 6af08c4d..35f5d1c0 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.cpp
+++ b/kresources/scalix/scalixadmin/ldapdialog.cpp
@@ -24,8 +24,8 @@
 
 #include "ldapdialog.h"
 
-LdapDialog::LdapDialog( TQWidget *parent )
-  : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
+LdapDialog::LdapDialog( TQWidget *tqparent )
+  : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
 {
   setCaption( i18n( "User Account Selection" ) );
 
diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/kresources/scalix/scalixadmin/ldapdialog.h
index 9d822af1..bcccd280 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.h
+++ b/kresources/scalix/scalixadmin/ldapdialog.h
@@ -27,7 +27,7 @@ class LdapView;
 class LdapDialog : public KDialogBase
 {
   public:
-    LdapDialog( TQWidget *parent = 0 );
+    LdapDialog( TQWidget *tqparent = 0 );
 
     TQString selectedUser() const;
 
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index 0e40f3ae..04351395 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -26,11 +26,11 @@
 
 #include "ldapview.h"
 
-class LdapItem : public QListViewItem
+class LdapItem : public TQListViewItem
 {
   public:
-    LdapItem( TQListView *parent, const TQString &text, const TQString &email )
-      : TQListViewItem( parent )
+    LdapItem( TQListView *tqparent, const TQString &text, const TQString &email )
+      : TQListViewItem( tqparent )
     {
       setText( 0, text );
       setText( 1, email );
@@ -38,8 +38,8 @@ class LdapItem : public QListViewItem
 };
 
 
-LdapView::LdapView( TQWidget *parent )
-  : KListView( parent )
+LdapView::LdapView( TQWidget *tqparent )
+  : KListView( tqparent )
 {
   addColumn( i18n( "User" ) );
   setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h
index 4616e11c..8d7375da 100644
--- a/kresources/scalix/scalixadmin/ldapview.h
+++ b/kresources/scalix/scalixadmin/ldapview.h
@@ -30,9 +30,10 @@ class LdapObject;
 class LdapView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LdapView( TQWidget *parent = 0 );
+    LdapView( TQWidget *tqparent = 0 );
     ~LdapView();
 
     TQString selectedUser() const;
diff --git a/kresources/scalix/scalixadmin/otherusermanager.h b/kresources/scalix/scalixadmin/otherusermanager.h
index 90d7195a..386280ad 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.h
+++ b/kresources/scalix/scalixadmin/otherusermanager.h
@@ -24,9 +24,10 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class OtherUserManager : public QObject
+class OtherUserManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     OtherUserManager();
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index f7a9ee63..6aba51c7 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -37,8 +37,8 @@
 
 #include "otheruserpage.h"
 
-OtherUserPage::OtherUserPage( TQWidget *parent )
-  : TQWidget( parent )
+OtherUserPage::OtherUserPage( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
 
@@ -149,8 +149,8 @@ void OtherUserPage::updateKmail()
   TQString error;
   TQCString dcopService;
   int result = KDCOPServiceStarter::self()->
-    findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                    TQString::null, &error, &dcopService );
+    findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                    TQString(), &error, &dcopService );
   if ( result != 0 ) {
     KMessageBox::error( 0, i18n( "Unable to start KMail to trigger account update with Scalix server" ) );
     delete msg;
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index e77536ec..f547c078 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -28,12 +28,13 @@
 class TQPushButton;
 class OtherUserView;
 
-class OtherUserPage : public QWidget
+class OtherUserPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OtherUserPage( TQWidget *parent = 0 );
+    OtherUserPage( TQWidget *tqparent = 0 );
     ~OtherUserPage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/kresources/scalix/scalixadmin/otheruserview.cpp
index 19b9c3b6..7b07612c 100644
--- a/kresources/scalix/scalixadmin/otheruserview.cpp
+++ b/kresources/scalix/scalixadmin/otheruserview.cpp
@@ -24,11 +24,11 @@
 
 #include "otheruserview.h"
 
-class OtherUserItem : public QListViewItem
+class OtherUserItem : public TQListViewItem
 {
   public:
-    OtherUserItem( TQListView *parent, const TQString &user )
-      : TQListViewItem( parent ), mUser( user )
+    OtherUserItem( TQListView *tqparent, const TQString &user )
+      : TQListViewItem( tqparent ), mUser( user )
     {
       setText( 0, mUser );
     }
@@ -39,8 +39,8 @@ class OtherUserItem : public QListViewItem
     TQString mUser;
 };
 
-OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
-  : KListView( parent ), mManager( manager )
+OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *tqparent )
+  : KListView( tqparent ), mManager( manager )
 {
   addColumn( i18n( "Registered Accounts" ) );
   setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h
index def14a84..36f5923b 100644
--- a/kresources/scalix/scalixadmin/otheruserview.h
+++ b/kresources/scalix/scalixadmin/otheruserview.h
@@ -28,9 +28,10 @@ class OtherUserManager;
 class OtherUserView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 );
+    OtherUserView( OtherUserManager *manager, TQWidget *tqparent = 0 );
 
     TQString selectedUser() const;
 
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index 401d4de1..d56e8954 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -33,12 +33,12 @@
 
 #include "outofofficepage.h"
 
-OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
-  : TQWidget( parent )
+OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent )
+  : TQWidget( tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
-  TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
+  TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this );
 
   mDisabled = new TQRadioButton( i18n( "I am in the office" ), group );
   mDisabled->setChecked( true );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index 148379d7..8e536b28 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -28,12 +28,13 @@ class TQPushButton;
 class TQRadioButton;
 class TQTextEdit;
 
-class OutOfOfficePage : public QWidget
+class OutOfOfficePage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OutOfOfficePage( TQWidget *parent = 0 );
+    OutOfOfficePage( TQWidget *tqparent = 0 );
     ~OutOfOfficePage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index e75d3fdd..53a163b8 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -35,8 +35,8 @@
 
 #include "passwordpage.h"
 
-PasswordPage::PasswordPage( TQWidget *parent )
-  : TQWidget( parent ), mJob( 0 )
+PasswordPage::PasswordPage( TQWidget *tqparent )
+  : TQWidget( tqparent ), mJob( 0 )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index 99f912f1..a461a086 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -30,12 +30,13 @@ namespace KIO {
 class Job;
 }
 
-class PasswordPage : public QWidget
+class PasswordPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PasswordPage( TQWidget *parent = 0 );
+    PasswordPage( TQWidget *tqparent = 0 );
 
   private slots:
     void buttonClicked();
diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index 60ea25ee..5a157048 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -75,8 +75,8 @@ bool KMailConnection::connectToKMail()
     TQString error;
     TQCString dcopService;
     int result = KDCOPServiceStarter::self()->
-      findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                      TQString::null, &error, &dcopService );
+      findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                      TQString(), &error, &dcopService );
     if ( result != 0 ) {
       kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
       // TODO: You might want to show "error" (if not empty) here,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index 3d34d5c6..6eab8ff1 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,6 +49,7 @@ class ResourceScalixBase;
 */
 class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index 9bd0afb8..c9c7ee11 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -155,7 +155,7 @@ TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources
   if ( possible.isEmpty() ) { // None found!!
     kdWarning(5650) << "No writable resource found!" << endl;
     KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) );
-    return TQString::null;
+    return TQString();
   }
   if ( possible.count() == 1 )
     // Just one found
@@ -167,7 +167,7 @@ TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources
                                                                  "Please select the one you want to write to." ),
                                                            possible.keys() );
   if ( chosenLabel.isEmpty() ) // cancelled
-    return TQString::null;
+    return TQString();
   return possible[chosenLabel];
 }
 
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index e402e427..82c6e471 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index e9a5ab8c..64400e4f 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,7 +45,7 @@ ScalixBase::ScalixBase( const TQString& tz )
   : mCreationDate( TQDateTime::tqcurrentDateTime() ),
     mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
-    mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
+    mHasPilotSyncId( false ),  mHasPilotSynctqStatus( false )
 {
 }
 
@@ -56,7 +56,7 @@ ScalixBase::~ScalixBase()
 void ScalixBase::setFields( const KCal::Incidence* incidence )
 {
   // So far unhandled KCal::IncidenceBase fields:
-  // mPilotID, mSyncStatus, mFloats
+  // mPilotID, mSynctqStatus, mFloats
 
   setUid( incidence->uid() );
   setBody( incidence->description() );
@@ -231,20 +231,20 @@ unsigned long ScalixBase::pilotSyncId() const
   return mPilotSyncId;
 }
 
-void ScalixBase::setPilotSyncStatus( int status )
+void ScalixBase::setPilotSynctqStatus( int status )
 {
-  mHasPilotSyncStatus = true;
-  mPilotSyncStatus = status;
+  mHasPilotSynctqStatus = true;
+  mPilotSynctqStatus = status;
 }
 
-bool ScalixBase::hasPilotSyncStatus() const
+bool ScalixBase::hasPilotSynctqStatus() const
 {
-  return mHasPilotSyncStatus;
+  return mHasPilotSynctqStatus;
 }
 
-int ScalixBase::pilotSyncStatus() const
+int ScalixBase::pilotSynctqStatus() const
 {
-  return mPilotSyncStatus;
+  return mPilotSynctqStatus;
 }
 
 bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -300,7 +300,7 @@ bool ScalixBase::loadAttribute( TQDomElement& element )
   else if ( tagName == "pilot-sync-id" )
     setPilotSyncId( element.text().toULong() );
   else if ( tagName == "pilot-sync-status" )
-    setPilotSyncStatus( element.text().toInt() );
+    setPilotSynctqStatus( element.text().toInt() );
   else
     return false;
 
@@ -320,8 +320,8 @@ bool ScalixBase::saveAttributes( TQDomElement& element ) const
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
     writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
-  if ( hasPilotSyncStatus() )
-    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
+  if ( hasPilotSynctqStatus() )
+    writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
   return true;
 }
 
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
 
 TQString ScalixBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( Qt::ISODate ) + 'Z';
+  return time.toString( TQt::ISODate ) + 'Z';
 }
 
 TQString ScalixBase::dateToString( const TQDate& date )
 {
-  return date.toString( Qt::ISODate );
+  return date.toString( TQt::ISODate );
 }
 
 TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
   TQString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, Qt::ISODate );
+  return TQDateTime::fromString( date, TQt::ISODate );
 }
 
 TQDate ScalixBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, Qt::ISODate );
+  return TQDate::fromString( date, TQt::ISODate );
 }
 
 TQString ScalixBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index 2db064f7..b837ab03 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -53,8 +53,8 @@ class ScalixBase {
 public:
   struct Email {
   public:
-    Email( const TQString& name = TQString::null,
-           const TQString& email = TQString::null )
+    Email( const TQString& name = TQString(),
+           const TQString& email = TQString() )
       : displayName( name ), smtpAddress( email )
     {
     }
@@ -65,7 +65,7 @@ public:
 
   enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
 
-  explicit ScalixBase( const TQString& timezone = TQString::null );
+  explicit ScalixBase( const TQString& timezone = TQString() );
   virtual ~ScalixBase();
 
   // Return a string identifying this type
@@ -93,9 +93,9 @@ public:
   virtual bool hasPilotSyncId() const;
   virtual unsigned long pilotSyncId() const;
 
-  virtual void setPilotSyncStatus( int status );
-  virtual bool hasPilotSyncStatus() const;
-  virtual int pilotSyncStatus() const;
+  virtual void setPilotSynctqStatus( int status );
+  virtual bool hasPilotSynctqStatus() const;
+  virtual int pilotSynctqStatus() const;
 
   // String - Date conversion methods
   static TQString dateTimeToString( const TQDateTime& time );
@@ -115,7 +115,7 @@ public:
   bool load( const TQString& xml );
   bool load( TQFile& xml );
 
-  // Load this QDomDocument
+  // Load this TQDomDocument
   virtual bool loadXML( const TQDomDocument& xml ) = 0;
 
   // Serialize this object to an XML string
@@ -166,9 +166,9 @@ protected:
   TQString mTimeZoneId;
 
   // KPilot synchronization stuff
-  bool mHasPilotSyncId,  mHasPilotSyncStatus;
+  bool mHasPilotSyncId,  mHasPilotSynctqStatus;
   unsigned long mPilotSyncId;
-  int mPilotSyncStatus;
+  int mPilotSynctqStatus;
 };
 
 }
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 02c9e40f..bd3fdd8a 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index d7c575da..3fcb6b03 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -46,7 +46,7 @@ namespace Scalix {
  */
 class SubResource {
 public:
-  // This is just for QMap
+  // This is just for TQMap
   SubResource() {}
 
   SubResource( bool active, bool writable, const TQString& label,
@@ -86,7 +86,7 @@ typedef TQMap<TQString, SubResource> ResourceMap;
  */
 class StorageReference {
 public:
-  // Just for QMap
+  // Just for TQMap
   StorageReference() {}
 
   StorageReference( const TQString& resource, TQ_UINT32 sernum );
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 433a6adb..76e233ce 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -194,7 +194,7 @@ bool ResourceSlox::asyncLoad()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->folderId() );
@@ -246,7 +246,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
       TQString uid = "kresources_slox_kabc_" + item.sloxId;
       if ( item.status == SloxItem::Delete ) {
         TQMap<TQString,Addressee>::Iterator it;
-        it = mAddrMap.find( uid );
+        it = mAddrMap.tqfind( uid );
         if ( it != mAddrMap.end() ) {
           mAddrMap.remove( it );
           changed = true;
@@ -255,7 +255,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
         Addressee a;
         a.setUid( uid );
 
-        mWebdavHandler.clearSloxAttributeStatus();
+        mWebdavHandler.clearSloxAttributetqStatus();
 
         TQDomNode n;
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
@@ -312,7 +312,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
       }
       if ( item.status == SloxItem::New ) {
         TQMap<TQString,Addressee>::Iterator search_res;
-        search_res = mAddrMap.find( item.clientId );
+        search_res = mAddrMap.tqfind( item.clientId );
         if ( search_res != mAddrMap.end() ) {
           // use the id provided by the server
           Addressee a = *search_res;
@@ -344,7 +344,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
   int pnType = 0;
 
   if ( tag == fieldName( Birthday ) ) {
-    TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
+    TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
     a.setBirthday( dt.date() );
   } else if ( tag == fieldName( Role ) ) {
     a.setRole( text );
@@ -400,8 +400,8 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
   } else if ( tag == fieldName( SpousesName ) ) {
     a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text );
   } else if ( tag == fieldName( Anniversary ) ) {
-    TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
-    a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) );
+    TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
+    a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) );
   } else if ( tag == fieldName( Categories ) ) {
     a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) );
   } else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX
@@ -576,7 +576,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
     TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" );
     if ( !anniversary.isEmpty() )
       WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ),
-        WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) );
+        WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) );
     else
       WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) );
   }
@@ -631,14 +631,14 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   }
 }
 
-void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
+void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
                                                const TQString &prefix, const KABC::Address &addr )
 {
-  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() );
-  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() );
-  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( City ), addr.locality() );
-  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( State ), addr.region() );
-  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Street ), addr.street() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( PostalCode ), addr.postalCode() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( City ), addr.locality() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( State ), addr.region() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Country ), addr.country() );
 }
 
 void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent )
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index 5815acd4..d7d3417f 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -48,6 +48,7 @@ class SloxPrefs;
 class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceSlox( const KConfig * );
     ResourceSlox( const KURL &url,
@@ -80,7 +81,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     void parseContactAttribute( const TQDomElement &e, Addressee &a );
 
     void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a );
-    void createAddressFields( TQDomDocument &doc, TQDomElement &parent,
+    void createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
                               const TQString &prefix, const KABC::Address &addr );
 
     void uploadContacts();
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index abacaf71..d6760156 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -39,8 +39,8 @@
 
 using namespace KABC;
 
-ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name ), mRes( 0 )
+ResourceSloxConfig::ResourceSloxConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name ), mRes( 0 )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 63031045..2392d5cc 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -35,9 +35,10 @@ namespace KABC {
 class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceSloxConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 668631d3..40afcd7e 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -213,7 +213,7 @@ void KCalResourceSlox::requestEvents()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->calendarFolderId() );
@@ -258,7 +258,7 @@ void KCalResourceSlox::requestTodos()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->taskFolderId() );
@@ -393,17 +393,17 @@ void KCalResourceSlox::uploadIncidences()
 }
 
 void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
-                                                  TQDomElement &parent,
+                                                  TQDomElement &tqparent,
                                                   Incidence *incidence )
 {
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( IncidenceTitle ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( IncidenceTitle ),
                                  incidence->summary() );
 
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Description ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Description ),
                                  incidence->description() );
 
   if ( incidence->attendeeCount() > 0 ) {
-    TQDomElement members = WebdavHandler::addSloxElement( this, doc, parent,
+    TQDomElement members = WebdavHandler::addSloxElement( this, doc, tqparent,
         fieldName( Participants ) );
     Attendee::List attendees = incidence->attendees();
     Attendee::List::ConstIterator it;
@@ -428,62 +428,62 @@ void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
   // TODO OX support
   if ( incidence->secrecy() == Incidence::SecrecyPublic && type() != "ox" )
   {
-    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" );
+    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, tqparent, "readrights" );
     WebdavHandler::addSloxElement( this, doc, rights, "group", "users" );
   }
 
   // set reminder as the number of minutes to the start of the event
   KCal::Alarm::List alarms = incidence->alarms();
   if ( !alarms.isEmpty() && alarms.first()->hasStartOffset() && alarms.first()->enabled() )
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ),
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ),
                                    TQString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) );
   else
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), "0" );
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ), "0" );
 
   // categories
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Categories ), incidence->categories().join( ", " ) );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Categories ), incidence->categories().join( ", " ) );
 }
 
 void KCalResourceSlox::createEventAttributes( TQDomDocument &doc,
-                                              TQDomElement &parent,
+                                              TQDomElement &tqparent,
                                               Event *event )
 {
   TQString folderId = mPrefs->calendarFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
 
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventBegin ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventBegin ),
       WebdavHandler::qDateTimeToSlox( event->dtStart(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventEnd ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventEnd ),
       WebdavHandler::qDateTimeToSlox( event->dtEnd(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Location ), event->location() );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Location ), event->location() );
 
   if ( event->doesFloat() ) {
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( true ) );
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( true ) );
   } else {
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( false ) );
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( false ) );
   }
 }
 
 void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
-                                             TQDomElement &parent,
+                                             TQDomElement &tqparent,
                                              Todo *todo )
 {
   TQString folderId = mPrefs->taskFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
 
   if ( todo->hasStartDate() ) {
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskBegin ),
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskBegin ),
         WebdavHandler::qDateTimeToSlox( todo->dtStart(), timeZoneId() ) );
   }
 
   if ( todo->hasDueDate() ) {
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskEnd ),
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskEnd ),
         WebdavHandler::qDateTimeToSlox( todo->dtDue(), timeZoneId() ) );
   }
 
@@ -502,18 +502,18 @@ void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
       txt = "2";
       break;
   }
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Priority ), txt );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Priority ), txt );
 
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( PercentComplete ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( PercentComplete ),
                                  TQString::number( todo->percentComplete() ) );
 }
 
 void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
-                                                   TQDomElement &parent,
+                                                   TQDomElement &tqparent,
                                                    KCal::Incidence *incidence )
 {
   if ( !incidence->doesRecur() ) {
-    WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
+    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
                                    type() == "ox" ? "none" : "no" );
     return;
   }
@@ -521,13 +521,13 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
   int monthOffset = ( type() == "ox" ? -1 : 0 );
   switch ( r->recurrenceType() ) {
     case Recurrence::rDaily:
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "daily" );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDailyFreq ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "daily" );
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDailyFreq ),
                                      TQString::number( r->frequency() ) );
       break;
     case Recurrence::rWeekly: {
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "weekly" );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceWeeklyFreq ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "weekly" );
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceWeeklyFreq ),
                                      TQString::number( r->frequency() ) );
       // TODO: SLOX support
       int oxDays = 0;
@@ -536,61 +536,61 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
           oxDays += 1 << ( ( i + 1 ) % 7 );
       }
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, parent, "days", TQString::number( oxDays ) );
+        WebdavHandler::addSloxElement( this, doc, tqparent, "days", TQString::number( oxDays ) );
       break; }
     case Recurrence::rMonthlyDay:
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "monthly" );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyFreq ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "monthly" );
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyFreq ),
                                      TQString::number( r->frequency() ) );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyDay ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyDay ),
                                      TQString::number( r->monthDays().first() ) );
       break;
     case Recurrence::rMonthlyPos: {
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "monthly" : "monthly2" );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Freq ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Freq ),
                                      TQString::number( r->frequency() ) );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Day ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Pos ),
                                      TQString::number( wdp.pos() ) );
       break; }
     case Recurrence::rYearlyMonth:
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "yearly" );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyDay ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "yearly" );
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyDay ),
                                      TQString::number( r->yearDates().first() ) );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyMonth ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyMonth ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
       break;
     case Recurrence::rYearlyPos: {
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "yearly" : "yearly2" );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Day ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Pos ),
                                      TQString::number( wdp.pos() ) );
-      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Month ),
+      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Month ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
       break; }
     default:
       kdDebug() << k_funcinfo << "unsupported recurrence type: " << r->recurrenceType() << endl;
   }
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceEnd ),
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceEnd ),
                                  WebdavHandler::qDateTimeToSlox( r->endDateTime() ) );
   // delete exceptions
   DateList exlist = r->exDates();
   TQStringList res;
   for ( DateList::Iterator it = exlist.begin(); it != exlist.end(); ++it )
     res.append( WebdavHandler::qDateTimeToSlox( *it ) );
-  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDelEx ), res.join( "," ) );
+  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDelEx ), res.join( "," ) );
 }
 
 void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
@@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
       TQString status = memberElement.attribute( "confirm" );
       if ( !status.isEmpty() ) {
         if ( status == "accept" ) {
-          a->seStatus( Attendee::Accepted );
+          a->setqStatus( Attendee::Accepted );
         } else if ( status == "decline" ) {
-          a->seStatus( Attendee::Declined );
+          a->setqStatus( Attendee::Declined );
         } else {
-          a->seStatus( Attendee::NeedsAction );
+          a->setqStatus( Attendee::NeedsAction );
         }
       }
     } else {
@@ -710,19 +710,19 @@ void KCalResourceSlox::parseEventAttribute( const TQDomElement &e,
     TQDateTime dt;
     if ( event->doesFloat() ) {
       if ( type() == "ox" )
-        dt = WebdavHandler::sloxToQDateTime( text, timeZoneId() );
+        dt = WebdavHandler::sloxToTQDateTime( text, timeZoneId() );
       else
-        dt = WebdavHandler::sloxToQDateTime( text ); // ### is this really correct for SLOX?
+        dt = WebdavHandler::sloxToTQDateTime( text ); // ### is this really correct for SLOX?
     } else
-      dt = WebdavHandler::sloxToQDateTime( text, timeZoneId() );
+      dt = WebdavHandler::sloxToTQDateTime( text, timeZoneId() );
     event->setDtStart( dt );
   } else if ( tag == fieldName( EventEnd ) ) {
     TQDateTime dt;
     if ( event->doesFloat() ) {
-      dt = WebdavHandler::sloxToQDateTime( text );
+      dt = WebdavHandler::sloxToTQDateTime( text );
       dt = dt.addSecs( -1 );
     }
-    else dt = WebdavHandler::sloxToQDateTime( text, timeZoneId() );
+    else dt = WebdavHandler::sloxToTQDateTime( text, timeZoneId() );
     event->setDtEnd( dt );
   } else if ( tag == fieldName( Location ) ) {
     event->setLocation( text );
@@ -769,7 +769,7 @@ void KCalResourceSlox::parseRecurrence( const TQDomNode &node, Event *event )
     } else if ( tag == "daily_value" ) {
       dailyValue = text.toInt();
     } else if ( tag == fieldName( RecurrenceEnd ) ) {
-      end = WebdavHandler::sloxToQDateTime( text );
+      end = WebdavHandler::sloxToTQDateTime( text );
     } else if ( tag == "weekly_value" ) {
       weeklyValue = text.toInt();
     } else if ( tag.left( 11 ) == "weekly_day_" ) {
@@ -823,7 +823,7 @@ void KCalResourceSlox::parseRecurrence( const TQDomNode &node, Event *event )
       TQStringList exdates = TQStringList::split( ",", text );
       TQStringList::Iterator it;
       for ( it = exdates.begin(); it != exdates.end(); ++it )
-        deleteExceptions.append( WebdavHandler::sloxToQDateTime( *it ).date() );
+        deleteExceptions.append( WebdavHandler::sloxToTQDateTime( *it ).date() );
     }
   }
 
@@ -875,13 +875,13 @@ void KCalResourceSlox::parseTodoAttribute( const TQDomElement &e,
   if ( text.isEmpty() ) return;
 
   if ( tag == fieldName( TaskBegin ) ) {
-    TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
+    TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
     if ( dt.isValid() ) {
       todo->setDtStart( dt );
       todo->setHasStartDate( true );
     }
   } else if ( tag == fieldName( TaskEnd ) ) {
-    TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
+    TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
     if ( dt.isValid() ) {
       todo->setDtDue( dt );
       todo->setHasDueDate( true );
@@ -953,7 +953,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
 
         todo->setCustomProperty( "SLOX", "ID", item.sloxId );
 
-        mWebdavHandler.clearSloxAttributeStatus();
+        mWebdavHandler.clearSloxAttributetqStatus();
 
         TQDomNode n;
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
@@ -1032,7 +1032,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
 
         bool doesRecur = false;
 
-        mWebdavHandler.clearSloxAttributeStatus();
+        mWebdavHandler.clearSloxAttributetqStatus();
 
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
           TQDomElement e = n.toElement();
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 0f9b289d..73e44a11 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -61,6 +61,7 @@ class SloxAccounts;
 class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class KCalResourceSloxConfig;
 
@@ -124,16 +125,16 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
     void parseRecurrence( const TQDomNode &n, KCal::Event *event );
 
     void createIncidenceAttributes( TQDomDocument &doc,
-                                    TQDomElement &parent,
+                                    TQDomElement &tqparent,
                                     KCal::Incidence *incidence );
     void createEventAttributes( TQDomDocument &doc,
-                                TQDomElement &parent,
+                                TQDomElement &tqparent,
                                 KCal::Event *event );
     void createTodoAttributes( TQDomDocument &doc,
-                               TQDomElement &parent,
+                               TQDomElement &tqparent,
                                KCal::Todo *todo );
     void createRecurrenceAttributes( TQDomDocument &doc,
-                                     TQDomElement &parent,
+                                     TQDomElement &tqparent,
                                      KCal::Incidence *incidence );
 
     bool confirmSave();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 441ea533..8b1683ea 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -40,8 +40,8 @@
 
 #include "kcalresourcesloxconfig.h"
 
-KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent,  const char* name ) :
-  KRES::ConfigWidget( parent, name ), mRes( 0 )
+KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* tqparent,  const char* name ) :
+  KRES::ConfigWidget( tqparent, name ), mRes( 0 )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() );
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index 7e7422b6..56fef761 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -45,8 +45,9 @@ class SloxBase;
 class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
+    KCalResourceSloxConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index a49594ea..de694b4f 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -78,7 +78,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
 KABC::Addressee SloxAccounts::lookupUser( const TQString &id )
 {
   TQMap<TQString, KABC::Addressee>::ConstIterator it;
-  it = mUsers.find( id );
+  it = mUsers.tqfind( id );
   if ( it == mUsers.end() ) {
     requestAccounts();
     return KABC::Addressee();
@@ -99,7 +99,7 @@ TQString SloxAccounts::lookupId( const TQString &email )
   }
   requestAccounts();
 
-  int pos = email.find( '@' );
+  int pos = email.tqfind( '@' );
   if ( pos < 0 ) return email;
   else return email.left( pos );
 }
@@ -127,7 +127,7 @@ void SloxAccounts::requestAccounts()
     url.setPath( "/servlet/webdav.groupuser/" );
 
     TQDomDocument doc;
-    TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+    TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
     TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
     WebdavHandler::addSloxElement( mRes, doc, prop, "user", "*" );
     WebdavHandler::addSloxElement( mRes, doc, prop, "group", "*" );
@@ -207,7 +207,7 @@ void SloxAccounts::readAccounts()
       TQDomElement e = n.toElement();
       TQString tag = e.tagName();
       // remove XML namespace
-      tag = tag.right( tag.length() - ( tag.find( ':' ) + 1 ) );
+      tag = tag.right( tag.length() - ( tag.tqfind( ':' ) + 1 ) );
       TQString value = e.text();
       if ( tag == "uid" ) id = value;
       else if ( tag == "mail" ) a.insertEmail( value, true );
diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h
index bda5c449..f971360c 100644
--- a/kresources/slox/sloxaccounts.h
+++ b/kresources/slox/sloxaccounts.h
@@ -30,9 +30,10 @@ class Job;
 
 class SloxBase;
 
-class KDE_EXPORT SloxAccounts : public QObject
+class KDE_EXPORT SloxAccounts : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     SloxAccounts( SloxBase *res, const KURL &baseUrl );
     ~SloxAccounts();
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index dd96cc49..3a6e7055 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase {
       FolderId,
       LastSync,
       ObjectType,
-      ObjecStatus,
+      ObjectqStatus,
       CreatedBy,
       Categories,
       IncidenceTitle, // incidence fields
diff --git a/kresources/slox/sloxfolder.cpp b/kresources/slox/sloxfolder.cpp
index fbfb9f05..0430f8ee 100644
--- a/kresources/slox/sloxfolder.cpp
+++ b/kresources/slox/sloxfolder.cpp
@@ -21,10 +21,10 @@
 
 #include "sloxfolder.h"
 
-SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) :
+SloxFolder::SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def ) :
   item( 0 ),
   mId( id ),
-  mParentId( parentId ),
+  mParentId( tqparentId ),
   mName( name ),
   mDefault( def )
 {
diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h
index e27399a6..967f83ed 100644
--- a/kresources/slox/sloxfolder.h
+++ b/kresources/slox/sloxfolder.h
@@ -35,10 +35,10 @@ enum FolderType {
 class KDE_EXPORT SloxFolder
 {
   public:
-    SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false );
+    SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def = false );
 
     TQString id() const { return mId; }
-    TQString parentId() const { return mParentId; }
+    TQString tqparentId() const { return mParentId; }
     FolderType type() const { return mType; }
     TQString name() const;
     bool isDefault() const { return mDefault; }
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index dc3c59dc..acf871b2 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -25,8 +25,8 @@
 #include "sloxfolderdialog.h"
 #include "sloxfoldermanager.h"
 
-SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *parent, const char *name ) :
-  KDialogBase( parent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
+SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *tqparent, const char *name ) :
+  KDialogBase( tqparent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
   mManager( manager ),
   mFolderType( type )
 {
@@ -70,11 +70,11 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
     return;
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
-  if( mManager->folders().tqcontains( folder->parentId() ) ) {
-    SloxFolder *parent = mManager->folders()[folder->parentId()];
-    createFolderViewItem( parent );
-    if ( parent->item )
-      folder->item = new KListViewItem( parent->item );
+  if( mManager->folders().tqcontains( folder->tqparentId() ) ) {
+    SloxFolder *tqparent = mManager->folders()[folder->tqparentId()];
+    createFolderViewItem( tqparent );
+    if ( tqparent->item )
+      folder->item = new KListViewItem( tqparent->item );
     else
       folder->item = new KListViewItem( mListView );
   } else {
diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h
index 6432a649..3c2cac88 100644
--- a/kresources/slox/sloxfolderdialog.h
+++ b/kresources/slox/sloxfolderdialog.h
@@ -31,8 +31,9 @@ class SloxFolderManager;
 class SloxFolderDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
+    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* tqparent = 0, const char *name = 0 );
     ~SloxFolderDialog();
 
     TQString selectedFolder() const;
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index 41864caf..b5fd3958 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -65,7 +65,7 @@ void SloxFolderManager::requestFolders()
   url.setPath( "/servlet/webdav.folders/file.xml" );
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( mRes, doc, prop, "objectmode", "NEW_AND_MODIFIED" );
   WebdavHandler::addSloxElement( mRes, doc, prop, "lastsync", "0" );
@@ -136,7 +136,7 @@ void SloxFolderManager::readFolders()
   TQDomNodeList nodes = doc.elementsByTagName( "D:prop" );
   for( uint i = 0; i < nodes.count(); ++i ) {
     TQDomElement element = nodes.item(i).toElement();
-    TQString id = "-1", parentId = "-1"; // OX default folder
+    TQString id = "-1", tqparentId = "-1"; // OX default folder
     bool def = false;
     TQString name, type;
     TQDomNode n;
@@ -145,13 +145,13 @@ void SloxFolderManager::readFolders()
       TQString tag = e.tagName();
       TQString value = e.text();
       if ( tag == "ox:object_id" ) id = value;
-      else if ( tag == "ox:folder_id" ) parentId = value;
+      else if ( tag == "ox:folder_id" ) tqparentId = value;
       else if ( tag == "ox:title" ) name = value;
       else if ( tag == "ox:module" ) type = value;
       else if ( tag == "ox:defaultfolder" ) def = (value == "true");
     }
-    if ( id != "-1" && parentId != "-1" ) {
-      SloxFolder *folder = new SloxFolder( id, parentId, type, name, def );
+    if ( id != "-1" && tqparentId != "-1" ) {
+      SloxFolder *folder = new SloxFolder( id, tqparentId, type, name, def );
       mFolders[id] = folder;
       kdDebug() << k_funcinfo << "Found folder: " << folder->name() << endl;
     }
diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h
index 832c7067..ee21c150 100644
--- a/kresources/slox/sloxfoldermanager.h
+++ b/kresources/slox/sloxfoldermanager.h
@@ -35,9 +35,10 @@ class DavJob;
 class SloxBase;
 class SloxFolder;
 
-class KDE_EXPORT SloxFolderManager : public QObject
+class KDE_EXPORT SloxFolderManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     SloxFolderManager( SloxBase *res, const KURL &baseUrl );
     ~SloxFolderManager();
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 576def37..b010e0e9 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -129,9 +129,9 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc
           item.status = SloxItem::New;
       }
 
-      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) );
-      if ( !sloxStatus.isNull() ) {
-        TQDomElement sloxStatusElement = sloxStatus.toElement();
+      TQDomNode sloxtqStatus = prop.namedItem( res->fieldName( SloxBase::ObjectqStatus ) );
+      if ( !sloxtqStatus.isNull() ) {
+        TQDomElement sloxStatusElement = sloxtqStatus.toElement();
         if ( sloxStatusElement.text() == "DELETE" ) {
           item.status = SloxItem::Delete;
         } else if ( sloxStatusElement.text() == "CREATE" ) {
@@ -186,7 +186,7 @@ TQString WebdavHandler::qDateTimeToSlox( const TQDateTime &dt,
   return TQString::number( ticks ) + "000";
 }
 
-TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str )
+TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str )
 {
   TQString s = str.mid( 0, str.length() - 3 );
 
@@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str )
   TQDateTime dt;
 
   if (preEpoch) {
-    dt.setTime_t( 0, Qt::UTC );
+    dt.setTime_t( 0, TQt::UTC );
     if (ticks > INT_MAX) {
       dt = dt.addSecs(-INT_MAX);
       ticks -= INT_MAX;
@@ -208,16 +208,16 @@ TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str )
   }
   else
   {
-    dt.setTime_t( ticks, Qt::UTC );
+    dt.setTime_t( ticks, TQt::UTC );
   }
 
   return dt;
 }
 
-TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str,
+TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str,
                                           const TQString &timeZoneId )
 {
-  return KPimPrefs::utcToLocalTime( sloxToQDateTime(str), timeZoneId );
+  return KPimPrefs::utcToLocalTime( sloxToTQDateTime(str), timeZoneId );
 }
 
 TQDomElement WebdavHandler::addElement( TQDomDocument &doc, TQDomNode &node,
@@ -276,7 +276,7 @@ void WebdavHandler::parseSloxAttribute( const TQDomElement &e )
   }
 }
 
-void WebdavHandler::clearSloxAttributeStatus()
+void WebdavHandler::clearSloxAttributetqStatus()
 {
   if ( mRes->resType() == "ox" )
     mWritable = true; // parseSloxAttribute() won't work for OX
diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h
index 2d428619..bbaf897f 100644
--- a/kresources/slox/webdavhandler.h
+++ b/kresources/slox/webdavhandler.h
@@ -37,14 +37,14 @@ class SloxBase;
 class KDE_EXPORT SloxItem
 {
   public:
-    enum Status { Invalid, Delete, Create, New };
+    enum tqStatus { Invalid, Delete, Create, New };
 
     SloxItem();
 
     TQDomNode domNode;
     TQString sloxId;
     TQString clientId;
-    Status status;
+    tqStatus status;
     TQString response;
     TQString responseDescription;
 };
@@ -67,10 +67,10 @@ class KDE_EXPORT WebdavHandler
     static TQDomElement addSloxElement( SloxBase *res,
                                        TQDomDocument &, TQDomNode &,
                                        const TQString &tag,
-                                       const TQString &text = TQString::null );
+                                       const TQString &text = TQString() );
 
-    static TQDateTime sloxToQDateTime( const TQString &str );
-    static TQDateTime sloxToQDateTime( const TQString &str,
+    static TQDateTime sloxToTQDateTime( const TQString &str );
+    static TQDateTime sloxToTQDateTime( const TQString &str,
                                       const TQString &timeZoneId );
     static TQString qDateTimeToSlox( const TQDateTime &dt );
     static TQString qDateTimeToSlox( const TQDateTime &dt,
@@ -78,7 +78,7 @@ class KDE_EXPORT WebdavHandler
 
     static TQValueList<SloxItem> getSloxItems( SloxBase *res, const TQDomDocument &doc );
 
-    void clearSloxAttributeStatus();
+    void clearSloxAttributetqStatus();
     void parseSloxAttribute( const TQDomElement & );
     void setSloxAttributes( KCal::Incidence * );
     void setSloxAttributes( KABC::Addressee & );
diff --git a/kresources/tvanytime/COPYING b/kresources/tvanytime/COPYING
index c13faf0d..2ad70b8b 100644
--- a/kresources/tvanytime/COPYING
+++ b/kresources/tvanytime/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index a7cfebec..2ce2e9e4 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -415,7 +415,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
                 }
               }
               else
-                kdDebug() << " file tqcontains schedule for another service!" << endl;
+                kdDebug() << " file contains schedule for another service!" << endl;
             }
           }
         }
@@ -434,7 +434,7 @@ TQStringList ResourceTVAnytime::subresources() const
   return mServiceMap.keys();
 }
 
-const QString
+const TQString
 ResourceTVAnytime::labelForSubresource( const TQString& subresource ) const
 {
   Service s = mServiceMap[ subresource ];
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index be46a116..a43e759c 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -51,6 +51,7 @@ class TVAnytimePrefsBase;
 class KDE_EXPORT ResourceTVAnytime : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceTVAnytime();
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 47d62d37..6c07a9af 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -40,8 +40,8 @@
 
 using namespace KCal;
 
-ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index 57331a44..b4a391e2 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -41,8 +41,9 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceTVAnytimeConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/tvanytime/service.cpp b/kresources/tvanytime/service.cpp
index ecf34fc4..e4c3ff21 100644
--- a/kresources/tvanytime/service.cpp
+++ b/kresources/tvanytime/service.cpp
@@ -138,7 +138,7 @@ bool ScheduleEvent::loadAttribute( const TQDomElement& element )
   else if ( tagName == "PublishedStartTime" ) {
     TQDomNode cn = element.firstChild();
     TQDomText t = cn.toText();
-    mStartTime = TQDateTime::fromString( t.data(), Qt::ISODate );
+    mStartTime = TQDateTime::fromString( t.data(), TQt::ISODate );
   }
   else if ( tagName == "PublishedDuration" ) {
     TQDomNode cn = element.firstChild();
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 06e2685d..7fd6cacf 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -33,8 +33,8 @@
 #include <tqdatastream.h>
 #include <tqpicture.h>
 
-AttachPropertyDialog::AttachPropertyDialog(TQWidget *parent, const char *name)
-	: AttachPropertyDialogBase(parent, name, true)
+AttachPropertyDialog::AttachPropertyDialog(TQWidget *tqparent, const char *name)
+	: AttachPropertyDialogBase(tqparent, name, true)
 {
 }
 
@@ -44,7 +44,7 @@ AttachPropertyDialog::~AttachPropertyDialog()
 
 void AttachPropertyDialog::setAttachment(KTNEFAttach *attach)
 {
-	QString	s = (attach->fileName().isEmpty() ? attach->name() : attach->fileName());
+	TQString	s = (attach->fileName().isEmpty() ? attach->name() : attach->fileName());
 	filename_->setText("<b>"+s+"</b>");
 	setCaption(s);
 	display_->setText(attach->displayName());
@@ -113,19 +113,19 @@ void formatPropertySet( KTNEFPropertySet *pSet, TQListView *lv )
 	formatProperties( pSet->attributes(), 0, item, "attr" );
 }
 
-void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *parent )
+void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *tqparent )
 {
 	TQListViewItem *item = lv->selectedItem();
 	if ( !item )
-		KMessageBox::error( parent, i18n( "Select an item." ) );
+		KMessageBox::error( tqparent, i18n( "Select an item." ) );
 	else if ( item->text( 2 ).isEmpty() )
-		KMessageBox::error( parent, i18n( "The selected item cannot be saved." ) );
+		KMessageBox::error( tqparent, i18n( "The selected item cannot be saved." ) );
 	else
 	{
 		TQString tag = item->text( 2 );
 		int key = tag.mid( 5 ).toInt();
 		TQVariant prop = ( tag.startsWith( "attr_" ) ? pSet->attribute( key ) : pSet->property( key ) );
-		TQString filename = KFileDialog::getSaveFileName( tag, TQString::null, parent );
+		TQString filename = KFileDialog::getSaveFileName( tag, TQString(), tqparent );
 		if ( !filename.isEmpty() )
 		{
 			TQFile f( filename );
@@ -146,7 +146,7 @@ void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *parent )
 				f.close();
 			}
 			else
-				KMessageBox::error( parent, i18n( "Unable to open file for writing, check file permissions." ) );
+				KMessageBox::error( tqparent, i18n( "Unable to open file for writing, check file permissions." ) );
 		}
 	}
 }
@@ -170,7 +170,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor )
 		if ( type == 1 && w > 0 && h > 0 )
 		{
 			// Load WMF data
-			QWinMetaFile wmfLoader;
+			TQWinMetaFile wmfLoader;
 			TQBuffer wmfBuffer( wmf.asByteArray() );
 			wmfBuffer.open( IO_ReadOnly );
 			wmfLoader.setBbox( TQRect( 0, 0, w, h ) );
diff --git a/ktnef/gui/attachpropertydialog.h b/ktnef/gui/attachpropertydialog.h
index aa5e2bf3..b390caff 100644
--- a/ktnef/gui/attachpropertydialog.h
+++ b/ktnef/gui/attachpropertydialog.h
@@ -31,7 +31,7 @@ class TQListViewItem;
 class AttachPropertyDialog : public AttachPropertyDialogBase
 {
 public:
-	AttachPropertyDialog(TQWidget *parent = 0, const char *name = 0);
+	AttachPropertyDialog(TQWidget *tqparent = 0, const char *name = 0);
 	~AttachPropertyDialog();
 
 	void setAttachment(KTNEFAttach *attach);
diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui
index a06db962..eaf9a598 100644
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AttachPropertyDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AttachPropertyDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>display_</cstring>
             </property>
@@ -35,7 +35,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>description_</cstring>
             </property>
@@ -48,7 +48,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>mime_</cstring>
             </property>
@@ -61,7 +61,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>size_</cstring>
             </property>
@@ -74,7 +74,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="5" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>index_</cstring>
             </property>
@@ -101,7 +101,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>displayLabel_</cstring>
             </property>
@@ -117,7 +117,7 @@
                 <string>Comment:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>descriptionLabel_</cstring>
             </property>
@@ -125,7 +125,7 @@
                 <string>Description:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>mimeLabel_</cstring>
             </property>
@@ -133,7 +133,7 @@
                 <string>Mime type:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>sizeLabel_</cstring>
             </property>
@@ -141,7 +141,7 @@
                 <string>File size:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>indexLabel_</cstring>
             </property>
@@ -149,7 +149,7 @@
                 <string>Index:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>filename_</cstring>
             </property>
@@ -165,7 +165,7 @@
                 <enum>RichText</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="2">
+        <widget class="TQLabel" row="0" column="2">
             <property name="name">
                 <cstring>icon_</cstring>
             </property>
@@ -209,7 +209,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>tqlayout2</cstring>
             </property>
@@ -234,7 +234,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>save_</cstring>
                     </property>
@@ -242,7 +242,7 @@
                         <string>&amp;Save</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>close_</cstring>
                     </property>
@@ -271,9 +271,9 @@
         <slot>saveClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">saveClicked()</slot>
-</slots>
+</Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index ea44edbe..fd9438e6 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -57,8 +57,8 @@
 
 #define	NOT_IMPLEMENTED TQMessageBox::information(this, "ktnef", "Not implemented yet", TQMessageBox::Ok|TQMessageBox::Default, 0)
 
-KTNEFMain::KTNEFMain(TQWidget *parent, const char *name)
-	: KMainWindow(parent, name)
+KTNEFMain::KTNEFMain(TQWidget *tqparent, const char *name)
+	: KMainWindow(tqparent, name)
 {
 	setupActions();
 	setupStatusbar();
@@ -154,7 +154,7 @@ void KTNEFMain::loadFile(const TQString& filename)
 	else
 	{
 		TQPtrList<KTNEFAttach>	list = parser_->message()->attachmentList();
-		QString			msg;
+		TQString			msg;
 		msg = i18n( "%n attachment found", "%n attachments found", list.count() );
 		statusBar()->changeItem(msg, 0);
 		view_->setAttachments(&list);
@@ -165,7 +165,7 @@ void KTNEFMain::loadFile(const TQString& filename)
 
 void KTNEFMain::openFile()
 {
-	QString	filename = KFileDialog::getOpenFileName(0,0,this,0);
+	TQString	filename = KFileDialog::getOpenFileName(0,0,this,0);
 	if (!filename.isEmpty()) loadFile(filename);
 }
 
@@ -173,7 +173,7 @@ void KTNEFMain::viewFile()
 {
 	KTNEFAttach	*attach = view_->getSelection()->first();
 	KURL		url("file:"+extractTemp(attach));
-	QString		mimename(attach->mimeTag());
+	TQString		mimename(attach->mimeTag());
 
 	if (mimename.isEmpty() || mimename == "application/octet-stream")
 	{
@@ -189,7 +189,7 @@ void KTNEFMain::viewFile()
 
 TQString KTNEFMain::extractTemp(KTNEFAttach *att)
 {
-	QString		dir = KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/";
+	TQString		dir = KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/";
 	parser_->extractFileTo(att->name(), dir);
 	dir.append(att->name());
 	return dir;
@@ -210,7 +210,7 @@ void KTNEFMain::extractFile()
 
 void KTNEFMain::extractFileTo()
 {
-	QString	dir = KFileDialog::getExistingDirectory(lastdir_, this);
+	TQString	dir = KFileDialog::getExistingDirectory(lastdir_, this);
 	if (!dir.isEmpty())
 	{
 		extractTo(dir);
@@ -220,7 +220,7 @@ void KTNEFMain::extractFileTo()
 
 void KTNEFMain::extractAllFiles()
 {
-	QString	dir = KFileDialog::getExistingDirectory(lastdir_, this);
+	TQString	dir = KFileDialog::getExistingDirectory(lastdir_, this);
 	if (!dir.isEmpty())
 	{
 		lastdir_ = dir;
@@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles()
 		for (;it.current();++it)
 			if (!parser_->extractFileTo(it.current()->name(), dir))
 			{
-				QString	msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() );
+				TQString	msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() );
 				TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 				return;
 			}
@@ -247,7 +247,7 @@ void KTNEFMain::propertiesFile()
 
 void KTNEFMain::optionDefaultDir()
 {
-	QString	dirname = KFileDialog::getExistingDirectory(defaultdir_, this);
+	TQString	dirname = KFileDialog::getExistingDirectory(defaultdir_, this);
 	if (!dirname.isEmpty())
 	{
 		defaultdir_ = dirname;
@@ -285,23 +285,23 @@ void KTNEFMain::enableSingleAction(bool on)
 
 void KTNEFMain::cleanup()
 {
-	QDir	d(KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/");
-	const QFileInfoList	*list = d.entryInfoList(TQDir::Files|TQDir::Hidden,TQDir::Unsorted);
-	QFileInfoListIterator	it(*list);
+	TQDir	d(KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/");
+	const TQFileInfoList	*list = d.entryInfoList(TQDir::Files|TQDir::Hidden,TQDir::Unsorted);
+	TQFileInfoListIterator	it(*list);
 	for (;it.current();++it)
 		d.remove(it.current()->absFilePath());
 }
 
 void KTNEFMain::extractTo(const TQString& dirname)
 {
-	QString	dir = dirname;
+	TQString	dir = dirname;
 	if (dir.right(1) != "/") dir.append("/");
 	TQPtrList<KTNEFAttach>	*list = view_->getSelection();
 	TQPtrListIterator<KTNEFAttach>	it(*list);
 	for (;it.current();++it)
 		if (!parser_->extractFileTo(it.current()->name(), dir))
 		{
-			QString	msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() );
+			TQString	msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() );
 			TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 			return;
 		}
@@ -390,7 +390,7 @@ void KTNEFMain::slotShowMessageText()
 void KTNEFMain::slotSaveMessageText()
 {
 	TQString rtf = parser_->message()->rtfString();
-	TQString filename = KFileDialog::getSaveFileName( TQString::null, TQString::null, this );
+	TQString filename = KFileDialog::getSaveFileName( TQString(), TQString(), this );
 	if ( !filename.isEmpty() )
 	{
 		TQFile f( filename );
diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h
index 5f15f3d9..1b645d1e 100644
--- a/ktnef/gui/ktnefmain.h
+++ b/ktnef/gui/ktnefmain.h
@@ -29,9 +29,10 @@ class KTNEFAttach;
 class KTNEFMain : public KMainWindow
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KTNEFMain(TQWidget *parent = 0, const char *name = 0);
+	KTNEFMain(TQWidget *tqparent = 0, const char *name = 0);
 	~KTNEFMain();
 
 	void loadFile(const TQString& filename);
@@ -73,9 +74,9 @@ private:
 private:
 	KTNEFView	*view_;
 	KTNEFParser	*parser_;
-	QString		filename_;
-	QString		defaultdir_;
-	QString		lastdir_;
+	TQString		filename_;
+	TQString		defaultdir_;
+	TQString		lastdir_;
 };
 
 #endif
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index 79d5f073..dcf401ab 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -30,10 +30,10 @@
 
 #include <kmimetype.h>
 
-class Attachment : public QListViewItem
+class Attachment : public TQListViewItem
 {
 public:
-	Attachment(TQListView *parent, KTNEFAttach *attach);
+	Attachment(TQListView *tqparent, KTNEFAttach *attach);
 	~Attachment();
 
 	KTNEFAttach* getAttachment() const { return attach_; }
@@ -42,14 +42,14 @@ private:
 	KTNEFAttach	*attach_;
 };
 
-Attachment::Attachment(TQListView *parent, KTNEFAttach *attach)
-	: TQListViewItem(parent, attach->name()), attach_(attach)
+Attachment::Attachment(TQListView *tqparent, KTNEFAttach *attach)
+	: TQListViewItem(tqparent, attach->name()), attach_(attach)
 {
 	setText(2, TQString::number( attach_->size() ));
 	if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName());
 	KMimeType::Ptr	mimeType = KMimeType::mimeType( attach_->mimeTag() );
 	setText(1, mimeType->comment());
-	TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() );
+	TQPixmap pix = loadRenderingPixmap( attach, tqparent->tqcolorGroup().base() );
 	if ( !pix.isNull() )
 		setPixmap( 0, pix );
 	else
@@ -63,8 +63,8 @@ Attachment::~Attachment()
 
 //------------------------------------------------------------------------------------------------------
 
-KTNEFView::KTNEFView(TQWidget *parent, const char *name)
-	: KListView(parent,name)
+KTNEFView::KTNEFView(TQWidget *tqparent, const char *name)
+	: KListView(tqparent,name)
 {
 	attachments_.setAutoDelete(false);
 	addColumn(i18n("File Name"));
@@ -103,7 +103,7 @@ void KTNEFView::resizeEvent(TQResizeEvent *e)
 TQPtrList<KTNEFAttach>* KTNEFView::getSelection()
 {
 	attachments_.clear();
-	QListViewItem	*item = firstChild();
+	TQListViewItem	*item = firstChild();
 	while (item)
 	{
 		if (item->isSelected()) attachments_.append(((Attachment*)item)->getAttachment());
diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h
index faa3262a..8fbe5e4b 100644
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@@ -27,9 +27,10 @@ class KTNEFAttach;
 class KDE_EXPORT KTNEFView : public KListView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KTNEFView(TQWidget *parent = 0, const char *name = 0);
+	KTNEFView(TQWidget *tqparent = 0, const char *name = 0);
 	~KTNEFView();
 
 	void setAttachments(TQPtrList<KTNEFAttach> *list);
diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp
index a2b1f75f..075b4823 100644
--- a/ktnef/gui/messagepropertydialog.cpp
+++ b/ktnef/gui/messagepropertydialog.cpp
@@ -22,8 +22,8 @@
 #include <klistview.h>
 #include <klocale.h>
 
-MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg )
-	: KDialogBase( parent, "MessagePropertyDialog", true, i18n( "Message Properties" ),
+MessagePropertyDialog::MessagePropertyDialog( TQWidget *tqparent, KTNEFMessage *msg )
+	: KDialogBase( tqparent, "MessagePropertyDialog", true, i18n( "Message Properties" ),
 			KDialogBase::Close|KDialogBase::User1, KDialogBase::Close, false,
 			KStdGuiItem::save() )
 {
diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h
index 7d1ee7aa..d7db44de 100644
--- a/ktnef/gui/messagepropertydialog.h
+++ b/ktnef/gui/messagepropertydialog.h
@@ -26,8 +26,9 @@ class KTNEFMessage;
 class MessagePropertyDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg );
+	MessagePropertyDialog( TQWidget *tqparent, KTNEFMessage *msg );
 
 protected slots:
 	void slotUser1();
diff --git a/ktnef/gui/metafuncs.h b/ktnef/gui/metafuncs.h
index 8675851e..e8f1232d 100644
--- a/ktnef/gui/metafuncs.h
+++ b/ktnef/gui/metafuncs.h
@@ -4,86 +4,86 @@
 #ifndef metafunc_h
 #define metafunc_h
 
-class QWinMetaFile;
+class TQWinMetaFile;
 
 static const struct MetaFuncRec
 {
     const char* name;
     unsigned short func;
-    void ( QWinMetaFile::*method )( long, short* );
+    void ( TQWinMetaFile::*method )( long, short* );
 } metaFuncTab[] =
   {
-      { "SETBKCOLOR",           0x0201, &QWinMetaFile::setBkColor },
-      { "SETBKMODE",            0x0102, &QWinMetaFile::setBkMode },
-      { "SETMAPMODE",           0x0103, &QWinMetaFile::noop },
-      { "SETROP2",              0x0104, &QWinMetaFile::setRop },
-      { "SETRELABS",            0x0105, &QWinMetaFile::noop },
-      { "SETPOLYFILLMODE",      0x0106, &QWinMetaFile::setPolyFillMode },
-      { "SETSTRETCHBLTMODE",    0x0107, &QWinMetaFile::noop },
-      { "SETTEXTCHAREXTRA",     0x0108, &QWinMetaFile::noop },
-      { "SETTEXTCOLOR",         0x0209, &QWinMetaFile::setTextColor },
-      { "SETTEXTJUSTIFICATION", 0x020A, &QWinMetaFile::noop },
-      { "SETWINDOWORG",         0x020B, &QWinMetaFile::setWindowOrg },
-      { "SETWINDOWEXT",         0x020C, &QWinMetaFile::setWindowExt },
-      { "SETVIEWPORTORG",       0x020D, &QWinMetaFile::noop },
-      { "SETVIEWPORTEXT",       0x020E, &QWinMetaFile::noop },
-      { "OFFSETWINDOWORG",      0x020F, &QWinMetaFile::noop },
-      { "SCALEWINDOWEXT",       0x0410, &QWinMetaFile::noop },
-      { "OFFSETVIEWPORTORG",    0x0211, &QWinMetaFile::noop },
-      { "SCALEVIEWPORTEXT",     0x0412, &QWinMetaFile::noop },
-      { "LINETO",               0x0213, &QWinMetaFile::lineTo },
-      { "MOVETO",               0x0214, &QWinMetaFile::moveTo },
-      { "EXCLUDECLIPRECT",      0x0415, &QWinMetaFile::excludeClipRect },
-      { "INTERSECTCLIPRECT",    0x0416, &QWinMetaFile::intersectClipRect },
-      { "ARC",                  0x0817, &QWinMetaFile::arc },
-      { "ELLIPSE",              0x0418, &QWinMetaFile::ellipse },
-      { "FLOODFILL",            0x0419, &QWinMetaFile::noop },
-      { "PIE",                  0x081A, &QWinMetaFile::pie },
-      { "RECTANGLE",            0x041B, &QWinMetaFile::rectangle },
-      { "ROUNDRECT",            0x061C, &QWinMetaFile::roundRect },
-      { "PATBLT",               0x061D, &QWinMetaFile::noop },
-      { "SAVEDC",               0x001E, &QWinMetaFile::saveDC },
-      { "SETPIXEL",             0x041F, &QWinMetaFile::setPixel },
-      { "OFFSETCLIPRGN",        0x0220, &QWinMetaFile::noop },
-      { "TEXTOUT",              0x0521, &QWinMetaFile::textOut },
-      { "BITBLT",               0x0922, &QWinMetaFile::noop },
-      { "STRETCHBLT",           0x0B23, &QWinMetaFile::noop },
-      { "POLYGON",              0x0324, &QWinMetaFile::polygon },
-      { "POLYLINE",             0x0325, &QWinMetaFile::polyline },
-      { "ESCAPE",               0x0626, &QWinMetaFile::noop },
-      { "RESTOREDC",            0x0127, &QWinMetaFile::restoreDC },
-      { "FILLREGION",           0x0228, &QWinMetaFile::noop },
-      { "FRAMEREGION",          0x0429, &QWinMetaFile::noop },
-      { "INVERTREGION",         0x012A, &QWinMetaFile::noop },
-      { "PAINTREGION",          0x012B, &QWinMetaFile::noop },
-      { "SELECTCLIPREGION",     0x012C, &QWinMetaFile::noop },
-      { "SELECTOBJECT",         0x012D, &QWinMetaFile::selectObject },
-      { "SETTEXTALIGN",         0x012E, &QWinMetaFile::setTextAlign },
-      { "CHORD",                0x0830, &QWinMetaFile::chord },
-      { "SETMAPPERFLAGS",       0x0231, &QWinMetaFile::noop },
-      { "EXTTEXTOUT",           0x0a32, &QWinMetaFile::extTextOut },
-      { "SETDIBTODEV",          0x0d33, &QWinMetaFile::noop },
-      { "SELECTPALETTE",        0x0234, &QWinMetaFile::noop },
-      { "REALIZEPALETTE",       0x0035, &QWinMetaFile::noop },
-      { "ANIMATEPALETTE",       0x0436, &QWinMetaFile::noop },
-      { "SETPALENTRIES",        0x0037, &QWinMetaFile::noop },
-      { "POLYPOLYGON",          0x0538, &QWinMetaFile::polyPolygon },
-      { "RESIZEPALETTE",        0x0139, &QWinMetaFile::noop },
-      { "DIBBITBLT",            0x0940, &QWinMetaFile::dibBitBlt },
-      { "DIBSTRETCHBLT",        0x0b41, &QWinMetaFile::dibStretchBlt },
-      { "DIBCREATEPATTERNBRUSH", 0x0142, &QWinMetaFile::dibCreatePatternBrush },
-      { "STRETCHDIB",           0x0f43, &QWinMetaFile::stretchDib },
-      { "EXTFLOODFILL",         0x0548, &QWinMetaFile::noop },
-      { "DELETEOBJECT",         0x01f0, &QWinMetaFile::deleteObject },
-      { "CREATEPALETTE",        0x00f7, &QWinMetaFile::createEmptyObject },
-      { "CREATEPATTERNBRUSH",   0x01F9, &QWinMetaFile::createEmptyObject },
-      { "CREATEPENINDIRECT",    0x02FA, &QWinMetaFile::createPenIndirect },
-      { "CREATEFONTINDIRECT",   0x02FB, &QWinMetaFile::createFontIndirect },
-      { "CREATEBRUSHINDIRECT",  0x02FC, &QWinMetaFile::createBrushIndirect },
-      { "CREATEREGION",         0x06FF, &QWinMetaFile::createEmptyObject },
-      { "END",                   0,      &QWinMetaFile::end },
+      { "SETBKCOLOR",           0x0201, &TQWinMetaFile::setBkColor },
+      { "SETBKMODE",            0x0102, &TQWinMetaFile::setBkMode },
+      { "SETMAPMODE",           0x0103, &TQWinMetaFile::noop },
+      { "SETROP2",              0x0104, &TQWinMetaFile::setRop },
+      { "SETRELABS",            0x0105, &TQWinMetaFile::noop },
+      { "SETPOLYFILLMODE",      0x0106, &TQWinMetaFile::setPolyFillMode },
+      { "SETSTRETCHBLTMODE",    0x0107, &TQWinMetaFile::noop },
+      { "SETTEXTCHAREXTRA",     0x0108, &TQWinMetaFile::noop },
+      { "SETTEXTCOLOR",         0x0209, &TQWinMetaFile::setTextColor },
+      { "SETTEXTJUSTIFICATION", 0x020A, &TQWinMetaFile::noop },
+      { "SETWINDOWORG",         0x020B, &TQWinMetaFile::setWindowOrg },
+      { "SETWINDOWEXT",         0x020C, &TQWinMetaFile::setWindowExt },
+      { "SETVIEWPORTORG",       0x020D, &TQWinMetaFile::noop },
+      { "SETVIEWPORTEXT",       0x020E, &TQWinMetaFile::noop },
+      { "OFFSETWINDOWORG",      0x020F, &TQWinMetaFile::noop },
+      { "SCALEWINDOWEXT",       0x0410, &TQWinMetaFile::noop },
+      { "OFFSETVIEWPORTORG",    0x0211, &TQWinMetaFile::noop },
+      { "SCALEVIEWPORTEXT",     0x0412, &TQWinMetaFile::noop },
+      { "LINETO",               0x0213, &TQWinMetaFile::lineTo },
+      { "MOVETO",               0x0214, &TQWinMetaFile::moveTo },
+      { "EXCLUDECLIPRECT",      0x0415, &TQWinMetaFile::excludeClipRect },
+      { "INTERSECTCLIPRECT",    0x0416, &TQWinMetaFile::intersectClipRect },
+      { "ARC",                  0x0817, &TQWinMetaFile::arc },
+      { "ELLIPSE",              0x0418, &TQWinMetaFile::ellipse },
+      { "FLOODFILL",            0x0419, &TQWinMetaFile::noop },
+      { "PIE",                  0x081A, &TQWinMetaFile::pie },
+      { "RECTANGLE",            0x041B, &TQWinMetaFile::rectangle },
+      { "ROUNDRECT",            0x061C, &TQWinMetaFile::roundRect },
+      { "PATBLT",               0x061D, &TQWinMetaFile::noop },
+      { "SAVEDC",               0x001E, &TQWinMetaFile::saveDC },
+      { "SETPIXEL",             0x041F, &TQWinMetaFile::setPixel },
+      { "OFFSETCLIPRGN",        0x0220, &TQWinMetaFile::noop },
+      { "TEXTOUT",              0x0521, &TQWinMetaFile::textOut },
+      { "BITBLT",               0x0922, &TQWinMetaFile::noop },
+      { "STRETCHBLT",           0x0B23, &TQWinMetaFile::noop },
+      { "POLYGON",              0x0324, &TQWinMetaFile::polygon },
+      { "POLYLINE",             0x0325, &TQWinMetaFile::polyline },
+      { "ESCAPE",               0x0626, &TQWinMetaFile::noop },
+      { "RESTOREDC",            0x0127, &TQWinMetaFile::restoreDC },
+      { "FILLREGION",           0x0228, &TQWinMetaFile::noop },
+      { "FRAMEREGION",          0x0429, &TQWinMetaFile::noop },
+      { "INVERTREGION",         0x012A, &TQWinMetaFile::noop },
+      { "PAINTREGION",          0x012B, &TQWinMetaFile::noop },
+      { "SELECTCLIPREGION",     0x012C, &TQWinMetaFile::noop },
+      { "SELECTOBJECT",         0x012D, &TQWinMetaFile::selectObject },
+      { "SETTEXTALIGN",         0x012E, &TQWinMetaFile::setTextAlign },
+      { "CHORD",                0x0830, &TQWinMetaFile::chord },
+      { "SETMAPPERFLAGS",       0x0231, &TQWinMetaFile::noop },
+      { "EXTTEXTOUT",           0x0a32, &TQWinMetaFile::extTextOut },
+      { "SETDIBTODEV",          0x0d33, &TQWinMetaFile::noop },
+      { "SELECTPALETTE",        0x0234, &TQWinMetaFile::noop },
+      { "REALIZEPALETTE",       0x0035, &TQWinMetaFile::noop },
+      { "ANIMATEPALETTE",       0x0436, &TQWinMetaFile::noop },
+      { "SETPALENTRIES",        0x0037, &TQWinMetaFile::noop },
+      { "POLYPOLYGON",          0x0538, &TQWinMetaFile::polyPolygon },
+      { "RESIZEPALETTE",        0x0139, &TQWinMetaFile::noop },
+      { "DIBBITBLT",            0x0940, &TQWinMetaFile::dibBitBlt },
+      { "DIBSTRETCHBLT",        0x0b41, &TQWinMetaFile::dibStretchBlt },
+      { "DIBCREATEPATTERNBRUSH", 0x0142, &TQWinMetaFile::dibCreatePatternBrush },
+      { "STRETCHDIB",           0x0f43, &TQWinMetaFile::stretchDib },
+      { "EXTFLOODFILL",         0x0548, &TQWinMetaFile::noop },
+      { "DELETEOBJECT",         0x01f0, &TQWinMetaFile::deleteObject },
+      { "CREATEPALETTE",        0x00f7, &TQWinMetaFile::createEmptyObject },
+      { "CREATEPATTERNBRUSH",   0x01F9, &TQWinMetaFile::createEmptyObject },
+      { "CREATEPENINDIRECT",    0x02FA, &TQWinMetaFile::createPenIndirect },
+      { "CREATEFONTINDIRECT",   0x02FB, &TQWinMetaFile::createFontIndirect },
+      { "CREATEBRUSHINDIRECT",  0x02FC, &TQWinMetaFile::createBrushIndirect },
+      { "CREATEREGION",         0x06FF, &TQWinMetaFile::createEmptyObject },
+      { "END",                   0,      &TQWinMetaFile::end },
       // always the latest in the table : in case of unknown function
-      { NULL,                   0,      &QWinMetaFile::noop },
+      { NULL,                   0,      &TQWinMetaFile::noop },
   };
 
 
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index f8e19411..8f8cd4d2 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -33,7 +33,7 @@ bool qwmfDebug = false;
 #include "wmfstruct.h"
 #include "metafuncs.h"
 
-#define QWMF_DEBUG  0
+#define TQWMF_DEBUG  0
 
 
 class WmfCmd
@@ -112,7 +112,7 @@ void WinObjFontHandle::apply( TQPainter& p )
 
 
 //-----------------------------------------------------------------------------
-QWinMetaFile::QWinMetaFile()
+TQWinMetaFile::TQWinMetaFile()
 {
     mValid       = false;
     mFirstCmd    = NULL;
@@ -122,7 +122,7 @@ QWinMetaFile::QWinMetaFile()
 
 
 //-----------------------------------------------------------------------------
-QWinMetaFile::~QWinMetaFile()
+TQWinMetaFile::~TQWinMetaFile()
 {
     if ( mFirstCmd ) delete mFirstCmd;
     if ( mObjHandleTab ) delete[] mObjHandleTab;
@@ -130,7 +130,7 @@ QWinMetaFile::~QWinMetaFile()
 
 
 //-----------------------------------------------------------------------------
-bool QWinMetaFile::load( const TQString &filename )
+bool TQWinMetaFile::load( const TQString &filename )
 {
     TQFile file( filename );
 
@@ -155,7 +155,7 @@ bool QWinMetaFile::load( const TQString &filename )
 }
 
 //-----------------------------------------------------------------------------
-bool QWinMetaFile::load( TQBuffer &buffer )
+bool TQWinMetaFile::load( TQBuffer &buffer )
 {
     TQDataStream st;
     WmfEnhMetaHeader eheader;
@@ -169,12 +169,12 @@ bool QWinMetaFile::load( TQBuffer &buffer )
 
     mTextAlign = 0;
     mRotation = 0;
-    mTextColor = Qt::black;
+    mTextColor = TQt::black;
     if ( mFirstCmd ) delete mFirstCmd;
     mFirstCmd = NULL;
 
     st.setDevice( &buffer );
-    st.setByteOrder( TQDataStream::LittleEndian ); // Great, I love Qt !
+    st.setByteOrder( TQDataStream::LittleEndian ); // Great, I love TQt !
 
     //----- Read placeable metafile header
     st >> pheader.key;
@@ -198,7 +198,7 @@ bool QWinMetaFile::load( TQBuffer &buffer )
         mBBox.setRight( pheader.bbox.right );
         mBBox.setBottom( pheader.bbox.bottom );
         mHeaderBoundingBox = mBBox;
-        if ( QWMF_DEBUG )
+        if ( TQWMF_DEBUG )
         {
             kdDebug() << endl << "-------------------------------------------------" << endl;
             kdDebug() << "WMF Placeable Header ( " << static_cast<int>(sizeof( pheader ) ) << "):" << endl;
@@ -240,7 +240,7 @@ bool QWinMetaFile::load( TQBuffer &buffer )
         st >> eheader.szlMillimeters.width;
         st >> eheader.szlMillimeters.height;
 
-        if ( QWMF_DEBUG )
+        if ( TQWMF_DEBUG )
         {
             kdDebug() << endl << "-------------------------------------------------" << endl;
             kdDebug() << "WMF Extended Header:" << endl;
@@ -265,7 +265,7 @@ bool QWinMetaFile::load( TQBuffer &buffer )
         st >> header.mtNoObjects;
         st >> header.mtMaxRecord;
         st >> header.mtNoParameters;
-        if ( QWMF_DEBUG ) {
+        if ( TQWMF_DEBUG ) {
             kdDebug() << "WMF Header: " <<  "mtSize=" << header.mtSize << endl;
         }
     }
@@ -329,7 +329,7 @@ bool QWinMetaFile::load( TQBuffer &buffer )
 
 
 //-----------------------------------------------------------------------------
-bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
+bool TQWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
 {
     int idx, i;
     WmfCmd* cmd;
@@ -349,7 +349,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
     mAbsoluteCoord = absolute;
 
     mPainter.begin( aTarget );
-    if ( QWMF_DEBUG )  {
+    if ( TQWMF_DEBUG )  {
         kdDebug() << "Bounding box : " << mBBox.left()
         << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
     }
@@ -364,12 +364,12 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
         idx = cmd->funcIndex;
         ( this->*metaFuncTab[ idx ].method )( cmd->numParm, cmd->parm );
 
-        if ( QWMF_DEBUG )  {
+        if ( TQWMF_DEBUG )  {
             TQString str = "", param;
             if ( metaFuncTab[ idx ].name == NULL ) {
                 str += "UNKNOWN ";
             }
-            if ( metaFuncTab[ idx ].method == &QWinMetaFile::noop ) {
+            if ( metaFuncTab[ idx ].method == &TQWinMetaFile::noop ) {
                 str += "UNIMPLEMENTED ";
             }
             str += metaFuncTab[ idx ].name;
@@ -389,7 +389,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
     mWindowsCoord += 1;
     if ( mWindowsCoord == 2 )  {
         kdDebug() << "DRAW ANGLES " << endl;
-        mPainter.setPen( Qt::white );
+        mPainter.setPen( TQt::white );
         mPainter.drawPoint( mBBox.left(), mBBox.top()  );
         mPainter.drawPoint( mBBox.right(), mBBox.bottom() );
     }
@@ -402,7 +402,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
 //----------------s-------------------------------------------------------------
 // Metafile painter methods
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setWindowOrg( long, short* parm )
+void TQWinMetaFile::setWindowOrg( long, short* parm )
 {
     if ( mAbsoluteCoord ) {
         TQRect r = mPainter.window();
@@ -421,9 +421,9 @@ void QWinMetaFile::setWindowOrg( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setWindowExt( long, short* parm )
+void TQWinMetaFile::setWindowExt( long, short* parm )
 {
-    // negative value allowed for width and height : QABS() forbidden
+    // negative value allowed for width and height : TQABS() forbidden
     if ( mAbsoluteCoord ) {
         TQRect r = mPainter.window();
         mPainter.setWindow( r.left(), r.top(), parm[ 1 ], parm[ 0 ] );
@@ -456,28 +456,28 @@ void QWinMetaFile::setWindowExt( long, short* parm )
 //-----------------------------------------------------------------------------
 // Drawing
 //-----------------------------------------------------------------------------
-void QWinMetaFile::lineTo( long, short* parm )
+void TQWinMetaFile::lineTo( long, short* parm )
 {
     mPainter.lineTo( parm[ 1 ], parm[ 0 ] );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::moveTo( long, short* parm )
+void TQWinMetaFile::moveTo( long, short* parm )
 {
     mPainter.moveTo( parm[ 1 ], parm[ 0 ] );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::ellipse( long, short* parm )
+void TQWinMetaFile::ellipse( long, short* parm )
 {
     mPainter.drawEllipse( parm[ 3 ], parm[ 2 ], parm[ 1 ]-parm[ 3 ], parm[ 0 ]-parm[ 2 ] );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::polygon( long, short* parm )
+void TQWinMetaFile::polygon( long, short* parm )
 {
     TQPointArray* pa;
 
@@ -487,7 +487,7 @@ void QWinMetaFile::polygon( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::polyPolygon( long, short* parm )
+void TQWinMetaFile::polyPolygon( long, short* parm )
 {
     TQRegion region;
     int  i, j, startPolygon;
@@ -512,9 +512,9 @@ void QWinMetaFile::polyPolygon( long, short* parm )
     mPainter.fillRect( win.left(), win.top(), win.width(), win.height(), mPainter.brush() );
 
     // draw polygon's border if necessary
-    if ( mPainter.pen().style() != Qt::NoPen ) {
+    if ( mPainter.pen().style() != TQt::NoPen ) {
         mPainter.setClipping( false );
-        mPainter.setBrush( Qt::NoBrush );
+        mPainter.setBrush( TQt::NoBrush );
 
         TQPointArray* pa;
         int idxPolygon = 1 + parm[ 0 ];
@@ -530,7 +530,7 @@ void QWinMetaFile::polyPolygon( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::polyline( long, short* parm )
+void TQWinMetaFile::polyline( long, short* parm )
 {
     TQPointArray* pa;
 
@@ -540,14 +540,14 @@ void QWinMetaFile::polyline( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::rectangle( long, short* parm )
+void TQWinMetaFile::rectangle( long, short* parm )
 {
     mPainter.drawRect( parm[ 3 ], parm[ 2 ], parm[ 1 ]-parm[ 3 ], parm[ 0 ]-parm[ 2 ] );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::roundRect( long, short* parm )
+void TQWinMetaFile::roundRect( long, short* parm )
 {
     int xRnd = 0, yRnd = 0;
 
@@ -562,7 +562,7 @@ void QWinMetaFile::roundRect( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::arc( long, short* parm )
+void TQWinMetaFile::arc( long, short* parm )
 {
     int xCenter, yCenter, angleStart, aLength;
 
@@ -576,7 +576,7 @@ void QWinMetaFile::arc( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::chord( long, short* parm )
+void TQWinMetaFile::chord( long, short* parm )
 {
     int xCenter, yCenter, angleStart, aLength;
 
@@ -590,7 +590,7 @@ void QWinMetaFile::chord( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::pie( long, short* parm )
+void TQWinMetaFile::pie( long, short* parm )
 {
     int xCenter, yCenter, angleStart, aLength;
 
@@ -604,29 +604,29 @@ void QWinMetaFile::pie( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setPolyFillMode( long, short* parm )
+void TQWinMetaFile::setPolyFillMode( long, short* parm )
 {
     mWinding = parm[ 0 ];
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setBkColor( long, short* parm )
+void TQWinMetaFile::setBkColor( long, short* parm )
 {
     mPainter.setBackgroundColor( color( parm ) );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setBkMode( long, short* parm )
+void TQWinMetaFile::setBkMode( long, short* parm )
 {
-    if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode );
-    else mPainter.setBackgroundMode( Qt::OpaqueMode );
+    if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode );
+    else mPainter.setBackgroundMode( TQt::OpaqueMode );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setPixel( long, short* parm )
+void TQWinMetaFile::setPixel( long, short* parm )
 {
     TQPen pen = mPainter.pen();
     mPainter.setPen( color( parm ) );
@@ -636,21 +636,21 @@ void QWinMetaFile::setPixel( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setRop( long, short* parm )
+void TQWinMetaFile::setRop( long, short* parm )
 {
-    mPainter.setRasterOp( winToQtRaster( parm[ 0 ] ) );
+    mPainter.setRasterOp( winToTQtRaster( parm[ 0 ] ) );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::saveDC( long, short* )
+void TQWinMetaFile::saveDC( long, short* )
 {
     mPainter.save();
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::restoreDC( long, short *parm )
+void TQWinMetaFile::restoreDC( long, short *parm )
 {
     for ( int i=0; i > parm[ 0 ] ; i-- )
         mPainter.restore();
@@ -658,7 +658,7 @@ void QWinMetaFile::restoreDC( long, short *parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::intersectClipRect( long, short* parm )
+void TQWinMetaFile::intersectClipRect( long, short* parm )
 {
 /*  TODO: better implementation : need QT 3.0.2
     TQRegion region = mPainter.clipRegion();
@@ -675,7 +675,7 @@ void QWinMetaFile::intersectClipRect( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::excludeClipRect( long, short* parm )
+void TQWinMetaFile::excludeClipRect( long, short* parm )
 {
 /*  TODO: better implementation : need QT 3.0.2
     TQRegion region = mPainter.clipRegion();
@@ -694,21 +694,21 @@ void QWinMetaFile::excludeClipRect( long, short* parm )
 //-----------------------------------------------------------------------------
 // Text
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setTextColor( long, short* parm )
+void TQWinMetaFile::setTextColor( long, short* parm )
 {
     mTextColor = color( parm );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::setTextAlign( long, short* parm )
+void TQWinMetaFile::setTextAlign( long, short* parm )
 {
     mTextAlign = parm[ 0 ];
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::textOut( long num, short* parm )
+void TQWinMetaFile::textOut( long num, short* parm )
 {
 
     short *copyParm = new short[ num + 1 ];
@@ -727,7 +727,7 @@ void QWinMetaFile::textOut( long num, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::extTextOut( long num, short* parm )
+void TQWinMetaFile::extTextOut( long num, short* parm )
 {
     char* ptStr;
     int x, y, width, height;
@@ -773,14 +773,14 @@ void QWinMetaFile::extTextOut( long num, short* parm )
     if ( ( parm[ 2 ] > 1 ) && ( num >= (idxOffset + parm[ 2 ]) ) && ( parm[ 3 ] == 0 ) ) {
         // offset for each char
         int left = x;
-        mPainter.drawText( left, y, width, height, Qt::AlignLeft | Qt::AlignTop, text.mid(0, 1) );
+        mPainter.drawText( left, y, width, height, TQt::AlignLeft | TQt::AlignTop, text.mid(0, 1) );
         for ( int i = 1; i < parm[ 2 ] ; i++ ) {
             left += parm[ idxOffset + i - 1 ];
-            mPainter.drawText( left, y, width, height, Qt::AlignLeft | Qt::AlignTop, text.mid(i, 1) );
+            mPainter.drawText( left, y, width, height, TQt::AlignLeft | TQt::AlignTop, text.mid(i, 1) );
         }
     }
     else {
-        mPainter.drawText( x, y, width, height, Qt::AlignLeft | Qt::AlignTop, text );
+        mPainter.drawText( x, y, width, height, TQt::AlignLeft | TQt::AlignTop, text );
     }
 
     mPainter.restore();
@@ -792,7 +792,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
 //-----------------------------------------------------------------------------
 // Bitmap
 //-----------------------------------------------------------------------------
-void QWinMetaFile::dibBitBlt( long num, short* parm )
+void TQWinMetaFile::dibBitBlt( long num, short* parm )
 {
     if ( num > 9 ) {      // DIB image
         TQImage bmpSrc;
@@ -800,7 +800,7 @@ void QWinMetaFile::dibBitBlt( long num, short* parm )
         if ( dibToBmp( bmpSrc, (char*)&parm[ 8 ], (num - 8) * 2 ) ) {
             long raster = toDWord( parm );
 
-            mPainter.setRasterOp( winToQtRaster( raster )  );
+            mPainter.setRasterOp( winToTQtRaster( raster )  );
 
             // wmf file allow negative width or height
             mPainter.save();
@@ -817,20 +817,20 @@ void QWinMetaFile::dibBitBlt( long num, short* parm )
         }
     }
     else {
-        kdDebug() << "QWinMetaFile::dibBitBlt without image: not implemented " << endl;
+        kdDebug() << "TQWinMetaFile::dibBitBlt without image: not implemented " << endl;
     }
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::dibStretchBlt( long num, short* parm )
+void TQWinMetaFile::dibStretchBlt( long num, short* parm )
 {
     TQImage bmpSrc;
 
     if ( dibToBmp( bmpSrc, (char*)&parm[ 10 ], (num - 10) * 2 ) ) {
         long raster = toDWord( parm );
 
-        mPainter.setRasterOp( winToQtRaster( raster )  );
+        mPainter.setRasterOp( winToTQtRaster( raster )  );
 
         // wmf file allow negative width or height
         mPainter.save();
@@ -852,14 +852,14 @@ void QWinMetaFile::dibStretchBlt( long num, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::stretchDib( long num, short* parm )
+void TQWinMetaFile::stretchDib( long num, short* parm )
 {
     TQImage bmpSrc;
 
     if ( dibToBmp( bmpSrc, (char*)&parm[ 11 ], (num - 11) * 2 ) ) {
         long raster = toDWord( parm );
 
-        mPainter.setRasterOp( winToQtRaster( raster )  );
+        mPainter.setRasterOp( winToTQtRaster( raster )  );
 
         // wmf file allow negative width or height
         mPainter.save();
@@ -881,7 +881,7 @@ void QWinMetaFile::stretchDib( long num, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::dibCreatePatternBrush( long num, short* parm )
+void TQWinMetaFile::dibCreatePatternBrush( long num, short* parm )
 {
     WinObjPatternBrushHandle* handle = new WinObjPatternBrushHandle;
     addHandle( handle );
@@ -897,7 +897,7 @@ void QWinMetaFile::dibCreatePatternBrush( long num, short* parm )
 //-----------------------------------------------------------------------------
 // Object handle
 //-----------------------------------------------------------------------------
-void QWinMetaFile::selectObject( long, short* parm )
+void TQWinMetaFile::selectObject( long, short* parm )
 {
     int idx = parm[ 0 ];
     if ( idx>=0 && idx < MAX_OBJHANDLE && mObjHandleTab[ idx ] )
@@ -906,45 +906,45 @@ void QWinMetaFile::selectObject( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::deleteObject( long, short* parm )
+void TQWinMetaFile::deleteObject( long, short* parm )
 {
     deleteHandle( parm[ 0 ] );
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::createEmptyObject( long, short* )
+void TQWinMetaFile::createEmptyObject( long, short* )
 {
     // allocation of an empty object (to keep object counting in sync)
     WinObjPenHandle* handle = new WinObjPenHandle;
     addHandle( handle );
-    kdDebug() << "QWinMetaFile: unimplemented createObject " << endl;
+    kdDebug() << "TQWinMetaFile: unimplemented createObject " << endl;
 }
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::createBrushIndirect( long, short* parm )
+void TQWinMetaFile::createBrushIndirect( long, short* parm )
 {
-    static Qt::BrushStyle hatchedStyleTab[] =
+    static TQt::BrushStyle hatchedStyleTab[] =
     {
-        Qt::HorPattern,
-        Qt::FDiagPattern,
-        Qt::BDiagPattern,
-        Qt::CrossPattern,
-        Qt::DiagCrossPattern
+        TQt::HorPattern,
+        TQt::FDiagPattern,
+        TQt::BDiagPattern,
+        TQt::CrossPattern,
+        TQt::DiagCrossPattern
     };
-    static Qt::BrushStyle styleTab[] =
-    { Qt::SolidPattern,
-      Qt::NoBrush,
-      Qt::FDiagPattern,   /* hatched */
-      Qt::Dense4Pattern,  /* should be custom bitmap pattern */
-      Qt::HorPattern,     /* should be BS_INDEXED (?) */
-      Qt::VerPattern,     /* should be device-independent bitmap */
-      Qt::Dense6Pattern,  /* should be device-independent packed-bitmap */
-      Qt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
-      Qt::Dense3Pattern   /* should be device-independent BS_DIBPATTERN8x8 */
+    static TQt::BrushStyle styleTab[] =
+    { TQt::SolidPattern,
+      TQt::NoBrush,
+      TQt::FDiagPattern,   /* hatched */
+      TQt::Dense4Pattern,  /* should be custom bitmap pattern */
+      TQt::HorPattern,     /* should be BS_INDEXED (?) */
+      TQt::VerPattern,     /* should be tqdevice-independent bitmap */
+      TQt::Dense6Pattern,  /* should be tqdevice-independent packed-bitmap */
+      TQt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
+      TQt::Dense3Pattern   /* should be tqdevice-independent BS_DIBPATTERN8x8 */
     };
-    Qt::BrushStyle style;
+    TQt::BrushStyle style;
     short arg;
     WinObjBrushHandle* handle = new WinObjBrushHandle;
     addHandle( handle );
@@ -956,16 +956,16 @@ void QWinMetaFile::createBrushIndirect( long, short* parm )
         if ( arg>=0 && arg<5 ) style = hatchedStyleTab[ arg ];
         else
         {
-            kdDebug() << "QWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
-            style = Qt::SolidPattern;
+            kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
+            style = TQt::SolidPattern;
         }
     }
     else if ( arg>=0 && arg<9 )
         style = styleTab[ arg ];
     else
     {
-        kdDebug() << "QWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
-        style = Qt::SolidPattern;
+        kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
+        style = TQt::SolidPattern;
     }
     handle->brush.setStyle( style );
     handle->brush.setColor( color( parm+1 ) );
@@ -973,28 +973,28 @@ void QWinMetaFile::createBrushIndirect( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::createPenIndirect( long, short* parm )
+void TQWinMetaFile::createPenIndirect( long, short* parm )
 {
-    static Qt::PenStyle styleTab[] =
-    { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
-      Qt::NoPen, Qt::SolidLine };
-    Qt::PenStyle style;
+    static TQt::PenStyle styleTab[] =
+    { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
+      TQt::NoPen, TQt::SolidLine };
+    TQt::PenStyle style;
     WinObjPenHandle* handle = new WinObjPenHandle;
     addHandle( handle );
 
     if ( parm[ 0 ]>=0 && parm[ 0 ]<6 ) style=styleTab[ parm[ 0 ] ];
     else
     {
-        kdDebug() << "QWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
-        style = Qt::SolidLine;
+        kdDebug() << "TQWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
+        style = TQt::SolidLine;
     }
 
     handle->pen.setStyle( style );
     handle->pen.setColor( color( parm+3 ) );
-    handle->pen.setCapStyle( Qt::RoundCap );
+    handle->pen.setCapStyle( TQt::RoundCap );
 
     //int width = 0;
-    // TODO : width of pen proportional to device context width
+    // TODO : width of pen proportional to tqdevice context width
     // DOESN'T WORK
 /*
     TQRect devRec;
@@ -1010,7 +1010,7 @@ void QWinMetaFile::createPenIndirect( long, short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::createFontIndirect( long , short* parm)
+void TQWinMetaFile::createFontIndirect( long , short* parm)
 {
     WinObjFontHandle* handle = new WinObjFontHandle;
     addHandle( handle );
@@ -1022,7 +1022,7 @@ void QWinMetaFile::createFontIndirect( long , short* parm)
     handle->font.setFamily( family );
     handle->font.setFixedPitch( ((parm[ 8 ] & 0x01) == 0) );
     // TODO: investigation why some test case need -2. (size of font in logical point)
-    handle->font.setPointSize( QABS(parm[ 0 ]) - 2 );
+    handle->font.setPointSize( TQABS(parm[ 0 ]) - 2 );
     handle->font.setWeight( (parm[ 4 ] >> 3) );
     handle->font.setItalic( (parm[ 5 ] & 0x01) );
     handle->font.setUnderline( (parm[ 5 ] & 0x100) );
@@ -1032,12 +1032,12 @@ void QWinMetaFile::createFontIndirect( long , short* parm)
 //-----------------------------------------------------------------------------
 // Misc
 //-----------------------------------------------------------------------------
-void QWinMetaFile::noop( long, short* )
+void TQWinMetaFile::noop( long, short* )
 {
 }
 
 
-void QWinMetaFile::end( long, short* )
+void TQWinMetaFile::end( long, short* )
 {
     // end of file :
 //    kdDebug() << "END bbox=( " << mBBox.left() << "; " << mBBox.top() << "; " << mBBox.width() << "; " << mBBox.height() << ")" << endl;
@@ -1045,7 +1045,7 @@ void QWinMetaFile::end( long, short* )
 
 
 //-----------------------------------------------------------------------------
-unsigned short QWinMetaFile::calcCheckSum( WmfPlaceableHeader* apmfh )
+unsigned short TQWinMetaFile::calcCheckSum( WmfPlaceableHeader* apmfh )
 {
     WORD*  lpWord;
     WORD   wResult, i;
@@ -1062,7 +1062,7 @@ unsigned short QWinMetaFile::calcCheckSum( WmfPlaceableHeader* apmfh )
 
 
 //-----------------------------------------------------------------------------
-int QWinMetaFile::findFunc( unsigned short aFunc ) const
+int TQWinMetaFile::findFunc( unsigned short aFunc ) const
 {
     int i;
 
@@ -1074,7 +1074,7 @@ int QWinMetaFile::findFunc( unsigned short aFunc ) const
 }
 
 //-----------------------------------------------------------------------------
-TQPointArray* QWinMetaFile::pointArray( short num, short* parm )
+TQPointArray* TQWinMetaFile::pointArray( short num, short* parm )
 {
     int i;
 
@@ -1087,7 +1087,7 @@ TQPointArray* QWinMetaFile::pointArray( short num, short* parm )
 }
 
 //-----------------------------------------------------------------------------
-unsigned int QWinMetaFile::toDWord( short* parm )
+unsigned int TQWinMetaFile::toDWord( short* parm )
 {
     unsigned int l;
 
@@ -1109,7 +1109,7 @@ unsigned int QWinMetaFile::toDWord( short* parm )
 
 
 //-----------------------------------------------------------------------------
-TQColor QWinMetaFile::color( short* parm )
+TQColor TQWinMetaFile::color( short* parm )
 {
     unsigned int colorRef;
     int red, green, blue;
@@ -1124,7 +1124,7 @@ TQColor QWinMetaFile::color( short* parm )
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::xyToAngle( int xStart, int yStart, int xEnd, int yEnd, int& angleStart, int& angleLength )
+void TQWinMetaFile::xyToAngle( int xStart, int yStart, int xEnd, int yEnd, int& angleStart, int& angleLength )
 {
     float aStart, aLength;
 
@@ -1138,7 +1138,7 @@ void QWinMetaFile::xyToAngle( int xStart, int yStart, int xEnd, int yEnd, int& a
 
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::addHandle( WinObjHandle* handle )
+void TQWinMetaFile::addHandle( WinObjHandle* handle )
 {
     int idx;
 
@@ -1148,11 +1148,11 @@ void QWinMetaFile::addHandle( WinObjHandle* handle )
     if ( idx < MAX_OBJHANDLE )
         mObjHandleTab[ idx ] = handle;
     else
-        kdDebug() << "QWinMetaFile error: handle table full !" << endl;
+        kdDebug() << "TQWinMetaFile error: handle table full !" << endl;
 }
 
 //-----------------------------------------------------------------------------
-void QWinMetaFile::deleteHandle( int idx )
+void TQWinMetaFile::deleteHandle( int idx )
 {
     if ( idx >= 0 && idx < MAX_OBJHANDLE && mObjHandleTab[ idx ] )
     {
@@ -1162,25 +1162,25 @@ void QWinMetaFile::deleteHandle( int idx )
 }
 
 //-----------------------------------------------------------------------------
-Qt::RasterOp  QWinMetaFile::winToQtRaster( short parm ) const
+TQt::RasterOp  TQWinMetaFile::winToTQtRaster( short parm ) const
 {
-    static const Qt::RasterOp opTab[] =
+    static const TQt::RasterOp opTab[] =
     {
-        Qt::CopyROP,
-        Qt::ClearROP, Qt::NandROP, Qt::NotAndROP, Qt::NotCopyROP,
-        Qt::AndNotROP, Qt::NotROP, Qt::XorROP, Qt::NorROP,
-        Qt::AndROP, Qt::NotXorROP, Qt::NopROP, Qt::NotOrROP,
-        Qt::CopyROP, Qt::OrNotROP, Qt::OrROP, Qt::SetROP
+        TQt::CopyROP,
+        TQt::ClearROP, TQt::NandROP, TQt::NotAndROP, TQt::NotCopyROP,
+        TQt::AndNotROP, TQt::NotROP, TQt::XorROP, TQt::NorROP,
+        TQt::AndROP, TQt::NotXorROP, TQt::NopROP, TQt::NotOrROP,
+        TQt::CopyROP, TQt::OrNotROP, TQt::OrROP, TQt::SetROP
     };
 
     if ( parm > 0 && parm <= 16 )
         return opTab[ parm ];
     else
-        return Qt::CopyROP;
+        return TQt::CopyROP;
 }
 
 //-----------------------------------------------------------------------------
-Qt::RasterOp  QWinMetaFile::winToQtRaster( long parm ) const
+TQt::RasterOp  TQWinMetaFile::winToTQtRaster( long parm ) const
 {
     /* TODO: Ternary raster operations
     0x00C000CA  dest = (source AND pattern)
@@ -1190,24 +1190,24 @@ Qt::RasterOp  QWinMetaFile::winToQtRaster( long parm ) const
     static const struct OpTab
     {
         long winRasterOp;
-        Qt::RasterOp qtRasterOp;
+        TQt::RasterOp qtRasterOp;
     } opTab[] =
     {
-        { 0x00CC0020, Qt::CopyROP },
-        { 0x00EE0086, Qt::OrROP },
-        { 0x008800C6, Qt::AndROP },
-        { 0x00660046, Qt::XorROP },
-        { 0x00440328, Qt::AndNotROP },
-        { 0x00330008, Qt::NotCopyROP },
-        { 0x001100A6, Qt::NandROP },
-        { 0x00C000CA, Qt::CopyROP },
-        { 0x00BB0226, Qt::NotOrROP },
-        { 0x00F00021, Qt::CopyROP },
-        { 0x00FB0A09, Qt::CopyROP },
-        { 0x005A0049, Qt::CopyROP },
-        { 0x00550009, Qt::NotROP },
-        { 0x00000042, Qt::ClearROP },
-        { 0x00FF0062, Qt::SetROP }
+        { 0x00CC0020, TQt::CopyROP },
+        { 0x00EE0086, TQt::OrROP },
+        { 0x008800C6, TQt::AndROP },
+        { 0x00660046, TQt::XorROP },
+        { 0x00440328, TQt::AndNotROP },
+        { 0x00330008, TQt::NotCopyROP },
+        { 0x001100A6, TQt::NandROP },
+        { 0x00C000CA, TQt::CopyROP },
+        { 0x00BB0226, TQt::NotOrROP },
+        { 0x00F00021, TQt::CopyROP },
+        { 0x00FB0A09, TQt::CopyROP },
+        { 0x005A0049, TQt::CopyROP },
+        { 0x00550009, TQt::NotROP },
+        { 0x00000042, TQt::ClearROP },
+        { 0x00FF0062, TQt::SetROP }
     };
 
     int i;
@@ -1218,11 +1218,11 @@ Qt::RasterOp  QWinMetaFile::winToQtRaster( long parm ) const
     if ( i < 15 )
         return opTab[ i ].qtRasterOp;
     else
-        return Qt::CopyROP;
+        return TQt::CopyROP;
 }
 
 //-----------------------------------------------------------------------------
-bool QWinMetaFile::dibToBmp( TQImage& bmp, const char* dib, long size )
+bool TQWinMetaFile::dibToBmp( TQImage& bmp, const char* dib, long size )
 {
     typedef struct _BMPFILEHEADER {
         WORD bmType;
@@ -1245,7 +1245,7 @@ bool QWinMetaFile::dibToBmp( TQImage& bmp, const char* dib, long size )
     bmpHeader->bmSize = sizeBmp;
 
     if ( !bmp.loadFromData( (const uchar*)bmpHeader, pattern.size(), "BMP" ) ) {
-        kdDebug() << "QWinMetaFile::dibToBmp: invalid bitmap " << endl;
+        kdDebug() << "TQWinMetaFile::dibToBmp: invalid bitmap " << endl;
         return false;
     }
     else {
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index 5717b393..2ac861d7 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -37,21 +37,21 @@ class WinObjBrushHandle;
 struct WmfPlaceableHeader;
 
 /**
- * QWinMetaFile is a WMF viewer based on QT toolkit
- * How to use QWinMetaFile :
+ * TQWinMetaFile is a WMF viewer based on QT toolkit
+ * How to use TQWinMetaFile :
  * #include "qwmf.h"
- * QWinMetaFile wmf;
+ * TQWinMetaFile wmf;
  * TQPicture pic;     // or TQImage pic;
  * if ( wmf.load( filename )
  *    wmf.paint( &pic );
  */
 
 
-class QWinMetaFile
+class TQWinMetaFile
 {
 public:
-    QWinMetaFile();
-    virtual ~QWinMetaFile();
+    TQWinMetaFile();
+    virtual ~TQWinMetaFile();
 
     /**
      * Load WMF file. Returns true on success.
@@ -60,7 +60,7 @@ public:
     virtual bool load( TQBuffer &buffer );
 
     /**
-     * Paint metafile to given paint-device using absolute or relative coordinate.
+     * Paint metafile to given paint-tqdevice using absolute or relative coordinate.
      * abosute coord. reset the world transfomation Matrix
      * relative coord. use the existing world transfomation Matrix
      * Returns true on success.
@@ -124,9 +124,9 @@ public: // should be protected but cannot
     void setPixel( long num, short* parms );
     // Set raster operation mode
     void setRop( long num, short* parms );
-    /* save device context */
+    /* save tqdevice context */
     void saveDC( long num, short* parms );
-    /* restore device context */
+    /* restore tqdevice context */
     void restoreDC( long num, short* parms );
     /*  clipping region is the intersection of this region and the original region */
     void intersectClipRect( long num, short* parms );
@@ -198,8 +198,8 @@ protected:
     void deleteHandle( int );
 
     /** Convert windows rasterOp in QT rasterOp */
-    Qt::RasterOp winToQtRaster( short parm ) const;
-    Qt::RasterOp winToQtRaster( long parm ) const;
+    TQt::RasterOp winToTQtRaster( short parm ) const;
+    TQt::RasterOp winToTQtRaster( long parm ) const;
 
     /** Converts DIB to BMP */
     bool dibToBmp( TQImage& bmp, const char* dib, long size);
diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h
index 33a4a67c..5e50f022 100644
--- a/ktnef/gui/wmfstruct.h
+++ b/ktnef/gui/wmfstruct.h
@@ -43,7 +43,7 @@ struct WmfEnhMetaHeader
     DWORD   iType;              // Record type EMR_HEADER
     DWORD   nSize;              // Record size in bytes.  This may be greater
     // than the sizeof( ENHMETAHEADER ).
-    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in tqdevice units
     RECTL   rclFrame;           // Inclusive-inclusive Picture Frame of metafile
     // in .01 mm units
     DWORD   dSignature;         // Signature.  Must be ENHMETA_SIGNATURE.
@@ -58,8 +58,8 @@ struct WmfEnhMetaHeader
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string
     DWORD   nPalEntries;        // Number of entries in the metafile palette.
-    SIZEL   szlDevice;          // Size of the reference device in pels
-    SIZEL   szlMillimeters;     // Size of the reference device in millimeters
+    SIZEL   szlDevice;          // Size of the reference tqdevice in pels
+    SIZEL   szlMillimeters;     // Size of the reference tqdevice in millimeters
 };
 #define ENHMETA_SIGNATURE       0x464D4520
 
diff --git a/ktnef/ktnef/ktnefdefs.h b/ktnef/ktnef/ktnefdefs.h
index d2e57aa5..06ec3bdb 100644
--- a/ktnef/ktnef/ktnefdefs.h
+++ b/ktnef/ktnef/ktnefdefs.h
@@ -85,7 +85,7 @@
 #define MAPI_TAG_DATA           0x3701
 #define MAPI_TAG_ATTACHENCODING 0x3702
 #define	MAPI_TAG_EXTENSION	    0x3703
-#define MAPI_TAG_ATTACHQT_METHOD   0x3705
+#define MAPI_TAG_ATTACHTQT_METHOD   0x3705
 #define MAPI_TAG_RENDERINGPOS   0x370b
 #define	MAPI_TAG_MIMETAG	    0x370e
 #define MAPI_TAG_ATTACHFLAGS    0x3714
diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h
index ff48ab08..06754df5 100644
--- a/ktnef/ktnef/ktnefparser.h
+++ b/ktnef/ktnef/ktnefparser.h
@@ -34,7 +34,7 @@ public:
 	~KTNEFParser();
 
 	bool openFile(const TQString& filename);
-	bool openDevice( TQIODevice *device );
+	bool openDevice( TQIODevice *tqdevice );
 	bool extractFile(const TQString& filename);
 	bool extractFileTo(const TQString& filename, const TQString& dirname);
 	bool extractAll();
diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h
index 841cf950..6a5ec75a 100644
--- a/ktnef/ktnef/ktnefpropertyset.h
+++ b/ktnef/ktnef/ktnefpropertyset.h
@@ -32,8 +32,8 @@ public:
 
 	/* MAPI properties interface */
 	void addProperty( int key, int type, const TQVariant& value, const TQVariant& name = TQVariant(), bool overwrite = false );
-	TQString findProp(     int key,             const TQString& fallback=TQString::null, bool convertToUpper=false);
-	TQString findNamedProp(const TQString& name, const TQString& fallback=TQString::null, bool convertToUpper=false);
+	TQString findProp(     int key,             const TQString& fallback=TQString(), bool convertToUpper=false);
+	TQString findNamedProp(const TQString& name, const TQString& fallback=TQString(), bool convertToUpper=false);
 	TQMap<int,KTNEFProperty*>& properties();
 	const TQMap<int,KTNEFProperty*>& properties() const;
 	TQVariant property( int key ) const;
diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp
index 8f2648c3..8a8bf065 100644
--- a/ktnef/lib/ktnefmessage.cpp
+++ b/ktnef/lib/ktnefmessage.cpp
@@ -70,7 +70,7 @@ TQString KTNEFMessage::rtfString()
 {
 	TQVariant prop = property( 0x1009 );
 	if ( prop.isNull() || prop.type() != TQVariant::ByteArray)
-		return TQString::null;
+		return TQString();
 	else
 	{
 		TQByteArray rtf;
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index a73a1d54..cd006346 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -70,7 +70,7 @@ public:
 		defaultdir_ = "/tmp/";
 		current_ = 0;
 		deleteDevice_ = false;
-		device_ = 0;
+		tqdevice_ = 0;
 		message_ = new KTNEFMessage;
 	}
 	~ParserPrivate()
@@ -79,7 +79,7 @@ public:
 	}
 
 	TQDataStream              stream_;
-	TQIODevice                *device_;
+	TQIODevice                *tqdevice_;
 	bool                     deleteDevice_;
 	TQString                  defaultdir_;
 	KTNEFAttach              *current_;
@@ -105,8 +105,8 @@ KTNEFMessage* KTNEFParser::message() const
 void KTNEFParser::deleteDevice()
 {
 	if ( d->deleteDevice_ )
-		delete d->device_;
-	d->device_ = 0;
+		delete d->tqdevice_;
+	d->tqdevice_ = 0;
 	d->deleteDevice_ = false;
 }
 
@@ -124,7 +124,7 @@ bool KTNEFParser::decodeMessage()
 	// read data length
 	d->stream_ >> i2;
 	// offset after reading the value
-	off = d->device_->at() + i2;
+	off = d->tqdevice_->at() + i2;
 	switch ( tag )
 	{
 		case attAIDOWNER:
@@ -158,9 +158,9 @@ bool KTNEFParser::decodeMessage()
 			kdDebug() << "Message MAPI Properties" << " (length=" << i2 << ")" << endl;
 			{
 				int nProps = d->message_->properties().count();
-				i2 += d->device_->at();
+				i2 += d->tqdevice_->at();
 				readMAPIProperties( d->message_->properties(), 0 );
-				d->device_->at( i2 );
+				d->tqdevice_->at( i2 );
 				kdDebug() << "Properties: " << d->message_->properties().count() << endl;
 				value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps );
 			}
@@ -171,7 +171,7 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attFROM:
 			d->message_->addProperty( 0x0024, MAPI_TYPE_STRING8, readTNEFAddress( d->stream_ ) );
-			d->device_->at( d->device_->at() - i2 );
+			d->tqdevice_->at( d->tqdevice_->at() - i2 );
 			value = readTNEFData( d->stream_, i2 );
 			kdDebug() << "Message From" << " (length=" << i2 << ")" << endl;
 			break;
@@ -198,7 +198,7 @@ bool KTNEFParser::decodeMessage()
 				d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
 				value = c;
 			}
-			kdDebug() << "Message Status" << " (length=" << i2 << ")" << endl;
+			kdDebug() << "Message tqStatus" << " (length=" << i2 << ")" << endl;
 			break;
 		case attRECIPTABLE:
 			{
@@ -212,7 +212,7 @@ bool KTNEFParser::decodeMessage()
 					recipTable << formatRecipient( props );
 				}
 				d->message_->addProperty( 0x0E12, MAPI_TYPE_STRING8, recipTable );
-				d->device_->at( d->device_->at() - i2 );
+				d->tqdevice_->at( d->tqdevice_->at() - i2 );
 				value = readTNEFData( d->stream_, i2 );
 			}
 			kdDebug() << "Message Recipient Table" << " (length=" << i2 << ")" << endl;
@@ -242,13 +242,13 @@ bool KTNEFParser::decodeMessage()
 			break;
 	}
 	// skip data
-	if ( d->device_->at() != off && !d->device_->at( off ) )
+	if ( d->tqdevice_->at() != off && !d->tqdevice_->at( off ) )
 		return false;
 	// get checksum
 	d->stream_ >> u;
 	// add TNEF attribute
 	d->message_->addAttribute( tag, type, value, true );
-	//kdDebug() << "stream: " << d->device_->at() << endl;
+	//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
 	return true;
 }
 
@@ -273,15 +273,15 @@ bool KTNEFParser::decodeAttachment()
 		   break;
 	   case attATTACHDATA:
 		   d->current_->setSize( i );
-		   d->current_->setOffset( d->device_->at() );
-		   d->device_->at( d->device_->at() + i );
+		   d->current_->setOffset( d->tqdevice_->at() );
+		   d->tqdevice_->at( d->tqdevice_->at() + i );
 		   value = TQString( "< size=%1 >" ).arg( i );
 		   kdDebug() << "Attachment Data: size=" << i << endl;
 		   break;
 	   case attATTACHMENT:	// try to get attachment info
-		   i += d->device_->at();
+		   i += d->tqdevice_->at();
 		   readMAPIProperties( d->current_->properties(), d->current_ );
-		   d->device_->at( i );
+		   d->tqdevice_->at( i );
 		   d->current_->setIndex( d->current_->property( MAPI_TAG_INDEX ).toUInt() );
 		   d->current_->setDisplaySize( d->current_->property( MAPI_TAG_SIZE ).toUInt() );
 		   str = d->current_->property( MAPI_TAG_DISPLAYNAME ).toString();
@@ -305,7 +305,7 @@ bool KTNEFParser::decodeAttachment()
 	   case attATTACHMETAFILE:
 		   kdDebug() << "Attachment Metafile: size=" << i << endl;
 		   //value = TQString( "< size=%1 >" ).arg( i );
-		   //d->device_->at( d->device_->at()+i );
+		   //d->tqdevice_->at( d->tqdevice_->at()+i );
 		   value = readTNEFData( d->stream_, i );
 		   break;
 	   default:
@@ -316,7 +316,7 @@ bool KTNEFParser::decodeAttachment()
 	d->stream_ >> u;	// u <- checksum
 	// add TNEF attribute
 	d->current_->addAttribute( tag, type, value, true );
-	//kdDebug() << "stream: " << d->device_->at() << endl;
+	//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
 
 	return true;
 }
@@ -339,19 +339,19 @@ bool KTNEFParser::parseDevice()
 		d->current_ = 0;
 	}
 
-	if ( !d->device_->open( IO_ReadOnly ) ) {
-	  kdDebug() << "Couldn't open device" << endl;
+	if ( !d->tqdevice_->open( IO_ReadOnly ) ) {
+	  kdDebug() << "Couldn't open tqdevice" << endl;
 		return false;
 	}
 
-	d->stream_.setDevice( d->device_ );
+	d->stream_.setDevice( d->tqdevice_ );
 	d->stream_.setByteOrder( TQDataStream::LittleEndian );
 	d->stream_ >> i;
 	if (i == TNEF_SIGNATURE)
 	{
 		d->stream_ >> u;
 		kdDebug().form( "Attachment cross reference key: 0x%04x\n",u );
-		//kdDebug() << "stream: " << d->device_->at() << endl;
+		//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
 		while (!d->stream_.eof())
 		{
 			d->stream_ >> c;
@@ -364,7 +364,7 @@ bool KTNEFParser::parseDevice()
 				if (!decodeAttachment()) goto end;
 				break;
 			   default:
-				kdDebug() << "Unknown Level: " << c << ", at offset " << d->device_->at() << endl;
+				kdDebug() << "Unknown Level: " << c << ", at offset " << d->tqdevice_->at() << endl;
 				goto end;
 			}
 		}
@@ -381,7 +381,7 @@ bool KTNEFParser::parseDevice()
 	else
 	{
 	  kdDebug() << "This is not a TNEF file" << endl;
-end:	d->device_->close();
+end:	d->tqdevice_->close();
 		return false;
 	}
 }
@@ -395,10 +395,10 @@ bool KTNEFParser::extractFile(const TQString& filename)
 
 bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname)
 {
-	QString	filename = dirname + "/" + att->name();
-	if (!d->device_->isOpen())
+	TQString	filename = dirname + "/" + att->name();
+	if (!d->tqdevice_->isOpen())
 		return false;
-	if (!d->device_->at(att->offset()))
+	if (!d->tqdevice_->at(att->offset()))
 		return false;
 	KSaveFile saveFile( filename );
 	TQFile *outfile = saveFile.file();
@@ -411,7 +411,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname)
 	bool		ok(true);
 	while (ok && len > 0)
 	{
-		n = d->device_->readBlock(buf,QMIN(sz,len));
+		n = d->tqdevice_->readBlock(buf,TQMIN(sz,len));
 		if (n < 0)
 			ok = false;
 		else
@@ -447,15 +447,15 @@ bool KTNEFParser::openFile(const TQString& filename)
 	deleteDevice();
 	delete d->message_;
 	d->message_ = new KTNEFMessage();
-	d->device_ = new TQFile( filename );
+	d->tqdevice_ = new TQFile( filename );
 	d->deleteDevice_ = true;
 	return parseDevice();
 }
 
-bool KTNEFParser::openDevice( TQIODevice *device )
+bool KTNEFParser::openDevice( TQIODevice *tqdevice )
 {
 	deleteDevice();
-	d->device_ = device;
+	d->tqdevice_ = tqdevice;
 	return parseDevice();
 }
 
@@ -478,16 +478,16 @@ void KTNEFParser::checkCurrent( int key )
 					// and/or content (using at most 32 bytes)
 					KMimeType::Ptr mimetype;
 					if ( !d->current_->fileName().isEmpty() )
-						mimetype = KMimeType::tqfindByPath( d->current_->fileName(), 0, true );
+						mimetype = KMimeType::findByPath( d->current_->fileName(), 0, true );
                                         if (!mimetype) return; // FIXME
 					if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 )
 					{
-						int oldOffset = d->device_->at();
-						TQByteArray buffer( QMIN( 32, d->current_->size() ) );
-						d->device_->at( d->current_->offset() );
-						d->device_->readBlock( buffer.data(), buffer.size() );
-						mimetype = KMimeType::tqfindByContent( buffer );
-						d->device_->at( oldOffset );
+						int oldOffset = d->tqdevice_->at();
+						TQByteArray buffer( TQMIN( 32, d->current_->size() ) );
+						d->tqdevice_->at( d->current_->offset() );
+						d->tqdevice_->readBlock( buffer.data(), buffer.size() );
+						mimetype = KMimeType::findByContent( buffer );
+						d->tqdevice_->at( oldOffset );
 					}
 					d->current_->setMimeTag( mimetype->name() );
 				}
@@ -554,11 +554,11 @@ TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props )
 {
 	TQString s, dn, addr, t;
 	TQMap<int,KTNEFProperty*>::ConstIterator it;
-	if ( ( it = props.find( 0x3001 ) ) != props.end() )
+	if ( ( it = props.tqfind( 0x3001 ) ) != props.end() )
 		dn = ( *it )->valueString();
-	if ( ( it = props.find( 0x3003 ) ) != props.end() )
+	if ( ( it = props.tqfind( 0x3003 ) ) != props.end() )
 		addr = ( *it )->valueString();
-	if ( ( it = props.find( 0x0C15 ) ) != props.end() )
+	if ( ( it = props.tqfind( 0x0C15 ) ) != props.end() )
 		switch ( ( *it )->value().toInt() )
 		{
 			case 0: t = "From:"; break;
@@ -791,20 +791,20 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					TQByteArray data = mapi.value.toByteArray();
 					int len = data.size();
 					ALIGN( len, 4 );
-					d->device_->at( d->device_->at()-len );
+					d->tqdevice_->at( d->tqdevice_->at()-len );
 					TQ_UINT32 interface_ID;
 					d->stream_ >> interface_ID;
 					if ( interface_ID == MAPI_IID_IMessage )
 					{
 						// embedded TNEF file
 						attach->unsetDataParser();
-						attach->setOffset( d->device_->at()+12 );
+						attach->setOffset( d->tqdevice_->at()+12 );
 						attach->setSize( data.size()-16 );
 						attach->setMimeTag( "application/ms-tnef" );
 						attach->setDisplayName( "Embedded Message" );
 						kdDebug() << "MAPI Embedded Message: size=" << data.size() << endl;
 					}
-					d->device_->at( d->device_->at() + ( len-4 ) );
+					d->tqdevice_->at( d->tqdevice_->at() + ( len-4 ) );
 					break;
 				}
 				else if ( mapi.type == MAPI_TYPE_BINARY && attach && attach->offset() < 0 )
@@ -813,7 +813,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					int len = mapi.value.toByteArray().size();
 					ALIGN( len, 4 )
 					attach->setSize( len );
-					attach->setOffset( d->device_->at() - len );
+					attach->setOffset( d->tqdevice_->at() - len );
 					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false );
 				}
 			}
@@ -855,12 +855,12 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 			break;
 		}
 		// do not remove potential existing similar entry
-		if ( ( it = props.find( key ) ) == props.end() )
+		if ( ( it = props.tqfind( key ) ) == props.end() )
 		{
 			p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value );
 			props[ p->key() ] = p;
 		}
-		//kdDebug() << "stream: " << d->device_->at() << endl;
+		//kdDebug() << "stream: " << d->tqdevice_->at() << endl;
 	}
 
 	if ( foundAttachment && attach )
diff --git a/ktnef/lib/ktnefproperty.cpp b/ktnef/lib/ktnefproperty.cpp
index df04a388..ae43236f 100644
--- a/ktnef/lib/ktnefproperty.cpp
+++ b/ktnef/lib/ktnefproperty.cpp
@@ -55,13 +55,13 @@ TQString KTNEFProperty::formatValue( const TQVariant& value, bool beautify )
 		// printable characters
 		TQByteArray arr = value.toByteArray();
 		bool printable = true;
-		for ( int i=QMIN( arr.size(), 8 )-1; i>=0 && printable; i-- )
+		for ( int i=TQMIN( arr.size(), 8 )-1; i>=0 && printable; i-- )
 			printable = ( isprint( arr[ i ] ) != 0 );
 		if ( !printable )
 		{
 			TQString s;
 			uint i;
-      uint txtCount = beautify ? QMIN( arr.size(), 32 ) : arr.size();
+      uint txtCount = beautify ? TQMIN( arr.size(), 32 ) : arr.size();
 			for ( i=0; i < txtCount; ++i )
 			{
 				s.append( TQString().sprintf( "%02X", ( uchar )arr[ i ] ) );
diff --git a/ktnef/lib/ktnefpropertyset.cpp b/ktnef/lib/ktnefpropertyset.cpp
index ec3ee2b5..b67c1ffb 100644
--- a/ktnef/lib/ktnefpropertyset.cpp
+++ b/ktnef/lib/ktnefpropertyset.cpp
@@ -30,7 +30,7 @@ KTNEFPropertySet::~KTNEFPropertySet()
 
 void KTNEFPropertySet::addProperty( int key, int type, const TQVariant& value, const TQVariant& name, bool overwrite )
 {
-	TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.find( key );
+	TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.tqfind( key );
 	if ( it != properties_.end() )
 	{
 		if ( overwrite )
@@ -45,7 +45,7 @@ void KTNEFPropertySet::addProperty( int key, int type, const TQVariant& value, c
 
 TQString KTNEFPropertySet::findProp(int key, const TQString& fallback, bool upper)
 {
-  TQMap<int,KTNEFProperty*>::Iterator it = properties_.find( key );
+  TQMap<int,KTNEFProperty*>::Iterator it = properties_.tqfind( key );
   if( properties_.end() != it )
     return upper ? KTNEFProperty::formatValue( (*it)->value(), false ).upper()
                  : KTNEFProperty::formatValue( (*it)->value(), false );
@@ -100,7 +100,7 @@ const TQMap<int,KTNEFProperty*>& KTNEFPropertySet::properties() const
 
 TQVariant KTNEFPropertySet::property( int key ) const
 {
-	TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.find( key );
+	TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.tqfind( key );
 	if ( it == properties_.end() )
 		return TQVariant();
 	else
@@ -122,7 +122,7 @@ void KTNEFPropertySet::clear( bool deleteAll )
 
 void KTNEFPropertySet::addAttribute( int key, int type, const TQVariant& value, bool overwrite )
 {
-	TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.find( key );
+	TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.tqfind( key );
 	if ( it != attributes_.end() )
 	{
 		if ( overwrite )
@@ -146,7 +146,7 @@ const TQMap<int,KTNEFProperty*>& KTNEFPropertySet::attributes() const
 
 TQVariant KTNEFPropertySet::attribute( int key ) const
 {
-	TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.find( key );
+	TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.tqfind( key );
 	if ( it == attributes_.end() )
 		return TQVariant();
 	else
diff --git a/ktnef/lib/ktnefwriter.cpp b/ktnef/lib/ktnefwriter.cpp
index 3da4dc1e..2264b15e 100644
--- a/ktnef/lib/ktnefwriter.cpp
+++ b/ktnef/lib/ktnefwriter.cpp
@@ -100,7 +100,7 @@ TQ_UINT32 mergeTagAndType( TQ_UINT32 tag, TQ_UINT32 type ) {
  */
 bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
   TQMap<int,KTNEFProperty*>& properties = mData->properties.properties();
-  TQMap<int,KTNEFProperty*>::Iterator it = properties.find( tag );
+  TQMap<int,KTNEFProperty*>::Iterator it = properties.tqfind( tag );
 
   if ( it == properties.end() )
     return false;
@@ -179,7 +179,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
   case attSUBJECT:
   case attBODY:
   case attMSGID:
-    // QCString
+    // TQCString
     cs = property->value().toString().local8Bit();
     addToChecksum( cs, checksum );
 
@@ -236,7 +236,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
   case attDATESENT:
   case attDATERECD:
   case attDATEMODIFIED:
-    // QDateTime
+    // TQDateTime
     dt = property->value().toDateTime();
     time = dt.time();
     date = dt.date();
@@ -287,7 +287,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
       addToChecksum( i, checksum );
       // from reader: d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
     }
-    kdDebug() << "Message Status" << " (length=" << i2 << ")" << endl;
+    kdDebug() << "Message tqStatus" << " (length=" << i2 << ")" << endl;
     break;
 */
 
@@ -417,7 +417,7 @@ void KTNEFWriter::addAttendee( const TQString& /*cn*/, Role /*r*/, PartStat /*p*
 // I assume this is the same as the sender?
 // U also assume that this is like "Name <address>"
 void KTNEFWriter::setOrganizer( const TQString& organizer ) {
-  int i = organizer.find( '<' );
+  int i = organizer.tqfind( '<' );
 
   if ( i == -1 )
     return;
diff --git a/ktnef/lib/mapi.cpp b/ktnef/lib/mapi.cpp
index bf84f1fd..e4f6f85c 100644
--- a/ktnef/lib/mapi.cpp
+++ b/ktnef/lib/mapi.cpp
@@ -130,7 +130,7 @@ static struct
 	{ 0x8004, I18N_NOOP( "Subject" ) },
 	{ 0x8005, I18N_NOOP( "Date Sent" ) },
 	{ 0x8006, I18N_NOOP( "Date Received" ) },
-	{ 0x8007, I18N_NOOP( "Message Status" ) },
+	{ 0x8007, I18N_NOOP( "Message tqStatus" ) },
 	{ 0x8008, I18N_NOOP( "Message Class" ) },
 	{ 0x8009, I18N_NOOP( "Message ID" ) },
 	{ 0x800A, I18N_NOOP( "Parent ID" ) },
@@ -176,7 +176,7 @@ MAPI_NamedTagStrings[] =
 	{ 0x820D, I18N_NOOP( "Appointment Start Date" ) },
 	{ 0x820E, I18N_NOOP( "Appointment End Date" ) },
 	{ 0x8213, I18N_NOOP( "Appointment Duration" ) },
-	{ 0x8218, I18N_NOOP( "Appointment Response Status" ) },
+	{ 0x8218, I18N_NOOP( "Appointment Response tqStatus" ) },
 	{ 0x8223, I18N_NOOP( "Appointment Is Recurring" ) },
 	{ 0x8231, I18N_NOOP( "Appointment Recurrence Type" ) },
 	{ 0x8232, I18N_NOOP( "Appointment Recurrence Pattern" ) },
@@ -197,7 +197,7 @@ TQString mapiTagString( int key )
 		for ( int i=0; MAPI_TagStrings[ i ].str; i++ )
 			MAPI_TagMap[ MAPI_TagStrings[ i ].tag ] = i18n(MAPI_TagStrings[ i ].str);
 	}
-	TQMap<int,TQString>::ConstIterator it = MAPI_TagMap.find( key );
+	TQMap<int,TQString>::ConstIterator it = MAPI_TagMap.tqfind( key );
 	if ( it == MAPI_TagMap.end() )
 		return TQString().sprintf( "0x%04X", key );
 	else
@@ -211,7 +211,7 @@ TQString mapiNamedTagString( int key, int tag )
 		for ( int i=0; MAPI_NamedTagStrings[ i ].str; i++ )
 			MAPI_NamedTagMap[ MAPI_NamedTagStrings[ i ].tag ] = i18n(MAPI_NamedTagStrings[ i ].str);
 	}
-	TQMap<int,TQString>::ConstIterator it = MAPI_NamedTagMap.find( key );
+	TQMap<int,TQString>::ConstIterator it = MAPI_NamedTagMap.tqfind( key );
 	if ( it == MAPI_NamedTagMap.end() )
 		if ( tag >= 0 )
 			return TQString().sprintf( "0x%04X [0x%04X]: ", tag, key ) + *it;
diff --git a/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef
index aea529ec..2c5b6473 100644
--- a/ktnef/tests/mapi_attach_data_obj.tnef
+++ b/ktnef/tests/mapi_attach_data_obj.tnef
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index 8390431c..c97bebaf 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -32,7 +32,7 @@ TQStringList KPIM::splitEmailAddrList(const TQString& aStr)
 {
   // Features:
   // - always ignores quoted characters
-  // - ignores everything (including parentheses and commas)
+  // - ignores everything (including tqparentheses and commas)
   //   inside quoted strings
   // - supports nested comments
   // - ignores everything (including double quotes and commas)
@@ -463,7 +463,7 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
   switch ( errorCode ) {
     case TooManyAts :
       return i18n("The email address you entered is not valid because it "
-                "tqcontains more than one @. "
+                "contains more than one @. "
                 "You will not create valid messages if you do not "
                 "change your address.");
     case TooFewAts :
@@ -481,18 +481,18 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
                 "does not contain a domain part.");
     case UnbalancedParens :
       return i18n("The email address you entered is not valid because it "
-                "tqcontains unclosed comments/brackets.");
+                "contains unclosed comments/brackets.");
     case AddressOk :
       return i18n("The email address you entered is valid.");
     case UnclosedAngleAddr :
       return i18n("The email address you entered is not valid because it "
-                "tqcontains an unclosed anglebracket.");
+                "contains an unclosed anglebracket.");
     case UnopenedAngleAddr :
       return i18n("The email address you entered is not valid because it "
-                "tqcontains an unopened anglebracket.");
+                "contains an unopened anglebracket.");
     case UnexpectedComma :
       return i18n("The email address you have entered is not valid because it "
-                "tqcontains an unexpected comma.");
+                "contains an unexpected comma.");
     case UnexpectedEnd :
       return i18n("The email address you entered is not valid because it ended "
                 "unexpectedly, this probably means you have used an escaping type "
@@ -500,17 +500,17 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
                 "address.");
     case UnbalancedQuote :
       return i18n("The email address you entered is not valid because it "
-                  "tqcontains quoted text which does not end.");
+                  "contains quoted text which does not end.");
     case NoAddressSpec :
       return i18n("The email address you entered is not valid because it "
                   "does not seem to contain an actual email address, i.e. "
                   "something of the form joe@kde.org.");
     case DisallowedChar :
       return i18n("The email address you entered is not valid because it "
-                  "tqcontains an illegal character.");
+                  "contains an illegal character.");
     case InvalidDisplayName :
       return i18n("The email address you have entered is not valid because it "
-                  "tqcontains an invalid displayname.");
+                  "contains an invalid displayname.");
   }
   return i18n("Unknown problem with email address");
 }
@@ -620,8 +620,8 @@ TQString KPIM::getFirstEmailAddress( const TQString & addresses )
 //-----------------------------------------------------------------------------
 bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
 {
-  name = TQString::null;
-  mail = TQString::null;
+  name = TQString();
+  mail = TQString();
 
   const int len=aStr.length();
   const char cQuotes = '"';
@@ -729,12 +729,12 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
     //          and outside of quoted text behind the trailing '>'.
     bInComment = false;
     bInQuotesOutsideOfEmail = false;
-    int parenthesesNesting = 0;
+    int tqparenthesesNesting = 0;
     for( i = iAd+1; len > i; ++i ) {
       c = aStr[i];
       if( bInComment ){
         if( ')' == c ){
-          if ( --parenthesesNesting == 0 ) {
+          if ( --tqparenthesesNesting == 0 ) {
             bInComment = false;
             if( !name.isEmpty() )
               name.append( ' ' );
@@ -745,7 +745,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
         } else {
           if( '(' == c ) {
             // nested "("
-            ++parenthesesNesting;
+            ++tqparenthesesNesting;
           }
           name.append( c ); // all comment stuff is part of the name
         }
@@ -772,7 +772,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
             case '(':
               if( !name.isEmpty() )
                 name.append( ' ' );
-              if ( ++parenthesesNesting > 0 )
+              if ( ++tqparenthesesNesting > 0 )
                 bInComment = true;
               break;
             default:
@@ -838,7 +838,7 @@ TQString KPIM::decodeIDN( const TQString & addrSpec )
 
   TQString idn = KIDNA::toUnicode( addrSpec.mid( atPos + 1 ) );
   if ( idn.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   return addrSpec.left( atPos + 1 ) + idn;
 }
@@ -979,7 +979,7 @@ TQString KPIM::quoteNameIfNecessary( const TQString &str )
   if ( ( quoted[0] == '"' ) && ( quoted[quoted.length() - 1] == '"' ) ) {
     quoted = "\"" + escapeQuotes( quoted.mid( 1, quoted.length() - 2 ) ) + "\"";
   }
-  else if ( quoted.find( needQuotes ) != -1 ) {
+  else if ( quoted.tqfind( needQuotes ) != -1 ) {
     quoted = "\"" + escapeQuotes( quoted ) + "\"";
   }
 
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index fd568b97..5e5e665b 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -192,7 +192,7 @@ KDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses );
  * and "Stefan Taferner". "joe@example.com" returns "joe@example.com"
  * and "". Note that this only returns the first address.
  * Also note that the return value is TRUE if both the name and the
- * mail are not empty: this does NOT tell you if mail tqcontains a
+ * mail are not empty: this does NOT tell you if mail contains a
  * valid email address or just some rubbish.
  */
 KDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail);
@@ -249,7 +249,7 @@ KDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses
  */
 KDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str );
 
-/** Add quote characters around the given string if it tqcontains a 
+/** Add quote characters around the given string if it contains a 
  * character that makes that necessary, in an email name, such as ",".
  */
 KDE_EXPORT TQString quoteNameIfNecessary( const TQString& str );
diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp
index 089aa922..d90ad817 100644
--- a/libemailfunctions/idmapper.cpp
+++ b/libemailfunctions/idmapper.cpp
@@ -134,12 +134,12 @@ void IdMapper::removeRemoteId( const TQString &remoteId )
 TQString IdMapper::remoteId( const TQString &localId ) const
 {
   TQMap<TQString, TQVariant>::ConstIterator it;
-  it = mIdMap.find( localId );
+  it = mIdMap.tqfind( localId );
 
   if ( it != mIdMap.end() )
     return it.data().toString();
   else
-    return TQString::null;
+    return TQString();
 }
 
 TQString IdMapper::localId( const TQString &remoteId ) const
@@ -149,7 +149,7 @@ TQString IdMapper::localId( const TQString &remoteId ) const
     if ( it.data().toString() == remoteId )
       return it.key();
 
-  return TQString::null;
+  return TQString();
 }
 
 TQString IdMapper::asString() const
@@ -177,7 +177,7 @@ const TQString& IdMapper::fingerprint( const TQString &localId ) const
   if ( mFingerprintMap.tqcontains( localId ) )
     return mFingerprintMap[ localId ];
   else 
-    return TQString::null;
+    return TQString();
 }
 
 TQMap<TQString, TQString> IdMapper::remoteIdMap() const
diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h
index 999c68ac..dcb30697 100644
--- a/libemailfunctions/idmapper.h
+++ b/libemailfunctions/idmapper.h
@@ -52,7 +52,7 @@ class KDE_EXPORT IdMapper
       The current implementation stores the data at
       $(KDEHOME)/share/apps/\<path\>/\<identifier\>.
     */
-    IdMapper( const TQString &path, const TQString &identifier = TQString::null );
+    IdMapper( const TQString &path, const TQString &identifier = TQString() );
     /** Destructor. */
     ~IdMapper();
 
diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index 07ea1e83..5cdae0e9 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -29,58 +29,58 @@
 
 using namespace KPIM;
 
-static KStaticDeleter<NetworkStatus> networkStatusDeleter;
-NetworkStatus *NetworkStatus::mSelf = 0;
+static KStaticDeleter<NetworktqStatus> networkStatusDeleter;
+NetworktqStatus *NetworktqStatus::mSelf = 0;
 
-NetworkStatus::NetworkStatus()
-  : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" )
+NetworktqStatus::NetworktqStatus()
+  : TQObject( 0, "NetworktqStatus" ), DCOPObject( "NetworktqStatus" )
 {
-  KConfigGroup group( KGlobal::config(), "NetworkStatus" );
+  KConfigGroup group( KGlobal::config(), "NetworktqStatus" );
   if ( group.readBoolEntry( "Online", true ) == true )
-    mStatus = Online;
+    mtqStatus = Online;
   else
-    mStatus = Offline;
+    mtqStatus = Offline;
 
   connectDCOPSignal( 0, 0, "onlineStatusChanged()", "onlineStatusChanged()", false );
 }
 
-NetworkStatus::~NetworkStatus()
+NetworktqStatus::~NetworktqStatus()
 {
-  KConfigGroup group( KGlobal::config(), "NetworkStatus" );
-  group.writeEntry( "Online", mStatus == Online );
+  KConfigGroup group( KGlobal::config(), "NetworktqStatus" );
+  group.writeEntry( "Online", mtqStatus == Online );
 }
 
-void NetworkStatus::seStatus( Status status )
+void NetworktqStatus::setqStatus( tqStatus status )
 {
-  mStatus = status;
+  mtqStatus = status;
 
-  emit statusChanged( mStatus );
+  emit statusChanged( mtqStatus );
 }
 
-NetworkStatus::Status NetworkStatus::status() const
+NetworktqStatus::tqStatus NetworktqStatus::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
-void NetworkStatus::onlineStatusChanged()
+void NetworktqStatus::onlineStatusChanged()
 {
   DCOPRef dcopCall( "kded", "networkstatus" );
-  DCOPReply reply = dcopCall.call( "onlineStatus()", true );
+  DCOPReply reply = dcopCall.call( "onlinetqStatus()", true );
   if ( reply.isValid() ) {
     int status = reply;
     if ( status == 3 )
-      seStatus( Online );
+      setqStatus( Online );
     else {
-      if ( mStatus != Offline )
-        seStatus( Offline );
+      if ( mtqStatus != Offline )
+        setqStatus( Offline );
     }
   }
 }
 
-NetworkStatus *NetworkStatus::self()
+NetworktqStatus *NetworktqStatus::self()
 {
   if ( !mSelf )
-    networkStatusDeleter.setObject( mSelf, new NetworkStatus );
+    networkStatusDeleter.setObject( mSelf, new NetworktqStatus );
 
   return mSelf;
 }
diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h
index 7b29431f..e42e4348 100644
--- a/libemailfunctions/networkstatus.h
+++ b/libemailfunctions/networkstatus.h
@@ -32,7 +32,7 @@ namespace KPIM {
     the machine KDE is running on going from "online" mode to
     offline. What this means is left as an exercise for the reader.
  */
-class NetworkStatus : public TQObject, public DCOPObject
+class NetworktqStatus : public TQObject, public DCOPObject
 {
   Q_OBJECT
 
@@ -40,7 +40,7 @@ class NetworkStatus : public TQObject, public DCOPObject
     /**
      * The possible states.
      */
-    enum Status {
+    enum tqStatus {
       Online,     //< The machine now has internet connectivity
       Offline     //< The machine has no internet connectivity
     };
@@ -48,24 +48,24 @@ class NetworkStatus : public TQObject, public DCOPObject
     /**
      * Destructor.
      */
-    ~NetworkStatus();
+    ~NetworktqStatus();
 
     /**
      * Returns the only instance of this class.
      */
-    static NetworkStatus *self();
+    static NetworktqStatus *self();
 
     /**
      * Sets a new status.
      *
      * @param status The new status.
      */
-    void seStatus( Status status );
+    void setqStatus( tqStatus status );
 
     /**
      * Returns the current status.
      */
-    Status status() const;
+    tqStatus status() const;
 
   k_dcop:
     /**
@@ -79,18 +79,18 @@ class NetworkStatus : public TQObject, public DCOPObject
      *
      * @param status The new status.
      */
-    void statusChanged( Status status );
+    void statusChanged( tqStatus status );
 
   protected:
     /**
      * Constructor. This is protected, so you must use self()
      * to get the singleton object of this class.
      */
-    NetworkStatus();
+    NetworktqStatus();
 
   private:
-    Status mStatus;
-    static NetworkStatus *mSelf;
+    tqStatus mtqStatus;
+    static NetworktqStatus *mSelf;
 };
 
 }
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 319151c4..432334e1 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -166,10 +166,10 @@ int main(int argc, char *argv[])
   KApplication app( false, false );
 
   // Empty input
-  checkGetNameAndEmail( TQString::null, TQString::null, TQString::null, false );
+  checkGetNameAndEmail( TQString(), TQString(), TQString(), false );
 
   // Email only
-  checkGetNameAndEmail( "faure@kde.org", TQString::null, "faure@kde.org", false );
+  checkGetNameAndEmail( "faure@kde.org", TQString(), "faure@kde.org", false );
 
   // Normal case
   checkGetNameAndEmail( "David Faure <faure@kde.org>", "David Faure", "faure@kde.org", true );
@@ -183,10 +183,10 @@ int main(int argc, char *argv[])
   checkGetNameAndEmail( "(David Faure) faure@kde.org", "David Faure", "faure@kde.org", true );
   checkGetNameAndEmail( "My Name (me) <me@home.net>", "My Name (me)", "me@home.net", true ); // #93513
 
-  // Nested parenthesis as per https://intevation.de/roundup/kolab/issue858
+  // Nested tqparenthesis as per https://intevation.de/roundup/kolab/issue858
   checkGetNameAndEmail( "faure@kde.org (David (The Man) Faure)", "David (The Man) Faure", "faure@kde.org", true );
 
-  // Double-quotes inside parenthesis
+  // Double-quotes inside tqparenthesis
   checkGetNameAndEmail( "faure@kde.org (David \"Crazy\" Faure)", "David \"Crazy\" Faure", "faure@kde.org", true );
   checkGetNameAndEmail( "(David \"Crazy\" Faure) faure@kde.org", "David \"Crazy\" Faure", "faure@kde.org", true );
 
@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
   //checkGetNameAndEmail( "\"a@b\" <faure@kde.org>", "a@b", "faure@kde.org", true );
 
   // While typing, when there's no '@' yet
-  checkGetNameAndEmail( "foo", "foo", TQString::null, false );
-  checkGetNameAndEmail( "foo <", "foo", TQString::null, false );
+  checkGetNameAndEmail( "foo", "foo", TQString(), false );
+  checkGetNameAndEmail( "foo <", "foo", TQString(), false );
   checkGetNameAndEmail( "foo <b", "foo", "b", true );
 
   // If multiple emails are there, only return the first one
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
   checkIsValidEmailAddress( "mattfruitsalad.org", "TooFewAts" );
 
   // An empty string
-  checkIsValidEmailAddress( TQString::null , "AddressEmpty" );
+  checkIsValidEmailAddress( TQString() , "AddressEmpty" );
 
   // email address starting with a @
   checkIsValidEmailAddress( "@mattfruitsalad.org", "MissingLocalPart" );
@@ -433,7 +433,7 @@ int main(int argc, char *argv[])
   checkIsValidSimpleEmailAddress( "matt@123.123.123.123]", "false" );
   checkIsValidSimpleEmailAddress( "\"matt@fruitsalad.org", "false" );
   checkIsValidSimpleEmailAddress( "matt\"@fruitsalad.org", "false" );
-  checkIsValidSimpleEmailAddress( TQString::null, "false" );
+  checkIsValidSimpleEmailAddress( TQString(), "false" );
 
   // and here some insane but still valid cases
   checkIsValidSimpleEmailAddress( "\"m@tt\"@fruitsalad.org", "true" );
diff --git a/libkcal/COPYING b/libkcal/COPYING
index b05ce718..5c8730e0 100644
--- a/libkcal/COPYING
+++ b/libkcal/COPYING
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
+all the source code for all modules it tqcontains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
+structure tqlayouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 8bc40f00..a860072d 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -29,8 +29,8 @@
 
 using namespace KCal;
 
-Alarm::Alarm(Incidence *parent)
- : mParent(parent),
+Alarm::Alarm(Incidence *tqparent)
+ : mParent(tqparent),
    mType(Invalid),
    mDescription(""),    // to make operator==() not fail
    mFile(""),           // to make operator==() not fail
@@ -163,7 +163,7 @@ void Alarm::setAudioFile(const TQString &audioFile)
 
 TQString Alarm::audioFile() const
 {
-  return (mType == Audio) ? mFile : TQString::null;
+  return (mType == Audio) ? mFile : TQString();
 }
 
 void Alarm::setProcedureAlarm(const TQString &programFile, const TQString &arguments)
@@ -184,7 +184,7 @@ void Alarm::setProgramFile(const TQString &programFile)
 
 TQString Alarm::programFile() const
 {
-  return (mType == Procedure) ? mFile : TQString::null;
+  return (mType == Procedure) ? mFile : TQString();
 }
 
 void Alarm::setProgramArguments(const TQString &arguments)
@@ -197,7 +197,7 @@ void Alarm::setProgramArguments(const TQString &arguments)
 
 TQString Alarm::programArguments() const
 {
-  return (mType == Procedure) ? mDescription : TQString::null;
+  return (mType == Procedure) ? mDescription : TQString();
 }
 
 void Alarm::setEmailAlarm(const TQString &subject, const TQString &text,
@@ -251,7 +251,7 @@ void Alarm::setMailSubject(const TQString &mailAlarmSubject)
 
 TQString Alarm::mailSubject() const
 {
-  return (mType == Email) ? mMailSubject : TQString::null;
+  return (mType == Email) ? mMailSubject : TQString();
 }
 
 void Alarm::setMailAttachment(const TQString &mailAttachFile)
@@ -294,7 +294,7 @@ void Alarm::setMailText(const TQString &text)
 
 TQString Alarm::mailText() const
 {
-  return (mType == Email) ? mDescription : TQString::null;
+  return (mType == Email) ? mDescription : TQString();
 }
 
 void Alarm::setDisplayAlarm(const TQString &text)
@@ -315,7 +315,7 @@ void Alarm::setText(const TQString &text)
 
 TQString Alarm::text() const
 {
-  return (mType == Display) ? mDescription : TQString::null;
+  return (mType == Display) ? mDescription : TQString();
 }
 
 void Alarm::setTime(const TQDateTime &alarmTime)
@@ -476,9 +476,9 @@ Duration Alarm::endOffset() const
   return (mHasTime || !mEndOffset) ? Duration( 0 ) : mOffset;
 }
 
-void Alarm::setParent( Incidence *parent )
+void Alarm::setParent( Incidence *tqparent )
 {
-  mParent = parent;
+  mParent = tqparent;
 }
 
 void Alarm::customPropertyUpdated()
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index 893e7be4..fc85e96f 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -52,7 +52,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     /**
       Construct a new alarm with variables initialized to "sane" values.
     */
-    explicit Alarm( Incidence *parent );
+    explicit Alarm( Incidence *tqparent );
     /**
       Destruct Alarm object.
     */
@@ -95,7 +95,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
 
       @param text text to display when the alarm is triggered.
     */
-    void setDisplayAlarm( const TQString &text = TQString::null );
+    void setDisplayAlarm( const TQString &text = TQString() );
 
     /**
       Set the text to be displayed when the alarm is triggered.
@@ -113,7 +113,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
 
       @param audioFile optional file to play when the alarm is triggered.
     */
-    void setAudioAlarm( const TQString &audioFile = TQString::null );
+    void setAudioAlarm( const TQString &audioFile = TQString() );
     /**
       Set the file to play when the audio alarm is triggered.
       Ignored if the alarm is not an audio alarm.
@@ -122,7 +122,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     /**
       Return the name of the audio file for the alarm.
 
-      @return The audio file for the alarm, or TQString::null if not an audio alarm.
+      @return The audio file for the alarm, or TQString() if not an audio alarm.
     */
     TQString audioFile() const;
 
@@ -133,7 +133,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
       @param arguments arguments to supply to programFile.
     */
     void setProcedureAlarm( const TQString &programFile,
-                            const TQString &arguments = TQString::null );
+                            const TQString &arguments = TQString() );
     /**
       Set the program file to execute when the alarm is triggered.
       Ignored if the alarm is not a procedure alarm.
@@ -142,7 +142,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     /**
       Return the name of the program file to execute when the alarm is triggered.
 
-      @return the program file name, or TQString::null if not a procedure alarm.
+      @return the program file name, or TQString() if not a procedure alarm.
     */
     TQString programFile() const;
     /**
@@ -153,7 +153,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     /**
       Return the arguments to the program to run when the alarm is triggered.
 
-      @return the program arguments, or TQString::null if not a procedure alarm.
+      @return the program arguments, or TQString() if not a procedure alarm.
     */
     TQString programArguments() const;
 
@@ -227,7 +227,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     /**
       Return the email body text.
 
-      @return the body text, or TQString::null if not an email alarm.
+      @return the body text, or TQString() if not an email alarm.
     */
     TQString mailText() const;
 
@@ -342,13 +342,13 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties
     bool enabled() const;
 
     /**
-      Set the alarm's parent incidence.
+      Set the alarm's tqparent incidence.
     */
     void setParent( Incidence * );
     /**
-      Get the alarm's parent incidence.
+      Get the alarm's tqparent incidence.
     */
-    Incidence *parent() const  { return mParent; }
+    Incidence *tqparent() const  { return mParent; }
 
   protected:
     /**
diff --git a/libkcal/attachment.cpp b/libkcal/attachment.cpp
index 51858161..0b1db1a3 100644
--- a/libkcal/attachment.cpp
+++ b/libkcal/attachment.cpp
@@ -72,7 +72,7 @@ TQString Attachment::uri() const
   if ( !mBinary ) {
     return mUri;
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
diff --git a/libkcal/attachment.h b/libkcal/attachment.h
index 7727a5c6..9d36274c 100644
--- a/libkcal/attachment.h
+++ b/libkcal/attachment.h
@@ -49,7 +49,7 @@ class KDE_EXPORT Attachment
       @param uri the uri this attachment refers to
       @param mime the mime type of the resource being linked to
     */
-    Attachment( const TQString &uri, const TQString &mime = TQString::null );
+    Attachment( const TQString &uri, const TQString &mime = TQString() );
 
     /**
       Create a binary attachment.
@@ -57,7 +57,7 @@ class KDE_EXPORT Attachment
       @param base64 the attachment in base64 format
       @param mime the mime type of the attachment
     */
-    Attachment( const char *base64, const TQString &mime = TQString::null );
+    Attachment( const char *base64, const TQString &mime = TQString() );
 
     ~Attachment();
 
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index 3163def0..eb0fc2b7 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -47,7 +47,7 @@
 
 namespace KCal {
 
-Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName,
+Attachment *AttachmentHandler::tqfind( TQWidget *tqparent, const TQString &attachmentName,
                                      Incidence *incidence )
 {
   if ( !incidence ) {
@@ -69,15 +69,15 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen
 
   if ( !a ) {
     KMessageBox::error(
-      parent,
+      tqparent,
       i18n( "No attachment named \"%1\" found in the incidence." ).arg( attachmentName ) );
     return 0;
   }
 
   if ( a->isUri() ) {
-    if ( !KIO::NetAccess::exists( a->uri(), true, parent ) ) {
+    if ( !KIO::NetAccess::exists( a->uri(), true, tqparent ) ) {
       KMessageBox::sorry(
-        parent,
+        tqparent,
         i18n( "The attachment \"%1\" is a web link that is inaccessible from this computer. " ).
         arg( KURL::decode_string( a->uri() ) ) );
       return 0;
@@ -86,7 +86,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen
   return a;
 }
 
-Attachment *AttachmentHandler::find( TQWidget *parent,
+Attachment *AttachmentHandler::tqfind( TQWidget *tqparent,
                                      const TQString &attachmentName, const TQString &uid )
 {
   if ( uid.isEmpty() ) {
@@ -99,16 +99,16 @@ Attachment *AttachmentHandler::find( TQWidget *parent,
   Incidence *incidence = cal->incidence( uid );
   if ( !incidence ) {
     KMessageBox::error(
-      parent,
+      tqparent,
       i18n( "The incidence that owns the attachment named \"%1\" could not be found. "
             "Perhaps it was removed from your calendar?" ).arg( attachmentName ) );
     return 0;
   }
 
-  return find( parent, attachmentName, incidence );
+  return tqfind( tqparent, attachmentName, incidence );
 }
 
-Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName,
+Attachment *AttachmentHandler::tqfind( TQWidget *tqparent, const TQString &attachmentName,
                                      ScheduleMessage *message )
 {
   if ( !message ) {
@@ -118,13 +118,13 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen
   Incidence *incidence = dynamic_cast<Incidence*>( message->event() );
   if ( !incidence ) {
     KMessageBox::error(
-      parent,
+      tqparent,
       i18n( "The calendar invitation stored in this email message is broken in some way. "
             "Unable to continue." ) );
     return 0;
   }
 
-  return find( parent, attachmentName, incidence );
+  return tqfind( tqparent, attachmentName, incidence );
 }
 
 static KTempFile *s_tempFile = 0;
@@ -134,10 +134,10 @@ static KURL tempFileForAttachment( Attachment *attachment )
   KURL url;
   TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns();
   if ( !patterns.empty() ) {
-    s_tempFile = new KTempFile( TQString::null,
+    s_tempFile = new KTempFile( TQString(),
                                 TQString( patterns.first() ).remove( '*' ), 0600 );
   } else {
-    s_tempFile = new KTempFile( TQString::null, TQString::null, 0600 );
+    s_tempFile = new KTempFile( TQString(), TQString(), 0600 );
   }
 
   TQFile *qfile = s_tempFile->file();
@@ -157,7 +157,7 @@ static KURL tempFileForAttachment( Attachment *attachment )
   return url;
 }
 
-bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment )
+bool AttachmentHandler::view( TQWidget *tqparent, Attachment *attachment )
 {
   if ( !attachment ) {
     return false;
@@ -174,7 +174,7 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment )
     } else {
       stat = false;
       KMessageBox::error(
-        parent,
+        tqparent,
         i18n( "Unable to create a temporary file for the attachment." ) );
     }
     delete s_tempFile;
@@ -183,31 +183,31 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment )
   return stat;
 }
 
-bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence )
+bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence )
 {
-  return view( parent, find( parent, attachmentName, incidence ) );
+  return view( tqparent, tqfind( tqparent, attachmentName, incidence ) );
 }
 
-bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, const TQString &uid )
+bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid )
 {
-  return view( parent, find( parent, attachmentName, uid ) );
+  return view( tqparent, tqfind( tqparent, attachmentName, uid ) );
 }
 
-bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName,
+bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName,
                               ScheduleMessage *message )
 {
-  return view( parent, find( parent, attachmentName, message ) );
+  return view( tqparent, tqfind( tqparent, attachmentName, message ) );
 }
 
-bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment )
+bool AttachmentHandler::saveAs( TQWidget *tqparent, Attachment *attachment )
 {
   // get the saveas file name
-  TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString::null, parent,
+  TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString(), tqparent,
                                                      i18n( "Save Attachment" ) );
   if ( saveAsFile.isEmpty() ||
        ( TQFile( saveAsFile ).exists() &&
          ( KMessageBox::warningYesNo(
-             parent,
+             tqparent,
              i18n( "%1 already exists. Do you want to overwrite it?").
              arg( saveAsFile ) ) == KMessageBox::No ) ) ) {
     return false;
@@ -223,12 +223,12 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment )
     if ( tempUrl.isValid() ) {
       stat = KIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true );
       if ( !stat && KIO::NetAccess::lastError() ) {
-        KMessageBox::error( parent, KIO::NetAccess::lastErrorString() );
+        KMessageBox::error( tqparent, KIO::NetAccess::lastErrorString() );
       }
     } else {
       stat = false;
       KMessageBox::error(
-        parent,
+        tqparent,
         i18n( "Unable to create a temporary file for the attachment." ) );
     }
     delete s_tempFile;
@@ -237,21 +237,21 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment )
   return stat;
 }
 
-bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName,
+bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName,
                                 Incidence *incidence )
 {
-  return saveAs( parent, find( parent, attachmentName, incidence ) );
+  return saveAs( tqparent, tqfind( tqparent, attachmentName, incidence ) );
 }
 
-bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid )
+bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid )
 {
-  return saveAs( parent, find( parent, attachmentName, uid ) );
+  return saveAs( tqparent, tqfind( tqparent, attachmentName, uid ) );
 }
 
-bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName,
+bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName,
                                 ScheduleMessage *message )
 {
-  return saveAs( parent, find( parent, attachmentName, message ) );
+  return saveAs( tqparent, tqfind( tqparent, attachmentName, message ) );
 }
 
 }
diff --git a/libkcal/attachmenthandler.h b/libkcal/attachmenthandler.h
index 6116f15a..7fc97382 100644
--- a/libkcal/attachmenthandler.h
+++ b/libkcal/attachmenthandler.h
@@ -49,128 +49,128 @@ namespace AttachmentHandler {
   /**
     Finds the attachment in the user's calendar, by @p attachmentName and @p incidence.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param incidence is a pointer to a valid Incidence object containing the attachment.
 
     @return a pointer to the Attachment object located; 0 if no such attachment could be found.
   */
-  Attachment *find( TQWidget *parent, const TQString &attachmentName, Incidence *incidence );
+  Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence );
 
   /**
     Finds the attachment in the user's calendar, by @p attachmentName and a scheduler message;
     in other words, this function is intended to retrieve attachments from calendar invitations.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param message is a pointer to a valid ScheduleMessage object containing the attachment.
 
     @return a pointer to the Attachment object located; 0 if no such attachment could be found.
   */
-  Attachment *find( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message );
+  Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message );
 
   /**
     Finds the attachment in the user's calendar, by @p attachmentName and @p uid.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param uid is a TQString containing a UID of the incidence containing the attachment.
 
     @return a pointer to the Attachment object located; 0 if no such attachment could be found.
   */
-  Attachment *find( TQWidget *parent, const TQString &attachmentName, const TQString &uid );
+  Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid );
 
   /**
     Launches a viewer on the specified attachment.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachment is a pointer to a valid Attachment object.
 
     @return true if the viewer program successfully launched; false otherwise.
   */
-  bool view( TQWidget *parent, Attachment *attachment );
+  bool view( TQWidget *tqparent, Attachment *attachment );
 
   /**
     Launches a viewer on the specified attachment.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param incidence is a pointer to a valid Incidence object containing the attachment.
 
     @return true if the attachment could be found and the viewer program successfully launched;
     false otherwise.
   */
-  bool view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence );
+  bool view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence );
 
   /**
     Launches a viewer on the specified attachment.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param uid is a TQString containing a UID of the incidence containing the attachment.
 
     @return true if the attachment could be found and the viewer program successfully launched;
     false otherwise.
   */
-  bool view( TQWidget *parent, const TQString &attachmentName, const TQString &uid );
+  bool view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid );
 
   /**
     Launches a viewer on the specified attachment.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param message is a pointer to a valid ScheduleMessage object containing the attachment.
 
     @return true if the attachment could be found and the viewer program successfully launched;
     false otherwise.
   */
-  bool view( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message );
+  bool view( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message );
 
   /**
     Saves the specified attachment to a file of the user's choice.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachment is a pointer to a valid Attachment object.
 
     @return true if the save operation was successful; false otherwise.
   */
-  bool saveAs( TQWidget *parent, Attachment *attachment );
+  bool saveAs( TQWidget *tqparent, Attachment *attachment );
 
   /**
     Saves the specified attachment to a file of the user's choice.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param incidence is a pointer to a valid Incidence object containing the attachment.
 
     @return true if the attachment could be found and the save operation was successful;
     false otherwise.
   */
-  bool saveAs( TQWidget *parent, const TQString &attachmentName, Incidence *incidence );
+  bool saveAs( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence );
 
   /**
     Saves the specified attachment to a file of the user's choice.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param uid is a TQString containing a UID of the incidence containing the attachment.
 
     @return true if the attachment could be found and the save operation was successful;
     false otherwise.
   */
-  bool saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid );
+  bool saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid );
 
   /**
     Saves the specified attachment to a file of the user's choice.
 
-    @param parent is the parent widget for the dialogs used in this function.
+    @param tqparent is the tqparent widget for the dialogs used in this function.
     @param attachmentName is the name of the attachment
     @param message is a pointer to a valid ScheduleMessage object containing the attachment.
 
     @return true if the attachment could be found and the save operation was successful;
     false otherwise.
   */
-  bool saveAs( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message );
+  bool saveAs( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message );
 }
 
 }
diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp
index d129bc36..a34f9759 100644
--- a/libkcal/attendee.cpp
+++ b/libkcal/attendee.cpp
@@ -33,7 +33,7 @@ Attendee::Attendee( const TQString &name, const TQString &email, bool _rsvp,
   : Person( name, email )
 {
   mRSVP = _rsvp;
-  mStatus = s;
+  mtqStatus = s;
   mRole = r;
   mUid = u;
 }
@@ -53,19 +53,19 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 )
              a1.delegator() == a2.delegator() );
 }
 
-void Attendee::seStatus( Attendee::PartStat s )
+void Attendee::setqStatus( Attendee::PartStat s )
 {
-  mStatus = s;
+  mtqStatus = s;
 }
 
 Attendee::PartStat Attendee::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
 TQString Attendee::statusStr() const
 {
-  return statusName( mStatus );
+  return statusName( mtqStatus );
 }
 
 TQString Attendee::statusName( Attendee::PartStat s )
diff --git a/libkcal/attendee.h b/libkcal/attendee.h
index a61b07c5..609974e9 100644
--- a/libkcal/attendee.h
+++ b/libkcal/attendee.h
@@ -48,13 +48,13 @@ class LIBKCAL_EXPORT Attendee : public Person
       @param name Name
       @param email Email address
       @param rsvp Request for reply
-      @param status Status (see enum for list)
+      @param status tqStatus (see enum for list)
       @param role Role
       @param u the uid for the attendee
     */
     Attendee( const TQString &name, const TQString &email,
               bool rsvp = false, PartStat status = None,
-              Role role = ReqParticipant, const TQString &u = TQString::null );
+              Role role = ReqParticipant, const TQString &u = TQString() );
     /**
       Destruct Attendee.
     */
@@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person
     /**
       Set status. See enum for definitions of possible values.
     */
-    void seStatus( PartStat s );
+    void setqStatus( PartStat s );
 
     /**
       Return status.
@@ -146,7 +146,7 @@ class LIBKCAL_EXPORT Attendee : public Person
   private:
     bool mRSVP;
     Role mRole;
-    PartStat mStatus;
+    PartStat mtqStatus;
     TQString mUid;
     TQString mDelegate;
     TQString mDelegator;
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index c76ce329..9d9b63f4 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -162,7 +162,7 @@ TQStringList Calendar::categories()
     thisCats = (*i)->categories();
     for ( TQStringList::ConstIterator si = thisCats.constBegin();
           si != thisCats.constEnd(); ++si ) {
-      if ( cats.find( *si ) == cats.end() ) {
+      if ( cats.tqfind( *si ) == cats.end() ) {
         cats.append( *si );
       }
     }
@@ -474,16 +474,16 @@ bool Calendar::deleteIncidence( Incidence *incidence )
 {
   if ( beginChange( incidence ) ) {
     if (incidence->hasRecurrenceID()) {
-      // Delete this event's UID from the parent's list of children
-      Incidence *parentIncidence;
+      // Delete this event's UID from the tqparent's list of tqchildren
+      Incidence *tqparentIncidence;
       IncidenceList il = incidence->childIncidences();
       IncidenceListIterator it;
       it = il.begin();
-      parentIncidence = this->incidence(*it);
-      parentIncidence->deleteChildIncidence(incidence->uid());
+      tqparentIncidence = this->incidence(*it);
+      tqparentIncidence->deleteChildIncidence(incidence->uid());
     }
     else {
-      // Delete all children as well
+      // Delete all tqchildren as well
       IncidenceList il = incidence->childIncidences();
       IncidenceListIterator it;
       for ( it = il.begin(); it != il.end(); ++it ) {
@@ -512,7 +512,7 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, TQDate date,
   Incidence *newInc = incidence->clone();
   newInc->recreate();
   newInc->setHasRecurrenceID(false);
-//  newInc->setRecurrenceID(QString());
+//  newInc->setRecurrenceID(TQString());
   newInc->setRelatedTo( incidence );
   Recurrence *recur = newInc->recurrence();
   if ( single ) {
@@ -841,7 +841,7 @@ void Calendar::setupRelations( Incidence *forincidence )
 // kdDebug(5850) << "Calendar::setupRelations for incidence " << forincidence << " with UID " << forincidence->uid() << ", summary: " << forincidence->summary() << endl;
   TQString uid = forincidence->uid();
 
-  // First, go over the list of orphans and see if this is their parent
+  // First, go over the list of orphans and see if this is their tqparent
   while ( Incidence* i = mOrphans[ uid ] ) {
     mOrphans.remove( uid );
     i->setRelatedTo( forincidence );
@@ -849,19 +849,19 @@ void Calendar::setupRelations( Incidence *forincidence )
     mOrphanUids.remove( i->uid() );
   }
 
-  // Now see about this incidences parent
+  // Now see about this incidences tqparent
   if ( !forincidence->relatedTo() && !forincidence->relatedToUid().isEmpty() ) {
     // This incidence has a uid it is related to but is not registered to it yet
     // Try to find it
-    Incidence* parent = incidence( forincidence->relatedToUid() );
-    if ( parent ) {
+    Incidence* tqparent = incidence( forincidence->relatedToUid() );
+    if ( tqparent ) {
       // Found it
-      forincidence->setRelatedTo( parent );
-      parent->addRelation( forincidence );
+      forincidence->setRelatedTo( tqparent );
+      tqparent->addRelation( forincidence );
     } else {
       // Not found, put this in the mOrphans list
       // Note that the mOrphans dict might have several entries with the same key! That are
-      // multiple children that wait for the parent incidence to be inserted.
+      // multiple tqchildren that wait for the tqparent incidence to be inserted.
       mOrphans.insert( forincidence->relatedToUid(), forincidence );
       mOrphanUids.insert( forincidence->uid(), forincidence );
     }
@@ -883,7 +883,7 @@ void Calendar::removeRelations( Incidence *incidence )
   Incidence::List::ConstIterator it;
   for ( it = relations.begin(); it != relations.end(); ++it ) {
     Incidence *i = *it;
-    if ( !mOrphanUids.find( i->uid() ) ) {
+    if ( !mOrphanUids.tqfind( i->uid() ) ) {
       mOrphans.insert( uid, i );
       mOrphanUids.insert( i->uid(), i );
       i->setRelatedTo( 0 );
@@ -901,10 +901,10 @@ void Calendar::removeRelations( Incidence *incidence )
     // Since the mOrphans dict might contain the same key (with different
     // child incidence pointers!) multiple times, take care that we remove
     // the correct one. So we need to remove all items with the given
-    // parent UID, and readd those that are not for this item. Also, there
+    // tqparent UID, and readd those that are not for this item. Also, there
     // might be other entries with differnet UID that point to this
     // incidence (this might happen when the relatedTo of the item is
-    // changed before its parent is inserted. This might happen with
+    // changed before its tqparent is inserted. This might happen with
     // groupware servers....). Remove them, too
     TQStringList relatedToUids;
     // First get the list of all keys in the mOrphans list that point to the removed item
@@ -960,7 +960,7 @@ void Calendar::setModified( bool modified )
 
 void Calendar::incidenceUpdated( IncidenceBase *incidence )
 {
-  incidence->setSyncStatus( Event::SYNCMOD );
+  incidence->setSynctqStatus( Event::SYNCMOD );
   incidence->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 005b513e..c2a4e6e6 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -170,6 +170,7 @@ class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties,
                                 public IncidenceBase::Observer
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 95b5a006..310c65d2 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -50,7 +50,7 @@ CalendarLocal::CalendarLocal( const TQString &timeZoneId )
 void CalendarLocal::init()
 {
   mDeletedIncidences.setAutoDelete( true );
-  mFileName = TQString::null;
+  mFileName = TQString();
 }
 
 
@@ -92,7 +92,7 @@ bool CalendarLocal::save( const TQString &fileName, CalFormat *format )
 void CalendarLocal::close()
 {
   setObserversEnabled( false );
-  mFileName = TQString::null;
+  mFileName = TQString();
 
   deleteAllEvents();
   deleteAllTodos();
@@ -107,7 +107,7 @@ void CalendarLocal::close()
 void CalendarLocal::closeEvents()
 {
   setObserversEnabled( false );
-  mFileName = TQString::null;
+  mFileName = TQString();
 
   deleteAllEvents();
 
@@ -120,7 +120,7 @@ void CalendarLocal::closeEvents()
 void CalendarLocal::closeTodos()
 {
   setObserversEnabled( false );
-  mFileName = TQString::null;
+  mFileName = TQString();
 
   deleteAllTodos();
 
@@ -133,7 +133,7 @@ void CalendarLocal::closeTodos()
 void CalendarLocal::closeJournals()
 {
   setObserversEnabled( false );
-  mFileName = TQString::null;
+  mFileName = TQString();
 
   deleteAllJournals();
 
@@ -229,7 +229,7 @@ bool CalendarLocal::addTodo( Todo *todo )
 
 bool CalendarLocal::deleteTodo( Todo *todo )
 {
-  // Handle orphaned children
+  // Handle orphaned tqchildren
   removeRelations( todo );
 
   if ( mTodoList.removeRef( todo ) ) {
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index 50c5fba5..9bec7a64 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -108,7 +108,7 @@ ResourceCalendar
   }
 
   KRES::Resource *r;
-  r = KRES::SelectDialog::getResource( list, parent() );
+  r = KRES::SelectDialog::getResource( list, tqparent() );
   return static_cast<ResourceCalendar *>( r );
 }
 
@@ -215,12 +215,12 @@ void CalendarResources::setAskDestinationPolicy()
 
 TQWidget *CalendarResources::dialogParentWidget()
 {
-  return mDestinationPolicy->parent();
+  return mDestinationPolicy->tqparent();
 }
 
-void CalendarResources::setDialogParentWidget( TQWidget *parent )
+void CalendarResources::setDialogParentWidget( TQWidget *tqparent )
 {
-  mDestinationPolicy->setParent( parent );
+  mDestinationPolicy->setParent( tqparent );
 }
 
 void CalendarResources::close()
@@ -430,7 +430,7 @@ bool CalendarResources::deleteEvent( Event *event )
   kdDebug(5800) << "CalendarResources::deleteEvent" << endl;
 
   bool status;
-  if ( mResourceMap.find( event ) != mResourceMap.end() ) {
+  if ( mResourceMap.tqfind( event ) != mResourceMap.end() ) {
     status = mResourceMap[event]->deleteEvent( event );
     if ( status )
       mPendingDeleteFromResourceMap = true;
@@ -487,7 +487,7 @@ bool CalendarResources::deleteTodo( Todo *todo )
   kdDebug(5800) << "CalendarResources::deleteTodo" << endl;
 
   bool status;
-  if ( mResourceMap.find( todo ) != mResourceMap.end() ) {
+  if ( mResourceMap.tqfind( todo ) != mResourceMap.end() ) {
     status = mResourceMap[todo]->deleteTodo( todo );
     if ( status )
       mPendingDeleteFromResourceMap = true;
@@ -686,7 +686,7 @@ bool CalendarResources::deleteJournal( Journal *journal )
   kdDebug(5800) << "CalendarResources::deleteJournal" << endl;
 
   bool status;
-  if ( mResourceMap.find( journal ) != mResourceMap.end() ) {
+  if ( mResourceMap.tqfind( journal ) != mResourceMap.end() ) {
     status = mResourceMap[journal]->deleteJournal( journal );
     if ( status )
       mPendingDeleteFromResourceMap = true;
@@ -771,7 +771,7 @@ void CalendarResources::connectResource( ResourceCalendar *resource )
 
 ResourceCalendar *CalendarResources::resource( Incidence *incidence )
 {
-  if ( mResourceMap.find( incidence ) != mResourceMap.end() ) {
+  if ( mResourceMap.tqfind( incidence ) != mResourceMap.end() ) {
     return mResourceMap[ incidence ];
   }
   return 0;
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index 9a93be53..3f601502 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -66,6 +66,7 @@ class LIBKCAL_EXPORT CalendarResources :
       public KRES::ManagerObserver<ResourceCalendar>
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
        @class DestinationPolicy
@@ -74,12 +75,12 @@ class LIBKCAL_EXPORT CalendarResources :
     {
       public:
         DestinationPolicy( CalendarResourceManager *manager,
-                              TQWidget *parent = 0  ) :
-          mManager( manager ), mParent( parent ) {}
+                              TQWidget *tqparent = 0  ) :
+          mManager( manager ), mParent( tqparent ) {}
 
         virtual ResourceCalendar *destination( Incidence *incidence ) = 0;
-        virtual TQWidget *parent() { return mParent; }
-        virtual void setParent( TQWidget *newparent ) { mParent = newparent; }
+        virtual TQWidget *tqparent() { return mParent; }
+        virtual void setParent( TQWidget *newtqparent ) { mParent = newtqparent; }
         bool hasCalendarResources();
       protected:
         CalendarResourceManager *resourceManager()
@@ -97,8 +98,8 @@ class LIBKCAL_EXPORT CalendarResources :
     {
       public:
         StandardDestinationPolicy( CalendarResourceManager *manager,
-                              TQWidget *parent = 0  ) :
-          DestinationPolicy( manager, parent ) {}
+                              TQWidget *tqparent = 0  ) :
+          DestinationPolicy( manager, tqparent ) {}
 
         ResourceCalendar *destination( Incidence *incidence );
 
@@ -114,8 +115,8 @@ class LIBKCAL_EXPORT CalendarResources :
     {
       public:
         AskDestinationPolicy( CalendarResourceManager *manager,
-                              TQWidget *parent = 0 ) :
-          DestinationPolicy( manager, parent ) {}
+                              TQWidget *tqparent = 0 ) :
+          DestinationPolicy( manager, tqparent ) {}
 
         ResourceCalendar *destination( Incidence *incidence );
 
@@ -270,8 +271,8 @@ class LIBKCAL_EXPORT CalendarResources :
     void setAskDestinationPolicy();
 
     /**
-       Returns the current parent for new dialogs. This is a bad hack, but we need
-       to properly set the parent for the resource selection dialog. Otherwise
+       Returns the current tqparent for new dialogs. This is a bad hack, but we need
+       to properly set the tqparent for the resource selection dialog. Otherwise
        the dialog will not be modal to the editor dialog in korganizer and
        the user can still work in the editor dialog (and thus crash korganizer).
        Afterwards we need to reset it (to avoid pointers to widgets that are
@@ -279,12 +280,12 @@ class LIBKCAL_EXPORT CalendarResources :
     */
     TQWidget *dialogParentWidget();
     /**
-       Set the widget parent for new dialogs. This is a bad hack, but we need
-       to properly set the parent for the resource selection dialog. Otherwise
+       Set the widget tqparent for new dialogs. This is a bad hack, but we need
+       to properly set the tqparent for the resource selection dialog. Otherwise
        the dialog will not be modal to the editor dialog in korganizer and
        the user can still work in the editor dialog (and thus crash korganizer).
     */
-    void setDialogParentWidget( TQWidget *parent );
+    void setDialogParentWidget( TQWidget *tqparent );
 
     /**
        Request ticket for saving the Calendar.  If a ticket is returned the
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index c065bf44..01df3296 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -125,7 +125,7 @@ bool CalFilter::filterIncidence(Incidence *incidence) const
       if ( !todo->attendees().isEmpty() ) {
         Attendee::List::ConstIterator it;
         for( it = attendees.begin(); it != attendees.end(); ++it ) {
-          if ( mEmailList.find( (*it)->email() ) != mEmailList.end() ) {
+          if ( mEmailList.tqfind( (*it)->email() ) != mEmailList.end() ) {
             iAmOneOfTheAttendees = true;
             break;
           }
diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp
index ebdb9de9..bb1442f5 100644
--- a/libkcal/calhelper.cpp
+++ b/libkcal/calhelper.cpp
@@ -146,10 +146,10 @@ ResourceCalendar *CalHelper::incResourceCalendar( Calendar *calendar, Incidence
   return cal->resource( incidence );
 }
 
-QPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar *calendar,
+TQPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar *calendar,
                                                                       Incidence *incidence )
 {
-  QPair<ResourceCalendar *, TQString> p( 0, TQString() );
+  TQPair<ResourceCalendar *, TQString> p( 0, TQString() );
 
   CalendarResources *cal = dynamic_cast<CalendarResources*>( calendar );
   if ( !cal || !incidence ) {
diff --git a/libkcal/calhelper.h b/libkcal/calhelper.h
index edebecf9..d14149df 100644
--- a/libkcal/calhelper.h
+++ b/libkcal/calhelper.h
@@ -116,15 +116,15 @@ namespace CalHelper {
     @param calendar is a pointer to a valid Calendar object.
     @param incidence is a pointer to an Incidence object.
 
-    @return a QPair containing a pointer to the Incidence's ResourceCalendar
-    in the 'first' element of the QPair and the SubResourceCalendar in the
+    @return a TQPair containing a pointer to the Incidence's ResourceCalendar
+    in the 'first' element of the TQPair and the SubResourceCalendar in the
     'second' element.
 
     @note many resource types do not support subresources, so the 'second'
     element will be an empty TQString in those situations.
     @since 4.5
   */
-  QPair<ResourceCalendar *, TQString> incSubResourceCalendar( Calendar *calendar,
+  TQPair<ResourceCalendar *, TQString> incSubResourceCalendar( Calendar *calendar,
                                                              Incidence *incidence );
 
 }
diff --git a/libkcal/compat.cpp b/libkcal/compat.cpp
index 5b5c6a5a..4a1a38fd 100644
--- a/libkcal/compat.cpp
+++ b/libkcal/compat.cpp
@@ -37,15 +37,15 @@ Compat *CompatFactory::createCompat( const TQString &productId )
 
   Compat *compat = 0;
 
-  int korg = productId.find( "KOrganizer" );
-  int outl9 = productId.find( "Outlook 9.0" );
-//   int kcal = productId.find( "LibKCal" );
+  int korg = productId.tqfind( "KOrganizer" );
+  int outl9 = productId.tqfind( "Outlook 9.0" );
+//   int kcal = productId.tqfind( "LibKCal" );
 
   // TODO: Use the version of LibKCal to determine the compat class...
   if ( korg >= 0 ) {
-    int versionStart = productId.find( " ", korg );
+    int versionStart = productId.tqfind( " ", korg );
     if ( versionStart >= 0 ) {
-      int versionStop = productId.find( TQRegExp( "[ /]" ), versionStart + 1 );
+      int versionStop = productId.tqfind( TQRegExp( "[ /]" ), versionStart + 1 );
       if ( versionStop >= 0 ) {
         TQString version = productId.mid( versionStart + 1,
                                          versionStop - versionStart - 1 );
@@ -54,7 +54,7 @@ Compat *CompatFactory::createCompat( const TQString &productId )
         int versionNum = version.section( ".", 0, 0 ).toInt() * 10000 +
                          version.section( ".", 1, 1 ).toInt() * 100 +
                          version.section( ".", 2, 2 ).toInt();
-        int releaseStop = productId.find( "/", versionStop );
+        int releaseStop = productId.tqfind( "/", versionStop );
         TQString release;
         if ( releaseStop > versionStop ) {
           release = productId.mid( versionStop+1, releaseStop-versionStop-1 );
diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp
index 9b7f4d31..0d9edf1e 100644
--- a/libkcal/confirmsavedialog.cpp
+++ b/libkcal/confirmsavedialog.cpp
@@ -30,8 +30,8 @@
 using namespace KCal;
 
 ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination,
-                                      TQWidget *parent, const char *name )
-  : KDialogBase( parent, name, true, i18n("Confirm Save"), Ok | Cancel )
+                                      TQWidget *tqparent, const char *name )
+  : KDialogBase( tqparent, name, true, i18n("Confirm Save"), Ok | Cancel )
 {
   TQFrame *topFrame = makeMainWidget();
 
diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h
index c20a4951..cb6a0905 100644
--- a/libkcal/confirmsavedialog.h
+++ b/libkcal/confirmsavedialog.h
@@ -32,7 +32,7 @@ namespace KCal {
 class KDE_EXPORT ConfirmSaveDialog : public KDialogBase
 {
   public:
-    ConfirmSaveDialog( const TQString &destination, TQWidget *parent,
+    ConfirmSaveDialog( const TQString &destination, TQWidget *tqparent,
                        const char *name = 0 );
 
     void addIncidences( const Incidence::List &incidences,
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index be02fd66..0e4b4352 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -39,7 +39,7 @@ using namespace KCal;
 static const KCmdLineOptions options[] =
 {
   {"q", 0, 0 },
-  {"qtopia2icalendar", I18N_NOOP("Convert Qtopia calendar file to iCalendar"), 0 },
+  {"qtopia2icalendar", I18N_NOOP("Convert TQtopia calendar file to iCalendar"), 0 },
   {"i", 0, 0 },
   {"icalendar2qtopia", I18N_NOOP("Convert iCalendar to iCalendar"), 0 },
   {"o", 0, 0},
@@ -50,7 +50,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
+  KAboutData aboutData("convertqtopia",I18N_NOOP("TQtopia calendar file converter"),"0.1");
   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
 
   KCmdLineArgs::init(argc,argv,&aboutData);
@@ -60,22 +60,22 @@ int main(int argc,char **argv)
 
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
-  bool sourceQtopia = false;
+  bool sourceTQtopia = false;
   bool sourceIcalendar = false;
 
   if ( args->isSet( "qtopia2icalendar" ) ) {
-    sourceQtopia = true;
+    sourceTQtopia = true;
   }
 
   if ( args->isSet( "icalendar2qtopia" ) ) {
     sourceIcalendar = true;
   }
 
-  if ( sourceQtopia && sourceIcalendar ) {
+  if ( sourceTQtopia && sourceIcalendar ) {
     KCmdLineArgs::usage(
         i18n("Please specify only one of the conversion options.") );
   }
-  if ( !sourceQtopia && !sourceIcalendar ) {
+  if ( !sourceTQtopia && !sourceIcalendar ) {
     KCmdLineArgs::usage(
         i18n("You have to specify one conversion option.") );
   }
@@ -92,10 +92,10 @@ int main(int argc,char **argv)
   kdDebug(5800) << "Input File: '" << inputFile << "'" << endl;
   kdDebug(5800) << "Output File: '" << outputFile << "'" << endl;
 
-  if ( sourceQtopia ) {
+  if ( sourceTQtopia ) {
     CalendarLocal cal;
     
-    QtopiaFormat qtopiaFormat;
+    TQtopiaFormat qtopiaFormat;
     qtopiaFormat.load( &cal, inputFile );
 
     ICalFormat icalendarFormat;
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index 689a2c85..b79166a2 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -44,7 +44,7 @@ bool CustomProperties::operator==( const CustomProperties &other ) const
   TQMap<TQCString, TQString>::ConstIterator it;
   for( it = mProperties.begin(); it != mProperties.end(); ++it ) {
     TQMap<TQCString, TQString>::ConstIterator itOther =
-      other.mProperties.find( it.key() );
+      other.mProperties.tqfind( it.key() );
 
     if ( itOther == other.mProperties.end() ) {
       return false;
@@ -87,7 +87,7 @@ void CustomProperties::setNonKDECustomProperty(const TQCString &name, const TQSt
 
 void CustomProperties::removeNonKDECustomProperty(const TQCString &name)
 {
-  TQMap<TQCString, TQString>::Iterator it = mProperties.find(name);
+  TQMap<TQCString, TQString>::Iterator it = mProperties.tqfind(name);
   if (it != mProperties.end()) {
     mProperties.remove(it);
     customPropertyUpdated();
@@ -96,9 +96,9 @@ void CustomProperties::removeNonKDECustomProperty(const TQCString &name)
 
 TQString CustomProperties::nonKDECustomProperty(const TQCString &name) const
 {
-  TQMap<TQCString, TQString>::ConstIterator it = mProperties.find(name);
+  TQMap<TQCString, TQString>::ConstIterator it = mProperties.tqfind(name);
   if (it == mProperties.end())
-    return TQString::null;
+    return TQString();
   return it.data();
 }
 
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index 46814ca0..d4347389 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -56,7 +56,7 @@ class LIBKCAL_EXPORT CustomProperties
       
       @param app   Application name as it appears in the custom property name.
       @param key   Property identifier specific to the application.
-      @param value The property's value. A call with a value of TQString::null
+      @param value The property's value. A call with a value of TQString()
                    will be ignored.
     */
     void setCustomProperty( const TQCString &app, const TQCString &key,
@@ -73,7 +73,7 @@ class LIBKCAL_EXPORT CustomProperties
       
       @param app Application name as it appears in the custom property name.
       @param key Property identifier specific to the application.
-      @return Property value, or TQString::null if (and only if) the property
+      @return Property value, or TQString() if (and only if) the property
               does not exist.
     */
     TQString customProperty( const TQCString &app, const TQCString &key ) const;
@@ -82,7 +82,7 @@ class LIBKCAL_EXPORT CustomProperties
       Create or modify a non-KDE or non-standard custom calendar property.
       
       @param name Full property name
-      @param value The property's value. A call with a value of TQString::null
+      @param value The property's value. A call with a value of TQString()
                    will be ignored.
     */
     void setNonKDECustomProperty( const TQCString &name, const TQString &value );
@@ -96,7 +96,7 @@ class LIBKCAL_EXPORT CustomProperties
       Return the value of a non-KDE or non-standard custom calendar property.
       
       @param name Full property name
-      @return Property value, or TQString::null if (and only if) the property
+      @return Property value, or TQString() if (and only if) the property
               does not exist.
     */
     TQString nonKDECustomProperty( const TQCString& name ) const;
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index 7f439819..913036d3 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences )
 
 bool DndFactory::copyIncidences( const Incidence::List &incidences )
 {
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   CalendarLocal cal( mCalendar->timeZoneId() );
   Incidence::List::ConstIterator it;
 
@@ -206,7 +206,7 @@ bool DndFactory::copyIncidence( Incidence *selectedInc )
 Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime *newTime )
 {
   CalendarLocal cal( mCalendar->timeZoneId() );
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   Incidence::List list;
 
   if ( !ICalDrag::decode( cb->data(), &cal ) &&
@@ -216,7 +216,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
   }
 
   // All pasted incidences get new uids, must keep track of old uids,
-  // so we can update child's parents
+  // so we can update child's tqparents
   TQMap<TQString,Incidence*> oldUidToNewInc;
 
   Incidence::List::ConstIterator it;
@@ -233,9 +233,9 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
   for ( it = list.constBegin(); it != list.constEnd(); ++it ) {
     Incidence *inc = *it;
     if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) {
-      Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()];
-      inc->setRelatedToUid( parentInc->uid() );
-      inc->setRelatedTo( parentInc );
+      Incidence *tqparentInc = oldUidToNewInc[inc->relatedToUid()];
+      inc->setRelatedToUid( tqparentInc->uid() );
+      inc->setRelatedTo( tqparentInc );
     } else {
       // not related to anything in the clipboard
       inc->setRelatedToUid( TQString() );
@@ -249,7 +249,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
 Incidence *DndFactory::pasteIncidence( const TQDate &newDate, const TQTime *newTime )
 {
   CalendarLocal cal( mCalendar->timeZoneId() );
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::clipboard();
 
   if ( !ICalDrag::decode( cb->data(), &cal ) &&
        !VCalDrag::decode( cb->data(), &cal ) ) {
diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp
index 7a824f08..882a7fce 100644
--- a/libkcal/dummyscheduler.cpp
+++ b/libkcal/dummyscheduler.cpp
@@ -95,7 +95,7 @@ TQPtrList<ScheduleMessage> DummyScheduler::retrieveTransactions()
     while (!messageLine.isNull()) {
 //      kdDebug(5800) << "++++++++" << messageLine << endl;
       messageString += messageLine + "\n";
-      if (messageLine.find("END:VCALENDAR") >= 0) {
+      if (messageLine.tqfind("END:VCALENDAR") >= 0) {
         kdDebug(5800) << "---------------" << messageString << endl;
         ScheduleMessage *message = mFormat->parseScheduleMessage(mCalendar,
                                                                  messageString);
diff --git a/libkcal/exceptions.h b/libkcal/exceptions.h
index 8bdf7fa0..4963f40f 100644
--- a/libkcal/exceptions.h
+++ b/libkcal/exceptions.h
@@ -42,7 +42,7 @@ class Exception
     /**
       Construct exception with descriptive message \a message.
     */
-    Exception( const TQString &message = TQString::null );
+    Exception( const TQString &message = TQString() );
     virtual ~Exception();
 
     /**
@@ -84,7 +84,7 @@ class ErrorFormat : public Exception
     /**
       Create format error exception.
     */
-    ErrorFormat( ErrorCodeFormat code, const TQString &message = TQString::null );
+    ErrorFormat( ErrorCodeFormat code, const TQString &message = TQString() );
 
     /**
       Return format error message.
diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h
index 1d12cc4e..16303259 100644
--- a/libkcal/filestorage.h
+++ b/libkcal/filestorage.h
@@ -32,7 +32,7 @@ class CalFormat;
 class LIBKCAL_EXPORT FileStorage : public CalStorage
 {
   public:
-    FileStorage( Calendar *, const TQString &fileName = TQString::null,
+    FileStorage( Calendar *, const TQString &fileName = TQString(),
                   CalFormat *format = 0 );
     virtual ~FileStorage();
 
diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index f5fde5d9..387ba173 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -332,18 +332,18 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
     Todo *subev = ev;
     if ( ev->relatedTo() ) {
       if ( ev->relatedTo()->type()=="Todo" ) {
-        if ( rawTodoList.find( static_cast<Todo *>( ev->relatedTo() ) ) ==
+        if ( rawTodoList.tqfind( static_cast<Todo *>( ev->relatedTo() ) ) ==
              rawTodoList.end() ) {
           rawTodoList.append( static_cast<Todo *>( ev->relatedTo() ) );
         }
       }
     }
-    it = rawTodoList.find( subev );
+    it = rawTodoList.tqfind( subev );
     ++it;
   }
 
   // FIXME: Sort list by priorities. This is brute force and should be
-  // tqreplaced by a real sorting algorithm.
+  // replaced by a real sorting algorithm.
   Todo::List todoList;
   for ( int i = 1; i <= 9; ++i ) {
     for( it = rawTodoList.begin(); it != rawTodoList.end(); ++it ) {
@@ -403,7 +403,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
 
       Todo::List sortedList;
       // FIXME: Sort list by priorities. This is brute force and should be
-      // tqreplaced by a real sorting algorithm.
+      // replaced by a real sorting algorithm.
       for ( int i = 1; i <= 9; ++i ) {
         Incidence::List::ConstIterator it2;
         for( it2 = relations.begin(); it2 != relations.end(); ++it2 ) {
@@ -559,7 +559,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
 #ifndef KORG_NOKABC
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
     KABC::Addressee::List addressList;
-    addressList = add_book->tqfindByEmail(event->organizer().email());
+    addressList = add_book->findByEmail(event->organizer().email());
     KABC::Addressee o = addressList.first();
     if (!o.isEmpty() && addressList.size()<2) {
       *ts << "<a href=\"mailto:" << event->organizer().email() << "\">";
@@ -598,7 +598,7 @@ TQString HtmlExport::breakString(const TQString &text)
     int pos = 0;
     TQString tmp;
     for(int i=0;i<=number;i++) {
-      pos = tmpText.find("\n");
+      pos = tmpText.tqfind("\n");
       tmp = tmpText.left(pos);
       tmpText = tmpText.right(tmpText.length() - pos - 1);
       out += tmp + "<br />";
diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h
index 1a209e17..0fbe8022 100644
--- a/libkcal/htmlexport.h
+++ b/libkcal/htmlexport.h
@@ -51,7 +51,7 @@ class KDE_EXPORT HtmlExport
     /**
       Writes out the calendar in HTML format.
     */
-    bool save( const TQString &fileName = TQString::null );
+    bool save( const TQString &fileName = TQString() );
 
     /**
       Writes out calendar to text stream.
diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp
index 2c5f2309..4ff3111a 100644
--- a/libkcal/icaldrag.cpp
+++ b/libkcal/icaldrag.cpp
@@ -28,8 +28,8 @@
 
 using namespace KCal;
 
-ICalDrag::ICalDrag( Calendar *cal, TQWidget *parent, const char *name )
-  : TQStoredDrag( "text/calendar", parent, name )
+ICalDrag::ICalDrag( Calendar *cal, TQWidget *tqparent, const char *name )
+  : TQStoredDrag( "text/calendar", tqparent, name )
 {
   ICalFormat icf;
   TQString scal = icf.toString( cal );
diff --git a/libkcal/icaldrag.h b/libkcal/icaldrag.h
index eecb03b9..b1beb436 100644
--- a/libkcal/icaldrag.h
+++ b/libkcal/icaldrag.h
@@ -32,13 +32,13 @@ namespace KCal {
 /**
   iCalendar drag&drop class.
 */
-class LIBKCAL_EXPORT ICalDrag : public QStoredDrag
+class LIBKCAL_EXPORT ICalDrag : public TQStoredDrag
 {
   public:
     /**
       Create a drag&drop object for iCalendar component \a ical.
     */
-    ICalDrag( Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
+    ICalDrag( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 );
     ~ICalDrag() {};
 
     /**
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 76898ec0..8c1cd3b0 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -267,7 +267,7 @@ TQString ICalFormat::toString( Calendar *cal )
   if (!text) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("libical error")));
-    return TQString::null;
+    return TQString();
   }
 
   return text;
@@ -298,15 +298,15 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar )
   icalcomponent *component;
   TQString text = "";
 
-  // See if there are any parent or child events that must be added to the string
+  // See if there are any tqparent or child events that must be added to the string
   if ( incidence->hasRecurrenceID() ) {
-    // Get the parent
+    // Get the tqparent
     IncidenceList il = incidence->childIncidences();
     IncidenceListIterator it;
     it = il.begin();
-    Incidence *parentIncidence;
-    parentIncidence = calendar->incidence(*it);
-    il = parentIncidence->childIncidences();
+    Incidence *tqparentIncidence;
+    tqparentIncidence = calendar->incidence(*it);
+    il = tqparentIncidence->childIncidences();
     if (il.count() > 0) {
       for ( it = il.begin(); it != il.end(); ++it ) {
         component = mImpl->writeIncidence( calendar->incidence(*it) );
@@ -314,12 +314,12 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar )
         icalcomponent_free( component );
       }
     }
-    component = mImpl->writeIncidence( parentIncidence );
+    component = mImpl->writeIncidence( tqparentIncidence );
     text = text + TQString::fromUtf8( icalcomponent_as_ical_string( component ) );
     icalcomponent_free( component );
   }
   else {
-    // This incidence is a potential parent
+    // This incidence is a potential tqparent
     IncidenceList il = incidence->childIncidences();
     if (il.count() > 0) {
       IncidenceListIterator it;
@@ -377,7 +377,7 @@ TQString ICalFormat::createScheduleMessage(IncidenceBase *incidence,
       // We have a separation of scheduling ID and UID
       i = i->clone();
       i->setUid( i->schedulingID() );
-      i->setSchedulingID( TQString::null );
+      i->setSchedulingID( TQString() );
 
       // Build the message with the cloned incidence
       message = mImpl->createScheduleComponent( i, method );
@@ -577,7 +577,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
   kdDebug(5800) << "ICalFormat::parseScheduleMessage() returning..." << endl;
   kdDebug(5800) << "ICalFormat::parseScheduleMessage(), result = " << result << endl;
 
-  ScheduleMessage::Status status;
+  ScheduleMessage::tqStatus status;
 
   switch (result) {
     case ICAL_XLICCLASS_PUBLISHNEW:
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index bdbc1f7b..297118b5 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -83,8 +83,8 @@ const int gSecondsPerHour   = gSecondsPerMinute * 60;
 const int gSecondsPerDay    = gSecondsPerHour   * 24;
 const int gSecondsPerWeek   = gSecondsPerDay    * 7;
 
-ICalFormatImpl::ICalFormatImpl( ICalFormat *parent ) :
-  mParent( parent ), mCompat( new Compat )
+ICalFormatImpl::ICalFormatImpl( ICalFormat *tqparent ) :
+  mParent( tqparent ), mCompat( new Compat )
 {
 }
 
@@ -247,11 +247,9 @@ icalcomponent *ICalFormatImpl::writeEvent(Event *event)
 icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy,
                                              Scheduler::Method method)
 {
-#if QT_VERSION >= 300
   kdDebug(5800) << "icalformatimpl: writeFreeBusy: startDate: "
     << freebusy->dtStart().toString("ddd MMMM d yyyy: h:m:s ap") << " End Date: "
     << freebusy->dtEnd().toString("ddd MMMM d yyyy: h:m:s ap") << endl;
-#endif
 
   icalcomponent *vfreebusy = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
 
@@ -307,30 +305,30 @@ icalcomponent *ICalFormatImpl::writeJournal(Journal *journal)
   return vjournal;
 }
 
-void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
+void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence)
 {
   // pilot sync stuff
 // TODO: move this application-specific code to kpilot
   if (incidence->pilotId()) {
     // NOTE: we can't do setNonKDECustomProperty here because this changes
     // data and triggers an updated() event...
-    // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->syncStatus()));
+    // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->synctqStatus()));
     // incidence->setNonKDECustomProperty("X-PILOTID", TQString::number(incidence->pilotId()));
 
     icalproperty *p = 0;
-    p = icalproperty_new_x(TQString::number(incidence->syncStatus()).utf8());
+    p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8());
     icalproperty_set_x_name(p,"X-PILOTSTAT");
-    icalcomponent_add_property(parent,p);
+    icalcomponent_add_property(tqparent,p);
 
     p = icalproperty_new_x(TQString::number(incidence->pilotId()).utf8());
     icalproperty_set_x_name(p,"X-PILOTID");
-    icalcomponent_add_property(parent,p);
+    icalcomponent_add_property(tqparent,p);
   }
 
   TQString modifiedUid;
   if ( incidence->hasRecurrenceID() ) {
-    // Recurring incidences are special; they must match their parent's UID
-    // Each child has the parent set as the first item in the list
+    // Recurring incidences are special; they must match their tqparent's UID
+    // Each child has the tqparent set as the first item in the list
     // So, get and set the UID...
     IncidenceList il = incidence->childIncidences();
     IncidenceListIterator it;
@@ -348,53 +346,53 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   else
     incidence->removeCustomProperty( "LIBKCAL", "ID" );
 
-  writeIncidenceBase(parent,incidence);
+  writeIncidenceBase(tqparent,incidence);
 
   // creation date
-  icalcomponent_add_property(parent,icalproperty_new_created(
+  icalcomponent_add_property(tqparent,icalproperty_new_created(
       writeICalDateTime(incidence->created())));
 
   // unique id
   // If the scheduling ID is different from the real UID, the real
   // one is stored on X-REALID above
   if ( incidence->hasRecurrenceID() ) {
-    // Recurring incidences are special; they must match their parent's UID
-    icalcomponent_add_property(parent,icalproperty_new_uid(modifiedUid.utf8()));
+    // Recurring incidences are special; they must match their tqparent's UID
+    icalcomponent_add_property(tqparent,icalproperty_new_uid(modifiedUid.utf8()));
   }
   else {
     if ( !incidence->schedulingID().isEmpty() ) {
-      icalcomponent_add_property(parent,icalproperty_new_uid(
+      icalcomponent_add_property(tqparent,icalproperty_new_uid(
           incidence->schedulingID().utf8()));
     }
   }
 
   // revision
   if ( incidence->revision() > 0 ) { // 0 is default, so don't write that out
-    icalcomponent_add_property(parent,icalproperty_new_sequence(
+    icalcomponent_add_property(tqparent,icalproperty_new_sequence(
         incidence->revision()));
   }
 
   // last modification date
   if ( incidence->lastModified().isValid() ) {
-   icalcomponent_add_property(parent,icalproperty_new_lastmodified(
+   icalcomponent_add_property(tqparent,icalproperty_new_lastmodified(
        writeICalDateTime(incidence->lastModified())));
   }
 
   // description
   if (!incidence->description().isEmpty()) {
-    icalcomponent_add_property(parent,icalproperty_new_description(
+    icalcomponent_add_property(tqparent,icalproperty_new_description(
         incidence->description().utf8()));
   }
 
   // summary
   if (!incidence->summary().isEmpty()) {
-    icalcomponent_add_property(parent,icalproperty_new_summary(
+    icalcomponent_add_property(tqparent,icalproperty_new_summary(
         incidence->summary().utf8()));
   }
 
   // location
   if (!incidence->location().isEmpty()) {
-    icalcomponent_add_property(parent,icalproperty_new_location(
+    icalcomponent_add_property(tqparent,icalproperty_new_location(
         incidence->location().utf8()));
   }
 
@@ -412,7 +410,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
     case Incidence::StatusX: {
       icalproperty* p = icalproperty_new_status(ICAL_STATUS_X);
       icalvalue_set_x(icalproperty_get_value(p), incidence->statusStr().utf8());
-      icalcomponent_add_property(parent, p);
+      icalcomponent_add_property(tqparent, p);
       break;
     }
     case Incidence::StatusNone:
@@ -420,7 +418,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
       break;
   }
   if (status != ICAL_STATUS_NONE)
-    icalcomponent_add_property(parent, icalproperty_new_status(status));
+    icalcomponent_add_property(tqparent, icalproperty_new_status(status));
 
   // secrecy
   icalproperty_class secClass;
@@ -437,12 +435,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
       break;
   }
   if ( secClass != ICAL_CLASS_PUBLIC ) {
-    icalcomponent_add_property(parent,icalproperty_new_class(secClass));
+    icalcomponent_add_property(tqparent,icalproperty_new_class(secClass));
   }
 
   // priority
   if ( incidence->priority() > 0 ) { // 0 is undefined priority
-    icalcomponent_add_property(parent,icalproperty_new_priority(
+    icalcomponent_add_property(tqparent,icalproperty_new_priority(
         incidence->priority()));
   }
 
@@ -450,18 +448,18 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   TQStringList categories = incidence->categories();
   TQStringList::Iterator it;
   for(it = categories.begin(); it != categories.end(); ++it ) {
-    icalcomponent_add_property(parent,icalproperty_new_categories((*it).utf8()));
+    icalcomponent_add_property(tqparent,icalproperty_new_categories((*it).utf8()));
   }
 
   // related event
   if ( !incidence->relatedToUid().isEmpty() ) {
-    icalcomponent_add_property(parent,icalproperty_new_relatedto(
+    icalcomponent_add_property(tqparent,icalproperty_new_relatedto(
         incidence->relatedToUid().utf8()));
   }
 
   // recurrenceid
   if ( incidence->hasRecurrenceID() ) {
-    icalcomponent_add_property(parent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) ));
+    icalcomponent_add_property(tqparent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) ));
   }
 
 //   kdDebug(5800) << "Write recurrence for '" << incidence->summary() << "' (" << incidence->uid()
@@ -470,27 +468,27 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   RecurrenceRule::List rrules( incidence->recurrence()->rRules() );
   RecurrenceRule::List::ConstIterator rit;
   for ( rit = rrules.begin(); rit != rrules.end(); ++rit ) {
-    icalcomponent_add_property( parent, icalproperty_new_rrule(
+    icalcomponent_add_property( tqparent, icalproperty_new_rrule(
                                 writeRecurrenceRule( (*rit) ) ) );
   }
 
   RecurrenceRule::List exrules( incidence->recurrence()->exRules() );
   RecurrenceRule::List::ConstIterator exit;
   for ( exit = exrules.begin(); exit != exrules.end(); ++exit ) {
-    icalcomponent_add_property( parent, icalproperty_new_rrule(
+    icalcomponent_add_property( tqparent, icalproperty_new_rrule(
                                 writeRecurrenceRule( (*exit) ) ) );
   }
 
   DateList dateList = incidence->recurrence()->exDates();
   DateList::ConstIterator exIt;
   for(exIt = dateList.begin(); exIt != dateList.end(); ++exIt) {
-    icalcomponent_add_property(parent,icalproperty_new_exdate(
+    icalcomponent_add_property(tqparent,icalproperty_new_exdate(
         writeICalDate(*exIt)));
   }
   DateTimeList dateTimeList = incidence->recurrence()->exDateTimes();
   DateTimeList::ConstIterator extIt;
   for(extIt = dateTimeList.begin(); extIt != dateTimeList.end(); ++extIt) {
-    icalcomponent_add_property(parent,icalproperty_new_exdate(
+    icalcomponent_add_property(tqparent,icalproperty_new_exdate(
         writeICalDateTime(*extIt)));
   }
 
@@ -498,13 +496,13 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   dateList = incidence->recurrence()->rDates();
   DateList::ConstIterator rdIt;
   for( rdIt = dateList.begin(); rdIt != dateList.end(); ++rdIt) {
-     icalcomponent_add_property( parent, icalproperty_new_rdate(
+     icalcomponent_add_property( tqparent, icalproperty_new_rdate(
          writeICalDatePeriod(*rdIt) ) );
   }
   dateTimeList = incidence->recurrence()->rDateTimes();
   DateTimeList::ConstIterator rdtIt;
   for( rdtIt = dateTimeList.begin(); rdtIt != dateTimeList.end(); ++rdtIt) {
-     icalcomponent_add_property( parent, icalproperty_new_rdate(
+     icalcomponent_add_property( tqparent, icalproperty_new_rdate(
          writeICalDateTimePeriod(*rdtIt) ) );
   }
 
@@ -512,7 +510,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   Attachment::List attachments = incidence->attachments();
   Attachment::List::ConstIterator atIt;
   for ( atIt = attachments.begin(); atIt != attachments.end(); ++atIt ) {
-    icalcomponent_add_property( parent, writeAttachment( *atIt ) );
+    icalcomponent_add_property( tqparent, writeAttachment( *atIt ) );
   }
 
   // alarms
@@ -521,7 +519,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
         alarmIt != incidence->alarms().end(); ++alarmIt ) {
     if ( (*alarmIt)->enabled() ) {
 //      kdDebug(5800) << "Write alarm for " << incidence->summary() << endl;
-      icalcomponent_add_component( parent, writeAlarm( *alarmIt ) );
+      icalcomponent_add_component( tqparent, writeAlarm( *alarmIt ) );
     }
   }
 
@@ -529,19 +527,19 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   if (incidence->hasDuration()) {
     icaldurationtype duration;
     duration = writeICalDuration( incidence->duration() );
-    icalcomponent_add_property(parent,icalproperty_new_duration(duration));
+    icalcomponent_add_property(tqparent,icalproperty_new_duration(duration));
   }
 }
 
-void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent,
+void ICalFormatImpl::writeIncidenceBase( icalcomponent *tqparent,
                                          IncidenceBase * incidenceBase )
 {
-  icalcomponent_add_property( parent, icalproperty_new_dtstamp(
+  icalcomponent_add_property( tqparent, icalproperty_new_dtstamp(
       writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) );
 
   // organizer stuff
   if ( !incidenceBase->organizer().isEmpty() ) {
-    icalcomponent_add_property( parent, writeOrganizer( incidenceBase->organizer() ) );
+    icalcomponent_add_property( tqparent, writeOrganizer( incidenceBase->organizer() ) );
   }
 
   // attendees
@@ -549,27 +547,27 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent,
     Attendee::List::ConstIterator it;
     for( it = incidenceBase->attendees().begin();
          it != incidenceBase->attendees().end(); ++it ) {
-      icalcomponent_add_property( parent, writeAttendee( *it ) );
+      icalcomponent_add_property( tqparent, writeAttendee( *it ) );
     }
   }
 
   // comments
   TQStringList comments = incidenceBase->comments();
   for (TQStringList::Iterator it=comments.begin(); it!=comments.end(); ++it) {
-    icalcomponent_add_property(parent, icalproperty_new_comment((*it).utf8()));
+    icalcomponent_add_property(tqparent, icalproperty_new_comment((*it).utf8()));
   }
 
   // custom properties
-  writeCustomProperties( parent, incidenceBase );
+  writeCustomProperties( tqparent, incidenceBase );
 }
 
-void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties)
+void ICalFormatImpl::writeCustomProperties(icalcomponent *tqparent,CustomProperties *properties)
 {
   TQMap<TQCString, TQString> custom = properties->customProperties();
   for (TQMap<TQCString, TQString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
-    icalcomponent_add_property(parent,p);
+    icalcomponent_add_property(tqparent,p);
   }
 }
 
@@ -972,7 +970,7 @@ Todo *ICalFormatImpl::readTodo(icalcomponent *vtodo)
         todo->setPercentComplete(icalproperty_get_percentcomplete(p));
         break;
 
-      case ICAL_RELATEDTO_PROPERTY:  // related todo (parent)
+      case ICAL_RELATEDTO_PROPERTY:  // related todo (tqparent)
         todo->setRelatedToUid(TQString::fromUtf8(icalproperty_get_relatedto(p)));
         mTodosRelate.append(todo);
         break;
@@ -1052,7 +1050,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon
         dtEndProcessed = true;
         break;
 
-      case ICAL_RELATEDTO_PROPERTY:  // related event (parent)
+      case ICAL_RELATEDTO_PROPERTY:  // related event (tqparent)
         event->setRelatedToUid( TQString::fromUtf8( icalproperty_get_relatedto( p ) ) );
         mEventsRelate.append( event );
         break;
@@ -1178,7 +1176,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
   }
 
   TQString name;
-  TQString uid = TQString::null;
+  TQString uid = TQString();
   p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER);
   if (p) {
     name = TQString::fromUtf8(icalparameter_get_cn(p));
@@ -1358,11 +1356,11 @@ Attachment *ICalFormatImpl::readAttachment(icalproperty *attach)
   return attachment;
 }
 
-void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Incidence *incidence)
+void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, Incidence *incidence)
 {
-  readIncidenceBase(parent,incidence);
+  readIncidenceBase(tqparent,incidence);
 
-  icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY);
+  icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY);
 
   const char *text;
   int intvalue, inttext;
@@ -1422,7 +1420,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
         break;
 
       case ICAL_STATUS_PROPERTY: {  // status
-        Incidence::Status stat;
+        Incidence::tqStatus stat;
         switch (icalproperty_get_status(p)) {
           case ICAL_STATUS_TENTATIVE:   stat = Incidence::StatusTentative; break;
           case ICAL_STATUS_CONFIRMED:   stat = Incidence::StatusConfirmed; break;
@@ -1433,14 +1431,14 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
           case ICAL_STATUS_DRAFT:       stat = Incidence::StatusDraft; break;
           case ICAL_STATUS_FINAL:       stat = Incidence::StatusFinal; break;
           case ICAL_STATUS_X:
-            incidence->setCustomStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p))));
+            incidence->setCustomtqStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p))));
             stat = Incidence::StatusX;
             break;
           case ICAL_STATUS_NONE:
           default:                      stat = Incidence::StatusNone; break;
         }
         if (stat != Incidence::StatusX)
-          incidence->seStatus(stat);
+          incidence->setqStatus(stat);
         break;
       }
 
@@ -1468,7 +1466,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
 
 //       case ICAL_CONTACT_PROPERTY:
 //         incidenceBase->addContact(
-//           QString::fromUtf8( icalproperty_get_contact( p ) ) );
+//           TQString::fromUtf8( icalproperty_get_contact( p ) ) );
 //         break;
 
       case ICAL_RDATE_PROPERTY: {
@@ -1518,7 +1516,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
         break;
     }
 
-    p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY);
+    p = icalcomponent_get_next_property(tqparent,ICAL_ANY_PROPERTY);
   }
 
   // Set the scheduling ID
@@ -1540,9 +1538,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
   incidence->setCategories(categories);
 
   // iterate through all alarms
-  for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT);
+  for (icalcomponent *alarm = icalcomponent_get_first_component(tqparent,ICAL_VALARM_COMPONENT);
        alarm;
-       alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) {
+       alarm = icalcomponent_get_next_component(tqparent,ICAL_VALARM_COMPONENT)) {
     readAlarm(alarm,incidence);
   }
   // Fix incorrect alarm settings by other applications (like outloook 9)
@@ -1550,9 +1548,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
 
 }
 
-void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase)
+void ICalFormatImpl::readIncidenceBase(icalcomponent *tqparent,IncidenceBase *incidenceBase)
 {
-  icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY);
+  icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY);
 
   bool uidProcessed = false;
 
@@ -1582,7 +1580,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci
         break;
     }
 
-    p = icalcomponent_get_next_property( parent, ICAL_ANY_PROPERTY );
+    p = icalcomponent_get_next_property( tqparent, ICAL_ANY_PROPERTY );
   }
 
   if ( !uidProcessed ) {
@@ -1606,35 +1604,35 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci
   // (documented in UsingLibical.txt)
   icalproperty *next =0;
 
-  for ( p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY);
+  for ( p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY);
        p != 0;
        p = next )
   {
 
-    next = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY);
+    next = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY);
 
     TQString value = TQString::fromUtf8(icalproperty_get_x(p));
     TQString name = icalproperty_get_x_name(p);
 
     if (name == "X-PILOTID" && !value.isEmpty()) {
       incidenceBase->setPilotId(value.toInt());
-      icalcomponent_remove_property(parent,p);
+      icalcomponent_remove_property(tqparent,p);
     } else if (name == "X-PILOTSTAT" && !value.isEmpty()) {
-      incidenceBase->setSyncStatus(value.toInt());
-      icalcomponent_remove_property(parent,p);
+      incidenceBase->setSynctqStatus(value.toInt());
+      icalcomponent_remove_property(tqparent,p);
     }
   }
 
   // custom properties
-  readCustomProperties(parent, incidenceBase);
+  readCustomProperties(tqparent, incidenceBase);
 }
 
-void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties)
+void ICalFormatImpl::readCustomProperties(icalcomponent *tqparent,CustomProperties *properties)
 {
   TQMap<TQCString, TQString> customProperties;
   TQString lastProperty;
 
-  icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY);
+  icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY);
 
   while (p) {
 
@@ -1646,7 +1644,7 @@ void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties
       customProperties[name] = customProperties[name].append( "," ).append( value );
     }
     // kdDebug(5800) << "Set custom property [" << name << '=' << value << ']' << endl;
-    p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY);
+    p = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY);
     lastProperty = name;
   }
 
@@ -2168,7 +2166,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar )
     if (todo) {
       if (todo->hasRecurrenceID()) {
         TQString originalUid = todo->uid();
-        todo->setUid(originalUid + QString("-recur-%1").arg(todo->recurrenceID().toTime_t()));
+        todo->setUid(originalUid + TQString("-recur-%1").arg(todo->recurrenceID().toTime_t()));
         if (!cal->todo(todo->uid())) {
           if ( !cal->addTodo( todo ) ) {
             cal->endBatchAdding();
@@ -2179,9 +2177,9 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar )
             printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r");
           }
           else {
-            // Add this todo to its parent
+            // Add this todo to its tqparent
             cal->todo(originalUid)->addChildIncidence(todo->uid());
-            // And the parent to the child
+            // And the tqparent to the child
             todo->addChildIncidence(cal->todo(originalUid)->uid());
           }
         }
@@ -2210,16 +2208,16 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar )
     if (event) {
       if (event->hasRecurrenceID()) {
         TQString originalUid = event->uid();
-        event->setUid(originalUid + QString("-recur-%1").arg(event->recurrenceID().toTime_t()));
+        event->setUid(originalUid + TQString("-recur-%1").arg(event->recurrenceID().toTime_t()));
         if (!cal->event(event->uid())) {
           cal->addEvent(event);
           if (!cal->event(originalUid)) {
             printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r");
           }
           else {
-            // Add this event to its parent
+            // Add this event to its tqparent
             cal->event(originalUid)->addChildIncidence(event->uid());
-            // And the parent to the child
+            // And the tqparent to the child
             event->addChildIncidence(cal->event(originalUid)->uid());
           }
         }
@@ -2248,16 +2246,16 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar )
     if (journal) {
       if (journal->hasRecurrenceID()) {
         TQString originalUid = journal->uid();
-        journal->setUid(originalUid + QString("-recur-%1").arg(journal->recurrenceID().toTime_t()));
+        journal->setUid(originalUid + TQString("-recur-%1").arg(journal->recurrenceID().toTime_t()));
         if (!cal->journal(journal->uid())) {
           cal->addJournal(journal);
           if (!cal->event(originalUid)) {
             printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r");
           }
           else {
-            // Add this journal to its parent
+            // Add this journal to its tqparent
             cal->journal(originalUid)->addChildIncidence(journal->uid());
-            // And the parent to the child
+            // And the tqparent to the child
             journal->addChildIncidence(cal->journal(originalUid)->uid());
           }
         }
diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h
index 9a2e9f62..215adfe9 100644
--- a/libkcal/icalformatimpl.h
+++ b/libkcal/icalformatimpl.h
@@ -46,7 +46,7 @@ class ICalFormatImpl
 {
   public:
     /** Create new iCal format for calendar object */
-    ICalFormatImpl( ICalFormat *parent );
+    ICalFormatImpl( ICalFormat *tqparent );
     virtual ~ICalFormatImpl();
 
     bool populate( Calendar *, icalcomponent *fs);
@@ -57,7 +57,7 @@ class ICalFormatImpl
     icalcomponent *writeFreeBusy(FreeBusy *freebusy,
                                  Scheduler::Method method = Scheduler::Publish );
     icalcomponent *writeJournal(Journal *journal);
-    void writeIncidence(icalcomponent *parent,Incidence *incidence);
+    void writeIncidence(icalcomponent *tqparent,Incidence *incidence);
     icalproperty *writeAttendee(Attendee *attendee);
     icalproperty *writeOrganizer( const Person &organizer );
     icalproperty *writeAttachment(Attachment *attach);
@@ -73,7 +73,7 @@ class ICalFormatImpl
     Attendee *readAttendee(icalproperty *attendee);
     Person readOrganizer( icalproperty *organizer );
     Attachment *readAttachment(icalproperty *attach);
-    void readIncidence(icalcomponent *parent, icaltimezone *timezone, Incidence *incidence);
+    void readIncidence(icalcomponent *tqparent, icaltimezone *timezone, Incidence *incidence);
     void readRecurrenceRule(icalproperty *rrule,Incidence *event );
     void readExceptionRule( icalproperty *rrule, Incidence *incidence );
     void readRecurrence( const struct icalrecurrencetype &r, RecurrenceRule* recur );
@@ -96,10 +96,10 @@ class ICalFormatImpl
   protected:
     void dumpIcalRecurrence(icalrecurrencetype);
   private:
-    void writeIncidenceBase(icalcomponent *parent,IncidenceBase *);
-    void readIncidenceBase(icalcomponent *parent, IncidenceBase *);
-    void writeCustomProperties(icalcomponent *parent,CustomProperties *);
-    void readCustomProperties(icalcomponent *parent,CustomProperties *);
+    void writeIncidenceBase(icalcomponent *tqparent,IncidenceBase *);
+    void readIncidenceBase(icalcomponent *tqparent, IncidenceBase *);
+    void writeCustomProperties(icalcomponent *tqparent,CustomProperties *);
+    void readCustomProperties(icalcomponent *tqparent,CustomProperties *);
     void readTimezone(icalcomponent *vtimezone);
 
     ICalFormat *mParent;
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 4c41e7a9..05fc721c 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -33,7 +33,7 @@ using namespace KCal;
 
 Incidence::Incidence() :
   IncidenceBase(),
-  mRelatedTo(0), mStatus(StatusNone), mSecrecy(SecrecyPublic),
+  mRelatedTo(0), mtqStatus(StatusNone), mSecrecy(SecrecyPublic),
   mPriority(0), mRecurrence(0),
   mHasRecurrenceID( false ), mChildRecurrenceEvents()
 {
@@ -57,7 +57,7 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ),Recurrence::Obse
 //  Incidence::List mRelations;    Incidence::List mRelations;
   mResources = i.mResources;
   mStatusString = i.mStatusString;
-  mStatus = i.mStatus;
+  mtqStatus = i.mtqStatus;
   mSecrecy = i.mSecrecy;
   mPriority = i.mPriority;
   mLocation = i.mLocation;
@@ -125,7 +125,7 @@ Incidence& Incidence::operator=( const Incidence &i )
   mRelations.clear();
   mResources = i.mResources;
   mStatusString = i.mStatusString;
-  mStatus = i.mStatus;
+  mtqStatus = i.mtqStatus;
   mSecrecy = i.mSecrecy;
   mPriority = i.mPriority;
   mLocation = i.mLocation;
@@ -196,8 +196,8 @@ bool Incidence::operator==( const Incidence& i2 ) const
         relations() == i2.relations() &&
         attachments() == i2.attachments() &&
         resources() == i2.resources() &&
-        mStatus == i2.mStatus &&
-        ( mStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) &&
+        mtqStatus == i2.mtqStatus &&
+        ( mtqStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) &&
         secrecy() == i2.secrecy() &&
         priority() == i2.priority() &&
         stringCompare( location(), i2.location() ) &&
@@ -210,13 +210,13 @@ void Incidence::recreate()
   setCreated(TQDateTime::tqcurrentDateTime());
 
   setUid(CalFormat::createUniqueId());
-  setSchedulingID( TQString::null );
+  setSchedulingID( TQString() );
 
   setRevision(0);
 
   setLastModified(TQDateTime::tqcurrentDateTime());
   setPilotId( 0 );
-  setSyncStatus( SYNCNONE );
+  setSynctqStatus( SYNCNONE );
 }
 
 void Incidence::setReadOnly( bool readOnly )
@@ -353,7 +353,7 @@ void Incidence::setRelatedTo(Incidence *relatedTo)
     if ( mRelatedTo->uid() != mRelatedToUid )
       setRelatedToUid( mRelatedTo->uid() );
   } else {
-    setRelatedToUid( TQString::null );
+    setRelatedToUid( TQString() );
   }
 }
 
@@ -369,7 +369,7 @@ Incidence::List Incidence::relations() const
 
 void Incidence::addRelation( Incidence *event )
 {
-  if ( mRelations.find( event ) == mRelations.end() ) {
+  if ( mRelations.tqfind( event ) == mRelations.end() ) {
     mRelations.append( event );
   }
 }
@@ -445,9 +445,9 @@ bool Incidence::recursOn(const TQDate &qd, Calendar *cal) const
     IncidenceList il = childIncidences();
     IncidenceListIterator it;
     for ( it = il.begin(); it != il.end(); ++it ) {
-      QDateTime modifiedDt = cal->incidence(*it)->recurrenceID();
-      modifiedDt.setTime(QTime());
-      if (QDateTime(qd) == modifiedDt) {
+      TQDateTime modifiedDt = cal->incidence(*it)->recurrenceID();
+      modifiedDt.setTime(TQTime());
+      if (TQDateTime(qd) == modifiedDt) {
         doesRecur = false;
       }
     }
@@ -738,35 +738,35 @@ int Incidence::priority() const
   return mPriority;
 }
 
-void Incidence::seStatus(Incidence::Status status)
+void Incidence::setqStatus(Incidence::tqStatus status)
 {
   if (mReadOnly || status == StatusX) return;
-  mStatus = status;
-  mStatusString = TQString::null;
+  mtqStatus = status;
+  mStatusString = TQString();
   updated();
 }
 
-void Incidence::setCustomStatus(const TQString &status)
+void Incidence::setCustomtqStatus(const TQString &status)
 {
   if (mReadOnly) return;
-  mStatus = status.isEmpty() ? StatusNone : StatusX;
+  mtqStatus = status.isEmpty() ? StatusNone : StatusX;
   mStatusString = status;
   updated();
 }
 
-Incidence::Status Incidence::status() const
+Incidence::tqStatus Incidence::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
 TQString Incidence::statusStr() const
 {
-  if (mStatus == StatusX)
+  if (mtqStatus == StatusX)
     return mStatusString;
-  return statusName(mStatus);
+  return statusName(mtqStatus);
 }
 
-TQString Incidence::statusName(Incidence::Status status)
+TQString Incidence::statusName(Incidence::tqStatus status)
 {
   switch (status) {
     case StatusTentative:    return i18n("incidence status", "Tentative");
@@ -779,7 +779,7 @@ TQString Incidence::statusName(Incidence::Status status)
     case StatusFinal:        return i18n("Final");
     case StatusX:
     case StatusNone:
-    default:                 return TQString::null;
+    default:                 return TQString();
   }
 }
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 883d08c8..bfb883fd 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -38,8 +38,8 @@ namespace KCal {
 
 class Calendar;
 
-typedef QStringList IncidenceList;
-typedef QStringList::iterator IncidenceListIterator;
+typedef TQStringList IncidenceList;
+typedef TQStringList::iterator IncidenceListIterator;
 
 /**
   This class provides the base class common to all calendar components.
@@ -114,7 +114,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
     };
 
     /** Enumeration for describing an event's status.  */
-    enum Status {
+    enum tqStatus {
         StatusNone, StatusTentative, StatusConfirmed, StatusCompleted,
         StatusNeedsAction, StatusCanceled, StatusInProcess, StatusDraft,
         StatusFinal,
@@ -352,7 +352,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
 
 
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-// %%%%%  Secrecy and Status methods
+// %%%%%  Secrecy and tqStatus methods
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
     /**
@@ -381,17 +381,17 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
       Sets the incidence status to a standard status value. See
       separate enum. Note that StatusX cannot be specified.
     */
-    void seStatus( Status status );
+    void setqStatus( tqStatus status );
     /**
       Sets the incidence status to a non-standard status value.
       @param status non-standard status string. If empty,
       the incidence status will be set to StatusNone.
     */
-    void setCustomStatus( const TQString &status );
+    void setCustomtqStatus( const TQString &status );
     /**
       Return the event's status.
     */
-    Status status() const;
+    tqStatus status() const;
     /**
       Return the event's status string.
     */
@@ -399,7 +399,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
     /**
       Return human-readable translated name of status value.
     */
-    static TQString statusName( Status );
+    static TQString statusName( tqStatus );
 
 
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -459,14 +459,14 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
     TQDateTime recurrenceID() const;
 
     /**
-      Attach a child incidence to a parent incidence.
+      Attach a child incidence to a tqparent incidence.
       @param childIncidence is the child incidence to add
       @since 3.5.12
     */
     void addChildIncidence( TQString childIncidence );
 
     /**
-      Detach a child incidence from its parent incidence.
+      Detach a child incidence from its tqparent incidence.
       @param childIncidence is the child incidence to remove
       @since 3.5.12
     */
@@ -566,7 +566,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
     TQStringList mResources;
 
     TQString mStatusString;
-    Status  mStatus;
+    tqStatus  mtqStatus;
     int mSecrecy;
     int mPriority;                        // 1 = highest, 2 = less, etc.
 
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 518d0f63..bddfcb5a 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -32,7 +32,7 @@ using namespace KCal;
 
 IncidenceBase::IncidenceBase()
   : mReadOnly( false ), mFloats( true ), mDuration( 0 ), mHasDuration( false ),
-    mPilotId( 0 ), mSyncStatus( SYNCMOD )
+    mPilotId( 0 ), mSynctqStatus( SYNCMOD )
 {
   setUid( CalFormat::createUniqueId() );
 
@@ -56,7 +56,7 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
-  mSyncStatus = i.mSyncStatus;
+  mSynctqStatus = i.mSynctqStatus;
   mComments = i.mComments;
 
   // The copied object is a new one, so it isn't observed by the observer
@@ -88,7 +88,7 @@ IncidenceBase& IncidenceBase::operator=( const IncidenceBase& i )
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
-  mSyncStatus = i.mSyncStatus;
+  mSynctqStatus = i.mSynctqStatus;
   mComments = i.mComments;
 
   return *this;
@@ -124,7 +124,7 @@ bool IncidenceBase::operator==( const IncidenceBase& i2 ) const
            duration() == i2.duration() &&
            hasDuration() == i2.hasDuration() &&
            pilotId() == i2.pilotId() &&
-           syncStatus() == i2.syncStatus() );
+           synctqStatus() == i2.synctqStatus() );
   // no need to compare mObserver
 }
 
@@ -361,22 +361,22 @@ bool IncidenceBase::hasDuration() const
   return mHasDuration;
 }
 
-void IncidenceBase::setSyncStatus(int stat)
+void IncidenceBase::setSynctqStatus(int stat)
 {
   if (mReadOnly) return;
-  if ( mSyncStatus == stat ) return;
-  mSyncStatus = stat;
+  if ( mSynctqStatus == stat ) return;
+  mSynctqStatus = stat;
   updatedSilent();
 }
 void IncidenceBase::setSyncStatusSilent(int stat)
 {
   if (mReadOnly) return;
-  mSyncStatus = stat;
+  mSynctqStatus = stat;
 }
 
-int IncidenceBase::syncStatus() const
+int IncidenceBase::synctqStatus() const
 {
-  return mSyncStatus;
+  return mSynctqStatus;
 }
 
 void IncidenceBase::setPilotId( unsigned long id )
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index fa3a1a61..7d4eec7e 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -222,7 +222,7 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties
       Return first Attendee with one of the given email addresses.
     */
     Attendee *attendeeByMails( const TQStringList &,
-                               const TQString &email = TQString::null ) const;
+                               const TQString &email = TQString() ) const;
     /**
       Return attendee with given uid.
     */
@@ -235,12 +235,12 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties
     /**
       Set synchronisation satus.
     */
-    void setSyncStatus( int status );
+    void setSynctqStatus( int status );
     void setSyncStatusSilent( int status );
     /**
       Return synchronisation status.
     */
-    int syncStatus() const;
+    int synctqStatus() const;
 
     /**
       Set Pilot Id.
@@ -292,7 +292,7 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties
 
     // PILOT SYNCHRONIZATION STUFF
     unsigned long mPilotId;                         // unique id for pilot sync
-    int mSyncStatus;                      // status (for sync)
+    int mSynctqStatus;                      // status (for sync)
 
     TQPtrList<Observer> mObservers;
 
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index ebfb68ea..d7dd97e4 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -83,7 +83,7 @@ static TQString htmlAddTag( const TQString & tag, const TQString & text )
       int pos = 0;
       TQString tmp;
       for( int i = 0; i <= numLineBreaks; i++ ) {
-        pos = tmpText.find( "\n" );
+        pos = tmpText.tqfind( "\n" );
         tmp = tmpText.left( pos );
         tmpText = tmpText.right( tmpText.length() - pos - 1 );
         tmpStr += tmp + "<br>";
@@ -184,7 +184,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS
   // and either name or uid is missing
   if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
+    KABC::Addressee::List addressList = add_book->findByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -195,7 +195,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS
         uid = o.uid();
       } else {
         // Email not found in the addressbook. Don't make a link
-        uid = TQString::null;
+        uid = TQString();
       }
     }
   }
@@ -275,7 +275,7 @@ static TQString displayViewFormatAttendees( Incidence *incidence )
     tmpStr += "<td>" +
               displayViewLinkPerson( incidence->organizer().email(),
                                      incidence->organizer().name(),
-                                     TQString::null ) +
+                                     TQString() ) +
               "</td>";
     tmpStr += "</tr>";
   }
@@ -365,10 +365,10 @@ static TQString displayViewFormatCreationDate( Incidence *incidence )
 static TQString displayViewFormatBirthday( Event *event )
 {
   if ( !event ) {
-    return  TQString::null;
+    return  TQString();
   }
   if ( event->customProperty("KABC","BIRTHDAY") != "YES" ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString uid = event->customProperty("KABC","UID-1");
@@ -452,7 +452,7 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event,
                                        const TQDate &date )
 {
   if ( !event ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString tmpStr = displayViewFormatHeader( event );
@@ -625,7 +625,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo,
                                       const TQDate &date )
 {
   if ( !todo ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString tmpStr = displayViewFormatHeader( todo );
@@ -775,7 +775,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo,
 static TQString displayViewFormatJournal( Calendar *calendar, Journal *journal )
 {
   if ( !journal ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString tmpStr = displayViewFormatHeader( journal );
@@ -827,7 +827,7 @@ static TQString displayViewFormatJournal( Calendar *calendar, Journal *journal )
 static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb )
 {
   if ( !fb ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString tmpStr = htmlAddTag( "h2",
@@ -934,14 +934,14 @@ TQString IncidenceFormatter::extensiveDisplayStr( Calendar *calendar,
                                                  const TQDate &date )
 {
   if ( !incidence ) {
-    return TQString::null;
+    return TQString();
   }
 
   EventViewerVisitor v;
   if ( v.act( calendar, incidence, date ) ) {
     return v.result();
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -1135,7 +1135,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString
   // and either name or uid is missing
   if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
+    KABC::Addressee::List addressList = add_book->findByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -1146,7 +1146,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString
         uid = o.uid();
       } else {
         // Email not found in the addressbook. Don't make a link
-        uid = TQString::null;
+        uid = TQString();
       }
     }
   }
@@ -1274,7 +1274,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode )
 {
   // Invitation details are formatted into an HTML table
   if ( !event ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString sSummary = i18n( "Summary unspecified" );
@@ -1347,7 +1347,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode )
 //   }
 
   // Invitation Duration Row
-  QString durStr = IncidenceFormatter::durationString( event );
+  TQString durStr = IncidenceFormatter::durationString( event );
   if ( !durStr.isEmpty() ) {
     html += invitationRow( i18n( "Duration:" ), durStr );
   }
@@ -1385,7 +1385,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode )
 {
   // Task details are formatted into an HTML table
   if ( !todo ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString sSummary = i18n( "Summary unspecified" );
@@ -1449,7 +1449,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode )
 static TQString invitationDetailsJournal( Journal *journal, bool noHtmlMode )
 {
   if ( !journal ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString sSummary = i18n( "Summary unspecified" );
@@ -1480,7 +1480,7 @@ static TQString invitationDetailsJournal( Journal *journal, bool noHtmlMode )
 static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ )
 {
   if ( !fb )
-    return TQString::null;
+    return TQString();
   TQString html( "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n" );
 
   html += invitationRow( i18n("Person:"), fb->organizer().fullName() );
@@ -1510,7 +1510,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ )
       if ( dur > 0 ) {
         cont += i18n("1 second", "%n seconds", dur);
       }
-      html += invitationRow( TQString::null, i18n("startDate for duration", "%1 for %2")
+      html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2")
           .arg( KGlobal::locale()->formatDateTime( per.start(), false ) )
           .arg(cont) );
     } else {
@@ -1526,7 +1526,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ )
           .arg( KGlobal::locale()->formatDateTime( per.end(), false ) );
       }
 
-      html += invitationRow( TQString::null, cont );
+      html += invitationRow( TQString(), cont );
     }
   }
 
@@ -1557,7 +1557,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
                                       ScheduleMessage *msg, const TQString &sender )
 {
   if ( !msg || !event )
-    return TQString::null;
+    return TQString();
 
   switch ( msg->method() ) {
   case Scheduler::Publish:
@@ -1608,7 +1608,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
     Attendee::List attendees = event->attendees();
     if( attendees.count() == 0 ) {
       kdDebug(5850) << "No attendees in the iCal reply!" << endl;
-      return TQString::null;
+      return TQString();
     }
     if( attendees.count() != 1 ) {
       kdDebug(5850) << "Warning: attendeecount in the reply should be 1 "
@@ -1692,14 +1692,14 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
     return i18n("Error: iMIP message with unknown method: '%1'").
       arg( msg->method() );
   }
-  return TQString::null;
+  return TQString();
 }
 
 static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
                                      ScheduleMessage *msg, const TQString &sender )
 {
   if ( !msg || !todo ) {
-    return TQString::null;
+    return TQString();
   }
 
   switch ( msg->method() ) {
@@ -1752,7 +1752,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
     Attendee::List attendees = todo->attendees();
     if( attendees.count() == 0 ) {
       kdDebug(5850) << "No attendees in the iCal reply!" << endl;
-      return TQString::null;
+      return TQString();
     }
     if( attendees.count() != 1 ) {
       kdDebug(5850) << "Warning: attendeecount in the reply should be 1 "
@@ -1845,13 +1845,13 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
     return i18n( "Error: iMIP message with unknown method: '%1'" ).
       arg( msg->method() );
   }
-  return TQString::null;
+  return TQString();
 }
 
 static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg )
 {
   if ( !msg || !journal ) {
-    return TQString::null;
+    return TQString();
   }
 
   switch ( msg->method() ) {
@@ -1874,7 +1874,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg
     Attendee::List attendees = journal->attendees();
     if( attendees.count() == 0 ) {
       kdDebug(5850) << "No attendees in the iCal reply!" << endl;
-      return TQString::null;
+      return TQString();
     }
     if( attendees.count() != 1 ) {
       kdDebug(5850) << "Warning: attendeecount in the reply should be 1 "
@@ -1910,13 +1910,13 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg
     return i18n("Error: iMIP message with unknown method: '%1'").
       arg( msg->method() );
   }
-  return TQString::null;
+  return TQString();
 }
 
 static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg )
 {
   if ( !msg || !fb ) {
-    return TQString::null;
+    return TQString();
   }
 
   switch ( msg->method() ) {
@@ -1965,7 +1965,7 @@ static TQString invitationAttendees( Incidence *incidence )
         }
         tmpStr += "<tr>";
         tmpStr += "<td>";
-        tmpStr += invitationPerson( a->email(), a->name(), TQString::null );
+        tmpStr += invitationPerson( a->email(), a->name(), TQString() );
         if ( !a->delegator().isEmpty() ) {
           tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() );
         }
@@ -2117,7 +2117,7 @@ class IncidenceFormatter::IncidenceCompareVisitor
     TQString result() const
     {
       if ( mChanges.isEmpty() ) {
-        return TQString::null;
+        return TQString();
       }
       TQString html = "<div align=\"left\"><ul><li>";
       html += mChanges.join( "</li><li>" );
@@ -2388,7 +2388,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
                                                         const TQString &sender )
 {
   if ( invitation.isEmpty() ) {
-    return TQString::null;
+    return TQString();
   }
 
   ICalFormat format;
@@ -2399,7 +2399,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
     kdDebug( 5850 ) << "Failed to parse the scheduling message" << endl;
     Q_ASSERT( format.exception() );
     kdDebug( 5850 ) << format.exception()->message() << endl;
-    return TQString::null;
+    return TQString();
   }
 
   IncidenceBase *incBase = msg->event();
@@ -2437,12 +2437,12 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
   InvitationHeaderVisitor headerVisitor;
   // The InvitationHeaderVisitor returns false if the incidence is somehow invalid, or not handled
   if ( !headerVisitor.act( incBase, existingIncidence, msg, sender ) )
-    return TQString::null;
+    return TQString();
   html += "<b>" + headerVisitor.result() + "</b>";
 
   InvitationBodyVisitor bodyVisitor( noHtmlMode );
   if ( !bodyVisitor.act( incBase, existingIncidence, msg, sender ) )
-    return TQString::null;
+    return TQString();
   html += bodyVisitor.result();
 
   if ( msg->method() == Scheduler::Request ) {
@@ -2702,14 +2702,14 @@ TQString IncidenceFormatter::formatICalInvitationNoHtml( TQString invitation,
 //-----------------------------------------------------------------------------
 
 static TQString stringProp( KTNEFMessage* tnefMsg, const TQ_UINT32& key,
-                           const TQString& fallback = TQString::null)
+                           const TQString& fallback = TQString())
 {
   return tnefMsg->findProp( key < 0x10000 ? key & 0xFFFF : key >> 16,
                             fallback );
 }
 
 static TQString sNamedProp( KTNEFMessage* tnefMsg, const TQString& name,
-                           const TQString& fallback = TQString::null )
+                           const TQString& fallback = TQString() )
 {
   return tnefMsg->findNamedProp( name, fallback );
 }
@@ -2782,7 +2782,7 @@ static TQDateTime utc2Local( const TQDateTime& utcdt )
 }
 
 
-static TQDateTime pureISOToLocalQDateTime( const TQString& dtStr,
+static TQDateTime pureISOToLocalTQDateTime( const TQString& dtStr,
                                           bool bDateOnly = false )
 {
   TQDate tmpDate;
@@ -2843,7 +2843,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
 
     // Everything depends from property PR_MESSAGE_CLASS
     // (this is added by KTNEFParser):
-    TQString msgClass = tnefMsg->findProp( 0x001A, TQString::null, true )
+    TQString msgClass = tnefMsg->findProp( 0x001A, TQString(), true )
       .upper();
     if( !msgClass.isEmpty() ) {
       // Match the old class names that might be used by Outlook for
@@ -2907,9 +2907,9 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         TQString sSenderSearchKeyEmail( tnefMsg->findProp( 0x0C1D ) );
 
         if( !sSenderSearchKeyEmail.isEmpty() ) {
-          int colon = sSenderSearchKeyEmail.find( ':' );
+          int colon = sSenderSearchKeyEmail.tqfind( ':' );
           // May be e.g. "SMTP:KHZ@KDE.ORG"
-          if( sSenderSearchKeyEmail.find( ':' ) == -1 )
+          if( sSenderSearchKeyEmail.tqfind( ':' ) == -1 )
             sSenderSearchKeyEmail.remove( 0, colon+1 );
         }
 
@@ -2920,19 +2920,19 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
                it != attendees.end(); ++it ) {
             // Skip all entries that have no '@' since these are
             // no mail addresses
-            if( (*it).find('@') == -1 ) {
+            if( (*it).tqfind('@') == -1 ) {
               s = (*it).stripWhiteSpace();
 
               Attendee *attendee = new Attendee( s, s, true );
               if( bIsReply ) {
                 if( bCompatMethodAccepted )
-                  attendee->seStatus( Attendee::Accepted );
+                  attendee->setqStatus( Attendee::Accepted );
                 if( bCompatMethodDeclined )
-                  attendee->seStatus( Attendee::Declined );
+                  attendee->setqStatus( Attendee::Declined );
                 if( bCompatMethodAcceptedCond )
-                  attendee->seStatus(Attendee::Tentative);
+                  attendee->setqStatus(Attendee::Tentative);
               } else {
-                attendee->seStatus( Attendee::NeedsAction );
+                attendee->setqStatus( Attendee::NeedsAction );
                 attendee->setRole( Attendee::ReqParticipant );
               }
               event->addAttendee(attendee);
@@ -2943,17 +2943,17 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
           // This must be old style, let us use the PR_SENDER_SEARCH_KEY.
           s = sSenderSearchKeyEmail;
           if( !s.isEmpty() ) {
-            Attendee *attendee = new Attendee( TQString::null, TQString::null,
+            Attendee *attendee = new Attendee( TQString(), TQString(),
                                                true );
             if( bIsReply ) {
               if( bCompatMethodAccepted )
-                attendee->seStatus( Attendee::Accepted );
+                attendee->setqStatus( Attendee::Accepted );
               if( bCompatMethodAcceptedCond )
-                attendee->seStatus( Attendee::Declined );
+                attendee->setqStatus( Attendee::Declined );
               if( bCompatMethodDeclined )
-                attendee->seStatus( Attendee::Tentative );
+                attendee->setqStatus( Attendee::Tentative );
             } else {
-              attendee->seStatus(Attendee::NeedsAction);
+              attendee->setqStatus(Attendee::NeedsAction);
               attendee->setRole(Attendee::ReqParticipant);
             }
             event->addAttendee(attendee);
@@ -2966,12 +2966,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         if( !s.isEmpty() )
           event->setOrganizer( s );
 
-        s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString::null )
-          .tqreplace( TQChar( ':' ), TQString::null );
+        s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString() )
+          .tqreplace( TQChar( ':' ), TQString() );
         event->setDtStart( TQDateTime::fromString( s ) ); // ## Format??
 
-        s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString::null )
-          .tqreplace( TQChar( ':' ), TQString::null );
+        s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString() )
+          .tqreplace( TQChar( ':' ), TQString() );
         event->setDtEnd( TQDateTime::fromString( s ) );
 
         s = tnefMsg->findProp( 0x8208 );
@@ -2988,8 +2988,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         // PENDING(khz): is this value in local timezone? Must it be
         // adjusted? Most likely this is a bug in the server or in
         // Outlook - we ignore it for now.
-        s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString::null )
-          .tqreplace( TQChar( ':' ), TQString::null );
+        s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString() )
+          .tqreplace( TQChar( ':' ), TQString() );
         // ### libkcal always uses tqcurrentDateTime()
         // event->setDtStamp(TQDateTime::fromString(s));
 
@@ -3009,11 +3009,11 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         if(!tnefMsg->findProp(0x8503).isEmpty()) {
           Alarm *alarm = new Alarm(event);
           TQDateTime highNoonTime =
-            pureISOToLocalQDateTime( tnefMsg->findProp( 0x8502 )
+            pureISOToLocalTQDateTime( tnefMsg->findProp( 0x8502 )
                                      .tqreplace( TQChar( '-' ), "" )
                                      .tqreplace( TQChar( ':' ), "" ) );
           TQDateTime wakeMeUpTime =
-            pureISOToLocalQDateTime( tnefMsg->findProp( 0x8560, "" )
+            pureISOToLocalTQDateTime( tnefMsg->findProp( 0x8560, "" )
                                      .tqreplace( TQChar( '-' ), "" )
                                      .tqreplace( TQChar( ':' ), "" ) );
           alarm->setTime(wakeMeUpTime);
@@ -3047,8 +3047,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         addressee.insertCustom( "KADDRESSBOOK", "X-Profession", stringProp( tnefMsg, MAPI_TAG_PR_PROFESSION ) );
 
         TQString s = tnefMsg->findProp( MAPI_TAG_PR_WEDDING_ANNIVERSARY )
-          .tqreplace( TQChar( '-' ), TQString::null )
-          .tqreplace( TQChar( ':' ), TQString::null );
+          .tqreplace( TQChar( '-' ), TQString() )
+          .tqreplace( TQChar( ':' ), TQString() );
         if( !s.isEmpty() )
           addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", s );
 
@@ -3114,8 +3114,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) );
 
         s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY )
-          .tqreplace( TQChar( '-' ), TQString::null )
-          .tqreplace( TQChar( ':' ), TQString::null );
+          .tqreplace( TQChar( '-' ), TQString() )
+          .tqreplace( TQChar( ':' ), TQString() );
         if( !s.isEmpty() )
           addressee.setBirthday( TQDateTime::fromString( s ) );
 
@@ -3361,7 +3361,7 @@ static TQString tooltipPerson( const TQString& email, TQString name )
   // and name is missing
   if ( name.isEmpty() && !email.isEmpty() ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
+    KABC::Addressee::List addressList = add_book->findByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -3469,7 +3469,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
   uint maxDescLen = 120; // maximum description chars to print (before elipsis)
 
   if ( !incidence ) {
-    return TQString::null;
+    return TQString();
   }
 
   TQString tmp = "<qt>";
@@ -3554,7 +3554,7 @@ TQString IncidenceFormatter::toolTipStr( Calendar *calendar,
   if ( v.act( calendar, incidence, date, richText ) ) {
     return v.result();
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -3709,13 +3709,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal )
 TQString IncidenceFormatter::mailBodyString( IncidenceBase *incidence )
 {
   if ( !incidence )
-    return TQString::null;
+    return TQString();
 
   MailBodyVisitor v;
   if ( v.act( incidence ) ) {
     return v.result();
   }
-  return TQString::null;
+  return TQString();
 }
 
 static TQString recurEnd( Incidence *incidence )
@@ -4039,12 +4039,12 @@ TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date,
 TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *incidence )
 {
   if ( !calendar || !incidence ) {
-    return TQString::null;
+    return TQString();
   }
 
   CalendarResources *calendarResource = dynamic_cast<CalendarResources*>( calendar );
   if ( !calendarResource ) {
-    return TQString::null;
+    return TQString();
   }
 
   ResourceCalendar *resourceCalendar = calendarResource->resource( incidence );
@@ -4060,7 +4060,7 @@ TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *inci
     return resourceCalendar->resourceName();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 static TQString secs2Duration( int secs )
diff --git a/libkcal/listbase.h b/libkcal/listbase.h
index 2ce1dfa1..ac9e628e 100644
--- a/libkcal/listbase.h
+++ b/libkcal/listbase.h
@@ -67,7 +67,7 @@ class ListBase : public TQValueList<T *>
 
     bool removeRef( T *t )
     {
-      TQValueListIterator<T *> it = find( t );
+      TQValueListIterator<T *> it = tqfind( t );
       if ( it == TQValueList<T*>::end() ) {
         return false;
       } else {
diff --git a/libkcal/person.cpp b/libkcal/person.cpp
index aad80f68..3d7c2b42 100644
--- a/libkcal/person.cpp
+++ b/libkcal/person.cpp
@@ -64,7 +64,7 @@ TQString Person::fullName() const
       // Taken from KABC::Addressee::fullEmail
       TQString name = mName;
       TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
-      bool weNeedToQuote = name.find( needQuotes ) != -1;
+      bool weNeedToQuote = name.tqfind( needQuotes ) != -1;
       if ( weNeedToQuote ) {
           if ( name[0] != '"' )
               name.prepend( '"' );
diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp
index 372c5230..964e48c5 100644
--- a/libkcal/qtopiaformat.cpp
+++ b/libkcal/qtopiaformat.cpp
@@ -38,17 +38,17 @@
 
 using namespace KCal;
 
-class QtopiaParser : public QXmlDefaultHandler
+class TQtopiaParser : public TQXmlDefaultHandler
 {
   public:
-    QtopiaParser( Calendar *calendar ) : mCalendar( calendar ) {}
+    TQtopiaParser( Calendar *calendar ) : mCalendar( calendar ) {}
   
     bool startElement( const TQString &, const TQString &, const TQString & qName, 
                        const TQXmlAttributes &attributes )
     {
       if ( qName == "event" ) {
         Event *event = new Event;
-        TQString uid = "Qtopia" + attributes.value( "uid" );
+        TQString uid = "TQtopia" + attributes.value( "uid" );
         event->setUid( uid );
 
         event->setSummary( attributes.value( "description" ) );
@@ -136,11 +136,11 @@ class QtopiaParser : public QXmlDefaultHandler
       } else if ( qName == "Task" ) {
         Todo *todo = new Todo;
 
-        TQString uid = "Qtopia" + attributes.value( "Uid" );
+        TQString uid = "TQtopia" + attributes.value( "Uid" );
         todo->setUid( uid );
         
         TQString description = attributes.value( "Description" );
-        int pos = description.find( '\n' );
+        int pos = description.tqfind( '\n' );
         if ( pos > 0 ) {
           TQString summary = description.left( pos );
           todo->setSummary( summary );
@@ -205,7 +205,7 @@ class QtopiaParser : public QXmlDefaultHandler
  
     TQString errorString ()
     {
-      return "QtopiaParser: Error!";
+      return "TQtopiaParser: Error!";
     }
 
   protected:
@@ -242,7 +242,7 @@ class QtopiaParser : public QXmlDefaultHandler
 
     static TQString category( const TQString &id )
     {
-      TQMap<TQString,TQString>::ConstIterator it = mCategoriesMap.find( id );
+      TQMap<TQString,TQString>::ConstIterator it = mCategoriesMap.tqfind( id );
       if ( it == mCategoriesMap.end() ) return id;
       else return *it;
     }
@@ -255,23 +255,23 @@ class QtopiaParser : public QXmlDefaultHandler
     static TQMap<TQString,TQString> mCategoriesMap;
 };
 
-TQMap<TQString,TQString> QtopiaParser::mCategoriesMap;
+TQMap<TQString,TQString> TQtopiaParser::mCategoriesMap;
 
-QtopiaFormat::QtopiaFormat()
+TQtopiaFormat::TQtopiaFormat()
 {
 }
 
-QtopiaFormat::~QtopiaFormat()
+TQtopiaFormat::~TQtopiaFormat()
 {
 }
 
-bool QtopiaFormat::load( Calendar *calendar, const TQString &fileName)
+bool TQtopiaFormat::load( Calendar *calendar, const TQString &fileName)
 {
-  kdDebug(5800) << "QtopiaFormat::load() " << fileName << endl;
+  kdDebug(5800) << "TQtopiaFormat::load() " << fileName << endl;
 
   clearException();
 
-  QtopiaParser handler( calendar );
+  TQtopiaParser handler( calendar );
   TQFile xmlFile( fileName );
   TQXmlInputSource source( xmlFile );
   TQXmlSimpleReader reader;
@@ -279,9 +279,9 @@ bool QtopiaFormat::load( Calendar *calendar, const TQString &fileName)
   return reader.parse( source );
 }
 
-bool QtopiaFormat::save( Calendar *calendar, const TQString &fileName )
+bool TQtopiaFormat::save( Calendar *calendar, const TQString &fileName )
 {
-  kdDebug(5800) << "QtopiaFormat::save(): " << fileName << endl;
+  kdDebug(5800) << "TQtopiaFormat::save(): " << fileName << endl;
 
   clearException();
 
@@ -304,13 +304,13 @@ bool QtopiaFormat::save( Calendar *calendar, const TQString &fileName )
   return true;
 }
 
-bool QtopiaFormat::fromString( Calendar *, const TQString & )
+bool TQtopiaFormat::fromString( Calendar *, const TQString & )
 {
-  kdDebug(5800) << "QtopiaFormat::fromString() not yet implemented." << endl;
+  kdDebug(5800) << "TQtopiaFormat::fromString() not yet implemented." << endl;
   return false;
 }
 
-TQString QtopiaFormat::toString( Calendar * )
+TQString TQtopiaFormat::toString( Calendar * )
 {
-  return TQString::null;
+  return TQString();
 }
diff --git a/libkcal/qtopiaformat.h b/libkcal/qtopiaformat.h
index a2950f19..37caf871 100644
--- a/libkcal/qtopiaformat.h
+++ b/libkcal/qtopiaformat.h
@@ -18,8 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KCAL_QTOPIAFORMAT_H
-#define KCAL_QTOPIAFORMAT_H
+#ifndef KCAL_TQTOPIAFORMAT_H
+#define KCAL_TQTOPIAFORMAT_H
 
 #include <tqstring.h>
 
@@ -31,13 +31,13 @@
 namespace KCal {
 
 /**
-  This class implements the calendar format used by Qtopia.
+  This class implements the calendar format used by TQtopia.
 */
-class LIBKCAL_EXPORT QtopiaFormat : public CalFormat
+class LIBKCAL_EXPORT TQtopiaFormat : public CalFormat
 {
   public:
-    QtopiaFormat();
-    virtual ~QtopiaFormat();
+    TQtopiaFormat();
+    virtual ~TQtopiaFormat();
 
     bool load( Calendar *, const TQString &fileName );
     bool save( Calendar *, const TQString &fileName );
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 474d885f..47169ae4 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -839,7 +839,7 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
   TQDateTime nextDT = preDateTime;
   // prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g.
   // the exrule is identical to the rrule). If an occurrence is found, break
-  // out of the loop by returning that QDateTime
+  // out of the loop by returning that TQDateTime
 // TODO_Recurrence: Is a loop counter of 1000 really okay? I mean for secondly
 // recurrence, an exdate might exclude more than 1000 intervals!
   int loop = 0;
@@ -893,8 +893,8 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
     nextDT = dates.first();
 
     // Check if that date/time is excluded explicitly or by an exrule:
-    if ( !tqcontainsSorted( mExDates, nextDT.date() ) &&
-         !tqcontainsSorted( mExDateTimes, nextDT ) ) {
+    if ( !containsSorted( mExDates, nextDT.date() ) &&
+         !containsSorted( mExDateTimes, nextDT ) ) {
       bool allowed = true;
       for ( i = 0, end = mExRules.count();  i < end;  ++i ) {
         allowed = allowed && !( mExRules[i]->recursAt( nextDT ) );
@@ -914,7 +914,7 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
   TQDateTime prevDT = afterDateTime;
   // prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g.
   // the exrule is identical to the rrule). If an occurrence is found, break
-  // out of the loop by returning that QDateTime
+  // out of the loop by returning that TQDateTime
   int loop = 0;
   while ( loop < 1000 ) {
     // Outline of the algo:
@@ -964,8 +964,8 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
     prevDT = dates.last();
 
     // Check if that date/time is excluded explicitly or by an exrule:
-    if ( !tqcontainsSorted( mExDates, prevDT.date() ) &&
-         !tqcontainsSorted( mExDateTimes, prevDT ) ) {
+    if ( !containsSorted( mExDates, prevDT.date() ) &&
+         !containsSorted( mExDateTimes, prevDT ) ) {
       bool allowed = true;
       for ( i = 0, end = mExRules.count();  i < end;  ++i ) {
         allowed = allowed && !( mExRules[i]->recursAt( prevDT ) );
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index 355a922f..ea0bbd33 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -184,7 +184,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
     /** Returns the date and time of the next recurrence, after the specified date/time.
      * If the recurrence has no time, the next date after the specified date is returned.
      * @param preDateTime the date/time after which to find the recurrence.
-     * @return date/time of next recurrence (strictly later than the given QDateTiem), or invalid date if none.
+     * @return date/time of next recurrence (strictly later than the given TQDateTiem), or invalid date if none.
      */
     TQDateTime getNextDateTime( const TQDateTime& preDateTime ) const;
     /** Returns the date and time of the last previous recurrence, before the specified date/time.
diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp
index e225edb0..733e3f5e 100644
--- a/libkcal/recurrencerule.cpp
+++ b/libkcal/recurrencerule.cpp
@@ -35,10 +35,10 @@ using namespace KCal;
 // Maximum number of intervals to process
 const int LOOP_LIMIT = 10000;
 
-// FIXME: If Qt is ever changed so that TQDateTime:::addSecs takes into account
+// FIXME: If TQt is ever changed so that TQDateTime:::addSecs takes into account
 //        DST shifts, we need to use our own addSecs method, too, since we
 //        need to caalculate things in UTC!
-/** Workaround for broken TQDateTime::secsTo (at least in Qt 3.3). While
+/** Workaround for broken TQDateTime::secsTo (at least in TQt 3.3). While
    TQDateTime::secsTo does take time zones into account, TQDateTime::addSecs
    does not, so we have a problem:
       TQDateTime d1(TQDate(2005, 10, 30), TQTime(1, 30, 0) );
@@ -104,7 +104,7 @@ TQDate DateHelper::getNthWeek( int year, int weeknumber, short weekstart )
 {
   if ( weeknumber == 0 ) return TQDate();
   // Adjust this to the first day of week #1 of the year and add 7*weekno days.
-  TQDate dt( year, 1, 4 ); // Week #1 is the week that tqcontains Jan 4
+  TQDate dt( year, 1, 4 ); // Week #1 is the week that contains Jan 4
   int adjust = -(7 + dt.dayOfWeek() - weekstart) % 7;
   if ( weeknumber > 0 ) {
     dt = dt.addDays( 7 * (weeknumber-1) + adjust );
@@ -418,7 +418,7 @@ DateTimeList RecurrenceRule::Constraint::dateTimes( RecurrenceRule::PeriodType t
 
 bool RecurrenceRule::Constraint::increase( RecurrenceRule::PeriodType type, int freq )
 {
-  // convert the first day of the interval to QDateTime
+  // convert the first day of the interval to TQDateTime
   // Sub-daily types need to be converted to UTC to correctly handle DST shifts
   TQDateTime dt( intervalDateTime( type ) );
 
@@ -1299,7 +1299,7 @@ DateTimeList RecurrenceRule::timesInInterval( const TQDateTime &dtStart,
     if ( dt < enddt ) {
       n = static_cast<int>( ( dt.secsTo( enddt ) - 1 ) / mTimedRepetition ) + 1;
       // limit n by a sane value else we can "explode".
-      n = QMIN( n, LOOP_LIMIT );
+      n = TQMIN( n, LOOP_LIMIT );
       for ( int i = 0;  i < n;  dt = dt.addSecs( mTimedRepetition ), ++i ) {
         result += dt;
       }
@@ -1453,7 +1453,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat
     case rMinutely: modifier *= 60;
     case rSecondly:
         periods = ownSecsTo( start, toDate ) / modifier;
-        periods = QMAX( 0, periods);
+        periods = TQMAX( 0, periods);
         if ( periods > 0 )
           periods += ( frequency() - 1 - ( (periods - 1) % frequency() ) );
         nextValid = start.addSecs( modifier * periods );
@@ -1466,7 +1466,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat
         modifier *= 7;
     case rDaily:
         periods = start.daysTo( toDate ) / modifier;
-        periods = QMAX( 0, periods);
+        periods = TQMAX( 0, periods);
         if ( periods > 0 )
           periods += (frequency() - 1 - ( (periods - 1) % frequency() ) );
         nextValid = start.addDays( modifier * periods );
@@ -1475,7 +1475,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat
     case rMonthly: {
         periods = 12*( toDate.date().year() - start.date().year() ) +
              ( toDate.date().month() - start.date().month() );
-        periods = QMAX( 0, periods);
+        periods = TQMAX( 0, periods);
         if ( periods > 0 )
           periods += (frequency() - 1 - ( (periods - 1) % frequency() ) );
         // set the day to the first day of the month, so we don't have problems
@@ -1485,7 +1485,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat
         break; }
     case rYearly:
         periods = ( toDate.date().year() - start.date().year() );
-        periods = QMAX( 0, periods);
+        periods = TQMAX( 0, periods);
         if ( periods > 0 )
           periods += ( frequency() - 1 - ( (periods - 1) % frequency() ) );
         nextValid.setDate( start.date().addYears( periods ) );
diff --git a/libkcal/recurrencerule.h b/libkcal/recurrencerule.h
index 422113b5..a93062d0 100644
--- a/libkcal/recurrencerule.h
+++ b/libkcal/recurrencerule.h
@@ -148,7 +148,7 @@ Q_INLINE_TEMPLATES int removeSorted( TQValueList<T> &lst, const T &value, int st
 }
 
 template <class T>
-Q_INLINE_TEMPLATES bool tqcontainsSorted( const TQValueList<T> &lst, const T &value )
+Q_INLINE_TEMPLATES bool containsSorted( const TQValueList<T> &lst, const T &value )
 {
   return findSorted( lst, value, 0 ) >= 0;
 }
@@ -199,7 +199,7 @@ class LIBKCAL_EXPORT RecurrenceRule
                    // Bounded by -366 and +366, 0 means all weeks in that period
     };
 
-    RecurrenceRule( /*Incidence *parent, int compatVersion = 0*/ );
+    RecurrenceRule( /*Incidence *tqparent, int compatVersion = 0*/ );
     RecurrenceRule(const RecurrenceRule&);
     ~RecurrenceRule();
 
@@ -207,7 +207,7 @@ class LIBKCAL_EXPORT RecurrenceRule
     bool operator!=( const RecurrenceRule& r ) const  { return !operator==(r); }
     RecurrenceRule &operator=(const RecurrenceRule&);
 
-//     Incidence *parent() const { return mParent; }
+//     Incidence *tqparent() const { return mParent; }
 
 
     /** Set if recurrence is read-only or can be changed. */
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index a6365979..0e2d8d56 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -485,7 +485,7 @@ void ResourceCached::calendarIncidenceAdded( Incidence *i )
 #endif
 
   TQMap<Incidence *,bool>::ConstIterator it;
-  it = mAddedIncidences.find( i );
+  it = mAddedIncidences.tqfind( i );
   if ( it == mAddedIncidences.end() ) {
     mAddedIncidences.insert( i, true );
   }
@@ -501,7 +501,7 @@ void ResourceCached::calendarIncidenceChanged( Incidence *i )
 #endif
 
   TQMap<Incidence *,bool>::ConstIterator it;
-  it = mChangedIncidences.find( i );
+  it = mChangedIncidences.tqfind( i );
   // FIXME: If you modify an added incidence, there's no need to add it to mChangedIncidences!
   if ( it == mChangedIncidences.end() ) {
     mChangedIncidences.insert( i, true );
@@ -518,19 +518,19 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i )
 #endif
 
   if (i->hasRecurrenceID()) {
-    // This incidence has a parent; notify the parent of the child's death and do not destroy the parent!
-    // Get the parent
+    // This incidence has a tqparent; notify the tqparent of the child's death and do not destroy the tqparent!
+    // Get the tqparent
     IncidenceList il = i->childIncidences();
     IncidenceListIterator it;
     it = il.begin();
-    Incidence *parentIncidence;
-    parentIncidence = this->incidence(*it);
+    Incidence *tqparentIncidence;
+    tqparentIncidence = this->incidence(*it);
     // Remove the child
-    calendarIncidenceChanged(parentIncidence);
+    calendarIncidenceChanged(tqparentIncidence);
   }
   else {
     TQMap<Incidence *,bool>::ConstIterator it;
-    it = mDeletedIncidences.find( i );
+    it = mDeletedIncidences.tqfind( i );
     if ( it == mDeletedIncidences.end() ) {
       mDeletedIncidences.insert( i, true );
     }
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 74fcf5d6..f4302372 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -46,6 +46,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
                        public KCal::Calendar::Observer
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Reload policy.
diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp
index c1793c26..5224ff8b 100644
--- a/libkcal/resourcecachedconfig.cpp
+++ b/libkcal/resourcecachedconfig.cpp
@@ -35,9 +35,9 @@
 
 using namespace KCal;
 
-ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent,
+ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *tqparent,
                                                         const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -75,9 +75,9 @@ void ResourceCachedReloadConfig::slotIntervalStateChanged( int state )
 }
 
 
-ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent,
+ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *tqparent,
                                                         const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index fae77c33..16364f42 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -36,11 +36,12 @@ class ResourceCached;
   
   @see ResourceCached
 */
-class KDE_EXPORT ResourceCachedReloadConfig : public QWidget
+class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceCachedReloadConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     void loadSettings( ResourceCached *resource );
@@ -62,11 +63,12 @@ class KDE_EXPORT ResourceCachedReloadConfig : public QWidget
   
   @see ResourceCached
 */
-class KDE_EXPORT ResourceCachedSaveConfig : public QWidget
+class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceCachedSaveConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     void loadSettings( ResourceCached *resource );
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index 91f3d1ae..03318737 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -57,6 +57,7 @@ class CalFormat;
 class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceCalendar( const KConfig * );
     virtual ~ResourceCalendar();
@@ -385,10 +386,10 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
     virtual bool removeSubresource( const TQString& resource );
 
     /**
-     * Add a subresource with the name @param resource and the parent
-     * id @param parent.
+     * Add a subresource with the name @param resource and the tqparent
+     * id @param tqparent.
      */
-    virtual bool addSubresource( const TQString& resource, const TQString& parent );
+    virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
 
     /**
      * Returns the type of the subresource: "event", "todo" or "journal",
@@ -440,11 +441,11 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
     /**
       A resource should call this function if a load error happens.
     */
-    void loadError( const TQString &errorMessage = TQString::null );
+    void loadError( const TQString &errorMessage = TQString() );
     /**
       A resource should call this function if a save error happens.
     */
-    void saveError( const TQString &errorMessage = TQString::null );
+    void saveError( const TQString &errorMessage = TQString() );
 
   private:
     bool mReceivedLoadError;
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index ce0a112b..a5043a3f 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -45,6 +45,7 @@ class CalFormat;
 class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ResourceLocalConfig;
 
diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp
index 49728fe6..65b3cfe7 100644
--- a/libkcal/resourcelocalconfig.cpp
+++ b/libkcal/resourcelocalconfig.cpp
@@ -40,8 +40,8 @@
 
 using namespace KCal;
 
-ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceLocalConfig::ResourceLocalConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index 796355bc..fbd0d00f 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -42,8 +42,9 @@ namespace KCal {
 class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceLocalConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource);
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index e1316f21..c83d5128 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -45,6 +45,7 @@ class Incidence;
 class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ResourceLocalDirConfig;
 
diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp
index df2412b3..263d1ce2 100644
--- a/libkcal/resourcelocaldirconfig.cpp
+++ b/libkcal/resourcelocaldirconfig.cpp
@@ -39,8 +39,8 @@
 
 using namespace KCal;
 
-ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h
index 5588d36e..df1e682b 100644
--- a/libkcal/resourcelocaldirconfig.h
+++ b/libkcal/resourcelocaldirconfig.h
@@ -44,8 +44,9 @@ namespace KCal {
 class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceLocalDirConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource);
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 4622716a..54709eb4 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -39,14 +39,14 @@
 
 using namespace KCal;
 
-ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::Status status)
+ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::tqStatus status)
 {
   mIncidence = incidence;
   mMethod = method;
-  mStatus = status;
+  mtqStatus = status;
 }
 
-TQString ScheduleMessage::statusName(ScheduleMessage::Status status)
+TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status)
 {
   switch (status) {
     case PublishUpdate:
@@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::Status status)
     case RequestUpdate:
       return i18n("Updated Request");
     default:
-      return i18n("Unknown Status: %1").arg(TQString::number(status));
+      return i18n("Unknown tqStatus: %1").arg(TQString::number(status));
   }
 }
 
@@ -99,7 +99,7 @@ FreeBusyCache *Scheduler::freeBusyCache() const
 
 bool Scheduler::acceptTransaction( IncidenceBase *incidence,
                                    Method method,
-                                   ScheduleMessage::Status status,
+                                   ScheduleMessage::tqStatus status,
                                    const TQString &attendee )
 {
   kdDebug(5800) << "Scheduler::acceptTransaction, method="
@@ -183,7 +183,7 @@ bool Scheduler::deleteTransaction(IncidenceBase *)
 }
 
 bool Scheduler::acceptPublish( IncidenceBase *newIncBase,
-                               ScheduleMessage::Status status, Method method )
+                               ScheduleMessage::tqStatus status, Method method )
 {
   if( newIncBase->type() == "FreeBusy" ) {
     return acceptFreeBusy( newIncBase, method );
@@ -225,7 +225,7 @@ bool Scheduler::acceptPublish( IncidenceBase *newIncBase,
 }
 
 bool Scheduler::acceptRequest( IncidenceBase *incidence,
-                               ScheduleMessage::Status status,
+                               ScheduleMessage::tqStatus status,
                                const TQString &attendee )
 {
   Incidence *inc = static_cast<Incidence *>(incidence);
@@ -330,13 +330,13 @@ bool Scheduler::acceptRequest( IncidenceBase *incidence,
     return false;
   }
 
-  // FIXME: This is a nasty hack, since we need to set a parent for the
+  // FIXME: This is a nasty hack, since we need to set a tqparent for the
   //        resource selection dialog. However, we don't have any UI methods
   //        in the calendar, only in the CalendarResources::DestinationPolicy
   //        So we need to type-cast it and extract it from the CalendarResources
-  TQWidget *tmpparent = 0;
+  TQWidget *tmptqparent = 0;
   if ( stdcal ) {
-    tmpparent = stdcal->dialogParentWidget();
+    tmptqparent = stdcal->dialogParentWidget();
     stdcal->setDialogParentWidget( 0 );
   }
 
@@ -389,14 +389,14 @@ TryAgain:
   return true;
 }
 
-bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;
 }
 
 bool Scheduler::acceptCancel( IncidenceBase *incidence,
-                              ScheduleMessage::Status status,
+                              ScheduleMessage::tqStatus status,
                               const TQString &attendee )
 {
   Incidence *inc = static_cast<Incidence *>( incidence );
@@ -492,7 +492,7 @@ bool Scheduler::acceptCancel( IncidenceBase *incidence,
   return ret;
 }
 
-bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   const IncidenceBase *toDelete = mCalendar->incidenceFromSchedulingID( incidence->uid() );
 
@@ -525,19 +525,19 @@ bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /*
   return ret;
 }
 
-bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;
 }
 
-//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::Status status)
+//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::tqStatus status)
 //{
 //  deleteTransaction(incidence);
 //  return false;
 //}
 
-bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* status */, Method method)
+bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */, Method method)
 {
   if(incidence->type()=="FreeBusy") {
     return acceptFreeBusy(incidence, method);
@@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
         if (attIn->email().lower()==attEv->email().lower()) {
           //update attendee-info
           kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl;
-          attEv->seStatus(attIn->status());
+          attEv->setqStatus(attIn->status());
           attEv->setDelegate(attIn->delegate());
           attEv->setDelegator(attIn->delegator());
           ret = true;
@@ -668,14 +668,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
   return ret;
 }
 
-bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   // handled in korganizer's IncomingDialog
   deleteTransaction(incidence);
   return false;
 }
 
-bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;
diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index bf22c9c8..ceeace4a 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -47,14 +47,14 @@ class ScheduleMessage
     /**
       Message status.
     */
-    enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew,
+    enum tqStatus { PublishNew, PublishUpdate, Obsolete, RequestNew,
                   RequestUpdate, Unknown };
 
     /**
       Create a scheduling message with method as defined in Scheduler::Method
       and a status.
     */
-    ScheduleMessage( IncidenceBase *, int method, Status status );
+    ScheduleMessage( IncidenceBase *, int method, tqStatus status );
     ~ScheduleMessage() {};
 
     /**
@@ -68,7 +68,7 @@ class ScheduleMessage
     /**
       Return status of this message.
     */
-    Status status() { return mStatus; }
+    tqStatus status() { return mtqStatus; }
     /**
       Return error message if there is any.
     */
@@ -77,12 +77,12 @@ class ScheduleMessage
     /**
       Return a human-readable name for an iTIP message status.
     */
-    static TQString statusName( Status status );
+    static TQString statusName( tqStatus status );
 
   private:
     IncidenceBase *mIncidence;
     int mMethod;
-    Status mStatus;
+    tqStatus mtqStatus;
     TQString mError;
 
     class Private;
@@ -140,8 +140,8 @@ class LIBKCAL_EXPORT Scheduler
       on who's behalf this transaction is to be performed.
     */
     bool acceptTransaction( IncidenceBase *, Method method,
-                            ScheduleMessage::Status status,
-                            const TQString& attendee = TQString::null );
+                            ScheduleMessage::tqStatus status,
+                            const TQString& attendee = TQString() );
 
     /**
       Return a machine-readable name for a iTIP method.
@@ -169,20 +169,20 @@ class LIBKCAL_EXPORT Scheduler
     FreeBusyCache *freeBusyCache() const;
 
   protected:
-    bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status,
+    bool acceptPublish( IncidenceBase *, ScheduleMessage::tqStatus status,
                         Method method );
-    bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status,
+    bool acceptRequest( IncidenceBase *, ScheduleMessage::tqStatus status,
                         const TQString & attendee );
-    bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status );
-    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
-    bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status,
+    bool acceptAdd( IncidenceBase *, ScheduleMessage::tqStatus status );
+    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status );
+    bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status,
                        const TQString & attendee );
     bool acceptDeclineCounter( IncidenceBase *,
-                               ScheduleMessage::Status status );
-    bool acceptReply( IncidenceBase *, ScheduleMessage::Status status,
+                               ScheduleMessage::tqStatus status );
+    bool acceptReply( IncidenceBase *, ScheduleMessage::tqStatus status,
                       Method method );
-    bool acceptRefresh( IncidenceBase *, ScheduleMessage::Status status );
-    bool acceptCounter( IncidenceBase *, ScheduleMessage::Status status );
+    bool acceptRefresh( IncidenceBase *, ScheduleMessage::tqStatus status );
+    bool acceptCounter( IncidenceBase *, ScheduleMessage::tqStatus status );
     bool acceptFreeBusy( IncidenceBase *, Method method );
 
     Calendar *mCalendar;
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index a6117088..bb95d1f3 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -58,8 +58,8 @@ int main(int argc,char **argv)
     return 1;
   }
 
-  // 2 tests... first uid should result in a syncStatus of 0.  second uid
-  // should have a new summary and a 1 for syncStatus.
+  // 2 tests... first uid should result in a synctqStatus of 0.  second uid
+  // should have a new summary and a 1 for synctqStatus.
   TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965");
   TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967");
 
@@ -78,7 +78,7 @@ int main(int argc,char **argv)
 
   if (e->pilotId()) {
     kdDebug() << "Pilot ID = " << e->pilotId() << endl;
-    kdDebug() << "Pilot Sync Status = " << e->syncStatus() << endl;
+    kdDebug() << "Pilot Sync tqStatus = " << e->synctqStatus() << endl;
   } else {
     kdError() << "No Pilot ID" << endl;
     return 1;
@@ -86,7 +86,7 @@ int main(int argc,char **argv)
 
   kdDebug() << "First test passed.  Able to read fields." << endl;
 
-  e->setSyncStatus(KCal::Incidence::SYNCNONE);
+  e->setSynctqStatus(KCal::Incidence::SYNCNONE);
 
   TQString newSummary = TQString::tqfromLatin1("Mooo summary");
 
@@ -120,7 +120,7 @@ int main(int argc,char **argv)
 
   TQFile::remove( filew );
 
-  // check for uid1--should have syncStatus of 0
+  // check for uid1--should have synctqStatus of 0
   e = cal2.event( uid1 );
   if (!e) {
     kdError() << "No event for first read test" << uid1 << endl;
@@ -131,13 +131,13 @@ int main(int argc,char **argv)
 
   if (e->pilotId()) {
     kdDebug() << "First Pilot ID = " << e->pilotId() << endl;
-    kdDebug() << "First Pilot Sync Status = " << e->syncStatus() << endl;
+    kdDebug() << "First Pilot Sync tqStatus = " << e->synctqStatus() << endl;
   } else {
     kdError() << "No Pilot ID for first test" << endl;
     return 1;
   }
 
-  if (e->syncStatus() != KCal::Incidence::SYNCNONE) {
+  if (e->synctqStatus() != KCal::Incidence::SYNCNONE) {
     kdError() << "Wrong Pilot sync status." << endl;
     return 1;
   }
@@ -154,13 +154,13 @@ int main(int argc,char **argv)
 
   if (f->pilotId()) {
     kdDebug() << "Second Pilot ID = " << f->pilotId() << endl;
-    kdDebug() << "Second Pilot Sync Status = " << f->syncStatus() << endl;
+    kdDebug() << "Second Pilot Sync tqStatus = " << f->synctqStatus() << endl;
   } else {
     kdError() << "No Pilot ID for second read test" << endl;
     return 1;
   }
 
-  if (f->syncStatus() != KCal::Incidence::SYNCMOD) {
+  if (f->synctqStatus() != KCal::Incidence::SYNCMOD) {
     kdError() << "Wrong Pilot sync status for second read test." << endl;
     return 1;
   }
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index ef9d62c8..ca65dbfd 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -109,7 +109,7 @@ int main( int argc, char **argv )
         dt = dt.addSecs( -1 );
         ++i;
         dt = incidence->recurrence()->getPreviousDateTime( dt );
-        (*outstream) << dt.toString( Qt::ISODate ) << endl;
+        (*outstream) << dt.toString( TQt::ISODate ) << endl;
       }
     } else {
       if ( !dt.isValid() ) dt = TQDateTime( TQDate( 2005, 7, 31 ), TQTime( 23, 59, 59 ) );
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 4d0a2fae..bc1c0d37 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -105,7 +105,7 @@ int main( int argc, char **argv )
         ++i;
         dt = dt.addSecs( 1 );
         dt = incidence->recurrence()->getNextDateTime( dt );
-        (*outstream) << dt.toString( Qt::ISODate ) << endl;
+        (*outstream) << dt.toString( TQt::ISODate ) << endl;
       }
     } else {
       incidence->recurrence()->dump();
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 4d0a2fae..bc1c0d37 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -105,7 +105,7 @@ int main( int argc, char **argv )
         ++i;
         dt = dt.addSecs( 1 );
         dt = incidence->recurrence()->getNextDateTime( dt );
-        (*outstream) << dt.toString( Qt::ISODate ) << endl;
+        (*outstream) << dt.toString( TQt::ISODate ) << endl;
       }
     } else {
       incidence->recurrence()->dump();
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index 343bad45..fe949f6d 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -102,14 +102,14 @@ int main( int argc, char **argv )
       // Output to file for testing purposes
       while ( dt.year() <= 2010 ) {
         if ( incidence->recursOn( dt ) )
-          (*outstream) << dt.toString( Qt::ISODate ) << endl;
+          (*outstream) << dt.toString( TQt::ISODate ) << endl;
         dt = dt.addDays( 1 );
       }
     } else {
       dt = TQDate( 2005, 1, 1 );
       while ( dt.year() < 2007 ) {
         if ( incidence->recursOn( dt ) )
-          kdDebug(5800) << dt.toString( Qt::ISODate ) << endl;
+          kdDebug(5800) << dt.toString( TQt::ISODate ) << endl;
         dt = dt.addDays( 1 );
       }
     }
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index cd5174e2..68251869 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
  
     KApplication app;
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-    TQString type = TQString::null;
+    TQString type = TQString();
     if ( args->getOption( "resource" ) )
       type = TQString::fromLocal8Bit( args->getOption( "resource" ) );
     KConfig *config = 0;
@@ -133,9 +133,9 @@ void TestResource::runAll()
 bool TestResource::check(const TQString& txt, TQString a, TQString b)
 {
     if (a.isEmpty())
-        a = TQString::null;
+        a = TQString();
     if (b.isEmpty())
-        b = TQString::null;
+        b = TQString();
     if (a == b) {
         kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
     }
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index 30e61aeb..848d7988 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -26,9 +26,10 @@ namespace KCal {
 
   class ResourceCalendar;
 
-class TestResource : public QObject
+class TestResource : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     TestResource( const TQString& type, KConfig *config );
diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp
index 853c5187..590263ab 100644
--- a/libkcal/vcaldrag.cpp
+++ b/libkcal/vcaldrag.cpp
@@ -26,8 +26,8 @@
 
 using namespace KCal;
 
-VCalDrag::VCalDrag( Calendar *cal, TQWidget *parent, const char *name )
-  : TQStoredDrag( "text/x-vCalendar", parent, name )
+VCalDrag::VCalDrag( Calendar *cal, TQWidget *tqparent, const char *name )
+  : TQStoredDrag( "text/x-vCalendar", tqparent, name )
 {
   VCalFormat format;
   setEncodedData( format.toString( cal ).utf8() );
diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h
index 8855ed5f..c139827a 100644
--- a/libkcal/vcaldrag.h
+++ b/libkcal/vcaldrag.h
@@ -32,13 +32,13 @@ class Calendar;
 /**
   vCalendar drag&drop class.
 */
-class KDE_EXPORT VCalDrag : public QStoredDrag
+class KDE_EXPORT VCalDrag : public TQStoredDrag
 {
   public:
     /**
       Create a drag&drop object for vCalendar component \a vcal.
     */
-    VCalDrag( Calendar *vcal, TQWidget *parent = 0, const char *name = 0 );
+    VCalDrag( Calendar *vcal, TQWidget *tqparent = 0, const char *name = 0 );
     ~VCalDrag() {}
 
     /**
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 21d8ae4b..40736a90 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -184,7 +184,7 @@ TQString VCalFormat::toString( Calendar *calendar )
   Event *event = events.first();
   if ( !event ) {
     cleanVObject( vcal );
-    return TQString::null;
+    return TQString();
   }
 
   VObject *vevent = eventToVEvent( event );
@@ -262,7 +262,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit());
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
-      addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
+      addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status()));
     }
   }
 
@@ -270,7 +270,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vtodo, VCDescriptionProp,
                               anEvent->description().local8Bit());
-    if (anEvent->description().find('\n') != -1)
+    if (anEvent->description().tqfind('\n') != -1)
       addPropValue(d, VCEncodingProp, VCQuotedPrintableProp);
   }
 
@@ -355,7 +355,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
     // pilot sync stuff
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
-    tmpStr.sprintf("%i",anEvent->syncStatus());
+    tmpStr.sprintf("%i",anEvent->synctqStatus());
     addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit());
   }
 
@@ -422,7 +422,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vevent, VCAttendeeProp, tmpStr.local8Bit());
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
-      addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
+      addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status()));
     }
   }
 
@@ -530,7 +530,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vevent, VCDescriptionProp,
                               anEvent->description().local8Bit());
-    if (anEvent->description().find('\n') != -1)
+    if (anEvent->description().tqfind('\n') != -1)
       addPropValue(d, VCEncodingProp, VCQuotedPrintableProp);
   }
 
@@ -641,7 +641,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
     // pilot sync stuff
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit());
-    tmpStr.sprintf("%i",anEvent->syncStatus());
+    tmpStr.sprintf("%i",anEvent->synctqStatus());
     addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit());
   }
 
@@ -658,7 +658,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 
   // creation date
   if ((vo = isAPropertyOf(vtodo, VCDCreatedProp)) != 0) {
-      anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+      anEvent->setCreated(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
@@ -673,7 +673,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 
   // last modification date
   if ((vo = isAPropertyOf(vtodo, VCLastModifiedProp)) != 0) {
-    anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setLastModified(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
@@ -701,13 +701,13 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
-      if ((emailPos1 = tmpStr.find('<')) > 0) {
+      if ((emailPos1 = tmpStr.tqfind('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
-      } else if (tmpStr.find('@') > 0) {
+      } else if (tmpStr.tqfind('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
@@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->seStatus(readStatus(vObjectStringZValue(vp)));
+        a->setqStatus(readtqStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -765,7 +765,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 
   // completion date
   if ((vo = isAPropertyOf(vtodo, VCCompletedProp)) != 0) {
-    anEvent->setCompleted(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setCompleted(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
@@ -777,7 +777,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 
   // due date
   if ((vo = isAPropertyOf(vtodo, VCDueProp)) != 0) {
-    anEvent->setDtDue(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setDtDue(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
     anEvent->setHasDueDate(true);
   } else {
@@ -786,8 +786,8 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 
   // start time
   if ((vo = isAPropertyOf(vtodo, VCDTstartProp)) != 0) {
-    anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
-    //    kdDebug(5800) << "s is " << //          s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
+    anEvent->setDtStart(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    //    kdDebug(5800) << "s is " << //          s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     anEvent->setHasStartDate(true);
   } else {
@@ -800,7 +800,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
     Alarm* alarm = anEvent->newAlarm();
     VObject *a;
     if ((a = isAPropertyOf(vo, VCRunTimeProp))) {
-      alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a))));
+      alarm->setTime(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(a))));
       deleteStr(s);
     }
     alarm->setEnabled(true);
@@ -845,11 +845,11 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
     anEvent->setPilotId(0);
 
   if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) {
-    anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
-    anEvent->setSyncStatus(Event::SYNCMOD);
+    anEvent->setSynctqStatus(Event::SYNCMOD);
 
   return anEvent;
 }
@@ -864,7 +864,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
   // creation date
   if ((vo = isAPropertyOf(vevent, VCDCreatedProp)) != 0) {
-      anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+      anEvent->setCreated(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
@@ -888,7 +888,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
   // last modification date
   if ((vo = isAPropertyOf(vevent, VCLastModifiedProp)) != 0) {
-    anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setLastModified(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
@@ -917,13 +917,13 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
-      if ((emailPos1 = tmpStr.find('<')) > 0) {
+      if ((emailPos1 = tmpStr.tqfind('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
-      } else if (tmpStr.find('@') > 0) {
+      } else if (tmpStr.tqfind('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
@@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->seStatus(readStatus(vObjectStringZValue(vp)));
+        a->setqStatus(readtqStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -956,8 +956,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
   // start time
   if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) {
-    anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
-    //    kdDebug(5800) << "s is " << //          s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
+    anEvent->setDtStart(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    //    kdDebug(5800) << "s is " << //          s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     if (anEvent->dtStart().time().isNull())
       anEvent->setFloats(TRUE);
@@ -965,7 +965,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
   // stop time
   if ((vo = isAPropertyOf(vevent, VCDTendProp)) != 0) {
-    anEvent->setDtEnd(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setDtEnd(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
       if (anEvent->dtEnd().time().isNull())
         anEvent->setFloats(TRUE);
@@ -1012,7 +1012,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 // kdDebug() << " It's a supported type " << endl;
 
       // Immediately after the type is the frequency
-      int index = tmpStr.find(' ');
+      int index = tmpStr.tqfind(' ');
       int last = tmpStr.findRev(' ') + 1; // find last entry
       int rFreq = tmpStr.mid(typelen, (index-1)).toInt();
       ++index; // advance to beginning of stuff after freq
@@ -1086,7 +1086,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
              else {
                // e.g. MD1 3 #0
                while (index < last) {
-                 int index2 = tmpStr.find(' ', index);
+                 int index2 = tmpStr.tqfind(' ', index);
                  short tmpDay = tmpStr.mid(index, (index2-index)).toShort();
                  index = index2-1;
                  if (tmpStr.mid(index, 1) == "-")
@@ -1108,7 +1108,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
              else {
                // e.g. YM1 3 #0
                while (index < last) {
-                 int index2 = tmpStr.find(' ', index);
+                 int index2 = tmpStr.tqfind(' ', index);
                  short tmpMonth = tmpStr.mid(index, (index2-index)).toShort();
                  index = index2 + 1;
                  anEvent->recurrence()->addYearlyMonth( tmpMonth );
@@ -1127,7 +1127,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
              else {
                // e.g. YD1 123 #0
                while (index < last) {
-                 int index2 = tmpStr.find(' ', index);
+                 int index2 = tmpStr.tqfind(' ', index);
                  short tmpDay = tmpStr.mid(index, (index2-index)).toShort();
                  index = index2+1;
                  anEvent->recurrence()->addYearlyDay( tmpDay );
@@ -1146,8 +1146,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if ( rDuration > 0 )
           anEvent->recurrence()->setDuration( rDuration );
-      } else if ( tmpStr.find('T', index) != -1 ) {
-        TQDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
+      } else if ( tmpStr.tqfind('T', index) != -1 ) {
+        TQDate rEndDate = (ISOToTQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setEndDateTime( rEndDate );
       }
 // anEvent->recurrence()->dump();
@@ -1164,7 +1164,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     TQStringList exDates = TQStringList::split(",",s);
     TQStringList::ConstIterator it;
     for(it = exDates.begin(); it != exDates.end(); ++it ) {
-      anEvent->recurrence()->addExDate(ISOToQDate(*it));
+      anEvent->recurrence()->addExDate(ISOToTQDate(*it));
     }
     deleteStr(s);
   }
@@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
 // TODO: Define Event status
-//    anEvent->seStatus(tmpStr);
+//    anEvent->setqStatus(tmpStr);
   }
   else
-//    anEvent->seStatus("NEEDS ACTION");
+//    anEvent->setqStatus("NEEDS ACTION");
 #endif
 
   // secrecy
@@ -1262,7 +1262,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     Alarm* alarm = anEvent->newAlarm();
     VObject *a;
     if ((a = isAPropertyOf(vo, VCRunTimeProp))) {
-      alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a))));
+      alarm->setTime(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(a))));
       deleteStr(s);
     }
     alarm->setEnabled(true);
@@ -1311,11 +1311,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     anEvent->setPilotId(0);
 
   if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) {
-    anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
-    anEvent->setSyncStatus(Event::SYNCMOD);
+    anEvent->setSynctqStatus(Event::SYNCMOD);
 
   return anEvent;
 }
@@ -1372,7 +1372,7 @@ TQString VCalFormat::qDateTimeToISO(const TQDateTime &qdt, bool zulu)
   return tmpStr;
 }
 
-TQDateTime VCalFormat::ISOToQDateTime(const TQString & dtStr)
+TQDateTime VCalFormat::ISOToTQDateTime(const TQString & dtStr)
 {
   TQDate tmpDate;
   TQTime tmpTime;
@@ -1399,7 +1399,7 @@ TQDateTime VCalFormat::ISOToQDateTime(const TQString & dtStr)
   return tmpDT;
 }
 
-TQDate VCalFormat::ISOToQDate(const TQString &dateStr)
+TQDate VCalFormat::ISOToTQDate(const TQString &dateStr)
 {
   int year, month, day;
 
@@ -1565,7 +1565,7 @@ int VCalFormat::numFromDay(const TQString &day)
   return -1; // something bad happened. :)
 }
 
-Attendee::PartStat VCalFormat::readStatus(const char *s) const
+Attendee::PartStat VCalFormat::readtqStatus(const char *s) const
 {
   TQString statStr = s;
   statStr = statStr.upper();
@@ -1590,14 +1590,14 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const
   else if (statStr== "DELEGATED")
     status = Attendee::Delegated;
   else {
-    kdDebug(5800) << "error setting attendee mStatus, unknown mStatus!" << endl;
+    kdDebug(5800) << "error setting attendee mtqStatus, unknown mtqStatus!" << endl;
     status = Attendee::NeedsAction;
   }
 
   return status;
 }
 
-TQCString VCalFormat::writeStatus(Attendee::PartStat status) const
+TQCString VCalFormat::writetqStatus(Attendee::PartStat status) const
 {
   switch(status) {
     default:
diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h
index cb51f417..0e1818a2 100644
--- a/libkcal/vcalformat.h
+++ b/libkcal/vcalformat.h
@@ -89,10 +89,10 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat
     TQString qDateTimeToISO(const TQDateTime &, bool zulu=TRUE);
     /** takes a string in the format YYYYMMDDTHHMMSS and returns a
      * valid TQDateTime. */
-    TQDateTime ISOToQDateTime(const TQString & dtStr);
+    TQDateTime ISOToTQDateTime(const TQString & dtStr);
     /** takes a string in the format YYYYMMDD and returns a
      * valid TQDate. */
-    TQDate ISOToQDate(const TQString & dtStr);
+    TQDate ISOToTQDate(const TQString & dtStr);
     /** takes a vCalendar tree of VObjects, and puts all of them that have
      * the "event" property into the dictionary, todos in the todo-list, etc. */
     void populate(VObject *vcal);
@@ -103,8 +103,8 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat
     /** the reverse of the above function. */
     int numFromDay(const TQString &day);
 
-    Attendee::PartStat readStatus(const char *s) const;
-    TQCString writeStatus(Attendee::PartStat status) const;
+    Attendee::PartStat readtqStatus(const char *s) const;
+    TQCString writetqStatus(Attendee::PartStat status) const;
 
   private:
     Calendar *mCalendar;
diff --git a/libkcal/versit/port.h b/libkcal/versit/port.h
index afc16dd4..0052b700 100644
--- a/libkcal/versit/port.h
+++ b/libkcal/versit/port.h
@@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.
 
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt
index 5f38fe00..c03ba9b5 100644
--- a/libkcal/versit/readme.txt
+++ b/libkcal/versit/readme.txt
@@ -228,10 +228,10 @@ Use the API isAPropertyOf() to query if a name match the name of
 VObject tree can be pretty printed with the printVObject() function.
 The output of pretty printing a VObject representation of the input
 test file "vobject.vcf" is shown below. Note that the indentation
-indicates the tree hirerarchy where the immediate children nodes
-of a parent node is all at the same indentation level and the
-immediate children nodes are the immediate properties of the
-associated parent nodes.  In the following, {N,FN,ORG,TITLE,...}
+indicates the tree hirerarchy where the immediate tqchildren nodes
+of a tqparent node is all at the same indentation level and the
+immediate tqchildren nodes are the immediate properties of the
+associated tqparent nodes.  In the following, {N,FN,ORG,TITLE,...}
 are immediate properties of VCARD. {F and G} are properties of N
 with value {"Alden" and "Roland"} respectively; FN has no property
 but has the value "Roland H. Alden"; EMAIL has value and
@@ -391,7 +391,7 @@ c. values of a property is determined by the property definition
 	itself. The vobject APIs does not attempt to enforce
 	any of such definition. It is the consumer responsibility
 	to know what value is expected from a property. e.g
-	most properties have unicode string value, so to access
+	most properties have tqunicode string value, so to access
 	the value of these type of properties, you will use
 	the vObjectUStringZValue() to read the value and
 	setVObjectUStringZValue() to set or modify the value.
@@ -498,7 +498,7 @@ d. properties name (id) are case incensitive.
 
 	const wchar_t* vObjectUStringZValue(VObject *o);
 	    -- retrieve the VObject's value interpreted as
-		null-terminated unicode string.
+		null-terminated tqunicode string.
 
 	unsigned int vObjectIntegerValue(VObject *o);
 	    -- retrieve the VObject's value interpreted as
@@ -578,7 +578,7 @@ d. properties name (id) are case incensitive.
 		-- convert char* to wchar_t*.
 
 	extern int uStrLen(const wchar_t *u);
-		-- length of unicode u.
+		-- length of tqunicode u.
 
 	char *fakeCString(const wchar_t *u);
 		-- convert wchar_t to CString (blindly assumes that
diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c
index 0dfc6bff..1ff36f7d 100644
--- a/libkcal/versit/vcc.c
+++ b/libkcal/versit/vcc.c
@@ -122,7 +122,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
@@ -259,7 +259,7 @@ enum LexMode {
 	L_VTODO,
 	L_VALUES,
 	L_BASE64,
-	L_QUOTED_PRINTABLE
+	L_TQUOTED_PRINTABLE
 	};
 
 /****  Private Forward Declarations  ****/
@@ -1288,7 +1288,7 @@ yyreduce:
   case 15:
 #line 259 "vcc.y"
     {
-	if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
+	if (lexWithinMode(L_BASE64) || lexWithinMode(L_TQUOTED_PRINTABLE))
 	   lexPopMode(0);
 	lexPopMode(0);
 	;}
@@ -1750,7 +1750,7 @@ static void enterAttr(const char *s1, const char *s2)
 	lexPushMode(L_BASE64);
     else if (strcasecmp(p1,VCQuotedPrintableProp) == 0
 	    || (s2 && strcasecmp(p2,VCQuotedPrintableProp)==0))
-	lexPushMode(L_QUOTED_PRINTABLE);
+	lexPushMode(L_TQUOTED_PRINTABLE);
     deleteStr(s1); deleteStr(s2);
     }
 
@@ -2329,7 +2329,7 @@ static int yylex() {
 		yylval.str = p;
 		return STRING;
 		}
-	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
+	    else if (lexWithinMode(L_TQUOTED_PRINTABLE)) {
 		p = lexGetQuotedPrintable();
 		}
 	    else {
diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h
index 03886d16..0c160910 100644
--- a/libkcal/versit/vcc.h
+++ b/libkcal/versit/vcc.h
@@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c
index e6a19472..e52cecbe 100644
--- a/libkcal/versit/vobject.c
+++ b/libkcal/versit/vobject.c
@@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
@@ -867,7 +867,7 @@ static struct PreDefProp propNames[] = {
     { VCPronunciationProp, 0, 0, 0 },
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCTQPProp, VCQuotedPrintableProp, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
@@ -1106,7 +1106,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
     unsigned long trip;
     unsigned char b;
     char quad[5];
-#define MAXQUADS 16
+#define MAXTQUADS 16
 
     quad[4] = 0;
 
@@ -1133,8 +1133,8 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 	/* now output 'quad' with appropriate whitespace and line ending */
 	appendsOFile(fp, (numQuads == 0 ? "    " : ""));
 	appendsOFile(fp, quad);
-	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
-	numQuads = (numQuads + 1) % MAXQUADS;
+	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXTQUADS-1?"\n" : "")));
+	numQuads = (numQuads + 1) % MAXTQUADS;
 	}
     appendcOFile(fp,'\n');
 
@@ -1142,7 +1142,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 }
 
 /* this function really sucks.  Too basic. */
-static void writeQPString(OFile *fp, const char *s, int qp)
+static void writeTQPString(OFile *fp, const char *s, int qp)
 {
     const char *p = s;
     while (*p) {
@@ -1166,17 +1166,17 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size)
 	case VCVT_USTRINGZ: {
 	    char *s = fakeCString(USTRINGZ_VALUE_OF(o));
 	    if (isAPropertyOf(o, VCQuotedPrintableProp))
-	      writeQPString(fp, s, 1);
+	      writeTQPString(fp, s, 1);
 	    else
-	      writeQPString(fp, s, 0);
+	      writeTQPString(fp, s, 0);
 	    deleteStr(s);
 	    break;
 	    }
 	case VCVT_STRINGZ: {
 	    if (isAPropertyOf(o, VCQuotedPrintableProp))
-	      writeQPString(fp, STRINGZ_VALUE_OF(o), 1);
+	      writeTQPString(fp, STRINGZ_VALUE_OF(o), 1);
 	    else
-	      writeQPString(fp, STRINGZ_VALUE_OF(o), 0);
+	      writeTQPString(fp, STRINGZ_VALUE_OF(o), 0);
 	    break;
 	    }
 	case VCVT_UINT: {
diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index c84d4c8a..835a4b13 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
@@ -206,9 +206,9 @@ extern "C" {
 #define VCPronunciationProp		"SOUND"
 #define VCPSProp				"PS"
 #define VCPublicKeyProp			"KEY"
-#define VCQPProp				"QP"
-#define VCQuickTimeProp			"QTIME"
-#define VCQuotedPrintableProp	"QUOTED-PRINTABLE"
+#define VCTQPProp				"QP"
+#define VCQuickTimeProp			"TQTIME"
+#define VCQuotedPrintableProp	"TQUOTED-PRINTABLE"
 #define VCRDateProp				"RDATE"
 #define VCRegionProp			"R"
 #define VCRelatedToProp			"RELATED-TO"
diff --git a/libkdenetwork/gpgmepp/encryptionresult.cpp b/libkdenetwork/gpgmepp/encryptionresult.cpp
index f827ca83..cad520ba 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.cpp
+++ b/libkdenetwork/gpgmepp/encryptionresult.cpp
@@ -94,8 +94,8 @@ std::vector<GpgME::InvalidRecipient> GpgME::EncryptionResult::invalidEncryptionK
 
 
 
-GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * parent, unsigned int i )
-  : d( parent ), idx( i )
+GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int i )
+  : d( tqparent ), idx( i )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h
index 7267afc0..0624779d 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.h
+++ b/libkdenetwork/gpgmepp/encryptionresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
 
   class KDE_EXPORT InvalidRecipient {
     friend class EncryptionResult;
-    InvalidRecipient( EncryptionResult::Private * parent, unsigned int index );
+    InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int index );
   public:
     InvalidRecipient();
     InvalidRecipient( const InvalidRecipient & other );
diff --git a/libkdenetwork/gpgmepp/eventloopinteractor.h b/libkdenetwork/gpgmepp/eventloopinteractor.h
index 5a07490d..f924569e 100644
--- a/libkdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libkdenetwork/gpgmepp/eventloopinteractor.h
@@ -34,7 +34,7 @@ namespace GpgME {
       \brief Abstract base class for gpgme's external event loop support
 
       This class does most of the work involved with hooking GpgME++
-      up with external event loops, such as the GTK or Qt ones.
+      up with external event loops, such as the GTK or TQt ones.
 
       It actually provides two interfaces: An interface to the gpgme
       IO Callback handling and one for gpgme events. The IO Callback
@@ -67,7 +67,7 @@ namespace GpgME {
       and return a tag identifying that particular watching process
       uniquely. This could be the index into an array of objects you
       use for that purpose or the address of such an object. E.g. in
-      Qt, you'd essentially just create a new \c TQSocketNotifier:
+      TQt, you'd essentially just create a new \c TQSocketNotifier:
 
       \verbatim
       void * registerWatcher( int fd, Direction dir ) {
diff --git a/libkdenetwork/gpgmepp/importresult.cpp b/libkdenetwork/gpgmepp/importresult.cpp
index d23c195e..7acd35e4 100644
--- a/libkdenetwork/gpgmepp/importresult.cpp
+++ b/libkdenetwork/gpgmepp/importresult.cpp
@@ -140,8 +140,8 @@ std::vector<GpgME::Import> GpgME::ImportResult::imports() const {
 
 
 
-GpgME::Import::Import( ImportResult::Private * parent, unsigned int i )
-  : d( parent ), idx( i )
+GpgME::Import::Import( ImportResult::Private * tqparent, unsigned int i )
+  : d( tqparent ), idx( i )
 {
   if ( d )
     d->ref();
@@ -190,7 +190,7 @@ GpgME::Error GpgME::Import::error() const {
   return isNull() ? 0 : d->imports[idx]->result ;
 }
 
-GpgME::Import::Status GpgME::Import::status() const {
+GpgME::Import::tqStatus GpgME::Import::status() const {
   if ( isNull() )
     return Unknown;
   unsigned int s = d->imports[idx]->status;
@@ -200,5 +200,5 @@ GpgME::Import::Status GpgME::Import::status() const {
   if ( s & GPGME_IMPORT_SIG )    result |= NewSignatures;
   if ( s & GPGME_IMPORT_SUBKEY ) result |= NewSubkeys;
   if ( s & GPGME_IMPORT_SECRET ) result |= ContainedSecretKey;
-  return static_cast<Status>( result );
+  return static_cast<tqStatus>( result );
 }
diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h
index 2bb1b61b..eae58a5d 100644
--- a/libkdenetwork/gpgmepp/importresult.h
+++ b/libkdenetwork/gpgmepp/importresult.h
@@ -70,7 +70,7 @@ namespace GpgME {
 
   class KDE_EXPORT Import {
     friend class ImportResult;
-    Import( ImportResult::Private * parent, unsigned int idx );
+    Import( ImportResult::Private * tqparent, unsigned int idx );
   public:
     Import();
     Import( const Import & other );
@@ -83,7 +83,7 @@ namespace GpgME {
     const char * fingerprint() const;
     Error error() const;
 
-    enum Status {
+    enum tqStatus {
       Unknown = 0x0,
       NewKey = 0x1,
       NewUserIDs = 0x2,
@@ -91,7 +91,7 @@ namespace GpgME {
       NewSubkeys = 0x8,
       ContainedSecretKey = 0x10
     };
-    Status status() const;
+    tqStatus status() const;
 
   private:
     ImportResult::Private * d;
diff --git a/libkdenetwork/gpgmepp/key.cpp b/libkdenetwork/gpgmepp/key.cpp
index cf70aaf0..d24a1d64 100644
--- a/libkdenetwork/gpgmepp/key.cpp
+++ b/libkdenetwork/gpgmepp/key.cpp
@@ -348,7 +348,7 @@ namespace GpgME {
     return !d || !d->key || !d->subkey;
   }
 
-  Key Subkey::parent() const {
+  Key Subkey::tqparent() const {
     return Key( d->key, true );
   }
 
@@ -496,7 +496,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid;
   }
 
-  Key UserID::parent() const {
+  Key UserID::tqparent() const {
     return Key( d->key, true );
   }
 
@@ -669,7 +669,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid || !d->sig;
   }
 
-  UserID UserID::Signature::parent() const {
+  UserID UserID::Signature::tqparent() const {
     return UserID( d->key, d->uid );
   }
 
@@ -733,7 +733,7 @@ namespace GpgME {
     return d->sig ? d->sig->sig_class : 0 ;
   }
 
-  UserID::Signature::Status UserID::Signature::status() const {
+  UserID::Signature::tqStatus UserID::Signature::status() const {
     if ( !d->sig )
       return GeneralError;
 
@@ -911,7 +911,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid || !d->sig || !d->nota;
   }
 
-  UserID::Signature UserID::Signature::Notation::parent() const {
+  UserID::Signature UserID::Signature::Notation::tqparent() const {
     return Signature( d->key, d->uid, d->sig );
   }
 
diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h
index c25e3a6f..9760e642 100644
--- a/libkdenetwork/gpgmepp/key.h
+++ b/libkdenetwork/gpgmepp/key.h
@@ -123,7 +123,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Key parent() const;
+    Key tqparent() const;
 
     const char * keyID() const;
     const char * fingerprint() const;
@@ -171,7 +171,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Key parent() const;
+    Key tqparent() const;
 
     unsigned int numSignatures() const;
     Signature signature( unsigned int index ) const;
@@ -213,7 +213,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    UserID parent() const;
+    UserID tqparent() const;
 
     const char * signerKeyID() const;
 
@@ -235,9 +235,9 @@ namespace GpgME {
 
     unsigned int certClass() const;
 
-    enum Status { NoError = 0, SigExpired, KeyExpired,
+    enum tqStatus { NoError = 0, SigExpired, KeyExpired,
 		  BadSignature, NoPublicKey, GeneralError };
-    Status status() const;
+    tqStatus status() const;
     const char * statusAsString() const;
 
     const char * policyURL() const;
@@ -270,7 +270,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Signature parent() const;
+    Signature tqparent() const;
 
     const char * name() const;
     const char * value() const;
diff --git a/libkdenetwork/gpgmepp/signingresult.cpp b/libkdenetwork/gpgmepp/signingresult.cpp
index 6996eef7..6dab4d71 100644
--- a/libkdenetwork/gpgmepp/signingresult.cpp
+++ b/libkdenetwork/gpgmepp/signingresult.cpp
@@ -116,8 +116,8 @@ std::vector<GpgME::InvalidSigningKey> GpgME::SigningResult::invalidSigningKeys()
 
 
 
-GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * parent, unsigned int i )
-  : d( parent ), idx( i )
+GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * tqparent, unsigned int i )
+  : d( tqparent ), idx( i )
 {
   if ( d )
     d->ref();
@@ -165,8 +165,8 @@ GpgME::Error GpgME::InvalidSigningKey::reason() const {
 
 
 
-GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * parent, unsigned int i )
-  : d( parent ), idx( i )
+GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * tqparent, unsigned int i )
+  : d( tqparent ), idx( i )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h
index 202d09b4..facf8979 100644
--- a/libkdenetwork/gpgmepp/signingresult.h
+++ b/libkdenetwork/gpgmepp/signingresult.h
@@ -64,7 +64,7 @@ namespace GpgME {
 
   class KDE_EXPORT InvalidSigningKey {
     friend class SigningResult;
-    InvalidSigningKey( SigningResult::Private * parent, unsigned int index );
+    InvalidSigningKey( SigningResult::Private * tqparent, unsigned int index );
   public:
     InvalidSigningKey();
     InvalidSigningKey( const InvalidSigningKey & other );
@@ -86,7 +86,7 @@ namespace GpgME {
 
   class KDE_EXPORT CreatedSignature {
     friend class SigningResult;
-    CreatedSignature( SigningResult::Private * parent, unsigned int index );
+    CreatedSignature( SigningResult::Private * tqparent, unsigned int index );
   public:
     class Notation;
 
diff --git a/libkdenetwork/gpgmepp/verificationresult.cpp b/libkdenetwork/gpgmepp/verificationresult.cpp
index abf30d96..e4f905d8 100644
--- a/libkdenetwork/gpgmepp/verificationresult.cpp
+++ b/libkdenetwork/gpgmepp/verificationresult.cpp
@@ -121,8 +121,8 @@ std::vector<GpgME::Signature> GpgME::VerificationResult::signatures() const {
 
 
 
-GpgME::Signature::Signature( VerificationResult::Private * parent, unsigned int i )
-  : d( parent ), idx( i )
+GpgME::Signature::Signature( VerificationResult::Private * tqparent, unsigned int i )
+  : d( tqparent ), idx( i )
 {
   if ( d )
     d->ref();
@@ -253,8 +253,8 @@ std::vector<GpgME::Signature::Notation> GpgME::Signature::notations() const {
 }
 
 
-GpgME::Signature::Notation::Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex )
-  : d( parent ), sidx( sindex ), nidx( nindex )
+GpgME::Signature::Notation::Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex )
+  : d( tqparent ), sidx( sindex ), nidx( nindex )
 {
   if ( d )
     d->ref();
@@ -338,7 +338,7 @@ std::ostream & GpgME::operator<<( std::ostream & os, const Signature & sig ) {
     if ( !sig.isNull() ) {
         os << "\n Summary:           " << sig.summary()
            << "\n Fingerprint:       " << protect( sig.fingerprint() )
-           << "\n Status:            " << sig.status()
+           << "\n tqStatus:            " << sig.status()
            << "\n creationTime:      " << sig.creationTime()
            << "\n expirationTime:    " << sig.expirationTime()
            << "\n wrongKeyUsage:     " << sig.wrongKeyUsage()
diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h
index edcd0278..c5c14aab 100644
--- a/libkdenetwork/gpgmepp/verificationresult.h
+++ b/libkdenetwork/gpgmepp/verificationresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
 
   class KDE_EXPORT Signature {
     friend class VerificationResult;
-    Signature( VerificationResult::Private * parent, unsigned int index );
+    Signature( VerificationResult::Private * tqparent, unsigned int index );
   public:
     class Notation;
 
@@ -118,7 +118,7 @@ namespace GpgME {
 
   class KDE_EXPORT Signature::Notation {
     friend class Signature;
-    Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex );
+    Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex );
   public:
     Notation();
     Notation( const Notation & other );
diff --git a/libkdenetwork/libgpg-error-copy/err-codes.h.in b/libkdenetwork/libgpg-error-copy/err-codes.h.in
index de9e9df3..d9bef00c 100644
--- a/libkdenetwork/libgpg-error-copy/err-codes.h.in
+++ b/libkdenetwork/libgpg-error-copy/err-codes.h.in
@@ -213,10 +213,10 @@
 
 201	GPG_ERR_SEXP_INV_LEN_SPEC	Invalid length specifier in S-expression
 202	GPG_ERR_SEXP_STRING_TOO_LONG	String too long in S-expression
-203	GPG_ERR_SEXP_UNMATCHED_PAREN	Unmatched parentheses in S-expression
+203	GPG_ERR_SEXP_UNMATCHED_PAREN	Unmatched tqparentheses in S-expression
 204	GPG_ERR_SEXP_NOT_CANONICAL	S-expression not canonical
 205	GPG_ERR_SEXP_BAD_CHARACTER	Bad character in S-expression
-206	GPG_ERR_SEXP_BAD_QUOTATION	Bad quotation in S-expression
+206	GPG_ERR_SEXP_BAD_TQUOTATION	Bad quotation in S-expression
 207	GPG_ERR_SEXP_ZERO_PREFIX	Zero prefix in S-expression
 208	GPG_ERR_SEXP_NESTED_DH		Nested display hints in S-expression
 209	GPG_ERR_SEXP_UNMATCHED_DH	Unmatched display hints
@@ -237,7 +237,7 @@
 263	GPG_ERR_ASS_LINE_TOO_LONG	Line passed to IPC too long
 264	GPG_ERR_ASS_NESTED_COMMANDS	Nested IPC commands
 265	GPG_ERR_ASS_NO_DATA_CB		No data callback in IPC
-266	GPG_ERR_ASS_NO_INQUIRE_CB	No inquire callback in IPC
+266	GPG_ERR_ASS_NO_INTQUIRE_CB	No inquire callback in IPC
 267	GPG_ERR_ASS_NOT_A_SERVER	Not an IPC server
 268	GPG_ERR_ASS_NOT_A_CLIENT	Not an IPC client
 269	GPG_ERR_ASS_SERVER_START	Problem starting IPC server
@@ -252,7 +252,7 @@
 278	GPG_ERR_ASS_NO_INPUT		No input source for IPC
 279	GPG_ERR_ASS_NO_OUTPUT		No output source for IPC
 280	GPG_ERR_ASS_PARAMETER		IPC parameter error 
-281	GPG_ERR_ASS_UNKNOWN_INQUIRE	Unknown IPC inquire
+281	GPG_ERR_ASS_UNKNOWN_INTQUIRE	Unknown IPC inquire
 
 # 282 to 299 are reserved for future assuan codes.
 
diff --git a/libkdenetwork/libgpg-error-copy/gettext.h b/libkdenetwork/libgpg-error-copy/gettext.h
index 0cae5f45..fdb2511c 100644
--- a/libkdenetwork/libgpg-error-copy/gettext.h
+++ b/libkdenetwork/libgpg-error-copy/gettext.h
@@ -68,7 +68,7 @@
    translation is done at a different place in the code.
    The argument, String, should be a literal string.  Concatenated strings
    and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
+   The macro's expansion is not tqparenthesized, so that it is suitable as
    initializer for static 'char[]' or 'const char[]' variables.  */
 #define gettext_noop(String) String
 
diff --git a/libkdenetwork/libgpg-error-copy/gpg-error.h.in b/libkdenetwork/libgpg-error-copy/gpg-error.h.in
index 5211341f..cc1aaea8 100644
--- a/libkdenetwork/libgpg-error-copy/gpg-error.h.in
+++ b/libkdenetwork/libgpg-error-copy/gpg-error.h.in
@@ -198,8 +198,8 @@ const char *gpg_strerror (gpg_error_t err);
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   tqcontains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF tqcontains as much of the
+   contains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF contains as much of the
    beginning of the error string as fits into the buffer.  */
 int gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen);
 
diff --git a/libkdenetwork/libgpg-error-copy/strerror.c b/libkdenetwork/libgpg-error-copy/strerror.c
index 4de90de9..59b8e9ae 100644
--- a/libkdenetwork/libgpg-error-copy/strerror.c
+++ b/libkdenetwork/libgpg-error-copy/strerror.c
@@ -130,8 +130,8 @@ system_strerror_r (int no, char *buf, size_t buflen)
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   tqcontains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF tqcontains as much of the
+   contains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF contains as much of the
    beginning of the error string as fits into the buffer.  */
 int
 gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen)
diff --git a/libkdenetwork/libgpgme-copy/assuan/ChangeLog b/libkdenetwork/libgpgme-copy/assuan/ChangeLog
index a3b3f928..b53ac7fd 100644
--- a/libkdenetwork/libgpgme-copy/assuan/ChangeLog
+++ b/libkdenetwork/libgpgme-copy/assuan/ChangeLog
@@ -261,9 +261,9 @@
 	
 	* assuan.h [_ASSUAN_EXT_SYM_PREFIX]: New.
 	* assuan-io.c [_ASSUAN_NO_PTH]: New.
-	* assuan-pipe-connect.c (fix_signals) [_ASSUAN_NO_FIXED_SIGNALS]: New.
+	* assuan-pipe-connect.c (fix_Q_SIGNALS) [_ASSUAN_NO_FIXED_SIGNALS]: New.
 	(assuan_pipe_connect2) [_ASSUAN_USE_DOUBLE_FORK]: Use double fork.
-	(fix_signals) [_ASSUAN_USE_DOUBLE_FORK]: Do not wait..
+	(fix_Q_SIGNALS) [_ASSUAN_USE_DOUBLE_FORK]: Do not wait..
 	* assuan-logging.c, assuan-io.c: Include config.h
 	Replaced all usages of _WIN32 by the new HAVE_W32_SYSTEM because
 	there is nothing winning in this API.
@@ -271,7 +271,7 @@
 	error Not Imlemented.
 	* assuan-logging.c (_assuan_w32_strerror): New. 
 	* assuan-defs.h (w32_strerror): new.
-	* assuan-pipe-connect.c (assuan_pipe_connect2, fix_signals):
+	* assuan-pipe-connect.c (assuan_pipe_connect2, fix_Q_SIGNALS):
 	Factored signal code out to new function.
 	(build_w32_commandline, create_inheritable_pipe): New.  Taken
 	from gnupg 1.9.
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
index 3f8730aa..7a187987 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
@@ -163,7 +163,7 @@ _assuan_read_line (assuan_context_t ctx)
       int n = endp - line + 1;
 
       if (n < nread)
-	/* LINE tqcontains more than one line.  We copy it to the attic
+	/* LINE contains more than one line.  We copy it to the attic
 	   now as handlers are allowed to modify the passed
 	   buffer.  */
 	{
@@ -488,7 +488,7 @@ _assuan_cookie_write_flush (void *cookie)
  * data out @buffer may be passed as NULL (in which case @length must
  * also be 0); however when used by a client this flush operation does
  * also send the terminating "END" command to terminate the reponse on
- * a INQUIRE response.  However, when assuan_transact() is used, this
+ * a INTQUIRE response.  However, when assuan_transact() is used, this
  * function takes care of sending END itself.
  * 
  * Return value: 0 on success or an error code
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
index 94fbb41b..9ee417a9 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
@@ -299,7 +299,7 @@ FILE *_assuan_funopen(void *cookie,
 #define funopen(a,r,w,s,c) _assuan_funopen ((a), (r), (w), (s), (c))
 #endif /*HAVE_FOPENCOOKIE*/
 
-/* Prototypes for tqreplacement functions.  */
+/* Prototypes for replacement functions.  */
 #ifndef HAVE_MEMRCHR
 void *memrchr (const void *block, int c, size_t size);
 #endif
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c b/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
index d8c52d09..897e0773 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
@@ -141,7 +141,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
 {
   assuan_error_t rc;
   struct membuf mb;
-  char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INQUIRE ")+CR,LF) */
+  char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INTQUIRE ")+CR,LF) */
   unsigned char *line, *p;
   int linelen;
   int nodataexpected;
@@ -162,7 +162,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
   else
     init_membuf (&mb, maxlen? maxlen:1024, maxlen);
 
-  strcpy (stpcpy (cmdbuf, "INQUIRE "), keyword);
+  strcpy (stpcpy (cmdbuf, "INTQUIRE "), keyword);
   rc = assuan_write_line (ctx, cmdbuf);
   if (rc)
     goto leave;
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
index 518dc20b..ebae5ea3 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
@@ -325,7 +325,7 @@ pipe_connect_unix (assuan_context_t *ctx,
             }
           errno = 0;
 
-          /* We store our parents pid in the environment so that the
+          /* We store our tqparents pid in the environment so that the
              execed assuan server is able to read the actual pid of the
              client.  The server can't use getppid because it might have
              been double forked before the assuan server has been
@@ -337,7 +337,7 @@ pipe_connect_unix (assuan_context_t *ctx,
           unsetenv ("_assuan_connection_fd");
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the parent about it */
+          /* oops - use the pipe to tell the tqparent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -493,7 +493,7 @@ socketpair_connect (assuan_context_t *ctx,
             }
           errno = 0;
 
-          /* We store our parents pid in the environment so that the
+          /* We store our tqparents pid in the environment so that the
              execed assuan server is able to read the actual pid of the
              client.  The server can't use getppid becuase it might have
              been double forked before the assuan server has been
@@ -519,7 +519,7 @@ socketpair_connect (assuan_context_t *ctx,
             }
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the parent about it */
+          /* oops - use the pipe to tell the tqparent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -865,7 +865,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
    If NAME as well as ARGV are NULL, no exec is done but the same
    process is continued.  However all file descriptors are closed and
    some special environment variables are set. To let the caller
-   detect whether the child or the parent continues, the child returns
+   detect whether the child or the tqparent continues, the child returns
    a CTX of NULL. */
 assuan_error_t
 assuan_pipe_connect_ext (assuan_context_t *ctx,
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
index 975d2f2f..e9e81016 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
@@ -45,7 +45,7 @@
 #include "assuan-defs.h"
 
 #ifdef USE_DESCRIPTOR_PASSING
-/* Provide tqreplacement for missing CMSG maccros.  We assume that
+/* Provide replacement for missing CMSG maccros.  We assume that
    size_t matches the tqalignment requirement. */
 #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1))
 #ifndef CMSG_SPACE
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan.h b/libkdenetwork/libgpgme-copy/assuan/assuan.h
index 80c8d6b3..3ae24248 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan.h
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan.h
@@ -283,9 +283,9 @@ extern "C"
 #define  ASSUAN_Inquire_Error 121
 #define  ASSUAN_Invalid_Option 122
 #define  ASSUAN_Invalid_Index 123
-#define  ASSUAN_Unexpected_Status 124
+#define  ASSUAN_Unexpected_tqStatus 124
 #define  ASSUAN_Unexpected_Data 125
-#define  ASSUAN_Invalid_Status 126
+#define  ASSUAN_Invalid_tqStatus 126
 #define  ASSUAN_Locale_Problem 127
 #endif
 #define  ASSUAN_Not_Confirmed 128
diff --git a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
index 5c31489e..4985741d 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
+++ b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
@@ -362,7 +362,7 @@
 	to prototype.
 	* verify.c (parse_notation): Likewise for invocation.
 	* conversion.c (_gpgme_decode_percent_string): Likewise to
-	declaration.  If set, do not replace '\0' characters with a
+	declaration.  If set, do not tqreplace '\0' characters with a
 	printable string.
 	* gpgme.h (struct _gpgme_key_sig): New field notations.
 	* ops.h (_gpgme_parse_notation): New prototype.
@@ -1596,7 +1596,7 @@
 	(GpgmeSigNotation): Rename to gpgme_sig_notation_t.
 	(GpgmeSignature): Rename to gpgme_signature_t.
 	(GpgmeVerifyResult): Rename to gpgme_verify_result_t.
-	(GpgmeImportStatus): Rename to gpgme_import_status_t.
+	(GpgmeImporttqStatus): Rename to gpgme_import_status_t.
 	(GpgmeImportResult): Rename to gpgme_import_result_t.
 	(GpgmeGenKeyResult): Rename to gpgme_genkey_result_t.
 	(GpgmeKeyListResult): Rename to gpgme_keylist_result_t.
@@ -1901,7 +1901,7 @@
 	GPGME_Unsupported_Algorithm, GPGME_Sig_Expired,
 	GPGME_Bad_Signature, GPGME_No_Public_Key added as new error codes.
 	(struct _gpgme_import_status): New structure.
-	(GpgmeImportStatus): New type.
+	(GpgmeImporttqStatus): New type.
 	(struct _gpgme_op_import_result): New structure.
 	(GpgmeImportResult): New type.
 	(gpgme_op_import_result): New function.
@@ -2030,7 +2030,7 @@
 	(do_subsystem_inits): Do not call _gpgme_key_cache_init.
 
 	* mkstatus: Strip trailing comma.
-	* gpgme.h (GpgmeStatus): Pretty print.
+	* gpgme.h (GpgmetqStatus): Pretty print.
 
 	* gpgme.h (GpgmeError): Rename GPGME_No_Passphrase to
 	GPGME_Bad_Passphrase.
@@ -2648,11 +2648,11 @@
 
 2002-11-25  Marcus Brinkmann  <marcus@g10code.de>
 
-	* rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1.
+	* rungpg.c (_gpgme_gpg_spawn): Do not set tqparent fds to -1.
 	* posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close
-	for parent fds.
+	for tqparent fds.
 	* w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead
-	CloseHandle for parent fds.
+	CloseHandle for tqparent fds.
 
 2002-11-22  Marcus Brinkmann  <marcus@g10code.de>
 
@@ -3857,7 +3857,7 @@
 	version.
 	* posix-io.c: Include "sema.h".
 	(_gpgme_io_spawn): New variable FIXED_SIGNALS_LOCK.  Take the lock
-	while fixing the signals.
+	while fixing the Q_SIGNALS.
 	(_gpgme_io_select): Make READFDS and WRITEFDS non-static.
 	* key.c: Include "sema.h".  New globals KEY_CACHE_LOCK and
 	KEY_REF_LOCK.
@@ -4634,7 +4634,7 @@
 
 2001-11-23  Marcus Brinkmann  <marcus@g10code.de>
 
-	* engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for parent
+	* engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for tqparent
 	ends of the pipe.
 
 2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
@@ -5218,7 +5218,7 @@
 	* types.h: Add ulong typedef.
 
 	* rungpg.c (do_reaping,_gpgme_gpg_housecleaning): New.
-	(_gpgme_gpg_release): Reap children.
+	(_gpgme_gpg_release): Reap tqchildren.
 	* io.h, posix-io.c (_gpgme_io_kill): New.
 	* w32-io.c (_gpgme_io_kill): New (dummy).
 
diff --git a/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c b/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
index 1d536440..7ad8dc6f 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
@@ -202,9 +202,9 @@ map_assuan_error (gpg_error_t err)
     case ASSUAN_Inquire_Unknown:
     case ASSUAN_Inquire_Error:
     case ASSUAN_Invalid_Option:
-    case ASSUAN_Unexpected_Status:
+    case ASSUAN_Unexpected_tqStatus:
     case ASSUAN_Unexpected_Data:
-    case ASSUAN_Invalid_Status:
+    case ASSUAN_Invalid_tqStatus:
       return gpg_error (GPG_ERR_ASSUAN);
 
     case ASSUAN_Invalid_Response:
diff --git a/libkdenetwork/libgpgme-copy/gpgme/error.c b/libkdenetwork/libgpgme-copy/gpgme/error.c
index 9f8f26f7..f0ea4929 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/error.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/error.c
@@ -37,8 +37,8 @@ gpgme_strerror (gpgme_error_t err)
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   tqcontains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF tqcontains as much of the
+   contains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF contains as much of the
    beginning of the error string as fits into the buffer.  */
 int
 gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen)
diff --git a/libkdenetwork/libgpgme-copy/gpgme/get-env.c b/libkdenetwork/libgpgme-copy/gpgme/get-env.c
index 61e0dcbc..b5884048 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/get-env.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/get-env.c
@@ -1,4 +1,4 @@
-/* get_env.c - A getenv() tqreplacement.
+/* get_env.c - A getenv() replacement.
    Copyright (C) 2003, 2004 g10 Code GmbH
 
    This file is part of GPGME.
diff --git a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
index 577f9c33..f6f31ae2 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
@@ -137,8 +137,8 @@ const char *gpgme_strerror (gpgme_error_t err);
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   tqcontains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF tqcontains as much of the
+   contains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF contains as much of the
    beginning of the error string as fits into the buffer.  */
 int gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen);
 
@@ -326,7 +326,7 @@ struct _gpgme_sig_notation
 {
   struct _gpgme_sig_notation *next;
 
-  /* If NAME is a null pointer, then VALUE tqcontains a policy URL
+  /* If NAME is a null pointer, then VALUE contains a policy URL
      rather than a notation.  */
   char *name;
 
@@ -687,19 +687,19 @@ struct _gpgme_key
   /* This is the protocol supported by this key.  */
   gpgme_protocol_t protocol;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the
+  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the
      issuer serial.  */
   char *issuer_serial;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the
+  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the
      issuer name.  */
   char *issuer_name;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the chain
+  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the chain
      ID.  */
   char *chain_id;
 
-  /* If protocol is GPGME_PROTOCOL_OpenPGP, this field tqcontains the
+  /* If protocol is GPGME_PROTOCOL_OpenPGP, this field contains the
      owner trust.  */
   gpgme_validity_t owner_trust;
 
@@ -838,7 +838,7 @@ void gpgme_signers_clear (gpgme_ctx_t ctx);
 /* Add KEY to list of signers in CTX.  */
 gpgme_error_t gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key);
 
-/* Return the SEQth signer's key in CTX.  */
+/* Return the SETQth signer's key in CTX.  */
 gpgme_key_t gpgme_signers_enum (const gpgme_ctx_t ctx, int seq);
 
 /* Retrieve the signature status of signature IDX in CTX after a
@@ -1694,7 +1694,7 @@ typedef gpgme_encrypt_result_t GpgmeEncryptResult _GPGME_DEPRECATED;
 typedef gpgme_sig_notation_t GpgmeSigNotation _GPGME_DEPRECATED;
 typedef	gpgme_signature_t GpgmeSignature _GPGME_DEPRECATED;
 typedef gpgme_verify_result_t GpgmeVerifyResult _GPGME_DEPRECATED;
-typedef gpgme_import_status_t GpgmeImporStatus _GPGME_DEPRECATED;
+typedef gpgme_import_status_t GpgmeImportqStatus _GPGME_DEPRECATED;
 typedef gpgme_import_result_t GpgmeImportResult _GPGME_DEPRECATED;
 typedef gpgme_genkey_result_t GpgmeGenKeyResult _GPGME_DEPRECATED;
 typedef	gpgme_trust_item_t GpgmeTrustItem _GPGME_DEPRECATED;
diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h
index 47b748f8..cd0a4707 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/io.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/io.h
@@ -50,11 +50,11 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
 int _gpgme_io_set_nonblocking (int fd);
 
 /* Spawn the executable PATH with ARGV as arguments, after forking
-   close all fds in FD_PARENT_LIST in the parent and close or dup all
+   close all fds in FD_PARENT_LIST in the tqparent and close or dup all
    fds in FD_CHILD_LIST in the child.  */
 int _gpgme_io_spawn (const char *path, char **argv,
 		     struct spawn_fd_item_s *fd_child_list,
-		     struct spawn_fd_item_s *fd_parent_list);
+		     struct spawn_fd_item_s *fd_tqparent_list);
 int _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal);
 int _gpgme_io_kill (int pid, int hard);
 int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);
diff --git a/libkdenetwork/libgpgme-copy/gpgme/ops.h b/libkdenetwork/libgpgme-copy/gpgme/ops.h
index 869496f1..fd857dd5 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/ops.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/ops.h
@@ -140,7 +140,7 @@ void _gpgme_op_trustlist_event_cb (void *data, gpgme_event_io_t type,
 
 /* From version.c.  */
 
-/* Return true if MY_VERSION is at least REQ_VERSION, and false
+/* Return true if MY_VERSION is at least RETQ_VERSION, and false
    otherwise.  */
 int _gpgme_compare_versions (const char *my_version,
 			     const char *req_version);
diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
index 85df946f..5be77740 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
@@ -212,7 +212,7 @@ _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal)
 int
 _gpgme_io_spawn (const char *path, char **argv,
 		 struct spawn_fd_item_s *fd_child_list,
-		 struct spawn_fd_item_s *fd_parent_list)
+		 struct spawn_fd_item_s *fd_tqparent_list)
 {
   pid_t pid;
   int i;
@@ -299,9 +299,9 @@ _gpgme_io_spawn (const char *path, char **argv,
   if (status)
     return -1;
 
-  /* .dup_to is not used in the parent list.  */
-  for (i = 0; fd_parent_list[i].fd != -1; i++)
-    _gpgme_io_close (fd_parent_list[i].fd);
+  /* .dup_to is not used in the tqparent list.  */
+  for (i = 0; fd_tqparent_list[i].fd != -1; i++)
+    _gpgme_io_close (fd_tqparent_list[i].fd);
 
   return 0;
 }
diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
index 9a908570..a64f1467 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
@@ -52,11 +52,11 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
 int _gpgme_io_set_nonblocking (int fd);
 
 /* Spawn the executable PATH with ARGV as arguments, after forking
-   close all fds in FD_PARENT_LIST in the parent and close or dup all
+   close all fds in FD_PARENT_LIST in the tqparent and close or dup all
    fds in FD_CHILD_LIST in the child.  */
 int _gpgme_io_spawn (const char *path, char **argv,
 		     struct spawn_fd_item_s *fd_child_list,
-		     struct spawn_fd_item_s *fd_parent_list);
+		     struct spawn_fd_item_s *fd_tqparent_list);
 int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);
 
 /* Write the printable version of FD to the buffer BUF of length
diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
index d09cdf3b..42fff003 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
@@ -1211,7 +1211,7 @@ start (engine_gpg_t gpg)
   int saved_errno;
   int i, n;
   int status;
-  struct spawn_fd_item_s *fd_child_list, *fd_parent_list;
+  struct spawn_fd_item_s *fd_child_list, *fd_tqparent_list;
 
   if (!gpg)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -1247,7 +1247,7 @@ start (engine_gpg_t gpg)
   fd_child_list = calloc (n + n, sizeof *fd_child_list);
   if (!fd_child_list)
     return gpg_error_from_errno (errno);
-  fd_parent_list = fd_child_list + n;
+  fd_tqparent_list = fd_child_list + n;
 
   /* build the fd list for the child */
   n = 0;
@@ -1269,32 +1269,32 @@ start (engine_gpg_t gpg)
   fd_child_list[n].fd = -1;
   fd_child_list[n].dup_to = -1;
 
-  /* Build the fd list for the parent.  */
+  /* Build the fd list for the tqparent.  */
   n = 0;
   if (gpg->status.fd[1] != -1)
     {
-      fd_parent_list[n].fd = gpg->status.fd[1];
-      fd_parent_list[n].dup_to = -1;
+      fd_tqparent_list[n].fd = gpg->status.fd[1];
+      fd_tqparent_list[n].dup_to = -1;
       n++;
     }
   if (gpg->colon.fd[1] != -1)
     {
-      fd_parent_list[n].fd = gpg->colon.fd[1];
-      fd_parent_list[n].dup_to = -1;
+      fd_tqparent_list[n].fd = gpg->colon.fd[1];
+      fd_tqparent_list[n].dup_to = -1;
       n++;
     }
   for (i = 0; gpg->fd_data_map[i].data; i++)
     {
-      fd_parent_list[n].fd = gpg->fd_data_map[i].peer_fd;
-      fd_parent_list[n].dup_to = -1;
+      fd_tqparent_list[n].fd = gpg->fd_data_map[i].peer_fd;
+      fd_tqparent_list[n].dup_to = -1;
       n++;
     }        
-  fd_parent_list[n].fd = -1;
-  fd_parent_list[n].dup_to = -1;
+  fd_tqparent_list[n].fd = -1;
+  fd_tqparent_list[n].dup_to = -1;
 
   status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name :
 			    _gpgme_get_gpg_path (),
-			    gpg->argv, fd_child_list, fd_parent_list);
+			    gpg->argv, fd_child_list, fd_tqparent_list);
   saved_errno = errno;
   free (fd_child_list);
   if (status == -1)
diff --git a/libkdenetwork/libgpgme-copy/gpgme/signers.c b/libkdenetwork/libgpgme-copy/gpgme/signers.c
index d38732f0..e60d2dd3 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/signers.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/signers.c
@@ -78,7 +78,7 @@ gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key)
 }
 
 
-/* Return the SEQth signer's key in CTX with one reference.  */
+/* Return the SETQth signer's key in CTX with one reference.  */
 gpgme_key_t
 gpgme_signers_enum (const gpgme_ctx_t ctx, int seq)
 {
diff --git a/libkdenetwork/libgpgme-copy/gpgme/util.h b/libkdenetwork/libgpgme-copy/gpgme/util.h
index 5f20091f..05fd69d5 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/util.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/util.h
@@ -34,7 +34,7 @@ const char *_gpgme_get_gpgsm_path (void);
 int _gpgme_get_conf_int (const char *key, int *value);
 
 
-/*-- tqreplacement functions in <funcname>.c --*/
+/*-- replacement functions in <funcname>.c --*/
 #ifdef HAVE_CONFIG_H
 
 #ifndef HAVE_STPCPY
diff --git a/libkdenetwork/libgpgme-copy/gpgme/version.c b/libkdenetwork/libgpgme-copy/gpgme/version.c
index b823da1d..133b23c7 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/version.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/version.c
@@ -111,7 +111,7 @@ parse_version_string (const char *str, int *major, int *minor, int *micro)
 }
 
 
-/* Return true if MY_VERSION is at least REQ_VERSION, and false
+/* Return true if MY_VERSION is at least RETQ_VERSION, and false
    otherwise.  */
 int
 _gpgme_compare_versions (const char *my_version,
diff --git a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c
index 677c14e3..9625178a 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c
@@ -857,7 +857,7 @@ build_commandline (char **argv)
 int
 _gpgme_io_spawn ( const char *path, char **argv,
                   struct spawn_fd_item_s *fd_child_list,
-                  struct spawn_fd_item_s *fd_parent_list )
+                  struct spawn_fd_item_s *fd_tqparent_list )
 {
     SECURITY_ATTRIBUTES sec_attr;
     PROCESS_INFORMATION pi = {
@@ -966,8 +966,8 @@ _gpgme_io_spawn ( const char *path, char **argv,
     }
 
     /* Close the other ends of the pipes. */
-    for (i = 0; fd_parent_list[i].fd != -1; i++)
-      _gpgme_io_close (fd_parent_list[i].fd);
+    for (i = 0; fd_tqparent_list[i].fd != -1; i++)
+      _gpgme_io_close (fd_tqparent_list[i].fd);
 
     DEBUG4 ("CreateProcess ready\n"
             "-   hProcess=%p  hThread=%p\n"
diff --git a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
index ba064ebb..bfa618dd 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
@@ -41,7 +41,7 @@
    GPGME_EVENT_START event.  After that, it is added to the global
    list of active contexts.
 
-   The gpgme_wait function tqcontains a select() loop over all file
+   The gpgme_wait function contains a select() loop over all file
    descriptors in all active contexts.  If an error occurs, it closes
    all fds in that context and moves the context to the global done
    list.  Likewise, if a context has removed all I/O callbacks, it is
@@ -75,15 +75,15 @@ struct ctx_list_item
   gpgme_error_t status;
 };
 
-/* The active list tqcontains all contexts that are in the global event
+/* The active list contains all contexts that are in the global event
    loop, have active I/O callbacks, and have already seen the start
    event.  */
 static struct ctx_list_item *ctx_active_list;
 
-/* The done list tqcontains all contexts that have previously been
+/* The done list contains all contexts that have previously been
    active but now are not active any longer, either because they
    finished successfully or an I/O callback returned an error.  The
-   status field in the list item tqcontains the error value (or 0 if
+   status field in the list item contains the error value (or 0 if
    successful).  */
 static struct ctx_list_item *ctx_done_list;
 
diff --git a/libkdenetwork/qgpgme/dataprovider.cpp b/libkdenetwork/qgpgme/dataprovider.cpp
index 3fe991d9..a37684d0 100644
--- a/libkdenetwork/qgpgme/dataprovider.cpp
+++ b/libkdenetwork/qgpgme/dataprovider.cpp
@@ -1,20 +1,20 @@
 /* dataprovider.cpp
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
 
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -36,32 +36,32 @@ static bool resizeAndInit( TQByteArray & ba, size_t newSize ) {
   return ok;
 }
 
-QGpgME::QByteArrayDataProvider::QByteArrayDataProvider()
+QGpgME::TQByteArrayDataProvider::TQByteArrayDataProvider()
   : GpgME::DataProvider(), mOff( 0 ) {}
 
-QGpgME::QByteArrayDataProvider::QByteArrayDataProvider( const TQByteArray & initialData )
+QGpgME::TQByteArrayDataProvider::TQByteArrayDataProvider( const TQByteArray & initialData )
   : GpgME::DataProvider(), mArray( initialData ), mOff( 0 ) {}
 
-QGpgME::QByteArrayDataProvider::~QByteArrayDataProvider() {}
+QGpgME::TQByteArrayDataProvider::~TQByteArrayDataProvider() {}
 
-ssize_t QGpgME::QByteArrayDataProvider::read( void * buffer, size_t bufSize ) {
+ssize_t QGpgME::TQByteArrayDataProvider::read( void * buffer, size_t bufSize ) {
 #ifndef NDEBUG
-  //qDebug( "QGpgME::QByteArrayDataProvider::read( %p, %d )", buffer, bufSize );
+  //qDebug( "QGpgME::TQByteArrayDataProvider::read( %p, %d )", buffer, bufSize );
 #endif
   if ( bufSize == 0 )
     return 0;
   if ( mOff >= mArray.size() )
     return 0; // EOF
-  size_t amount = QMIN( bufSize, mArray.size() - mOff );
+  size_t amount = TQMIN( bufSize, mArray.size() - mOff );
   assert( amount > 0 );
   memcpy( buffer, mArray.data() + mOff, amount );
   mOff += amount;
   return amount;
 }
 
-ssize_t QGpgME::QByteArrayDataProvider::write( const void * buffer, size_t bufSize ) {
+ssize_t QGpgME::TQByteArrayDataProvider::write( const void * buffer, size_t bufSize ) {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::write( %p, %d )", buffer, bufSize );
+  qDebug( "QGpgME::TQByteArrayDataProvider::write( %p, %d )", buffer, bufSize );
 #endif
   if ( bufSize == 0 )
     return 0;
@@ -77,9 +77,9 @@ ssize_t QGpgME::QByteArrayDataProvider::write( const void * buffer, size_t bufSi
   return bufSize;
 }
 
-off_t QGpgME::QByteArrayDataProvider::seek( off_t offset, int whence ) {
+off_t QGpgME::TQByteArrayDataProvider::seek( off_t offset, int whence ) {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::seek( %d, %d )", int(offset), whence );
+  qDebug( "QGpgME::TQByteArrayDataProvider::seek( %d, %d )", int(offset), whence );
 #endif
   int newOffset = mOff;
   switch ( whence ) {
@@ -99,9 +99,9 @@ off_t QGpgME::QByteArrayDataProvider::seek( off_t offset, int whence ) {
   return mOff = newOffset;
 }
 
-void QGpgME::QByteArrayDataProvider::release() {
+void QGpgME::TQByteArrayDataProvider::release() {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::release()" );
+  qDebug( "QGpgME::TQByteArrayDataProvider::release()" );
 #endif
   mArray = TQByteArray();
 }
diff --git a/libkdenetwork/qgpgme/dataprovider.h b/libkdenetwork/qgpgme/dataprovider.h
index 52957afa..6f1c9ca9 100644
--- a/libkdenetwork/qgpgme/dataprovider.h
+++ b/libkdenetwork/qgpgme/dataprovider.h
@@ -1,25 +1,25 @@
 /* dataprovider.h
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
-#ifndef __QGPGME_DATAPROVIDER_H__
-#define __QGPGME_DATAPROVIDER_H__
+#ifndef __TQGPGME_DATAPROVIDER_H__
+#define __TQGPGME_DATAPROVIDER_H__
 
 #include <gpgmepp/interfaces/dataprovider.h>
 
@@ -28,11 +28,11 @@
 
 namespace QGpgME {
 
-  class KDE_EXPORT QByteArrayDataProvider : public GpgME::DataProvider {
+  class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
   public:
-    QByteArrayDataProvider();
-    QByteArrayDataProvider( const TQByteArray & initialData );
-    ~QByteArrayDataProvider();
+    TQByteArrayDataProvider();
+    TQByteArrayDataProvider( const TQByteArray & initialData );
+    ~TQByteArrayDataProvider();
 
     const TQByteArray & data() const { return mArray; }
 
@@ -57,6 +57,6 @@ namespace QGpgME {
 
 } // namespace QGpgME
 
-#endif // __QGPGME_EVENTLOOPINTERACTOR_H__
+#endif // __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp
index 8846bb2a..a773860e 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp
@@ -1,20 +1,20 @@
 /* qeventloopinteractor.cpp
    Copyright (C) 2003 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -32,10 +32,10 @@
 
 using namespace GpgME;
 
-QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char * name )
- : TQObject( parent, name ), GpgME::EventLoopInteractor()
+QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name ), GpgME::EventLoopInteractor()
 {
-  if ( !parent )
+  if ( !tqparent )
     if ( tqApp ) {
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.h b/libkdenetwork/qgpgme/eventloopinteractor.h
index 73d9a177..e1d514f5 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.h
+++ b/libkdenetwork/qgpgme/eventloopinteractor.h
@@ -1,25 +1,25 @@
 /* qeventloopinteractor.h
    Copyright (C) 2003 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
-#ifndef __QGPGME_EVENTLOOPINTERACTOR_H__
-#define __QGPGME_EVENTLOOPINTERACTOR_H__
+#ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__
+#define __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 #include <gpgmepp/eventloopinteractor.h>
 
@@ -37,8 +37,9 @@ namespace QGpgME {
 
   class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    EventLoopInteractor( TQObject * parent, const char * name=0 );
+    EventLoopInteractor( TQObject * tqparent, const char * name=0 );
   public:
     virtual ~EventLoopInteractor();
 
@@ -84,6 +85,6 @@ namespace QGpgME {
 
 } // namespace QGpgME
 
-#endif // __QGPGME_EVENTLOOPINTERACTOR_H__
+#endif // __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 
diff --git a/libkdenetwork/qgpgme/tests/dataprovidertest.cpp b/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
index 2493c586..675c85ea 100644
--- a/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
+++ b/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
@@ -1,20 +1,20 @@
 /* tests/dataprovidertest.cpp
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME's regression test suite.
+   This file is part of TQGPGME's regression test suite.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -60,11 +60,11 @@ int main( int, char** ) {
 
   {
     //
-    // QByteArrayDataProvider
+    // TQByteArrayDataProvider
     //
 
     // writing:
-    QGpgME::QByteArrayDataProvider qba_dp;
+    QGpgME::TQByteArrayDataProvider qba_dp;
     Data data( &qba_dp );
 
     assertEqual( data.write( input, inputSize ), inputSize );
@@ -108,11 +108,11 @@ int main( int, char** ) {
 
   {
     //
-    // QByteArrayDataProvider with initial data:
+    // TQByteArrayDataProvider with initial data:
     //
     TQByteArray ba;
     ba.duplicate( input, inputSize );
-    QGpgME::QByteArrayDataProvider qba_dp( ba );
+    QGpgME::TQByteArrayDataProvider qba_dp( ba );
     Data data( &qba_dp );
 
     assertEqual( data.seek( 0, SEEK_END ), inputSize );
diff --git a/libkdepim/addresseediffalgo.cpp b/libkdepim/addresseediffalgo.cpp
index 361ec631..1de2dddc 100644
--- a/libkdepim/addresseediffalgo.cpp
+++ b/libkdepim/addresseediffalgo.cpp
@@ -135,12 +135,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id,
                                   const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.find( left[ i ] ) == right.end() )
+    if ( right.tqfind( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.find( right[ i ] ) == left.end() )
+    if ( left.tqfind( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp
index f9f10160..481fc155 100644
--- a/libkdepim/addresseeemailselection.cpp
+++ b/libkdepim/addresseeemailselection.cpp
@@ -53,7 +53,7 @@ TQString AddresseeEmailSelection::fieldTitle( uint index ) const
       return i18n( "Bcc" );
       break;
     default:
-      return TQString::null;
+      return TQString();
   }
 }
 
@@ -195,7 +195,7 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const
   if ( index == 0 )
     return i18n( "Recent Addresses" );
   else
-    return TQString::null;
+    return TQString();
 }
 
 KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const
diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
index 243b6608..0d86fad4 100644
--- a/libkdepim/addresseelineedit.cpp
+++ b/libkdepim/addresseelineedit.cpp
@@ -109,9 +109,9 @@ static bool itemIsHeader( const TQListBoxItem* item )
 
 
 
-AddresseeLineEdit::AddresseeLineEdit( TQWidget* parent, bool useCompletion,
+AddresseeLineEdit::AddresseeLineEdit( TQWidget* tqparent, bool useCompletion,
                                       const char *name )
-  : ClickLineEdit( parent, TQString::null, name ), DCOPObject( newLineEditDCOPObjectName() ),
+  : ClickLineEdit( tqparent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ),
     m_useSemiColonAsSeparator( false ), m_allowDistLists( true )
 {
   m_useCompletion = useCompletion;
@@ -285,12 +285,12 @@ void AddresseeLineEdit::insert( const TQString &t )
     KURL url( newText );
     newText = url.path();
   }
-  else if ( newText.find(" at ") != -1 ) {
+  else if ( newText.tqfind(" at ") != -1 ) {
     // Anti-spam stuff
     newText.tqreplace( " at ", "@" );
     newText.tqreplace( " dot ", "." );
   }
-  else if ( newText.find("(at)") != -1 ) {
+  else if ( newText.tqfind("(at)") != -1 ) {
     newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
   }
 
@@ -310,7 +310,7 @@ void AddresseeLineEdit::insert( const TQString &t )
     eot--;
   }
   if ( eot == 0 ) {
-    contents = TQString::null;
+    contents = TQString();
   } else if ( pos >= eot ) {
     if ( contents[ eot - 1 ] == ',' ) {
       eot--;
@@ -365,7 +365,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
       while ( ( eot > 0 ) && contents[ eot - 1 ].isSpace() )
         eot--;
       if ( eot == 0 )
-        contents = TQString::null;
+        contents = TQString();
       else if ( contents[ eot - 1 ] == ',' ) {
         eot--;
         contents.truncate( eot );
@@ -388,7 +388,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
         return;
       }
     } else {
-      // Let's see if this drop tqcontains a comma separated list of emails
+      // Let's see if this drop contains a comma separated list of emails
       TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) );
       TQStringList addrs = splitEmailAddrList( dropData );
       if ( addrs.count() > 0 ) {
@@ -482,7 +482,7 @@ void AddresseeLineEdit::doCompletion( bool ctrlT )
         //if only our \" is left, remove it since user has not typed it either
         if ( m_searchExtended && m_searchString == "\"" ){
           m_searchExtended = false;
-          m_searchString = TQString::null;
+          m_searchString = TQString();
           setText( m_previousAddresses );
           break;
         }
@@ -567,7 +567,7 @@ void AddresseeLineEdit::loadContacts()
       KABC::Resource::Iterator it;
       for ( it = resource->begin(); it != resource->end(); ++it ) {
         TQString uid = (*it).uid();
-        TQMap<TQString, TQString>::const_iterator wit = uidToResourceMap.find( uid );
+        TQMap<TQString, TQString>::const_iterator wit = uidToResourceMap.tqfind( uid );
         const TQString subresourceLabel = resabc->subresourceLabel( *wit );
         const int weight = ( wit != uidToResourceMap.end() ) ? resabc->subresourceCompletionWeight( *wit ) : 80;
         const int idx = addCompletionSource( subresourceLabel, weight );
@@ -641,7 +641,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
     const TQString givenName = addr.givenName();
     const TQString familyName= addr.familyName();
     const TQString nickName  = addr.nickName();
-    const TQString domain    = email.mid( email.find( '@' ) + 1 );
+    const TQString domain    = email.mid( email.tqfind( '@' ) + 1 );
     TQString fullEmail = addr.fullEmail( email );
     //TODO: let user decide what fields to use in lookup, e.g. company, city, ...
 
@@ -757,10 +757,10 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
 void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, int completionItemSource, const TQStringList * keyWords )
 {
   // Check if there is an exact match for item already, and use the max weight if so.
-  // Since there's no way to get the information from KCompletion, we have to keep our own QMap
-  CompletionItemsMap::iterator it = s_completionItemMap->find( string );
+  // Since there's no way to get the information from KCompletion, we have to keep our own TQMap
+  CompletionItemsMap::iterator it = s_completionItemMap->tqfind( string );
   if ( it != s_completionItemMap->end() ) {
-    weight = QMAX( ( *it ).first, weight );
+    weight = TQMAX( ( *it ).first, weight );
     ( *it ).first = weight;
   } else {
     s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) );
@@ -900,7 +900,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
 
         if ( autoSuggest )
         {
-            int index = items.first().find( m_searchString );
+            int index = items.first().tqfind( m_searchString );
             TQString newText = items.first().mid( index );
             setUserSelection(false);
             setCompletedText(newText,true);
@@ -991,7 +991,7 @@ void AddresseeLineEdit::updateSearchString()
     m_previousAddresses = m_searchString.left( n );
     m_searchString = m_searchString.mid( n ).stripWhiteSpace();
   } else {
-    m_previousAddresses = TQString::null;
+    m_previousAddresses = TQString();
   }
 }
 
@@ -1020,7 +1020,7 @@ KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
 
 int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int weight )
 {
-  TQMap<TQString,int>::iterator it = s_completionSourceWeights->find( source );
+  TQMap<TQString,int>::iterator it = s_completionSourceWeights->tqfind( source );
   if ( it == s_completionSourceWeights->end() )
     s_completionSourceWeights->insert( source, weight );
   else
@@ -1047,7 +1047,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
       TQListBoxItem *item = completionBox()->itemAt( me->pos() );
       if ( !item ) {
         // In the case of a mouse move outside of the box we don't want
-        // the parent to fuzzy select a header by mistake.
+        // the tqparent to fuzzy select a header by mistake.
         bool eat = e->type() == TQEvent::MouseMove;
         return eat;
       }
@@ -1061,7 +1061,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
         } else {
           // if we are not on one of the group heading, make sure the item
           // below or above is selected, not the heading, inadvertedly, due
-          // to fuzzy auto-selection from QListBox
+          // to fuzzy auto-selection from TQListBox
           completionBox()->setCurrentItem( item );
           completionBox()->setSelected( completionBox()->index( item ), true );
           if ( e->type() == TQEvent::MouseMove )
@@ -1145,7 +1145,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
       /// first, find the header of the current section
       TQListBoxItem *myHeader = 0;
       const int iterationstep = ke->key() == Key_Tab ?  1 : -1;
-      int i = QMIN( QMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 );
+      int i = TQMIN( TQMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 );
       while ( i>=0 ) {
         if ( itemIsHeader( completionBox()->item(i) ) ) {
           myHeader = completionBox()->item( i );
@@ -1228,7 +1228,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
   TQMap<int, TQStringList> sections;
   TQStringList sortedItems;
   for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it, ++i ) {
-    CompletionItemsMap::const_iterator cit = s_completionItemMap->find(*it);
+    CompletionItemsMap::const_iterator cit = s_completionItemMap->tqfind(*it);
     if ( cit == s_completionItemMap->end() )
       continue;
     int idx = (*cit).second;
@@ -1236,7 +1236,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
     if ( s_completion->order() == KCompletion::Weighted ) {
       if ( lastSourceIndex == -1 || lastSourceIndex != idx ) {
         const TQString sourceLabel(  (*s_completionSources)[idx] );
-        if ( sections.find(idx) == sections.end() ) {
+        if ( sections.tqfind(idx) == sections.end() ) {
           items.insert( it, sourceLabel );
         }
         lastSourceIndex = idx;
diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
index 86d8d8db..416af167 100644
--- a/libkdepim/addresseelineedit.h
+++ b/libkdepim/addresseelineedit.h
@@ -45,7 +45,7 @@ namespace KPIM {
 class LdapSearch;
 class LdapResult;
 typedef TQValueList<LdapResult> LdapResultList;
-typedef TQMap< TQString, QPair<int,int> > CompletionItemsMap;
+typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap;
 }
 
 namespace KPIM {
@@ -54,9 +54,10 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
 {
   K_DCOP
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeLineEdit( TQWidget* parent, bool useCompletion = true,
+    AddresseeLineEdit( TQWidget* tqparent, bool useCompletion = true,
                      const char *name = 0L);
     virtual ~AddresseeLineEdit();
 
diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp
index 65e34985..c7e37817 100644
--- a/libkdepim/addresseeselector.cpp
+++ b/libkdepim/addresseeselector.cpp
@@ -79,7 +79,7 @@ TQStringList AddresseeSelector::AddressBookManager::titles() const
 
 void AddresseeSelector::AddressBookManager::addResource( KABC::Resource *resource )
 {
-  if ( mResources.find( resource ) == mResources.end() )
+  if ( mResources.tqfind( resource ) == mResources.end() )
     mResources.append( resource );
 }
 
@@ -184,12 +184,12 @@ uint SelectionItem::index() const
 }
 
 
-class SelectionViewItem : public QListViewItem
+class SelectionViewItem : public TQListViewItem
 {
   public:
-    SelectionViewItem( TQListView *parent, Selection *selection,
+    SelectionViewItem( TQListView *tqparent, Selection *selection,
                        SelectionItem *item )
-      : TQListViewItem( parent, "" ), mSelection( selection ), mItem( item )
+      : TQListViewItem( tqparent, "" ), mSelection( selection ), mItem( item )
     {
       if ( mItem->distributionList() == 0 )
         mIcon = mSelection->itemIcon( mItem->addressee(), mItem->index() );
@@ -205,7 +205,7 @@ class SelectionViewItem : public QListViewItem
         else
           return mSelection->distributionListText( mItem->distributionList() );
       } else
-        return TQString::null;
+        return TQString();
     }
 
     const TQPixmap* pixmap( int column ) const
@@ -224,8 +224,8 @@ class SelectionViewItem : public QListViewItem
     TQPixmap mIcon;
 };
 
-AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
+AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mSelection( selection ), mManager( 0 )
 {
   mMoveMapper = new TQSignalMapper( this );
   mRemoveMapper = new TQSignalMapper( this );
@@ -303,7 +303,7 @@ void AddresseeSelector::initGUI()
     mRemoveMapper->setMapping( listView, i );
 
     TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
-    buttonLayout->tqsetAlignment( Qt::AlignBottom );
+    buttonLayout->tqsetAlignment( TQt::AlignBottom );
     tqlayout->addLayout( buttonLayout, row, 1 );
 
     // move button
@@ -561,8 +561,8 @@ void AddresseeSelector::reloadAddressBook()
 
 
 AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection,
-                                                  TQWidget *parent, const char *name )
-  : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true )
+                                                  TQWidget *tqparent, const char *name )
+  : KDialogBase( Plain, "", Ok | Cancel, Ok, tqparent, name, true )
 {
   TQFrame *frame = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h
index e566d4e5..2b4771a1 100644
--- a/libkdepim/addresseeselector.h
+++ b/libkdepim/addresseeselector.h
@@ -163,13 +163,14 @@ class SelectionItem
     TQBitArray mField;
 };
 
-class KDE_EXPORT AddresseeSelector : public QWidget
+class KDE_EXPORT AddresseeSelector : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AddresseeSelector( Selection *selection,
-                       TQWidget *parent, const char *name = 0 );
+                       TQWidget *tqparent, const char *name = 0 );
     ~AddresseeSelector();
 
     /**
@@ -215,10 +216,11 @@ class KDE_EXPORT AddresseeSelector : public QWidget
 class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     AddresseeSelectorDialog( Selection *selection,
-                             TQWidget *parent = 0, const char *name = 0 );
+                             TQWidget *tqparent = 0, const char *name = 0 );
 
   protected slots:
     void accept();
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index d5b3e6e2..d8ead42b 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -50,9 +50,9 @@
 
 using namespace KPIM;
 
-AddresseeView::AddresseeView( TQWidget *parent, const char *name,
+AddresseeView::AddresseeView( TQWidget *tqparent, const char *name,
                               KConfig *config )
-  : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
+  : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ),
     mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
@@ -359,7 +359,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
           customEntry.remove( "KADDRESSBOOK-X-" );
           customEntry.remove( "KADDRESSBOOK-" );
 
-          int pos = customEntry.find( ':' );
+          int pos = customEntry.tqfind( ':' );
           TQString key = customEntry.left( pos );
           const TQString value = customEntry.mid( pos + 1 );
 
@@ -367,7 +367,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
           if ( key == "BlogFeed" || key == "IMAddress" )
             continue;
 
-          const TQMap<TQString, TQString>::ConstIterator keyIt = titleMap.find( key );
+          const TQMap<TQString, TQString>::ConstIterator keyIt = titleMap.tqfind( key );
           if ( keyIt != titleMap.end() )
             key = keyIt.data();
 
@@ -399,16 +399,16 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
           imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) );
 
         // make the status a link, if required
-        TQString imStatus;
+        TQString imtqStatus;
         if ( linkMask & IMLinks )
-          imStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
+          imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
         else
-          imStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" );
+          imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" );
 
         // append our status to the rest of the dynamic part of the addressee
         dynamicPart += rowFmtStr
                 .arg( i18n( "Presence" ) )
-                .arg( imStatus
+                .arg( imtqStatus
                           .arg( imgSrc )
                           .arg( proxy->presenceString( addr.uid() ) )
                     );
@@ -495,7 +495,7 @@ TQString AddresseeView::pixmapAsDataUrl( const TQPixmap& pixmap )
 void AddresseeView::updateView()
 {
   // clear view
-  setText( TQString::null );
+  setText( TQString() );
 
   if ( mAddressee.isEmpty() )
     return;
@@ -575,9 +575,9 @@ void AddresseeView::urlClicked( const TQString &url )
 void AddresseeView::emailClicked( const TQString &email )
 {
   if ( email.startsWith( "mailto:" ) )
-    kapp->invokeMailer( email.mid( 7 ), TQString::null );
+    kapp->invokeMailer( email.mid( 7 ), TQString() );
   else
-    kapp->invokeMailer( email, TQString::null );
+    kapp->invokeMailer( email, TQString() );
 }
 
 void AddresseeView::phoneNumberClicked( const TQString &number )
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index 74c3a657..09e17887 100644
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@@ -43,6 +43,7 @@ namespace KPIM {
 class KDE_EXPORT AddresseeView : public KTextBrowser
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructor.
@@ -50,7 +51,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
       @param config The config object where the settings are stored
                     which fields will be shown.
      */
-    AddresseeView( TQWidget *parent = 0, const char *name = 0,
+    AddresseeView( TQWidget *tqparent = 0, const char *name = 0,
                    KConfig *config = 0 );
 
     ~AddresseeView();
diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp
index 5807b0d6..b7bea236 100644
--- a/libkdepim/addressesdialog.cpp
+++ b/libkdepim/addressesdialog.cpp
@@ -91,9 +91,9 @@ struct AddressesDialog::AddressesDialogPrivate {
 };
 // privates end
 
-AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr,
+AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr,
                                       int emailIndex )
-  : TQObject( 0 ), KListViewItem( parent, addr.realName(),
+  : TQObject( 0 ), KListViewItem( tqparent, addr.realName(),
                                ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) )
 {
   d = new AddresseeViewItemPrivate;
@@ -120,17 +120,17 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ
   d->category = cat;
 }
 
-AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *parent, const TQString& name,
+AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *tqparent, const TQString& name,
                                        const KABC::Addressee::List &lst )
-  : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
+  : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") )
 {
   d = new AddresseeViewItemPrivate;
   d->category = FilledGroup;
   d->addresses = lst;
 }
 
-AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *parent, const TQString& name )
-  : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
+AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *tqparent, const TQString& name )
+  : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") )
 {
   d = new AddresseeViewItemPrivate;
   d->category = DistList;
@@ -162,13 +162,13 @@ AddresseeViewItem::category() const
   return d->category;
 }
 
-QString
+TQString
 AddresseeViewItem::name() const
 {
   return text(0);
 }
 
-QString
+TQString
 AddresseeViewItem::email() const
 {
   return text(1);
@@ -353,7 +353,7 @@ AddressesDialog::setShowBCC( bool b )
   d->ui->mBCCButton->setShown( b );
 }
 
-QStringList
+TQStringList
 AddressesDialog::to() const
 {
   TQStringList emails = allDistributionLists( d->toItem );
@@ -363,7 +363,7 @@ AddressesDialog::to() const
   return emails;
 }
 
-QStringList
+TQStringList
 AddressesDialog::cc() const
 {
   TQStringList emails = allDistributionLists( d->ccItem );
@@ -373,7 +373,7 @@ AddressesDialog::cc() const
   return emails;
 }
 
-QStringList
+TQStringList
 AddressesDialog::bcc() const
 {
   TQStringList emails = allDistributionLists( d->bccItem );
@@ -402,7 +402,7 @@ AddressesDialog::allToAddressesNoDuplicates()  const
     TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit;
     for( eit = eList.begin(); eit != eList.end(); ++eit ) {
       KABC::Addressee a = (*eit).addressee;
-      if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+      if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
           aList.append( a ) ;
       }
     }
@@ -415,7 +415,7 @@ AddressesDialog::allToAddressesNoDuplicates()  const
     TQValueList<KABC::DistributionList::Entry>::ConstIterator eit;
     for( eit = eList.begin(); eit != eList.end(); ++eit ) {
       KABC::Addressee a = (*eit).addressee;
-      if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+      if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
           aList.append( a ) ;
       }
     }
@@ -437,19 +437,19 @@ AddressesDialog::bccAddresses()  const
 }
 
 
-QStringList
+TQStringList
 AddressesDialog::toDistributionLists() const
 {
   return allDistributionLists( d->toItem );
 }
 
-QStringList
+TQStringList
 AddressesDialog::ccDistributionLists() const
 {
   return allDistributionLists( d->ccItem );
 }
 
-QStringList
+TQStringList
 AddressesDialog::bccDistributionLists() const
 {
   return allDistributionLists( d->bccItem );
@@ -544,12 +544,12 @@ AddressesDialog::availableAddressSelected( AddresseeViewItem* item, bool selecte
 void
 AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected )
 {
-  // we have to avoid that a parent and a child is selected together
+  // we have to avoid that a tqparent and a child is selected together
   // because in this case we get a double object deletion ( program crashes )
   // when removing the selected items from list
-  AddresseeViewItem* parent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->parent());
-  if ( parent  && selected )
-    parent->setSelected( false );
+  AddresseeViewItem* tqparent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->tqparent());
+  if ( tqparent  && selected )
+    tqparent->setSelected( false );
   if (selected)
   {
     selectedSelectedAddresses.append(item);
@@ -662,10 +662,10 @@ AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeV
 }
 
 void
-AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
+AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent,
                                           const TQPtrList<AddresseeViewItem>& addresses )
 {
-  Q_ASSERT( parent );
+  Q_ASSERT( tqparent );
 
   TQPtrListIterator<AddresseeViewItem> itr( addresses );
 
@@ -678,7 +678,7 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
     AddresseeViewItem* address = itr.current();
     ++itr;
 
-    if (selectedToAvailableMapping.find(address) != 0)
+    if (selectedToAvailableMapping.tqfind(address) != 0)
     {
       continue;
     }
@@ -686,15 +686,15 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
     AddresseeViewItem* newItem = 0;
     if (address->category() == AddresseeViewItem::Entry)
     {
-      newItem = new AddresseeViewItem( parent, address->addressee() );
+      newItem = new AddresseeViewItem( tqparent, address->addressee() );
     }
     else if (address->category() == AddresseeViewItem::DistList)
     {
-      newItem = new AddresseeViewItem( parent, address->name() );
+      newItem = new AddresseeViewItem( tqparent, address->name() );
     }
     else
     {
-      newItem = new AddresseeViewItem( parent, address->name(), allAddressee( address ) );
+      newItem = new AddresseeViewItem( tqparent, address->name(), allAddressee( address ) );
     }
 
     address->setSelected( false );
@@ -705,10 +705,10 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
             this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
   }
 
-  parent->setOpen( true );
+  tqparent->setOpen( true );
 }
 
-QStringList
+TQStringList
 AddressesDialog::entryToString( const KABC::Addressee::List& l ) const
 {
   TQStringList entries;
@@ -819,7 +819,7 @@ AddressesDialog::removeEntry()
       resetCC = true;
     else if( d->bccItem == item )
       resetBCC = true;
-    // we may only append parent items
+    // we may only append tqparent items
     unmapSelectedAddress(item);
     lst.append( item );
   }
@@ -854,7 +854,7 @@ AddressesDialog::removeEntry()
 
 // copied from kabcore.cpp :(
 // KDE4: should be in libkabc I think
-static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent )
+static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqparent )
 {
   TQPtrList<KABC::Resource> kabcResources = abook->resources();
 
@@ -870,7 +870,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare
     }
   }
 
-  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
+  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent );
   return static_cast<KABC::Resource*>( res );
 }
 #endif
@@ -894,7 +894,7 @@ AddressesDialog::saveAs()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Distribution List"),
                                         i18n("Please enter name:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() )
     return;
@@ -1002,11 +1002,11 @@ AddressesDialog::filterChanged( const TQString& txt )
     if ( item->category() == AddresseeViewItem::Entry ) {
       bool matches = item->matches( txt );
       item->setVisible( matches );
-      TQListViewItem *parent = static_cast<TQListViewItem*>( item )->parent();
-      if ( matches && parent ) {
-        if ( parent == d->personal ) {
+      TQListViewItem *tqparent = static_cast<TQListViewItem*>( item )->tqparent();
+      if ( matches && tqparent ) {
+        if ( tqparent == d->personal ) {
           personalVisible++;
-        } else if ( parent == d->recent ) {
+        } else if ( tqparent == d->recent ) {
           recentVisible++;
         }
       }
@@ -1087,19 +1087,19 @@ AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const
 }
 
 KABC::Addressee::List
-AddressesDialog::allAddressee( AddresseeViewItem* parent ) const
+AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const
 {
   KABC::Addressee::List lst;
 
-  if ( !parent ) return lst;
+  if ( !tqparent ) return lst;
 
-  if ( parent->category() == AddresseeViewItem::Entry )
+  if ( tqparent->category() == AddresseeViewItem::Entry )
   {
-    lst.append( parent->addressee() );
+    lst.append( tqparent->addressee() );
     return lst;
   }
 
-  AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( parent->firstChild() );
+  AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( tqparent->firstChild() );
   while( myChild ) {
     if ( myChild->category() == AddresseeViewItem::FilledGroup )
       lst += myChild->addresses();
@@ -1111,15 +1111,15 @@ AddressesDialog::allAddressee( AddresseeViewItem* parent ) const
   return lst;
 }
 
-QStringList
-AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const
+TQStringList
+AddressesDialog::allDistributionLists( AddresseeViewItem* tqparent ) const
 {
   TQStringList lists;
 
-  if ( !parent )
+  if ( !tqparent )
     return TQStringList();
 
-  AddresseeViewItem *item = static_cast<AddresseeViewItem*>( parent->firstChild() );
+  AddresseeViewItem *item = static_cast<AddresseeViewItem*>( tqparent->firstChild() );
   while ( item ) {
     if ( item->category() == AddresseeViewItem::DistList && !item->name().isEmpty() )
       lists.append( item->name() );
diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h
index 4b3ea9dc..71d6925d 100644
--- a/libkdepim/addressesdialog.h
+++ b/libkdepim/addressesdialog.h
@@ -38,6 +38,7 @@ namespace KPIM {
   class AddresseeViewItem : public TQObject, public KListViewItem
   {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Category {
@@ -49,10 +50,10 @@ namespace KPIM {
       FilledGroup =5,
       DistList    =6
     };
-    AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 );
+    AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex = 0 );
     AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group );
-    AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst );
-    AddresseeViewItem( AddresseeViewItem *parent, const TQString& name );
+    AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst );
+    AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name );
     ~AddresseeViewItem();
 
     KABC::Addressee       addressee() const;
@@ -78,6 +79,7 @@ namespace KPIM {
   class KDE_EXPORT AddressesDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     AddressesDialog( TQWidget *widget=0, const char *name=0 );
     ~AddressesDialog();
@@ -192,12 +194,12 @@ namespace KPIM {
                                   AddresseeViewItem* defaultParent=0, bool useCategory=true );
     void addAddresseeToSelected( const KABC::Addressee& addr,
                                  AddresseeViewItem* defaultParent=0 );
-    void addAddresseesToSelected( AddresseeViewItem *parent,
+    void addAddresseesToSelected( AddresseeViewItem *tqparent,
                                   const TQPtrList<AddresseeViewItem>& addresses );
     TQStringList entryToString( const KABC::Addressee::List& l ) const;
-    KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const;
+    KABC::Addressee::List allAddressee( AddresseeViewItem* tqparent ) const;
     KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const;
-    TQStringList allDistributionLists( AddresseeViewItem* parent ) const;
+    TQStringList allDistributionLists( AddresseeViewItem* tqparent ) const;
 
   private:
     // if there's only one group in the available list, open it
diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui
index e0bf7a9a..cf14f989 100644
--- a/libkdepim/addresspicker.ui
+++ b/libkdepim/addresspicker.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AddressPickerUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AddressPickerUI</cstring>
     </property>
@@ -64,7 +64,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
                 <cstring>tqlayout10</cstring>
             </property>
@@ -169,7 +169,7 @@
                 </spacer>
             </vbox>
         </widget>
-        <widget class="QLabel" row="0" column="2">
+        <widget class="TQLabel" row="0" column="2">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -188,7 +188,7 @@
                 <cstring>mSelectedView</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -207,7 +207,7 @@
                 <cstring>mAvailableView</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>tqlayout1</cstring>
             </property>
@@ -215,7 +215,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -226,7 +226,7 @@
                         <cstring>mFilterEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>mFilterEdit</cstring>
                     </property>
@@ -289,7 +289,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>mSaveAs</cstring>
             </property>
@@ -303,7 +303,7 @@
                 <string>Alt+D</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="0">
+        <widget class="TQPushButton" row="3" column="0">
             <property name="name">
                 <cstring>mLdapSearch</cstring>
             </property>
diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp
index fb48f05c..68900936 100644
--- a/libkdepim/broadcaststatus.cpp
+++ b/libkdepim/broadcaststatus.cpp
@@ -23,37 +23,37 @@
 #include "broadcaststatus.h"
 #include "progressmanager.h"
 
-KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0;
-static KStaticDeleter<KPIM::BroadcasStatus> broadcasStatusDeleter;
+KPIM::BroadcastqStatus* KPIM::BroadcastqStatus::instance_ = 0;
+static KStaticDeleter<KPIM::BroadcastqStatus> broadcasStatusDeleter;
 
 namespace KPIM {
 
-BroadcasStatus* BroadcasStatus::instance()
+BroadcastqStatus* BroadcastqStatus::instance()
 {
   if (!instance_)
-    broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() );
+    broadcasStatusDeleter.setObject( instance_, new BroadcastqStatus() );
 
   return instance_;
 }
 
-BroadcasStatus::BroadcasStatus()
+BroadcastqStatus::BroadcastqStatus()
   :mTransientActive( false )
 {
 }
 
-BroadcasStatus::~BroadcasStatus()
+BroadcastqStatus::~BroadcastqStatus()
 {
   instance_ = 0;
 }
 
-void BroadcasStatus::seStatusMsg( const TQString& message )
+void BroadcastqStatus::seStatusMsg( const TQString& message )
 {
   mStatusMsg = message;
   if( !mTransientActive )
     emit statusMsg( message );
 }
 
-void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message )
+void BroadcastqStatus::seStatusMsgWithTimestamp( const TQString& message )
 {
   KLocale* locale = KGlobal::locale();
   seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
@@ -62,7 +62,7 @@ void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message )
                 .arg( message ) );
 }
 
-void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages,
+void BroadcastqStatus::seStatusMsgTransmissionCompleted( int numMessages,
                                                            int numBytes,
                                                            int numBytesRead,
                                                            int numBytesToRead,
@@ -96,10 +96,10 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages,
 
   seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->seStatus( statusMsg );
+    item->setqStatus( statusMsg );
 }
 
-void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account,
+void BroadcastqStatus::seStatusMsgTransmissionCompleted( const TQString& account,
                                                            int numMessages,
                                                            int numBytes,
                                                            int numBytesRead,
@@ -144,16 +144,16 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account,
 
   seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->seStatus( statusMsg );
+    item->setqStatus( statusMsg );
 }
 
-void BroadcasStatus::setTransienStatusMsg( const TQString& msg )
+void BroadcastqStatus::setTransienStatusMsg( const TQString& msg )
 {
   mTransientActive = true;
   emit statusMsg( msg );
 }
 
-void BroadcasStatus::reset()
+void BroadcastqStatus::reset()
 {
   mTransientActive = false;
   // restore
diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h
index 11eacd3e..24365580 100644
--- a/libkdepim/broadcaststatus.h
+++ b/libkdepim/broadcaststatus.h
@@ -29,16 +29,17 @@ class ProgressItem;
   */
 
 
-class KDE_EXPORT BroadcasStatus : public QObject
+class KDE_EXPORT BroadcastqStatus : public TQObject
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  virtual ~BroadcasStatus();
+  virtual ~BroadcastqStatus();
 
   /** Return the instance of the singleton object for this class */
-  static BroadcasStatus *instance();
+  static BroadcastqStatus *instance();
 
   /** Return the last status message from seStatusMsg() */
   TQString statusMsg() const { return mStatusMsg; }
@@ -82,10 +83,10 @@ signals:
 
 protected:
 
-  BroadcasStatus();
+  BroadcastqStatus();
   TQString mStatusMsg;
   bool mTransientActive;
-  static BroadcasStatus* instance_;
+  static BroadcastqStatus* instance_;
 };
 
 
diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp
index 79676fb8..dc22fd30 100644
--- a/libkdepim/calendardiffalgo.cpp
+++ b/libkdepim/calendardiffalgo.cpp
@@ -42,17 +42,17 @@ static TQString toString( KCal::Attendee *attendee )
 
 static TQString toString( KCal::Alarm * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Incidence * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Attachment * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( const TQDate &date )
@@ -138,7 +138,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
     conflictField( i18n( "Summary" ), left->summary(), right->summary() );
 
   if ( left->status() != right->status() )
-    conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
+    conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
 
   if ( left->secrecy() != right->secrecy() )
     conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );
@@ -202,12 +202,12 @@ void CalendarDiffAlgo::diffList( const TQString &id,
                                  const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.find( left[ i ] ) == right.end() )
+    if ( right.tqfind( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.find( right[ i ] ) == left.end() )
+    if ( left.tqfind( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index d386ae10..c5c4885b 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -43,7 +43,7 @@ class CategoryEditDialog::Private
     TQPushButton *mDeleteButton;
 };
 
-class CategoryListViewItem : public QListViewItem
+class CategoryListViewItem : public TQListViewItem
 {
   public:
     CategoryListViewItem( TQListView *view, const TQString &text ) :
@@ -57,9 +57,9 @@ class CategoryListViewItem : public QListViewItem
     }
 };
 
-CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
+CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent,
                                         const char* name, bool modal )
-  : KDialogBase::KDialogBase( parent, name, modal,
+  : KDialogBase::KDialogBase( tqparent, name, modal,
     i18n("Edit Categories"), Ok|Apply|Cancel|Help, Ok, true ),
     mPrefs( prefs ), d( new Private )
 {
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index f8168b7a..761dbad1 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -32,8 +32,9 @@ namespace KPIM {
 class KDE_EXPORT CategoryEditDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0,
+    CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent = 0,
                         const char* name = 0,
                         bool modal = false );
     ~CategoryEditDialog();
diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui
index b23a6697..d8f903d0 100644
--- a/libkdepim/categoryeditdialog_base.ui
+++ b/libkdepim/categoryeditdialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CategoryEditDialog_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CategoryEditDialog_base</cstring>
     </property>
@@ -25,12 +25,12 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLineEdit" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>mEdit</cstring>
             </property>
         </widget>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Category</string>
@@ -52,7 +52,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>tqlayout103</cstring>
             </property>
@@ -60,7 +60,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>mButtonAdd</cstring>
                     </property>
@@ -68,7 +68,7 @@
                         <string>A&amp;dd</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>mButtonRemove</cstring>
                     </property>
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 4eb072b1..982e1151 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -32,9 +32,9 @@
 
 using namespace KPIM;
 
-CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent,
+CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* tqparent,
                                             const char* name, bool modal )
-  : KDialogBase::KDialogBase( parent, name, modal,
+  : KDialogBase::KDialogBase( tqparent, name, modal,
     i18n("Select Categories"), Ok|Apply|Cancel|Help, Ok, true ),
     mPrefs( prefs )
 {
@@ -58,7 +58,7 @@ void CategorySelectDialog::setCategories( const TQStringList &categoryList )
   TQStringList::ConstIterator it;
 
   for ( it = categoryList.begin(); it != categoryList.end(); ++it )
-    if ( mPrefs->mCustomCategories.find( *it ) == mPrefs->mCustomCategories.end() )
+    if ( mPrefs->mCustomCategories.tqfind( *it ) == mPrefs->mCustomCategories.end() )
       mPrefs->mCustomCategories.append( *it );
 
   for ( it = mPrefs->mCustomCategories.begin();
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index dd5ad3b5..9c304444 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -33,8 +33,9 @@ namespace KPIM {
 class KDE_EXPORT CategorySelectDialog : public KDialogBase
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0,
+    CategorySelectDialog( KPimPrefs *prefs, TQWidget *tqparent = 0,
                           const char *name = 0, bool modal = false );
     ~CategorySelectDialog();
 
diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui
index c5030679..c728e4f1 100644
--- a/libkdepim/categoryselectdialog_base.ui
+++ b/libkdepim/categoryselectdialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CategorySelectDialog_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CategorySelectDialog_base</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Category</string>
@@ -41,7 +41,7 @@
                 <cstring>mCategories</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout12</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>mButtonClear</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>mButtonEdit</cstring>
                     </property>
diff --git a/libkdepim/cfgc/example.cfg b/libkdepim/cfgc/example.cfg
index 28a2d06b..1cc4feff 100644
--- a/libkdepim/cfgc/example.cfg
+++ b/libkdepim/cfgc/example.cfg
@@ -27,12 +27,12 @@
     </entry>
   </group>
   <group name="MyOptions">
-    <entry type="TQString">
+    <entry type=TQSTRING_OBJECT_NAME_STRING>
       <name>MyString</name>
       <label>This is a string</label>
       <default>Default String</default>
     </entry>
-    <entry type="TQStringList">
+    <entry type=TQSTRINGLIST_OBJECT_NAME_STRING>
       <name>MyStringList</name>
       <default>up,down</default>
     </entry>
diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui
index 040990ef..e5d8bfed 100644
--- a/libkdepim/cfgc/general_base.ui
+++ b/libkdepim/cfgc/general_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>GeneralBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox" row="0" column="1">
+        <widget class="TQCheckBox" row="0" column="1">
             <property name="name">
                 <cstring>OneOption</cstring>
             </property>
@@ -27,12 +27,12 @@
                 <string>OneOption</string>
             </property>
         </widget>
-        <widget class="QSpinBox" row="1" column="1">
+        <widget class="TQSpinBox" row="1" column="1">
             <property name="name">
                 <cstring>Another_Option</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui
index fe5d43ac..eadcb030 100644
--- a/libkdepim/cfgc/myoptions_base.ui
+++ b/libkdepim/cfgc/myoptions_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>480</height>
         </rect>
     </property>
-    <widget class="QLabel">
+    <widget class="TQLabel">
         <property name="name">
             <cstring>textLabel1</cstring>
         </property>
@@ -28,7 +28,7 @@
             <string>MyString:</string>
         </property>
     </widget>
-    <widget class="QLineEdit">
+    <widget class="TQLineEdit">
         <property name="name">
             <cstring>MyString</cstring>
         </property>
diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp
index 98748e44..f8bfe0e9 100644
--- a/libkdepim/clicklineedit.cpp
+++ b/libkdepim/clicklineedit.cpp
@@ -26,8 +26,8 @@
 
 using namespace KPIM;
 
-ClickLineEdit::ClickLineEdit(TQWidget *parent, const TQString &msg, const char* name) :
-  KLineEdit(parent, name) 
+ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const TQString &msg, const char* name) :
+  KLineEdit(tqparent, name) 
 {
   mDrawClickMsg = true;
   setClickMessage( msg ); 
diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h
index 65357375..f9a9543d 100644
--- a/libkdepim/clicklineedit.h
+++ b/libkdepim/clicklineedit.h
@@ -27,7 +27,7 @@
 namespace KPIM {
 
 /** 
-  This class provides a KLineEdit which tqcontains a greyed-out hinting
+  This class provides a KLineEdit which contains a greyed-out hinting
   text as long as the user didn't enter any text
 
   @short LineEdit with customizable "Click here" text
@@ -36,9 +36,10 @@ namespace KPIM {
 class KDE_EXPORT ClickLineEdit : public KLineEdit
 {
   Q_OBJECT
-  Q_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
+  TQ_OBJECT
+  TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
   public:
-    ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 );
+    ClickLineEdit( TQWidget *tqparent, const TQString &msg = TQString(), const char* name = 0 );
     ~ClickLineEdit();
 
     void setClickMessage( const TQString &msg );
diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp
index 2e1b6171..d49da43b 100644
--- a/libkdepim/collectingprocess.cpp
+++ b/libkdepim/collectingprocess.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -49,8 +49,8 @@ struct CollectingProcess::Private {
 };
 
 
-CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
-  : KProcess( parent, name )
+CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name )
+  : KProcess( tqparent, name )
 {
   d = new Private();
 }
diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h
index aff8a8d3..8bc4651b 100644
--- a/libkdepim/collectingprocess.h
+++ b/libkdepim/collectingprocess.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,8 +48,9 @@ namespace KPIM {
  */
 class KDE_EXPORT CollectingProcess : public KProcess {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  CollectingProcess( TQObject * parent = 0, const char * name = 0 );
+  CollectingProcess( TQObject * tqparent = 0, const char * name = 0 );
   ~CollectingProcess();
 
   /** Starts the process in NotifyOnExit mode and writes in to stdin of
diff --git a/libkdepim/completionordereditor.cpp b/libkdepim/completionordereditor.cpp
index 9fd4950a..e4821f3d 100644
--- a/libkdepim/completionordereditor.cpp
+++ b/libkdepim/completionordereditor.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -160,7 +160,7 @@ private:
 
 /////////
 
-class CompletionViewItem : public QListViewItem
+class CompletionViewItem : public TQListViewItem
 {
 public:
   CompletionViewItem( TQListView* lv, CompletionItem* item )
@@ -173,8 +173,8 @@ private:
 };
 
 CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
-                                              TQWidget* parent, const char* name )
-  : KDialogBase( parent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
+                                              TQWidget* tqparent, const char* name )
+  : KDialogBase( tqparent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
     mConfig( "kpimcompletionorder" ), mDirty( false )
 {
   mItems.setAutoDelete( true );
@@ -213,7 +213,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
   TQHBox* page = makeHBoxMainWidget();
   mListView = new KListView( page );
   mListView->setSorting( -1 );
-  mListView->addColumn( TQString::null );
+  mListView->addColumn( TQString() );
   mListView->header()->hide();
 
   for( TQPtrListIterator<CompletionItem> compit( mItems ); *compit; ++compit ) {
diff --git a/libkdepim/completionordereditor.h b/libkdepim/completionordereditor.h
index 0e17a534..7d4d3e47 100644
--- a/libkdepim/completionordereditor.h
+++ b/libkdepim/completionordereditor.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -63,9 +63,10 @@ public:
 
 class CompletionOrderEditor : public KDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
+  CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* tqparent, const char* name = 0 );
   ~CompletionOrderEditor();
 
   KConfig* configFile() { return &mConfig; }
diff --git a/libkdepim/configmanager.cpp b/libkdepim/configmanager.cpp
index 64b4562f..47bcb9d0 100644
--- a/libkdepim/configmanager.cpp
+++ b/libkdepim/configmanager.cpp
@@ -21,8 +21,8 @@
 
 using namespace KPIM;
 
-ConfigManager::ConfigManager( TQObject * parent, const char * name )
-  : TQObject( parent, name )
+ConfigManager::ConfigManager( TQObject * tqparent, const char * name )
+  : TQObject( tqparent, name )
 {
 
 }
diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h
index 44a170bc..ba024093 100644
--- a/libkdepim/configmanager.h
+++ b/libkdepim/configmanager.h
@@ -31,6 +31,7 @@ namespace KPIM {
  **/
 class KDE_EXPORT ConfigManager : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Commit changes to disk and emit changed() if necessary. */
   virtual void commit() = 0;
@@ -45,7 +46,7 @@ signals:
   void changed();
 
 protected:
-  ConfigManager( TQObject * parent=0, const char * name=0 );
+  ConfigManager( TQObject * tqparent=0, const char * name=0 );
   virtual ~ConfigManager();
 };
 
diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp
index 4116e583..f828476f 100644
--- a/libkdepim/csshelper.cpp
+++ b/libkdepim/csshelper.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -83,7 +83,7 @@ namespace KPIM {
     cPgpOk1H  = TQColor( 0x40, 0xFF, 0x40 ); // light green
     cPgpOk0H  = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow
     cPgpWarnH = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow
-    cPgpErrH  = Qt::red;
+    cPgpErrH  = TQt::red;
 
     for ( int i = 0 ; i < 3 ; ++i )
       mQuoteColor[i] = TQColor( 0x00, 0x80 - i * 0x10, 0x00 ); // shades of green
diff --git a/libkdepim/csshelper.h b/libkdepim/csshelper.h
index 3dbc80c0..ab9190cf 100644
--- a/libkdepim/csshelper.h
+++ b/libkdepim/csshelper.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index bb5b8c25..6907485d 100644
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@@ -41,9 +41,9 @@
 
 using namespace KPIM;
 
-DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent,
+DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *tqparent,
   const char *name )
-  : TQWidget( parent, name )
+  : TQWidget( tqparent, name )
 {
   initGUI( uiFile );
 }
@@ -145,15 +145,15 @@ void DesignerFields::load( DesignerFields::Storage *storage )
     TQString value;
     if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
       TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() );
-      wdg->setText( TQString::null );
+      wdg->setText( TQString() );
     } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
       TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() );
       wdg->setValue( wdg->minValue() );
     } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
       TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() );
       wdg->setChecked( false );
-    } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) {
-      QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( widIt.data() );
+    } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() );
       wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) {
       KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() );
@@ -166,7 +166,7 @@ void DesignerFields::load( DesignerFields::Storage *storage )
       wdg->setCurrentItem( 0 );
     } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
       TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() );
-      wdg->setText( TQString::null );
+      wdg->setText( TQString() );
     }
   }
 
@@ -174,7 +174,7 @@ void DesignerFields::load( DesignerFields::Storage *storage )
   for ( it2 = keys.begin(); it2 != keys.end(); ++it2 ) {
     TQString value = storage->read( *it2 );
 
-    TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.find( *it2 );
+    TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.tqfind( *it2 );
     if ( it != mWidgets.end() ) {
       if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
         TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() );
@@ -186,14 +186,14 @@ void DesignerFields::load( DesignerFields::Storage *storage )
         TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
         wdg->setChecked( value == "true" || value == "1" );
       } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
-        QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( it.data() );
-        wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+        TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
+        wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
         KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
-        wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+        wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( "KDatePicker" ) ) {
         KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
-        wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
+        wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
         TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
         wdg->setCurrentText( value );
@@ -219,15 +219,15 @@ void DesignerFields::save( DesignerFields::Storage *storage )
     } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
       TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
       value = ( wdg->isChecked() ? "true" : "false" );
-    } else if ( it.data()->inherits( "QDateTimeEdit" ) ) {
-      QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( it.data() );
-      value = wdg->dateTime().toString( Qt::ISODate );
+    } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+      TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
+      value = wdg->dateTime().toString( TQt::ISODate );
     } else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
       KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
-      value = wdg->dateTime().toString( Qt::ISODate );
+      value = wdg->dateTime().toString( TQt::ISODate );
     } else if ( it.data()->inherits( "KDatePicker" ) ) {
       KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
-      value = wdg->date().toString( Qt::ISODate );
+      value = wdg->date().toString( TQt::ISODate );
     } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
       TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
       value = wdg->currentText();
@@ -244,7 +244,7 @@ void DesignerFields::setReadOnly( bool readOnly )
 {
   TQMap<TQString, TQWidget*>::Iterator it;
   for ( it = mWidgets.begin(); it != mWidgets.end(); ++it )
-    if ( mDisabledWidgets.find( it.data() ) == mDisabledWidgets.end() )
+    if ( mDisabledWidgets.tqfind( it.data() ) == mDisabledWidgets.end() )
       it.data()->setEnabled( !readOnly );
 }
 
diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h
index 2d5db2b1..89032ead 100644
--- a/libkdepim/designerfields.h
+++ b/libkdepim/designerfields.h
@@ -32,11 +32,12 @@
 
 namespace KPIM {
 
-class KDE_EXPORT DesignerFields : public QWidget
+class KDE_EXPORT DesignerFields : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    DesignerFields( const TQString &uiFile, TQWidget *parent,
+    DesignerFields( const TQString &uiFile, TQWidget *tqparent,
       const char *name = 0 );
 
     class Storage
diff --git a/libkdepim/diffalgo.cpp b/libkdepim/diffalgo.cpp
index 21c47686..42831656 100644
--- a/libkdepim/diffalgo.cpp
+++ b/libkdepim/diffalgo.cpp
@@ -75,7 +75,7 @@ void DiffAlgo::conflictField( const TQString &id, const TQString &leftValue,
 
 void DiffAlgo::addDisplay( DiffAlgoDisplay *display )
 {
-  if ( mDisplays.find( display ) == mDisplays.end() )
+  if ( mDisplays.tqfind( display ) == mDisplays.end() )
     mDisplays.append( display );
 }
 
diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp
index 6d96b235..97b11bcf 100644
--- a/libkdepim/distributionlist.cpp
+++ b/libkdepim/distributionlist.cpp
@@ -28,7 +28,7 @@ void KPIM::DistributionList::setName( const TQString &name )
 
 // Helper function, to parse the contents of the custom field
 // Returns a list of { uid, email }
-typedef TQValueList<QPair<TQString, TQString> > ParseList;
+typedef TQValueList<TQPair<TQString, TQString> > ParseList;
 static ParseList parseCustom( const TQString& str )
 {
   ParseList res;
@@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e
   TQString str = custom( "KADDRESSBOOK", s_customFieldName );
   // Assumption: UIDs don't contain ; nor ,
   str += ";" + uid + "," + email;
-  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
+  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
 }
 
 void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email )
@@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e
   }
   if ( str.isEmpty() )
     str = ";"; // keep something, for isDistributionList to work
-  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
+  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
 }
 
 bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr )
@@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo
   return DistributionList();
 }
 
-static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
+static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
 {
-  KABC::Addressee a = book->tqfindByUid( uidOrName );
+  KABC::Addressee a = book->findByUid( uidOrName );
   if ( a.isEmpty() ) {
     // UID not found, maybe it is a name instead.
     // If we have an email, let's use that for the lookup.
     // [This is used by e.g. the Kolab resource]
     if ( !email.isEmpty() ) {
-      KABC::Addressee::List lst = book->tqfindByEmail( email );
+      KABC::Addressee::List lst = book->findByEmail( email );
       KABC::Addressee::List::ConstIterator listit = lst.begin();
       for ( ; listit != lst.end(); ++listit )
         if ( (*listit).formattedName() == uidOrName ) {
@@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre
     const TQString uid = (*it).first;
     const TQString email = (*it).second;
     // look up contact
-    KABC::Addressee a = tqfindByUidOrName( book, uid, email );
+    KABC::Addressee a = findByUidOrName( book, uid, email );
     if ( a.isEmpty() ) {
       // ## The old DistributionListManager had a "missing entries" list...
       kdWarning() << "Addressee not found: " << uid << endl;
@@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const
     const TQString thisEmail = (*it).second;
 
     // look up contact
-    KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail );
+    KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail );
     if ( a.isEmpty() ) {
       // ## The old DistributionListManager had a "missing entries" list...
       continue;
diff --git a/libkdepim/distributionlist.h b/libkdepim/distributionlist.h
index 06b720b0..0faaeeec 100644
--- a/libkdepim/distributionlist.h
+++ b/libkdepim/distributionlist.h
@@ -89,18 +89,18 @@ class DistributionList : public KABC::Addressee
       Insert an entry into this distribution list. If the entry already exists
       nothing happens.
     */
-    void insertEntry( const Addressee &, const TQString &email=TQString::null );
+    void insertEntry( const Addressee &, const TQString &email=TQString() );
 
     /**
       Remove an entry from this distribution list. If the entry doesn't exist
       nothing happens.
     */
-    void removeEntry( const Addressee &, const TQString &email=TQString::null );
+    void removeEntry( const Addressee &, const TQString &email=TQString() );
 
     /// Overload, used by resources to avoid looking up the addressee
-    void insertEntry( const TQString& uid, const TQString& email=TQString::null );
+    void insertEntry( const TQString& uid, const TQString& email=TQString() );
     /// Overload, used by resources to avoid looking up the addressee
-    void removeEntry( const TQString& uid, const TQString& email=TQString::null );
+    void removeEntry( const TQString& uid, const TQString& email=TQString() );
 
 
     /**
diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp
index 12b25ded..e73911f0 100644
--- a/libkdepim/embeddedurlpage.cpp
+++ b/libkdepim/embeddedurlpage.cpp
@@ -33,8 +33,8 @@
 using namespace KPIM;
 
 EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype,
-                                  TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
+                                  TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
 {
   initGUI( url, mimetype );
 }
@@ -54,8 +54,8 @@ void EmbeddedURLPage::loadContents()
     TQString mimetype = mMimeType;
     if ( mimetype == "auto" )
         mimetype == KMimeType::findByURL( mUri )->name();
-    // "this" is both the parent widget and the parent object
-    mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 );
+    // "this" is both the tqparent widget and the tqparent object
+    mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
     if ( mPart ) {
         mPart->openURL( mUri );
         mPart->widget()->show();
diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h
index 61f8933a..7f5c4c9e 100644
--- a/libkdepim/embeddedurlpage.h
+++ b/libkdepim/embeddedurlpage.h
@@ -29,12 +29,13 @@ namespace KParts { class ReadOnlyPart; }
 
 namespace KPIM {
 
-class KDE_EXPORT EmbeddedURLPage : public QWidget
+class KDE_EXPORT EmbeddedURLPage : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     EmbeddedURLPage( const TQString &url, const TQString &mimetype,
-                     TQWidget *parent, const char *name = 0 );
+                     TQWidget *tqparent, const char *name = 0 );
 
   public slots:
     void loadContents();
diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp
index 2c6af164..19b99d4e 100644
--- a/libkdepim/htmldiffalgodisplay.cpp
+++ b/libkdepim/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
   return TQStyleSheet::convertFromPlainText( text );
 }
 
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
-  : KTextBrowser( parent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
+  : KTextBrowser( tqparent )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
   setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h
index 4495e200..55090f41 100644
--- a/libkdepim/htmldiffalgodisplay.h
+++ b/libkdepim/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
 {
   public:
-    HTMLDiffAlgoDisplay( TQWidget *parent );
+    HTMLDiffAlgoDisplay( TQWidget *tqparent );
 
     void begin();
     void end();
diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp
index 55cb3568..3c8ac26f 100644
--- a/libkdepim/infoextension.cpp
+++ b/libkdepim/infoextension.cpp
@@ -26,8 +26,8 @@
 
 using namespace KParts;
 
-InfoExtension::InfoExtension( KParts::ReadOnlyPart *parent, const char* name)
-: TQObject(parent, name), d(0)
+InfoExtension::InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name)
+: TQObject(tqparent, name), d(0)
 {
 }
 
diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h
index 0a992a15..343f7172 100644
--- a/libkdepim/infoextension.h
+++ b/libkdepim/infoextension.h
@@ -35,18 +35,19 @@ namespace KParts
   /**
    * Provides a way to get information out of a PIM-Part
    **/
-	class KDE_EXPORT InfoExtension : public QObject
+	class KDE_EXPORT InfoExtension : public TQObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 
 	public:
       /**
        * Constucts an InfoExtension.
        *
-       * @param parent   The parent widget.
+       * @param tqparent   The tqparent widget.
        * @param name     The name of the class.
        **/
-		InfoExtension( KParts::ReadOnlyPart *parent, const char* name);
+		InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name);
 		~InfoExtension();
 
 	private:
diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp
index beeb7b90..7e6842bf 100644
--- a/libkdepim/kabcresourcecached.cpp
+++ b/libkdepim/kabcresourcecached.cpp
@@ -178,7 +178,7 @@ void ResourceCached::insertAddressee( const Addressee &addr )
     mAddrMap.insert( addr.uid(), addr );
     mAddedAddressees.insert( addr.uid(), addr );
   } else {
-    KABC::Addressee oldAddressee = mAddrMap.find( addr.uid() ).data();
+    KABC::Addressee oldAddressee = mAddrMap.tqfind( addr.uid() ).data();
     if ( oldAddressee != addr ) {
       mAddrMap.remove( addr.uid() );
       mAddrMap.insert( addr.uid(), addr );
@@ -194,7 +194,7 @@ void ResourceCached::removeAddressee( const Addressee &addr )
     return;
   }
 
-  if ( mDeletedAddressees.find( addr.uid() ) == mDeletedAddressees.end() )
+  if ( mDeletedAddressees.tqfind( addr.uid() ) == mDeletedAddressees.end() )
     mDeletedAddressees.insert( addr.uid(), addr );
 
   mAddrMap.remove( addr.uid() );
diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h
index 00d6f4e8..64481901 100644
--- a/libkdepim/kabcresourcecached.h
+++ b/libkdepim/kabcresourcecached.h
@@ -34,6 +34,7 @@ namespace KABC {
 class KDE_EXPORT ResourceCached : public Resource
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/libkdepim/kaccount.cpp b/libkdepim/kaccount.cpp
index 9aab7cfe..392fea26 100644
--- a/libkdepim/kaccount.cpp
+++ b/libkdepim/kaccount.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkdepim/kaccount.h b/libkdepim/kaccount.h
index d8118276..7da94462 100644
--- a/libkdepim/kaccount.h
+++ b/libkdepim/kaccount.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,7 +50,7 @@ class KDE_EXPORT KAccount
       Other
     };
 
-    KAccount( const uint id = 0, const TQString &name = TQString::null,
+    KAccount( const uint id = 0, const TQString &name = TQString(),
        const Type type = Other );
     
     /**
@@ -75,13 +75,13 @@ class KDE_EXPORT KAccount
      * Save the settings
      * If the group is empty it must be preset in the KConfig
      */
-    void writeConfig( KConfig &config, const TQString &group = TQString::null ); 
+    void writeConfig( KConfig &config, const TQString &group = TQString() ); 
 
     /**
      * Read the settings
      * If the group is empty it must be preset in the KConfig
      */
-    void readConfig( KConfig &config, const TQString &group = TQString::null ); 
+    void readConfig( KConfig &config, const TQString &group = TQString() ); 
 
   protected:
     uint mId;
diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp
index 187ce637..7356bc2d 100644
--- a/libkdepim/kaddrbook.cpp
+++ b/libkdepim/kaddrbook.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
+void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) {
   TQString email;
   TQString name;
 
@@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+  KABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.count() > 0 ) {
     if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
@@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
 #else
     TQString text = email + " " + i18n( "is not in address book" );
 #endif
-    KMessageBox::information( parent, text, TQString::null, "notInAddressBook" );
+    KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" );
   }
 }
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
+void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
   TQString email;
   TQString name;
 
@@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
 
   // force a reload of the address book file so that changes that were made
   // by other programs are loaded
@@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+  KABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.isEmpty() ) {
     KABC::Addressee a;
@@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
       TQString text = i18n("<qt>The email address <b>%1</b> was added to your "
                           "addressbook; you can add more information to this "
                           "entry by opening the addressbook.</qt>").arg( addr );
-      KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
     }
   } else {
     TQString text = i18n("<qt>The email address <b>%1</b> is already in your "
                         "addressbook.</qt>").arg( addr );
-    KMessageBox::information( parent, text, TQString::null,
+    KMessageBox::information( tqparent, text, TQString(),
                               "alreadyInAddressBook" );
   }
   ab->setErrorHandler( 0 );
@@ -173,22 +173,22 @@ void KAddrBookExternal::addNewAddressee( TQWidget* )
   call.send("newContact()");
 }
 
-bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent )
+bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent )
 {
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
   bool inserted = false;
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
 
   KABC::Addressee::List addressees =
-      ab->tqfindByEmail( addressee.preferredEmail() );
+      ab->findByEmail( addressee.preferredEmail() );
 
   if ( addressees.isEmpty() ) {
     if ( KAddrBookExternal::addAddressee( addressee ) ) {
       TQString text = i18n("The VCard was added to your addressbook; "
                           "you can add more information to this "
                           "entry by opening the addressbook.");
-      KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
       inserted = true;
     }
   } else {
@@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa
                         "your addressbook; however, you may save the VCard "
                         "into a file and import it into the addressbook "
                         "manually.");
-    KMessageBox::information( parent, text );
+    KMessageBox::information( tqparent, text );
     inserted = true;
   }
 
@@ -229,7 +229,7 @@ bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr )
 TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
 {
   if ( listName.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const TQString lowerListName = listName.lower();
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -251,7 +251,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
     }
   }
 #endif
-  return TQString::null;
+  return TQString();
 }
 
 KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook )
diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h
index 374753e5..b4835234 100644
--- a/libkdepim/kaddrbook.h
+++ b/libkdepim/kaddrbook.h
@@ -19,12 +19,12 @@ class TQWidget;
 
 class KDE_EXPORT KAddrBookExternal {
 public:
-  static void addEmail( const TQString &addr, TQWidget *parent );
+  static void addEmail( const TQString &addr, TQWidget *tqparent );
   static void addNewAddressee( TQWidget* );
-  static void openEmail( const TQString &addr, TQWidget *parent );
-  static void openAddressBook( TQWidget *parent );
+  static void openEmail( const TQString &addr, TQWidget *tqparent );
+  static void openAddressBook( TQWidget *tqparent );
 
-  static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent );
+  static bool addVCard( const KABC::Addressee& addressee, TQWidget *tqparent );
 
   static TQString expandDistributionList( const TQString& listName );
 
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index bda4aa7d..be4aa97b 100644
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@@ -53,11 +53,11 @@
 
 using namespace KPIM;
 
-class PageItem : public QCheckListItem
+class PageItem : public TQCheckListItem
 {
   public:
-    PageItem( TQListView *parent, const TQString &path )
-      : TQCheckListItem( parent, "", TQCheckListItem::CheckBox ),
+    PageItem( TQListView *tqparent, const TQString &path )
+      : TQCheckListItem( tqparent, "", TQCheckListItem::CheckBox ),
         mPath( path ), mIsActive( false )
     {
       mName = path.mid( path.findRev( '/' ) + 1 );
@@ -85,7 +85,7 @@ class PageItem : public QCheckListItem
         allowedTypes.insert( "KDatePicker", i18n( "Date" ) );
 
         while ( it.current() ) {
-          if ( allowedTypes.find( it.current()->className() ) != allowedTypes.end() ) {
+          if ( allowedTypes.tqfind( it.current()->className() ) != allowedTypes.end() ) {
             TQString name = it.current()->name();
             if ( name.startsWith( "X_" ) ) {
               new TQListViewItem( this, name,
@@ -126,13 +126,13 @@ class PageItem : public QCheckListItem
     bool mIsActive;
 };
 
-KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMDesignerFields::KCMDesignerFields( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
   
   KAboutData *about = new KAboutData( I18N_NOOP( "KCMDesignerfields" ),
-                                      I18N_NOOP( "Qt Designer Fields Dialog" ),
+                                      I18N_NOOP( "TQt Designer Fields Dialog" ),
                                       0, 0, KAboutData::License_LGPL,
                                       I18N_NOOP( "(c), 2004 Tobias Koenig" ) );
 
@@ -174,7 +174,7 @@ void KCMDesignerFields::deleteFile()
 {
   TQListViewItem *item = mPageView->selectedItem();
   if ( item ) {
-    PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item );
+    PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item );
     if (KMessageBox::warningContinueCancel(this,
 	i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() )
          == KMessageBox::Continue)
@@ -215,9 +215,9 @@ void KCMDesignerFields::loadActivePages(const TQStringList& ai)
 {
   TQListViewItemIterator it( mPageView );
   while ( it.current() ) {
-    if ( it.current()->parent() == 0 ) {
+    if ( it.current()->tqparent() == 0 ) {
       PageItem *item = static_cast<PageItem*>( it.current() );
-      if ( ai.find( item->name() ) != ai.end() ) {
+      if ( ai.tqfind( item->name() ) != ai.end() ) {
         item->setOn( true );
         item->setIsActive( true );
       }
@@ -239,7 +239,7 @@ TQStringList KCMDesignerFields::saveActivePages()
 
   TQStringList activePages;
   while ( it.current() ) {
-    if ( it.current()->parent() == 0 ) {
+    if ( it.current()->tqparent() == 0 ) {
       PageItem *item = static_cast<PageItem*>( it.current() );
       activePages.append( item->name() );
     }
@@ -269,7 +269,7 @@ void KCMDesignerFields::initGUI()
   if ( noDesigner )
   {
     TQString txt =
-      i18n("<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
+      i18n("<qt><b>Warning:</b> TQt Designer could not be found. It is probably not "
          "installed. You will only be able to import existing designer files.</qt>");
     TQLabel *lbl = new TQLabel( txt, this );
     tqlayout->addWidget( lbl );
@@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI()
   mPageView->setFullWidth( true );
   hbox->addWidget( mPageView );
 
-  TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this );
+  TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this );
 
   mPagePreview = new TQLabel( box );
   mPagePreview->setMinimumWidth( 300 );
@@ -301,11 +301,11 @@ void KCMDesignerFields::initGUI()
                          "  Elements ('<i>Widgets</i>') to store your own values"
                          " into %1. Proceed as described below:</p>"
                          "<ol>"
-                         "<li>Click on '<i>Edit with Qt Designer</i>'"
+                         "<li>Click on '<i>Edit with TQt Designer</i>'"
                          "<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>"
                          "<li>Add your widgets to the form"
-                         "<li>Save the file in the directory proposed by Qt Designer"
-                         "<li>Close Qt Designer"
+                         "<li>Save the file in the directory proposed by TQt Designer"
+                         "<li>Close TQt Designer"
                          "</ol>"
                          "<p>In case you already have a designer file (*.ui) located"
                          " somewhere on your hard disk, simply choose '<i>Import Page</i>'</p>"
@@ -315,7 +315,7 @@ void KCMDesignerFields::initGUI()
                          " <i>name</i> property to '<i>X_Foo</i>'.</p>"
                          "<p><b>Important:</b> The widget will edit custom fields with an"
                          " application name of %2.  To change the application name"
-                         " to be edited, set the widget name in Qt Designer.</p></qt>" )
+                         " to be edited, set the widget name in TQt Designer.</p></qt>" )
                          .arg( applicationName(), applicationName() );
 
   KActiveLabel *activeLabel = new KActiveLabel(
@@ -332,7 +332,7 @@ void KCMDesignerFields::initGUI()
   hbox->addWidget( mDeleteButton );
   mImportButton = new TQPushButton( i18n( "Import Page..." ), this);
   hbox->addWidget( mImportButton );
-  mDesignerButton = new TQPushButton( i18n( "Edit with Qt Designer..." ), this );
+  mDesignerButton = new TQPushButton( i18n( "Edit with TQt Designer..." ), this );
   hbox->addWidget( mDesignerButton );
 
   if ( noDesigner )
@@ -353,7 +353,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
   bool widgetItemSelected = false;
 
   if ( item ) {
-    if ( item->parent() ) {
+    if ( item->tqparent() ) {
       TQString details = TQString( "<qt><table>"
                                  "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"
                                  "<tr><td align=\"right\"><b>%3</b></td><td>%4</td></tr>"
@@ -371,10 +371,10 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
 
       mPageDetails->setText( details );
 
-      PageItem *pageItem = static_cast<PageItem*>( item->parent() );
+      PageItem *pageItem = static_cast<PageItem*>( item->tqparent() );
       mPagePreview->setPixmap( pageItem->preview() );
     } else {
-      mPageDetails->setText( TQString::null );
+      mPageDetails->setText( TQString() );
 
       PageItem *pageItem = static_cast<PageItem*>( item );
       mPagePreview->setPixmap( pageItem->preview() );
@@ -386,7 +386,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
   } else {
     mPagePreview->setPixmap( TQPixmap() );
     mPagePreview->setFrameStyle( 0 );
-    mPageDetails->setText( TQString::null );
+    mPageDetails->setText( TQString() );
   }
 
   mDeleteButton->setEnabled( widgetItemSelected );
@@ -394,7 +394,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
 
 void KCMDesignerFields::itemClicked( TQListViewItem *item )
 {
-  if ( !item || item->parent() != 0 )
+  if ( !item || item->tqparent() != 0 )
     return;
 
   PageItem *pageItem = static_cast<PageItem*>( item );
@@ -420,7 +420,7 @@ void KCMDesignerFields::startDesigner()
 
   TQListViewItem *item = mPageView->selectedItem();
   if ( item ) {
-    PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item );
+    PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item );
     cmdLine += " " + KProcess::quote( pageItem->path() );
   }
 
diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h
index 453730f9..e2e5d5a5 100644
--- a/libkdepim/kcmdesignerfields.h
+++ b/libkdepim/kcmdesignerfields.h
@@ -36,9 +36,10 @@ namespace KPIM {
 class KDE_EXPORT KCMDesignerFields : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 );
+    KCMDesignerFields( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/libkdepim/kconfigpropagator.cpp b/libkdepim/kconfigpropagator.cpp
index 0f59c2a0..aea94089 100644
--- a/libkdepim/kconfigpropagator.cpp
+++ b/libkdepim/kconfigpropagator.cpp
@@ -159,9 +159,9 @@ void KConfigPropagator::parseConfigEntryPath( const TQString &path,
 
   if ( p.count() != 3 ) {
     kdError() << "Path has to be of form file/group/entry" << endl;
-    file = TQString::null;
-    group = TQString::null;
-    entry = TQString::null;
+    file = TQString();
+    group = TQString();
+    entry = TQString();
     return;
   }
   
diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h
index 9b3c1a6f..1bad2250 100644
--- a/libkdepim/kconfigpropagator.h
+++ b/libkdepim/kconfigpropagator.h
@@ -99,8 +99,8 @@ class KDE_EXPORT KConfigPropagator
         void setTitle( const TQString &title ) { mTitle = title; }
         TQString title() const { return mTitle; }
 
-        virtual TQString arg1() const { return TQString::null; }
-        virtual TQString arg2() const { return TQString::null; }
+        virtual TQString arg1() const { return TQString(); }
+        virtual TQString arg2() const { return TQString(); }
 
         virtual void apply() = 0;
 
diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp
index 6db0f999..99aa0b59 100644
--- a/libkdepim/kconfigwizard.cpp
+++ b/libkdepim/kconfigwizard.cpp
@@ -31,18 +31,18 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-KConfigWizard::KConfigWizard( TQWidget *parent,
+KConfigWizard::KConfigWizard( TQWidget *tqparent,
                               char *name, bool modal )
-  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
+  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
                  name, modal ),
     mPropagator( 0 ), mChangesPage( 0 )
 {
   init();
 }
 
-KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
+KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent,
                               char *name, bool modal )
-  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
+  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
                  name, modal ),
     mPropagator( propagator ), mChangesPage( 0 )
 {
diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h
index e5e6337e..290b55e3 100644
--- a/libkdepim/kconfigwizard.h
+++ b/libkdepim/kconfigwizard.h
@@ -33,16 +33,17 @@ class TQListView;
 class KDE_EXPORT KConfigWizard : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Create wizard. You have to set a propgator with setPropagator() later.
     */
-    KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
+    KConfigWizard( TQWidget *tqparent = 0, char *name = 0, bool modal = false );
     /**
       Create wizard for given KConfigPropagator. The wizard takes ownership of
       the propagator.
     */
-    KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0,
+    KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent = 0,
                    char *name = 0, bool modal = false );
     /**
       Destructor.
@@ -78,9 +79,9 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
 
     /**
       Validates the supplied data. Returns a appropiate error when some data
-      is invalid. Return TQString::null if all data is valid.
+      is invalid. Return TQString() if all data is valid.
     */
-    virtual TQString validate() { return TQString::null; }
+    virtual TQString validate() { return TQString(); }
 
   protected slots:
     void readConfig();
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index c4221556..1d54920d 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -34,11 +34,11 @@
 
 #include "kdateedit.h"
 
-class DateValidator : public QValidator
+class DateValidator : public TQValidator
 {
   public:
-    DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
-      : TQValidator( parent, name ), mKeywords( keywords )
+    DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 )
+      : TQValidator( tqparent, name ), mKeywords( keywords )
     {}
 
     virtual State validate( TQString &str, int& ) const
@@ -64,8 +64,8 @@ class DateValidator : public QValidator
     TQStringList mKeywords;
 };
 
-KDateEdit::KDateEdit( TQWidget *parent, const char *name )
-  : TQComboBox( true, parent, name ),
+KDateEdit::KDateEdit( TQWidget *tqparent, const char *name )
+  : TQComboBox( true, tqparent, name ),
     mReadOnly( false ),
     mDiscardNextMousePress( false )
 {
@@ -163,7 +163,7 @@ void KDateEdit::popup()
 
   // The combo box is now shown pressed. Make it show not pressed again
   // by causing its (invisible) list box to emit a 'selected' signal.
-  // First, ensure that the list box tqcontains the date currently displayed.
+  // First, ensure that the list box contains the date currently displayed.
   TQDate date = parseDate();
   assignDate( date );
   updateView();
@@ -171,7 +171,7 @@ void KDateEdit::popup()
   TQListBox *lb = listBox();
   if (lb) {
     lb->setCurrentItem(0);
-    TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, Qt::Key_Enter, 0, 0);
+    TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, TQt::Key_Enter, 0, 0);
     TQApplication::postEvent(lb, keyEvent);
   }
 }
@@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date )
 
 void KDateEdit::lineEnterPressed()
 {
-  bool tqreplaced = false;
+  bool replaced = false;
 
-  TQDate date = parseDate( &tqreplaced );
+  TQDate date = parseDate( &replaced );
 
   if (assignDate( date ) ) {
-    if ( tqreplaced )
+    if ( replaced )
       updateView();
 
     emit dateChanged( date );
@@ -204,13 +204,13 @@ void KDateEdit::lineEnterPressed()
   }
 }
 
-TQDate KDateEdit::parseDate( bool *tqreplaced ) const
+TQDate KDateEdit::parseDate( bool *replaced ) const
 {
   TQString text = currentText();
   TQDate result;
 
-  if ( tqreplaced )
-    (*tqreplaced) = false;
+  if ( replaced )
+    (*replaced) = false;
 
   if ( text.isEmpty() )
     result = TQDate();
@@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *tqreplaced ) const
     }
 
     result = today.addDays( i );
-    if ( tqreplaced )
-      (*tqreplaced) = true;
+    if ( replaced )
+      (*replaced) = true;
   } else {
     result = KGlobal::locale()->readDate( text );
   }
@@ -256,15 +256,15 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
       // Up and down arrow keys step the date
       TQKeyEvent* keyEvent = (TQKeyEvent*)event;
 
-      if ( keyEvent->key() == Qt::Key_Return ) {
+      if ( keyEvent->key() == TQt::Key_Return ) {
         lineEnterPressed();
         return true;
       }
 
       int step = 0;
-      if ( keyEvent->key() == Qt::Key_Up )
+      if ( keyEvent->key() == TQt::Key_Up )
         step = 1;
-      else if ( keyEvent->key() == Qt::Key_Down )
+      else if ( keyEvent->key() == TQt::Key_Down )
         step = -1;
       // TODO: If it's not an input key, but something like Return, Enter, Tab, etc..., don't eat the keypress, but handle it through to the default eventfilter!
       if ( step && !mReadOnly ) {
@@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
 
 void KDateEdit::mousePressEvent( TQMouseEvent *event )
 {
-  if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) {
+  if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) {
     mDiscardNextMousePress = false;
     return;
   }
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 0adb6ee5..cde85b0f 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -36,7 +36,7 @@ class TQEvent;
 
 /**
   A date editing widget that consists of an editable combo box.
-  The combo box tqcontains the date in text form, and clicking the combo
+  The combo box contains the date in text form, and clicking the combo
   box arrow will display a 'popup' style date picker.
 
   This widget also supports advanced features like allowing the user
@@ -51,12 +51,13 @@ class TQEvent;
   @author David Jarvie <software@astrojar.org.uk>
   @author Tobias Koenig <tokoe@kde.org>
 */
-class KDE_EXPORT KDateEdit : public QComboBox
+class KDE_EXPORT KDateEdit : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KDateEdit( TQWidget *parent = 0, const char *name = 0 );
+    KDateEdit( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~KDateEdit();
 
     /**
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index 8e3f3695..7d1f6427 100644
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@@ -26,9 +26,9 @@
 
 #include "kdatepickerpopup.h"
 
-KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *parent,
+KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *tqparent,
                                     const char *name )
-  : TQPopupMenu( parent, name )
+  : TQPopupMenu( tqparent, name )
 {
   mItems = items;
 
diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h
index 70ed6793..4b563280 100644
--- a/libkdepim/kdatepickerpopup.h
+++ b/libkdepim/kdatepickerpopup.h
@@ -42,9 +42,10 @@
 
    @author Bram Schoenmakers <bram_s@softhome.net>
 */
-class KDE_EXPORT KDatePickerPopup: public QPopupMenu
+class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum { NoDate = 1, DatePicker = 2, Words = 4 };
 
@@ -53,11 +54,11 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu
 
        @param items List of all desirable items, separated with a bitwise OR.
        @param date Initial date of datepicker-widget.
-       @param parent The object's parent.
+       @param tqparent The object's tqparent.
        @param name The object's name.
     */
     KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(),
-                      TQWidget *parent = 0, const char *name = 0 );
+                      TQWidget *tqparent = 0, const char *name = 0 );
 
     /**
        @return A pointer to the private variable mDatePicker, an instance of
diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets
index 21410ee6..2f1b5e24 100644
--- a/libkdepim/kdepim.widgets
+++ b/libkdepim/kdepim.widgets
@@ -25,5 +25,5 @@ Group=Input (KDE-PIM)
 ToolTip=Time Edit Combobox (KDE-PIM)
 WhatsThis=A widget to enter a time. It can also be selected from a drop-down list.
 IncludeFile=libkdepim/ktimeedit.h
-ConstructorArgs=(parent, QTime::currentTime(), name)
+ConstructorArgs=(tqparent, QTime::currentTime(), name)
 Group=Input (KDE-PIM)
diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp
index 6a7eea7c..913ee2cc 100644
--- a/libkdepim/kfileio.cpp
+++ b/libkdepim/kfileio.cpp
@@ -190,7 +190,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
     if (aAskIfExists)
     {
       TQString str;
-      str = i18n("File %1 exists.\nDo you want to tqreplace it?")
+      str = i18n("File %1 exists.\nDo you want to replace it?")
 		  .arg(aFileName);
       rc = KMessageBox::warningContinueCancel(0,
 	   str, i18n("Save to File"), i18n("&Replace"));
@@ -348,8 +348,8 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
     if ( !g.isReadable() ){
       error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n");
     } else {
-      const QFileInfoList *list = g.entryInfoList();
-      QFileInfoListIterator it( *list );
+      const TQFileInfoList *list = g.entryInfoList();
+      TQFileInfoListIterator it( *list );
       TQFileInfo *fi;
       while ((fi = it.current()) != 0) {
         TQString newToCheck = toCheck + "/" + fi->fileName();
@@ -365,7 +365,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
   return error;
 }
 
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent,
   const TQString &toCheck, const bool recursive, const bool wantItReadable,
   const bool wantItWritable )
 {
@@ -376,7 +376,7 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
   // it is just a warning.
   if ( !error.isEmpty() ) {
     kdDebug() << "checkPermissions found:" << error << endl;
-    KMessageBox::detailedSorry(parent,
+    KMessageBox::detailedSorry(tqparent,
                                i18n("Some files or folders do not have "
                                "the right permissions, please correct them "
                                "manually."),
diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h
index 99d4d1dc..8365f1e2 100644
--- a/libkdepim/kfileio.h
+++ b/libkdepim/kfileio.h
@@ -78,10 +78,10 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
    * all files and folders below. If the permissions are not ok, it tries to correct 
    * them. If that fails then a warning with detailled information is given.
    *
-   * @param  parent         If parent is 0, then the message box becomes an
-   *                        application-global modal dialog box. If parent 
+   * @param  tqparent         If tqparent is 0, then the message box becomes an
+   *                        application-global modal dialog box. If tqparent 
    *                        is a widget, the message box becomes modal 
-   *                        relative to parent.
+   *                        relative to tqparent.
    * @param toCheck         The file or folder of which the permissions should 
    *                        be checked.
    * @param recursive       Set to true, it will check the contents of a folder
@@ -97,7 +97,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
    *         then the permissions are not ok and it was not possible to correct
    *         all errors.
    */
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, 
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, 
    const TQString &toCheck, const bool recursive, const bool wantItReadable,
    const bool wantItWritable );
 }
diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp
index 2bf6ca1b..0098adbb 100644
--- a/libkdepim/kfoldertree.cpp
+++ b/libkdepim/kfoldertree.cpp
@@ -12,18 +12,18 @@
 #include <tqstyle.h>
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
+KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label,
 				  Protocol protocol, Type type )
-  : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+  : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
     mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent,
+KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent,
 				  const TQString & label, Protocol protocol, Type type,
           int unread, int total )
-    : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+    : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
       mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
@@ -149,7 +149,7 @@ void KFolderTreeItem::setUnreadCount( int aUnread )
 
   mUnread = aUnread;
 
-  TQString unread = TQString::null;
+  TQString unread = TQString();
   if (mUnread == 0)
     unread = "- ";
   else {
@@ -168,7 +168,7 @@ void KFolderTreeItem::setTotalCount( int aTotal )
 
   mTotal = aTotal;
 
-  TQString total = TQString::null;
+  TQString total = TQString();
   if (mTotal == 0)
     total = "- ";
   else {
@@ -269,7 +269,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
   // deal with the folder column if the unread column is not shown
 
   /* The below is exceedingly silly, but Ingo insists that the unread
-   * count that is shown in parenthesis after the folder name must
+   * count that is shown in tqparenthesis after the folder name must
    * be configurable in color. That means that paintCell needs to do
    * two painting passes which flickers. Since that flicker is not
    * needed when there is the unread column, special case that. */
@@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
 //=============================================================================
 
 
-KFolderTree::KFolderTree( TQWidget *parent, const char* name )
-  : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
+KFolderTree::KFolderTree( TQWidget *tqparent, const char* name )
+  : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
 {
   // GUI-options
   setStyleDependantFrameWidth();
@@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const
 void KFolderTree::addUnreadColumn( const TQString & name, int width )
 {
   mUnreadIndex = addColumn( name, width );
-  setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width )
 void KFolderTree::addTotalColumn( const TQString & name, int width )
 {
   mTotalIndex = addColumn( name, width );
-  setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn()
 void KFolderTree::addSizeColumn( const TQString & name, int width )
 {
   mSizeIndex = addColumn( name, width );
-  setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
   header()->adjustHeaderSize();
 }
 
diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h
index 5ababa1c..db0f8baf 100644
--- a/libkdepim/kfoldertree.h
+++ b/libkdepim/kfoldertree.h
@@ -61,7 +61,7 @@ struct KPaintInfo {
     showTodo(false),
     showSpamHam(false),
     showWatchedIgnored(false),
-    showStatus(false),
+    showtqStatus(false),
     showSigned(false),
     showCrypto(false),
     showReceiver(false),
@@ -108,7 +108,7 @@ struct KPaintInfo {
   bool showTodo;
   bool showSpamHam;
   bool showWatchedIgnored;
-  bool showStatus;
+  bool showtqStatus;
   bool showSigned;
   bool showCrypto;
   bool showReceiver;
@@ -171,11 +171,11 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
     };
 
     /** constructs a root-item */
-    KFolderTreeItem( KFolderTree *parent, const TQString & label=TQString::null,
+    KFolderTreeItem( KFolderTree *tqparent, const TQString & label=TQString(),
         Protocol protocol=NONE, Type type=Root );
 
     /** constructs a child-item */
-    KFolderTreeItem( KFolderTreeItem *parent, const TQString & label=TQString::null,
+    KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label=TQString(),
         Protocol protocol=NONE, Type type=Other, int unread=0, int total=0 );
 
     /** compare */
@@ -242,9 +242,10 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
 class KDE_EXPORT KFolderTree : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KFolderTree( TQWidget *parent, const char *name=0 );
+    KFolderTree( TQWidget *tqparent, const char *name=0 );
 
     /** registers MIMETypes that are handled
       @param mimeType the name of the MIMEType
diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index cb59200a..90441598 100644
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@@ -130,7 +130,7 @@ TQString KImportColumn::convert()
 
 class ColumnItem : public TQListViewItem {
   public:
-    ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col)
+    ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col)
     {
       setText(0,mColumn->header());
     }
@@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem {
   data objects, this class has to be inherited by a special class, which
   reimplements the convertRow() function.
 */
-KImportDialog::KImportDialog(TQWidget* parent)
-    : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
+KImportDialog::KImportDialog(TQWidget* tqparent)
+    : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
       mSeparator(","),
       mCurrentRow(0)
 {
@@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows )
   mData.clear();
 
   int row, column;
-  enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
+  enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
          S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 
   TQChar m_textquote = '"';
@@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows )
       case S_START :
         if (x == m_textquote) {
           field += x;
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         } else if (x == mSeparator) {
           ++column;
         } else if (x == '\n')  {
@@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows )
           state = S_MAYBE_NORMAL_FIELD;
         }
         break;
-      case S_QUOTED_FIELD :
+      case S_TQUOTED_FIELD :
         if (x == m_textquote) {
           field += x;
-          state = S_MAYBE_END_OF_QUOTED_FIELD;
+          state = S_MAYBE_END_OF_TQUOTED_FIELD;
         } else if (x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows )
           field += x;
         }
         break;
-      case S_MAYBE_END_OF_QUOTED_FIELD :
+      case S_MAYBE_END_OF_TQUOTED_FIELD :
         if (x == m_textquote) {
           field += x;
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         } else if (x == mSeparator || x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows )
           }
           state = S_START;
         } else {
-          state = S_END_OF_QUOTED_FIELD;
+          state = S_END_OF_TQUOTED_FIELD;
         }
         break;
-      case S_END_OF_QUOTED_FIELD :
+      case S_END_OF_TQUOTED_FIELD :
         if (x == mSeparator || x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows )
           }
           state = S_START;
         } else {
-          state = S_END_OF_QUOTED_FIELD;
+          state = S_END_OF_TQUOTED_FIELD;
         }
         break;
       case S_MAYBE_NORMAL_FIELD :
         if (x == m_textquote) {
           field = "";
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         }
       case S_NORMAL_FIELD :
         if (x == mSeparator || x == '\n') {
@@ -443,7 +443,7 @@ void KImportDialog::setCellText(int row, int col, const TQString& text)
   if ((mTable->numRows() - 1) < row) mTable->setNumRows(row + 1);
   if ((mTable->numCols() - 1) < col) mTable->setNumCols(col + 1);
 
-  KImportColumn *c = mColumnDict.find(col);
+  KImportColumn *c = mColumnDict.tqfind(col);
   TQString formattedText;
   if (c) formattedText = c->preview(text,findFormat(col));
   else formattedText = text;
@@ -492,7 +492,7 @@ void KImportDialog::tableSelected()
   TQTableSelection selection = mTable->selection(mTable->currentSelection());
 
   TQListViewItem *item = mHeaderList->firstChild();
-  KImportColumn *col = mColumnDict.find(selection.leftCol());
+  KImportColumn *col = mColumnDict.tqfind(selection.leftCol());
   if (col) {
     while(item) {
       if (item->text(0) == col->header()) {
@@ -633,7 +633,7 @@ void KImportDialog::removeColumn()
   for(int i=selection.leftCol();i<=selection.rightCol();++i) {
     if (i >= 0) {
       mTable->horizontalHeader()->setLabel(i,TQString::number(i+1));
-      KImportColumn *col = mColumnDict.find(i);
+      KImportColumn *col = mColumnDict.tqfind(i);
       if (col) {
         mColumnDict.remove(i);
         mFormats.remove(i);
@@ -674,7 +674,7 @@ void KImportDialog::applyConverter()
 
 int KImportDialog::findFormat(int column)
 {
-  TQMap<int,int>::ConstIterator formatIt = mFormats.find(column);
+  TQMap<int,int>::ConstIterator formatIt = mFormats.tqfind(column);
   int format;
   if (formatIt == mFormats.end()) format = KImportColumn::FormatUndefined;
   else format = *formatIt;
@@ -713,7 +713,7 @@ void KImportDialog::setData( uint row, uint col, const TQString &value )
     rowVector->resize( col + 1 );
   }
   
-  KImportColumn *c = mColumnDict.find( col );
+  KImportColumn *c = mColumnDict.tqfind( col );
   if ( c )
   	rowVector->at( col ) = c->preview( val, findFormat(col) );
   else
diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h
index d7dd634e..b16f335f 100644
--- a/libkdepim/kimportdialog.h
+++ b/libkdepim/kimportdialog.h
@@ -76,8 +76,9 @@ class KImportColumn
 class KImportDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KImportDialog(TQWidget* parent);
+    KImportDialog(TQWidget* tqparent);
 
   public slots:
     bool setFile(const TQString& file);
diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp
index 2cef98f3..431d650d 100644
--- a/libkdepim/kincidencechooser.cpp
+++ b/libkdepim/kincidencechooser.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -44,8 +44,8 @@
 
 int KIncidenceChooser::chooseMode = KIncidenceChooser::ask ;
 
-KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
-    KDialog(parent,name,true)
+KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) :
+    KDialog(tqparent,name,true)
 {
     KDialog *topFrame = this;
     TQGridLayout *topLayout = new TQGridLayout(topFrame,5,3);
@@ -104,7 +104,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
 #else
     mDiffBut = 0;
 #endif
-    mBg = new TQButtonGroup ( 1,  Qt::Horizontal, i18n("Sync Preferences"), topFrame);
+    mBg = new TQButtonGroup ( 1,  TQt::Horizontal, i18n("Sync Preferences"), topFrame);
     topLayout->addMultiCellWidget(mBg, iii,iii,0,2);
     ++iii;
     mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local);
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 9d9e016a..4dc6b2ef 100644
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KINCIDENCECHOOSER_H
 #define _KINCIDENCECHOOSER_H
@@ -42,12 +42,13 @@ class TQButtonGroup;
 class KDE_EXPORT KIncidenceChooser : public KDialog
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     enum mode {
       local, remote, newest, ask, both
     };
     /** Initialize dialog and pages */
-    KIncidenceChooser( TQWidget *parent=0, char *name=0 );
+    KIncidenceChooser( TQWidget *tqparent=0, char *name=0 );
     ~KIncidenceChooser();
     //void setChooseText( TQString );
     void setIncidence( KCal::Incidence *, KCal::Incidence  * );
diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp
index e7e9e17f..98a3cb9e 100644
--- a/libkdepim/kmailcompletion.cpp
+++ b/libkdepim/kmailcompletion.cpp
@@ -44,8 +44,8 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
   // this should be in postProcessMatch, but postProcessMatch is const and will not allow nextMatch
   if ( !match.isEmpty() ){
     const TQString firstMatch( match );
-    while ( match.find( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) {
-      /* local email do not require @domain part, if match is an address we'll find
+    while ( match.tqfind( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) {
+      /* local email do not require @domain part, if match is an address we'll tqfind
        * last+first <match> in m_keyMap and we'll know that match is already a valid email.
        *
        * Distribution list do not have last+first <match> entry, they will be in mailAddr
@@ -53,7 +53,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
       const TQStringList &mailAddr = m_keyMap[ match ]; //get all mailAddr for this keyword
       bool isEmail = false;
       for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit )
-        if ( (*sit).find( "<" + match + ">" ) != -1 || (*sit) == match ) {
+        if ( (*sit).tqfind( "<" + match + ">" ) != -1 || (*sit) == match ) {
           isEmail = true;
           break;
         }
@@ -62,7 +62,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
         // match is a keyword, skip it and try to find match <email@domain>
         match = nextMatch();
         if ( firstMatch == match ){
-          match = TQString::null;
+          match = TQString();
           break;
         }
       } else
@@ -77,7 +77,7 @@ void KMailCompletion::addItemWithKeys( const TQString& email, int weight, const
   Q_ASSERT( keyWords != 0 );
   for ( TQStringList::ConstIterator it( keyWords->begin() ); it != keyWords->end(); ++it ) {
     TQStringList &emailList = m_keyMap[ (*it) ];      //lookup email-list for given keyword
-    if ( emailList.find( email ) == emailList.end() ) //add email if not there
+    if ( emailList.tqfind( email ) == emailList.end() ) //add email if not there
       emailList.append( email );
     addItem( (*it),weight );                         //inform KCompletion about keyword
     }
@@ -90,7 +90,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const
     return;
 
   //KCompletion has found the keywords for us, we can now map them to mail-addr
-  TQMap< TQString, bool > mailAddrDistinct; //TODO tqreplace with QSet in KDE4
+  TQMap< TQString, bool > mailAddrDistinct; //TODO replace with TQSet in KDE4
   for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) {
     const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword
     for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) {
diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
index 8f29d7e0..254507c1 100644
--- a/libkdepim/kmailcompletion.h
+++ b/libkdepim/kmailcompletion.h
@@ -36,6 +36,7 @@ namespace KPIM {
 class KMailCompletion : public KCompletion
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KMailCompletion();
@@ -58,14 +59,14 @@ class KMailCompletion : public KCompletion
      *
      * Items may be added with KCompletion::addItem, those will only be returned as match if they
      * are in one of these formats:
-     * \li tqcontains localpart@domain 
+     * \li contains localpart@domain 
      * \li tqcontains <email>
      * or if they have also been added with this function.
      */
     void addItemWithKeys( const TQString& email, int weight, const TQStringList * keyWords);
 
     /**
-     * Uses an internal map to tqreplace all keywords in pMatches whith corrsesponding email addresses.
+     * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses.
      */
     virtual void postProcessMatches( TQStringList * pMatches )const;
 
diff --git a/libkdepim/komposer/core/attachment.cpp b/libkdepim/komposer/core/attachment.cpp
index f8240380..df803de6 100644
--- a/libkdepim/komposer/core/attachment.cpp
+++ b/libkdepim/komposer/core/attachment.cpp
@@ -61,50 +61,50 @@ Attachment::~Attachment()
   delete d; d = 0;
 }
 
-QString
+TQString
 Attachment::name() const
 {
   return d->name;
 }
 
-QCString
+TQCString
 Attachment::cte() const
 {
   return d->cte;
 }
 
-QByteArray
+TQByteArray
 Attachment::data() const
 {
   return d->data;
 }
 
-QCString
+TQCString
 Attachment::type() const
 {
   return d->type;
 }
 
 
-QCString
+TQCString
 Attachment::subType() const
 {
   return d->subType;
 }
 
-QCString
+TQCString
 Attachment::paramAttr() const
 {
   return d->paramAttr;
 }
 
-QString
+TQString
 Attachment::paramValue() const
 {
   return d->paramValue;
 }
 
-QCString
+TQCString
 Attachment::contentDisposition() const
 {
   return d->contDisp;
diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp
index f93e59cc..bffae60e 100644
--- a/libkdepim/komposer/core/core.cpp
+++ b/libkdepim/komposer/core/core.cpp
@@ -53,9 +53,9 @@
 
 using namespace Komposer;
 
-Core::Core( TQWidget *parent, const char *name )
+Core::Core( TQWidget *tqparent, const char *name )
   : KomposerIface( "KomposerIface" ),
-    KMainWindow( parent, name ), m_currentEditor( 0 )
+    KMainWindow( tqparent, name ), m_currentEditor( 0 )
 {
   initWidgets();
   initCore();
@@ -158,7 +158,7 @@ Core::selectEditor( Komposer::Editor *editor )
 
   TQPtrList<KParts::Part> *partList = const_cast<TQPtrList<KParts::Part>*>(
                                                    m_partManager->parts() );
-  if ( partList->find( part ) == -1 )
+  if ( partList->tqfind( part ) == -1 )
     addPart( part );
 
   m_partManager->setActivePart( part );
diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h
index 91ef133e..871d67a0 100644
--- a/libkdepim/komposer/core/core.h
+++ b/libkdepim/komposer/core/core.h
@@ -45,6 +45,7 @@ namespace Komposer
   class Core : public KMainWindow, virtual public KomposerIface
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
     virtual ~Core();
diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp
index c6589376..53e8abd2 100644
--- a/libkdepim/komposer/core/corewidget.cpp
+++ b/libkdepim/komposer/core/corewidget.cpp
@@ -24,8 +24,8 @@
 
 using namespace Komposer;
 
-CoreWidget::CoreWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+CoreWidget::CoreWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
 }
 
diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h
index 8b07a0a7..8c67e77d 100644
--- a/libkdepim/komposer/core/corewidget.h
+++ b/libkdepim/komposer/core/corewidget.h
@@ -29,11 +29,12 @@
 namespace Komposer
 {
 
-  class CoreWidget : public QWidget
+  class CoreWidget : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CoreWidget( TQWidget *parent, const char *name=0 );
+    CoreWidget( TQWidget *tqparent, const char *name=0 );
 
     virtual TQString subject() const =0;
     virtual TQStringList to()  const =0;
diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp
index 5dada393..d9ecbd56 100644
--- a/libkdepim/komposer/core/editor.cpp
+++ b/libkdepim/komposer/core/editor.cpp
@@ -30,8 +30,8 @@ public:
   TQString id;
 };
 
-Editor::Editor( TQObject *parent, const char *name, const TQStringList &args )
-  : Plugin( parent, name, args ), d( new Private )
+Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args )
+  : Plugin( tqparent, name, args ), d( new Private )
 {
 }
 
diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h
index a5b78915..9cc9336d 100644
--- a/libkdepim/komposer/core/editor.h
+++ b/libkdepim/komposer/core/editor.h
@@ -38,6 +38,7 @@ namespace Komposer {
   class Editor : public Plugin
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum TextType {
       Plain    = 1 << 0,
@@ -92,7 +93,7 @@ namespace Komposer {
     virtual void changeSignature( const TQString &txt ) =0;
 
   protected:
-    Editor( TQObject *parent, const char *name, const TQStringList &args );
+    Editor( TQObject *tqparent, const char *name, const TQStringList &args );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp
index 41af47cd..dbadaff5 100644
--- a/libkdepim/komposer/core/plugin.cpp
+++ b/libkdepim/komposer/core/plugin.cpp
@@ -35,8 +35,8 @@ public:
   //Core* core;
 };
 
-Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & )
-    : TQObject( parent, name ), d( new Private )
+Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & )
+    : TQObject( tqparent, name ), d( new Private )
 {
   //d->core = core;
 }
diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h
index 2dddd09f..bb62f322 100644
--- a/libkdepim/komposer/core/plugin.h
+++ b/libkdepim/komposer/core/plugin.h
@@ -33,6 +33,7 @@ namespace Komposer
                  virtual public KXMLGUIClient
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     virtual ~Plugin();
 
@@ -63,7 +64,7 @@ namespace Komposer
     Core *core() const;
   protected:
     friend class PluginManager;
-    Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() );
+    Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp
index d4fd5acc..d46d471b 100644
--- a/libkdepim/komposer/core/pluginmanager.cpp
+++ b/libkdepim/komposer/core/pluginmanager.cpp
@@ -66,8 +66,8 @@ public:
   TQValueStack<TQString> pluginsToLoad;
 };
 
-PluginManager::PluginManager( TQObject *parent )
-  : TQObject( parent )
+PluginManager::PluginManager( TQObject *tqparent )
+  : TQObject( tqparent )
 {
   d = new Private;
 
@@ -414,7 +414,7 @@ PluginManager::plugin( const TQString &pluginId ) const
     return 0;
 }
 
-QString
+TQString
 PluginManager::pluginName( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
@@ -427,7 +427,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
   return TQString::tqfromLatin1( "Unknown" );
 }
 
-QString
+TQString
 PluginManager::pluginId( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
@@ -440,7 +440,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
   return TQString::tqfromLatin1( "unknown" );
 }
 
-QString
+TQString
 PluginManager::pluginIcon( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
diff --git a/libkdepim/komposer/core/pluginmanager.h b/libkdepim/komposer/core/pluginmanager.h
index 179cf48d..34cc6b9c 100644
--- a/libkdepim/komposer/core/pluginmanager.h
+++ b/libkdepim/komposer/core/pluginmanager.h
@@ -37,9 +37,10 @@ namespace Komposer
 
   class Plugin;
 
-  class PluginManager : public QObject
+  class PluginManager : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginManager( TQObject * );
@@ -57,7 +58,7 @@ namespace Komposer
      * interface.
      */
     TQValueList<KPluginInfo*> availablePlugins( const TQString &category
-                                               = TQString::null ) const;
+                                               = TQString() ) const;
 
     /**
      * Returns a list of all plugins that are actually loaded.
@@ -65,7 +66,7 @@ namespace Komposer
      * See also @ref availablePlugins().
      */
     TQMap<KPluginInfo*, Plugin*> loadedPlugins( const TQString &category
-                                               = TQString::null ) const;
+                                               = TQString() ) const;
 
     /**
      * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name
diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp
index 3536ebb8..1c088e9e 100644
--- a/libkdepim/komposer/core/prefsmodule.cpp
+++ b/libkdepim/komposer/core/prefsmodule.cpp
@@ -35,14 +35,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
-    return new Komposer::PrefsModule( parent, "komposerprefs" );
+  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) {
+    return new Komposer::PrefsModule( tqparent, "komposerprefs" );
   }
 }
 using namespace Komposer;
 
-PrefsModule::PrefsModule( TQWidget *parent, const char *name )
-  : KPrefsModule( Komposer::Prefs::self(), parent, name )
+PrefsModule::PrefsModule( TQWidget *tqparent, const char *name )
+  : KPrefsModule( Komposer::Prefs::self(), tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -71,12 +71,12 @@ PrefsModule::aboutData() const
 
 
 EditorSelection::EditorSelection( const TQString &text, TQString &reference,
-                                  TQWidget *parent )
+                                  TQWidget *tqparent )
   : m_reference( reference )
 {
-  m_box = new TQGroupBox( 0, Qt::Vertical, text, parent );
+  m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent );
   TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h
index b213258b..ab174404 100644
--- a/libkdepim/komposer/core/prefsmodule.h
+++ b/libkdepim/komposer/core/prefsmodule.h
@@ -35,17 +35,19 @@ namespace Komposer {
   class PrefsModule : public KPrefsModule
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    PrefsModule( TQWidget *parent=0, const char *name=0 );
+    PrefsModule( TQWidget *tqparent=0, const char *name=0 );
     virtual const KAboutData *aboutData() const;
   };
 
   class EditorSelection : public KPrefsWid
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EditorSelection( const TQString &text, TQString &reference, TQWidget *parent );
+    EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent );
     ~EditorSelection();
 
     void readConfig();
diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp
index 487a84c5..4224a2e2 100644
--- a/libkdepim/komposer/core/tests/managertest.cpp
+++ b/libkdepim/komposer/core/tests/managertest.cpp
@@ -23,8 +23,8 @@
 #include "pluginmanager.h"
 using namespace Komposer;
 
-ManagerTest::ManagerTest( TQObject* parent )
-    : TQObject( parent )
+ManagerTest::ManagerTest( TQObject* tqparent )
+    : TQObject( tqparent )
 {
     m_manager = new PluginManager( this );
 }
diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h
index 397bfaf0..c0351b39 100644
--- a/libkdepim/komposer/core/tests/managertest.h
+++ b/libkdepim/komposer/core/tests/managertest.h
@@ -32,8 +32,9 @@ class ManagerTest : public TQObject,
                     public Tester
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ManagerTest( TQObject* parent = 0 );
+    ManagerTest( TQObject* tqparent = 0 );
 
 public slots:
     void allTests();
diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp
index b32c8964..2a0c8461 100644
--- a/libkdepim/komposer/core/tests/tester.cpp
+++ b/libkdepim/komposer/core/tests/tester.cpp
@@ -21,8 +21,8 @@
 #include "tester.h"
 
 
-Tester::Tester( TQObject* parent )
-    : TQObject( parent )
+Tester::Tester( TQObject* tqparent )
+    : TQObject( tqparent )
 {
 }
 
diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp
index 0fcba16b..893b35b8 100644
--- a/libkdepim/komposer/core/tests/testmanager.cpp
+++ b/libkdepim/komposer/core/tests/testmanager.cpp
@@ -11,8 +11,8 @@
 
 using namespace Komposer;
 
-TestManager::TestManager( TQObject *parent )
-  : TQObject( parent )
+TestManager::TestManager( TQObject *tqparent )
+  : TQObject( tqparent )
 {
   m_manager = new PluginManager( this );
   connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h
index c5ff8517..b574bc87 100644
--- a/libkdepim/komposer/core/tests/testmanager.h
+++ b/libkdepim/komposer/core/tests/testmanager.h
@@ -9,11 +9,12 @@ namespace Komposer {
 }
 using Komposer::Plugin;
 
-class TestManager : public QObject
+class TestManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  TestManager( TQObject *parent );
+  TestManager( TQObject *tqparent );
 
 public slots:
   void slotPluginLoaded( Plugin *plugin );
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp
index 56f97d22..6f7dcb7d 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp
@@ -36,7 +36,7 @@
 #include <kprinter.h>
 #include <kfinddialog.h>
 #include <kfind.h>
-#include <ktqreplacedialog.h>
+#include <kreplacedialog.h>
 #include <ktqreplace.h>
 
 #include <tqtextedit.h>
@@ -46,8 +46,8 @@ typedef KGenericFactory<DefaultEditor> DefaultEditorFactory;
 K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor,
                             DefaultEditorFactory( "komposer_defaulteditor" ) )
 
-DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args )
-  : Editor( parent, name, args ), m_textEdit( 0 )
+DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args )
+  : Editor( tqparent, name, args ), m_textEdit( 0 )
 {
   setInstance( DefaultEditorFactory::instance() );
 
@@ -69,7 +69,7 @@ DefaultEditor::widget()
     return m_textEdit;
 }
 
-QString
+TQString
 DefaultEditor::text() const
 {
   return m_textEdit->text();
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h
index a877b762..7c33bb33 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.h
+++ b/libkdepim/komposer/plugins/default/defaulteditor.h
@@ -34,8 +34,9 @@ class KActionCollection;
 class DefaultEditor : public Komposer::Editor
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
+  DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args );
   ~DefaultEditor();
 
   virtual TQWidget *widget();
diff --git a/libkdepim/komposer/plugins/default/defaulteditorui.rc b/libkdepim/komposer/plugins/default/defaulteditorui.rc
index 479fa8b0..de8c2e6d 100644
--- a/libkdepim/komposer/plugins/default/defaulteditorui.rc
+++ b/libkdepim/komposer/plugins/default/defaulteditorui.rc
@@ -24,7 +24,7 @@
     <Action name="format_color"/>
     <DefineGroup name="format_chars_group" />
     <Separator/>
-    <Menu name="alignment"><text>&amp;Alignment</text>
+    <Menu name="tqalignment"><text>&amp;Alignment</text>
        <Action name="format_align_left"/>
        <Action name="format_align_center"/>
        <Action name="format_align_right"/>
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
index 922e5126..b25e5035 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
@@ -47,8 +47,8 @@ void KPartsGenericPart::load()
     if ( m_part ) {
         delete m_part;
     }
-    // "this" is both the parent widget and the parent object
-    m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 );
+    // "this" is both the tqparent widget and the tqparent object
+    m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
     if ( m_part ) {
         m_part->openURL( m_url );
         m_part->widget()->show();
@@ -63,16 +63,16 @@ TQStringList KPartsWidgetPlugin::keys() const {
     return TQStringList() << mykey;
 }
 
-TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * parent, const char * name ) {
+TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * tqparent, const char * name ) {
     if ( key == mykey )
-        return new KPartsGenericPart( parent, name );
+        return new KPartsGenericPart( tqparent, name );
     return 0;
 }
 
 TQString KPartsWidgetPlugin::group( const TQString & key ) const {
     if ( key == mykey )
         return "Display (KDE)";
-    return TQString::null;
+    return TQString();
 }
 
 #if 0
@@ -84,19 +84,19 @@ TQIconSet KPartsWidgetPlugin::iconSet( const TQString & key ) const {
 TQString KPartsWidgetPlugin::includeFile( const TQString & key ) const {
     if ( key == mykey )
         return "partplugin.h";
-    return TQString::null;
+    return TQString();
 }
 
 TQString KPartsWidgetPlugin::toolTip( const TQString & key ) const {
     if ( key == mykey )
         return "Generic KParts viewer";
-    return TQString::null;
+    return TQString();
 }
 
 TQString KPartsWidgetPlugin::whatsThis( const TQString & key ) const {
     if ( key == mykey )
         return "A widget to embed any KParts viewer, given a url and optionally a mimetype";
-    return TQString::null;
+    return TQString();
 }
 
 bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
@@ -104,14 +104,14 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
 }
 
 /// Duplicated from kdelibs/kdecore/kdemacros.h.in for those with kdelibs < 3.4
-#ifndef KDE_Q_EXPORT_PLUGIN
-#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  Q_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  Q_EXTERN_C KDE_EXPORT QUnknownInterface* ucm_instantiate(); \
-  Q_EXPORT_PLUGIN(PLUGIN)
+#ifndef KDE_TQ_EXPORT_PLUGIN
+#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXPORT_PLUGIN(PLUGIN)
 #endif
 
-KDE_Q_EXPORT_PLUGIN( KPartsWidgetPlugin )
+KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin )
 
 #include "kpartsdesignerplugin.moc"
 
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
index 1302b137..0a37f2f8 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
@@ -31,8 +31,9 @@ namespace KParts { class ReadOnlyPart; }
  */
 class KPartsGenericPart : public TQWidget {
     Q_OBJECT
-    Q_PROPERTY( TQString url READ url WRITE setURL )
-    Q_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype )
+  TQ_OBJECT
+    TQ_PROPERTY( TQString url READ url WRITE setURL )
+    TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype )
 public:
     KPartsGenericPart( TQWidget* tqparentWidget, const char* name );
 
@@ -53,12 +54,12 @@ private:
 };
 
 /**
- * Qt designer plugin for embedding a KParts using KPartsGenericPart
+ * TQt designer plugin for embedding a KParts using KPartsGenericPart
  */
 class KPartsWidgetPlugin : public TQWidgetPlugin {
 public:
   TQStringList keys() const;
-  TQWidget * create( const TQString & key, TQWidget * parent, const char * name );
+  TQWidget * create( const TQString & key, TQWidget * tqparent, const char * name );
   TQString group( const TQString & key ) const;
   //TQIconSet iconSet( const TQString & key ) const;
   TQString includeFile( const TQString & key ) const;
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index 730ed8f5..55a6a799 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -79,7 +79,7 @@ const TQString KPimPrefs::timezone()
     int len = readlink( "/etc/localtime", zonefilebuf, PATH_MAX );
     if ( len > 0 && len < PATH_MAX ) {
       zone = TQString::fromLocal8Bit( zonefilebuf, len );
-      zone = zone.mid( zone.find( "zoneinfo/" ) + 9 );
+      zone = zone.mid( zone.tqfind( "zoneinfo/" ) + 9 );
       kdDebug(5300) << "system timezone from /etc/localtime is " << zone
                     << endl;
     } else {
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 90d5be86..cd1202ab 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -31,7 +31,7 @@ class TQString;
 class KDE_EXPORT KPimPrefs : public KConfigSkeleton
 {
   public:
-    KPimPrefs( const TQString &name = TQString::null );
+    KPimPrefs( const TQString &name = TQString() );
 
     virtual ~KPimPrefs();
 
diff --git a/libkdepim/kpimurlrequesterdlg.cpp b/libkdepim/kpimurlrequesterdlg.cpp
index 553ca659..7815aee5 100644
--- a/libkdepim/kpimurlrequesterdlg.cpp
+++ b/libkdepim/kpimurlrequesterdlg.cpp
@@ -25,9 +25,9 @@
 
 // KDE3.4 or KDE4.0: FIXME: Move to kdelibs!
 KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label,
-                                  TQWidget *parent, const TQString& caption )
+                                  TQWidget *tqparent, const TQString& caption )
 {
-    KURLRequesterDlg dlg(dir, label, parent, "filedialog", true);
+    KURLRequesterDlg dlg(dir, label, tqparent, "filedialog", true);
 
     dlg.setCaption(caption.isNull() ? i18n("Open") : caption);
 
diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h
index 2d606aa8..ef4cc987 100644
--- a/libkdepim/kpimurlrequesterdlg.h
+++ b/libkdepim/kpimurlrequesterdlg.h
@@ -35,12 +35,12 @@ class KDE_EXPORT KPimURLRequesterDlg
      *
      * @param url This specifies the initial path of the input line.
 		 * @param text The text to be shown on the label.
-     * @param parent The widget the dialog will be centered on initially.
+     * @param tqparent The widget the dialog will be centered on initially.
      */
-		static KURL getURL( const TQString &url = TQString::null, 
-			                const TQString &text = TQString::null,
-                      TQWidget *parent = 0, 
-			                const TQString &caption = TQString::null );
+		static KURL getURL( const TQString &url = TQString(), 
+			                const TQString &text = TQString(),
+                      TQWidget *tqparent = 0, 
+			                const TQString &caption = TQString() );
 };
 
 #endif // KPIMURLREQUESTDLG_H_INCLUDED
diff --git a/libkdepim/kpixmapregionselectordialog.cpp b/libkdepim/kpixmapregionselectordialog.cpp
index 4766a452..e7645d30 100644
--- a/libkdepim/kpixmapregionselectordialog.cpp
+++ b/libkdepim/kpixmapregionselectordialog.cpp
@@ -28,8 +28,8 @@
 
 using namespace KPIM;
 
-KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent,
-     const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true )
+KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent,
+     const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true )
 {
   TQVBox *vbox=new TQVBox(this);
   new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox);
@@ -44,9 +44,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog()
 {
 }
 
-TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent )
+TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent )
 {
-  KPixmapRegionSelectorDialog dialog(parent);
+  KPixmapRegionSelectorDialog dialog(tqparent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
 
@@ -65,9 +65,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ
   return rect;
 }
 
-TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent )
+TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent )
 {
-  KPixmapRegionSelectorDialog dialog(parent);
+  KPixmapRegionSelectorDialog dialog(tqparent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
   dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight);
@@ -87,9 +87,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in
   return rect;
 }
 
-TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent )
+TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent )
 {
-  KPixmapRegionSelectorDialog dialog(parent);
+  KPixmapRegionSelectorDialog dialog(tqparent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
 
@@ -107,9 +107,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ
   return image;
 }
 
-TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent )
+TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent )
 {
-  KPixmapRegionSelectorDialog dialog(parent);
+  KPixmapRegionSelectorDialog dialog(tqparent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
   dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight);
diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h
index 7cc08e32..477148fd 100644
--- a/libkdepim/kpixmapregionselectordialog.h
+++ b/libkdepim/kpixmapregionselectordialog.h
@@ -51,7 +51,7 @@ public:
     * later the setPixmap method of the KPixmapRegionSelectorWidget widget of
     * the new object.
     */
-   KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L,
+   KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L,
                       bool modal = false );
    /**
     * The destructor of the dialog
@@ -72,7 +72,7 @@ public:
     * @returns the selected rectangle, or an invalid rectangle if the user
     * pressed the Cancel button.
     */
-   static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L );
+   static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -82,7 +82,7 @@ public:
     * @returns the selected rectangle, or an invalid rectangle if the user
     * pressed the Cancel button.
     */
-   static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L );
+   static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -91,7 +91,7 @@ public:
     * @returns the selected image, or an invalid image if the user
     * pressed the Cancel button.
     */
-   static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L );
+   static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -101,7 +101,7 @@ public:
     * @returns the selected image, or an invalid image if the user
     * pressed the Cancel button.
     */
-   static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L );
+   static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L );
 
 protected:
    KPIM::KPixmapRegionSelectorWidget *m_pixmapSelectorWidget;
diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp
index 308ae0cc..4efcbbcb 100644
--- a/libkdepim/kpixmapregionselectorwidget.cpp
+++ b/libkdepim/kpixmapregionselectorwidget.cpp
@@ -41,8 +41,8 @@
 
 using namespace KPIM;
 
-KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent,
-      const char *name) : TQWidget( parent, name)
+KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent,
+      const char *name) : TQWidget( tqparent, name)
 {
    TQHBoxLayout * hboxLayout=new TQHBoxLayout( this );
 
@@ -51,7 +51,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent,
 
    vboxLayout->addStretch();
    m_label = new TQLabel(this, "pixmapHolder");
-   m_label->setBackgroundMode( Qt::NoBackground );
+   m_label->setBackgroundMode( TQt::NoBackground );
    m_label->installEventFilter( this );
 
    vboxLayout->addWidget(m_label);
@@ -112,9 +112,9 @@ void KPixmapRegionSelectorWidget::updatePixmap()
      m_linedPixmap = m_originalPixmap;
 
      painter.begin(&m_linedPixmap);
-     painter.setRasterOp( Qt::XorROP );
+     painter.setRasterOp( TQt::XorROP );
      painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(),
-                  TQBrush( TQColor(255,255,255), Qt::BDiagPattern) );
+                  TQBrush( TQColor(255,255,255), TQt::BDiagPattern) );
      painter.end();
 
      TQImage image=m_linedPixmap.convertToImage();
@@ -129,7 +129,7 @@ void KPixmapRegionSelectorWidget::updatePixmap()
         m_originalPixmap, m_selectedRegion );
 
    painter.setPen( TQColor(255,255,255) );
-   painter.setRasterOp( Qt::XorROP );
+   painter.setRasterOp( TQt::XorROP );
 
    painter.drawRect( m_selectedRegion );
 
@@ -231,12 +231,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
           && m_selectedRegion!=m_originalPixmap.rect() )
       {
          m_state=Moving;
-         cursor=TQCursor(Qt::SizeAllCursor);
+         cursor=TQCursor(TQt::SizeAllCursor);
       }
       else
       {
          m_state=Resizing;
-         cursor=TQCursor(Qt::CrossCursor);
+         cursor=TQCursor(TQt::CrossCursor);
       }
       TQApplication::setOverrideCursor(cursor);
 
diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h
index 4d92869d..b1ad7bbd 100644
--- a/libkdepim/kpixmapregionselectorwidget.h
+++ b/libkdepim/kpixmapregionselectorwidget.h
@@ -44,15 +44,16 @@ namespace KPIM {
  * @author Antonio Larrosa <larrosa@kde.org>
  * @since 3.4
  */
-class KPixmapRegionSelectorWidget : public QWidget
+class KPixmapRegionSelectorWidget : public TQWidget
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
    /**
     * Constructor for a KPixmapRegionSelectorWidget.
     */
-   KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L);
+   KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L);
 
    /**
     * Destructor for a KPixmapRegionSelectorWidget
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index 93b3feaa..547c712c 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -50,18 +50,18 @@
 
 namespace KPrefsWidFactory {
 
-KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
+KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent )
 {
   KConfigSkeleton::ItemBool *boolItem =
       dynamic_cast<KConfigSkeleton::ItemBool *>( item );
   if ( boolItem ) {
-    return new KPrefsWidBool( boolItem, parent );
+    return new KPrefsWidBool( boolItem, tqparent );
   }
 
   KConfigSkeleton::ItemString *stringItem =
       dynamic_cast<KConfigSkeleton::ItemString *>( item );
   if ( stringItem ) {
-    return new KPrefsWidString( stringItem, parent );
+    return new KPrefsWidString( stringItem, tqparent );
   }
 
   KConfigSkeleton::ItemEnum *enumItem =
@@ -72,7 +72,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
       kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl;
       return 0;
     } else {
-      KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent );
+      KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, tqparent );
       TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         radios->addRadio( (*it).label );
@@ -84,7 +84,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
   KConfigSkeleton::ItemInt *intItem =
       dynamic_cast<KConfigSkeleton::ItemInt *>( item );
   if ( intItem ) {
-    return new KPrefsWidInt( intItem, parent );
+    return new KPrefsWidInt( intItem, tqparent );
   }
 
   return 0;
@@ -99,10 +99,10 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const
 }
 
 
-KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent )
+KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent )
   : mItem( item )
 {
-  mCheck = new TQCheckBox( item->label(), parent);
+  mCheck = new TQCheckBox( item->label(), tqparent);
   connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) );
   if ( !item->whatsThis().isNull() ) {
     TQWhatsThis::add( mCheck, item->whatsThis() );
@@ -133,11 +133,11 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const
 
 
 KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item,
-                            TQWidget *parent )
+                            TQWidget *tqparent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mSpin = new TQSpinBox( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mSpin = new TQSpinBox( tqparent );
   if ( !item->minValue().isNull() ) {
     mSpin->setMinValue( item->minValue().toInt() );
   }
@@ -183,12 +183,12 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const
 
 
 KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item,
-                                TQWidget *parent )
+                                TQWidget *tqparent )
   : mItem( item )
 {
-  mButton = new KColorButton( parent );
+  mButton = new KColorButton( tqparent );
   connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) );
-  mLabel = new TQLabel( mButton, mItem->label()+':', parent );
+  mLabel = new TQLabel( mButton, mItem->label()+':', tqparent );
   mLabel->setBuddy( mButton );
   TQString whatsThis = mItem->whatsThis();
   if (!whatsThis.isNull()) {
@@ -223,15 +223,15 @@ KColorButton *KPrefsWidColor::button()
 
 
 KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item,
-                              TQWidget *parent, const TQString &sampleText )
+                              TQWidget *tqparent, const TQString &sampleText )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
 
-  mPreview = new TQLabel( sampleText, parent );
+  mPreview = new TQLabel( sampleText, tqparent );
   mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 
-  mButton = new TQPushButton( i18n("Choose..."), parent );
+  mButton = new TQPushButton( i18n("Choose..."), tqparent );
   connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) );
   TQString whatsThis = mItem->whatsThis();
   if (!whatsThis.isNull()) {
@@ -281,11 +281,11 @@ void KPrefsWidFont::selectFont()
 
 
 KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item,
-                              TQWidget *parent )
+                              TQWidget *tqparent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mTimeEdit = new KTimeEdit( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mTimeEdit = new KTimeEdit( tqparent );
   mLabel->setBuddy( mTimeEdit );
   connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) );
   TQString whatsThis = mItem->whatsThis();
@@ -320,14 +320,14 @@ KTimeEdit *KPrefsWidTime::timeEdit()
 
 
 KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                      TQWidget *parent )
+                                      TQWidget *tqparent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mTimeEdit = new QTimeEdit( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mTimeEdit = new TQTimeEdit( tqparent );
   mLabel->setBuddy( mTimeEdit );
   mTimeEdit->setAutoAdvance( true );
-  mTimeEdit->setDisplay( QTimeEdit::Hours | QTimeEdit::Minutes );
+  mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes );
   mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr]
   connect( mTimeEdit,
            TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) );
@@ -354,18 +354,18 @@ TQLabel *KPrefsWidDuration::label()
   return mLabel;
 }
 
-QTimeEdit *KPrefsWidDuration::timeEdit()
+TQTimeEdit *KPrefsWidDuration::timeEdit()
 {
   return mTimeEdit;
 }
 
 
 KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
-                              TQWidget *parent )
+                              TQWidget *tqparent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mDateEdit = new KDateEdit( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mDateEdit = new KDateEdit( tqparent );
   mLabel->setBuddy( mDateEdit );
   connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) );
   TQString whatsThis = mItem->whatsThis();
@@ -398,10 +398,10 @@ KDateEdit *KPrefsWidDate::dateEdit()
 
 
 KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item,
-                                  TQWidget *parent )
+                                  TQWidget *tqparent )
   : mItem( item )
 {
-  mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent );
+  mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), tqparent );
   connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) );
 }
 
@@ -440,10 +440,10 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const
 }
 
 KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item,
-                                  TQWidget *parent )
+                                  TQWidget *tqparent )
   : mItem( item )
 {
-  TQHBox *hbox = new TQHBox(parent);
+  TQHBox *hbox = new TQHBox(tqparent);
   new TQLabel( mItem->label(), hbox );
   mCombo = new TQComboBox( hbox );
   connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
@@ -476,12 +476,12 @@ TQComboBox* KPrefsWidCombo::comboBox()
 }
 
 KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item,
-                                  TQWidget *parent,
+                                  TQWidget *tqparent,
                                   TQLineEdit::EchoMode echomode )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mEdit = new TQLineEdit( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mEdit = new TQLineEdit( tqparent );
   mLabel->setBuddy( mEdit );
   connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
            TQT_SIGNAL( changed() ) );
@@ -525,12 +525,12 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const
 }
 
 
-KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
                               const TQString &filter, uint mode )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', parent );
-  mURLRequester = new KURLRequester( parent );
+  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mURLRequester = new KURLRequester( tqparent );
   mLabel->setBuddy( mURLRequester );
   mURLRequester->setMode( mode );
   mURLRequester->setFilter( filter );
@@ -590,49 +590,49 @@ void KPrefsWidManager::addWid( KPrefsWid *wid )
 }
 
 KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
-                                             TQWidget *parent )
+                                             TQWidget *tqparent )
 {
-  KPrefsWidBool *w = new KPrefsWidBool( item, parent );
+  KPrefsWidBool *w = new KPrefsWidBool( item, tqparent );
   addWid( w );
   return w;
 }
 
 KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item,
-                                             TQWidget *parent )
+                                             TQWidget *tqparent )
 {
-  KPrefsWidTime *w = new KPrefsWidTime( item, parent );
+  KPrefsWidTime *w = new KPrefsWidTime( item, tqparent );
   addWid( w );
   return w;
 }
 
 KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                                     TQWidget *parent )
+                                                     TQWidget *tqparent )
 {
-  KPrefsWidDuration *w = new KPrefsWidDuration( item, parent );
+  KPrefsWidDuration *w = new KPrefsWidDuration( item, tqparent );
   addWid( w );
   return w;
 }
 
 KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item,
-                                             TQWidget *parent )
+                                             TQWidget *tqparent )
 {
-  KPrefsWidDate *w = new KPrefsWidDate( item, parent );
+  KPrefsWidDate *w = new KPrefsWidDate( item, tqparent );
   addWid( w );
   return w;
 }
 
 KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
-                                               TQWidget *parent )
+                                               TQWidget *tqparent )
 {
-  KPrefsWidColor *w = new KPrefsWidColor( item, parent );
+  KPrefsWidColor *w = new KPrefsWidColor( item, tqparent );
   addWid( w );
   return w;
 }
 
 KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item,
-                                                 TQWidget *parent )
+                                                 TQWidget *tqparent )
 {
-  KPrefsWidRadios *w = new KPrefsWidRadios( item, parent );
+  KPrefsWidRadios *w = new KPrefsWidRadios( item, tqparent );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
   TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
@@ -644,9 +644,9 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item
 }
 
 KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
-                                               TQWidget* parent )
+                                               TQWidget* tqparent )
 {
-  KPrefsWidCombo *w = new KPrefsWidCombo( item, parent );
+  KPrefsWidCombo *w = new KPrefsWidCombo( item, tqparent );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
   TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
@@ -658,43 +658,43 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
 }
 
 KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item,
-                                                 TQWidget *parent )
+                                                 TQWidget *tqparent )
 {
-  KPrefsWidString *w = new KPrefsWidString( item, parent,
+  KPrefsWidString *w = new KPrefsWidString( item, tqparent,
                                             TQLineEdit::Normal );
   addWid( w );
   return w;
 }
 
 KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
-                                             TQWidget *parent, const TQString &filter, uint mode )
+                                             TQWidget *tqparent, const TQString &filter, uint mode )
 {
-  KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode );
+  KPrefsWidPath *w = new KPrefsWidPath( item, tqparent, filter, mode );
   addWid( w );
   return w;
 }
 
 KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item,
-                                                   TQWidget *parent )
+                                                   TQWidget *tqparent )
 {
-  KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password );
+  KPrefsWidString *w = new KPrefsWidString( item, tqparent, TQLineEdit::Password );
   addWid( w );
   return w;
 }
 
 KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
-                                             TQWidget *parent,
+                                             TQWidget *tqparent,
                                              const TQString &sampleText )
 {
-  KPrefsWidFont *w = new KPrefsWidFont( item, parent, sampleText );
+  KPrefsWidFont *w = new KPrefsWidFont( item, tqparent, sampleText );
   addWid( w );
   return w;
 }
 
 KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item,
-                                           TQWidget *parent )
+                                           TQWidget *tqparent )
 {
-  KPrefsWidInt *w = new KPrefsWidInt( item, parent );
+  KPrefsWidInt *w = new KPrefsWidInt( item, tqparent );
   addWid( w );
   return w;
 }
@@ -733,9 +733,9 @@ void KPrefsWidManager::writeWidConfig()
 }
 
 
-KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name,
+KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent, char *name,
                             bool modal )
-  : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent,
+  : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,tqparent,
                 name,modal,true),
     KPrefsWidManager( prefs )
 {
@@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault()
 }
 
 
-KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent,
+KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *tqparent,
                             const char *name )
-  : KCModule( parent, name ),
+  : KCModule( tqparent, name ),
     KPrefsWidManager( prefs )
 {
   emit changed( false );
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 3667a7ae..e94b4a44 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -41,7 +41,7 @@ class TQComboBox;
 class TQLabel;
 class TQSpinBox;
 class TQButtonGroup;
-class QTimeEdit;
+class TQTimeEdit;
 class KTimeEdit;
 class KDateEdit;
 class KURLRequester;
@@ -55,9 +55,10 @@ class KURLRequester;
   KPrefsDialog. The control element consists of a set of widgets for handling
   a certain type of configuration information.
 */
-class KDE_EXPORT KPrefsWid : public QObject
+class KDE_EXPORT KPrefsWid : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       This function is called to read value of the setting from the
@@ -92,15 +93,15 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
 {
   public:
     /**
-      Create a bool value control element consisting of a QCheckbox.
+      Create a bool value control element consisting of a TQCheckbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent );
+    KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent );
 
     /**
-      Return the QCheckbox used by this control element.
+      Return the TQCheckbox used by this control element.
     */
     TQCheckBox *checkBox();
 
@@ -130,9 +131,9 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
       spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent );
+    KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *tqparent );
 
     /**
       Return TQLabel used by this control element.
@@ -170,9 +171,9 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
       Create a time value control element consisting of a label and a spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
 
     /**
       Return TQLabel used by this widget.
@@ -208,9 +209,9 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
       spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
 
     /**
       Return TQLabel used by this widget.
@@ -219,7 +220,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
     /**
       Return TQSpinBox used by this widget.
     */
-    QTimeEdit *timeEdit();
+    TQTimeEdit *timeEdit();
 
     void readConfig();
     void writeConfig();
@@ -228,7 +229,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
     KConfigSkeleton::ItemDateTime *mItem;
 
     TQLabel *mLabel;
-    QTimeEdit *mTimeEdit;
+    TQTimeEdit *mTimeEdit;
 };
 
 /**
@@ -245,9 +246,9 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
       Create a time value control element consisting of a label and a date box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
 
     /**
       Return TQLabel used by this widget.
@@ -278,15 +279,16 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
 class KDE_EXPORT KPrefsWidColor : public KPrefsWid
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Create a color value control element consisting of a test field and a
       button for opening a color dialog.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent );
+    KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *tqparent );
     /**
       Destruct color setting widget.
     */
@@ -320,17 +322,18 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
 class KDE_EXPORT KPrefsWidFont : public KPrefsWid
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Create a font value control element consisting of a test field and a
       button for opening a font dialog.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
     KPrefsWidFont( KConfigSkeleton::ItemFont *item,
-                   TQWidget *parent, const TQString &sampleText );
+                   TQWidget *tqparent, const TQString &sampleText );
     /**
       Destruct font setting widget.
     */
@@ -382,9 +385,9 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
       with several radio buttons.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+    KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent );
     virtual ~KPrefsWidRadios();
 
     /**
@@ -394,7 +397,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
       @param whatsThis What's This help for the button.
     */
     void addRadio( const TQString &text,
-                   const TQString &whatsThis = TQString::null );
+                   const TQString &whatsThis = TQString() );
 
     /**
       Return the box widget used by this widget.
@@ -430,9 +433,9 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
       combo box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
-    KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+    KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent );
     virtual ~KPrefsWidCombo();
 
     void readConfig();
@@ -463,10 +466,10 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
       line edit.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
       @param echomode  Describes how a line edit should display its contents.
     */
-    KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent,
+    KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *tqparent,
                      TQLineEdit::EchoMode echomode=TQLineEdit::Normal );
     /**
       Destructor.
@@ -510,12 +513,12 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
       line edit.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
       @param filter URLRequester filter
       @param mode  Describes how a line edit should display its contents.
     */
-    KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
-                   const TQString &filter = TQString::null, uint mode = KFile::File );
+    KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
+                   const TQString &filter = TQString(), uint mode = KFile::File );
     /**
       Destructor.
     */
@@ -576,116 +579,116 @@ class KDE_EXPORT KPrefsWidManager
       Register a @ref KPrefsWidBool object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item,
-                               TQWidget *parent );
+                               TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidInt object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item,
-                             TQWidget *parent );
+                             TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidDate object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item,
-                               TQWidget *parent );
+                               TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidTime object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item,
-                               TQWidget *parent );
+                               TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidDuration object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                       TQWidget *parent );
+                                       TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidColor object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item,
-                                 TQWidget *parent );
+                                 TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidRadios object. The choices represented by the
       given item object are automatically added as radio buttons.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item,
-                                   TQWidget *parent );
+                                   TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidCombo object. The choices represented by the
       given item object are automatically added to the combo box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item,
-                                   TQWidget *parent );
+                                   TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidString object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item,
-                                   TQWidget *parent );
+                                   TQWidget *tqparent );
 
     /**
       Register a path @ref KPrefsWidPath object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
       @param filter URLRequester filter
       @param mode URLRequester mode
     */
-    KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent,
-                                const TQString &filter = TQString::null,
+    KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
+                                const TQString &filter = TQString(),
                                 uint mode = KFile::File );
 
     /**
       Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param parent  Parent widget.
+      @param tqparent  Parent widget.
     */
     KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item,
-                                      TQWidget *parent );
+                                      TQWidget *tqparent );
 
     /**
       Register a @ref KPrefsWidFont object.
 
       @param item       The KConfigSkeletonItem representing the preferences
                         entry.
-      @param parent     Parent widget.
+      @param tqparent     Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
     KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item,
-                               TQWidget *parent, const TQString &sampleText );
+                               TQWidget *tqparent, const TQString &sampleText );
 
     /** Set all widgets to default values. */
     void setWidDefaults();
@@ -718,16 +721,17 @@ class KDE_EXPORT KPrefsWidManager
 class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Create a KPrefsDialog for a KPrefs object.
 
       @param prefs  KPrefs object used to access te configuration.
-      @param parent Parent widget.
+      @param tqparent Parent widget.
       @param name   Widget name.
       @param modal  true, if dialog has to be modal, false for non-modal.
     */
-    KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
+    KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent = 0, char *name = 0,
                   bool modal = false );
     /**
       Destructor.
@@ -771,8 +775,9 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
+    KPrefsModule( KConfigSkeleton *, TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void addWid( KPrefsWid * );
 
diff --git a/libkdepim/kregexp3.cpp b/libkdepim/kregexp3.cpp
index f34dad33..87827e07 100644
--- a/libkdepim/kregexp3.cpp
+++ b/libkdepim/kregexp3.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -38,12 +38,12 @@
 #endif
 
 TQString KRegExp3::tqreplace( const TQString & str,
-			   const TQString & tqreplacementStr,
+			   const TQString & replacementStr,
 			   int start, bool global )
 {
   int oldpos, pos;
 
-  //-------- parsing the tqreplacementStr into
+  //-------- parsing the replacementStr into
   //-------- literal parts and backreferences:
   TQStringList     literalStrs;
   TQValueList<int> backRefs;
@@ -55,20 +55,20 @@ TQString KRegExp3::tqreplace( const TQString & str,
   TQRegExp brx("\\");
 
 #ifdef DEBUG_KREGEXP3
-  kdDebug() << "Analyzing tqreplacementStr: \"" + tqreplacementStr + "\"" << endl;
+  kdDebug() << "Analyzing replacementStr: \"" + replacementStr + "\"" << endl;
 #endif
 
   oldpos = 0;
   pos = 0;
   while ( true ) {
-    pos = rx.search( tqreplacementStr, pos );
+    pos = rx.search( replacementStr, pos );
     
 #ifdef DEBUG_KREGEXP3
     kdDebug() << TQString("  Found match at pos %1").arg(pos) << endl;
 #endif
 
     if ( pos < 0 ) {
-      literalStrs << tqreplacementStr.mid( oldpos )
+      literalStrs << replacementStr.mid( oldpos )
 	.tqreplace( bbrx, "\\" )
 	.tqreplace( brx, "" );
 #ifdef DEBUG_KREGEXP3
@@ -76,7 +76,7 @@ TQString KRegExp3::tqreplace( const TQString & str,
 #endif
       break;
     } else {
-      literalStrs << tqreplacementStr.mid( oldpos, pos-oldpos )
+      literalStrs << replacementStr.mid( oldpos, pos-oldpos )
 	.tqreplace( bbrx, "\\" )
 	.tqreplace( brx, "" );
 #ifdef DEBUG_KREGEXP3
@@ -101,12 +101,12 @@ TQString KRegExp3::tqreplace( const TQString & str,
   }
 
 #ifdef DEBUG_KREGEXP3
-  kdDebug() << "Finished the analysis of tqreplacementStr!" << endl;
+  kdDebug() << "Finished the analysis of replacementStr!" << endl;
 #endif
   Q_ASSERT( literalStrs.count() == backRefs.count() + 1 );
 
   //-------- actual construction of the
-  //-------- resulting QString
+  //-------- resulting TQString
   TQString result = "";
   oldpos = 0;
   pos = start;
@@ -145,7 +145,7 @@ TQString KRegExp3::tqreplace( const TQString & str,
             iIt != backRefs.end() ; ++sIt, ++iIt ) {
 	result += (*sIt);
 #ifdef DEBUG_KREGEXP3
-	kdDebug() << "   Adding literal tqreplacement part:" << endl;
+	kdDebug() << "   Adding literal replacement part:" << endl;
 	kdDebug() << "    result == \"" + result + "\"" << endl;
 #endif
 	result += cap( (*iIt) );
@@ -156,7 +156,7 @@ TQString KRegExp3::tqreplace( const TQString & str,
       }
       result += (*sIt);
 #ifdef DEBUG_KREGEXP3
-      kdDebug() << "   Adding literal tqreplacement part:" << endl;
+      kdDebug() << "   Adding literal replacement part:" << endl;
       kdDebug() << "    result == \"" + result + "\"" << endl;
 #endif
     }
@@ -173,7 +173,7 @@ TQString KRegExp3::tqreplace( const TQString & str,
     oldpos = pos;
 
     if ( !global ) {
-      // only tqreplace the first occurrence, so stop here:
+      // only replace the first occurrence, so stop here:
       result += str.mid( oldpos );
       break;
     }
diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h
index c9b53c5f..64a874d3 100644
--- a/libkdepim/kregexp3.h
+++ b/libkdepim/kregexp3.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -36,21 +36,21 @@
 
 #include <kdepimmacros.h>
 
-/** @short A TQRegExp (Qt3.x) with a tqreplace() method.
+/** @short A TQRegExp (TQt3.x) with a tqreplace() method.
 
     This class is simply there to provide a namespace for some nice
-    enhancements of the mighty TQRegExp (Qt3 version) regular
+    enhancements of the mighty TQRegExp (TQt3 version) regular
     expression engine, namely the method tqreplace(), which can be
-    used to do search-and-tqreplace like one is used to from perl or sed.
+    used to do search-and-replace like one is used to from perl or sed.
     
-    It "simply" adds the ability to define a tqreplacement string which
-    tqcontains references to the captured substrings. The following
+    It "simply" adds the ability to define a replacement string which
+    contains references to the captured substrings. The following
     constructs are understood, which can be freely mixed in the
-    tqreplacement string:
+    replacement string:
 
     @section Sed syntax
 
-    Back references in the tqreplacement string are made using \n
+    Back references in the replacement string are made using \n
     (backslash-digit), where @p n is a single digit. With this mode of
     operation, only the first nine captured substrings can be
     referenced.
@@ -60,7 +60,7 @@
 
     @section Perl syntax
 
-    Back references in the tqreplacement string are made using $n
+    Back references in the replacement string are made using $n
     (dollarsign-digit), where @p n is a single digit. With this mode
     of operation, only the first nine captured substrings can be
     referenced.
@@ -73,10 +73,10 @@
     To reference the entire matched string, use $0, ${0} or \\0.
 
     @author Marc Mutz <mutz@kde.org>
-    @see QRegExp
+    @see TQRegExp
 */
 
-class KDE_EXPORT KRegExp3 : public QRegExp
+class KDE_EXPORT KRegExp3 : public TQRegExp
 {
 public:
   KRegExp3()
@@ -91,21 +91,21 @@ public:
     : TQRegExp( (TQRegExp)rx ) {}
 
   /** Replaces each matching subpattern in @p str with
-      @p tqreplacementStr, inserting captured substrings for
+      @p replacementStr, inserting captured substrings for
       \\n, $n and ${nn} as described in the class documentation.
       @param str The source string.
-      @param tqreplacementStr The string which tqreplaces matched
+      @param replacementStr The string which replaces matched
              substrings of @p str.
       @param start Start position for the search.
              If @p start is negative, starts @p -(start) positions
 	     from the end of @p str.
-      @param global If @p TRUE, requests to tqreplace all occurrences
-             of the regexp with @p tqreplacementStr; if @p FALSE,
-	     only the first occurrence will be tqreplaced.
+      @param global If @p TRUE, requests to replace all occurrences
+             of the regexp with @p replacementStr; if @p FALSE,
+	     only the first occurrence will be replaced.
 	     Equivalent to the /g switch to perl's s/// operator.
       @return The modified string.
   */
   TQString tqreplace( const TQString & str,
-		   const TQString & tqreplacementStr,
+		   const TQString & replacementStr,
 		   int start=0, bool global=TRUE );
 };
diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h
index e36dc608..2cc2ae83 100644
--- a/libkdepim/kresourceprefs.h
+++ b/libkdepim/kresourceprefs.h
@@ -38,7 +38,7 @@ class TQString;
 class KDE_EXPORT KResourcePrefs : public KConfigSkeleton
 {
   public:
-    KResourcePrefs( const TQString &name = TQString::null );
+    KResourcePrefs( const TQString &name = TQString() );
 
     /**
       Adds a prefix to all groups of this prefs object.
diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp
index ef9746ee..512db73c 100644
--- a/libkdepim/krsqueezedtextlabel.cpp
+++ b/libkdepim/krsqueezedtextlabel.cpp
@@ -22,15 +22,15 @@
 #include "kstringhandler.h"
 #include <tqtooltip.h>
 
-KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
+KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
   tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
 }
 
-KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
+KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
   tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 }
 
diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h
index 13627252..0b54da78 100644
--- a/libkdepim/krsqueezedtextlabel.h
+++ b/libkdepim/krsqueezedtextlabel.h
@@ -18,14 +18,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRSQUEEZEDTEXTLABEL_H
-#define KRSQUEEZEDTEXTLABEL_H
+#ifndef KRSTQUEEZEDTEXTLABEL_H
+#define KRSTQUEEZEDTEXTLABEL_H
 
 #include <tqlabel.h>
 #include <kdepimmacros.h>
 
 /**
- * @short A tqreplacement for TQLabel that squeezes its text
+ * @short A replacement for TQLabel that squeezes its text
  *
  * A label class that squeezes its text into the label
  *
@@ -36,17 +36,18 @@
  */
 
 /*
- * QLabel
+ * TQLabel
  */
 class KDE_EXPORT KRSqueezedTextLabel : public TQLabel {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
    * Default constructor.
    */
-  KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
-  KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
+  KRSqueezedTextLabel( TQWidget *tqparent, const char *name = 0 );
+  KRSqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
 
   virtual TQSize tqminimumSizeHint() const;
   virtual TQSize tqsizeHint() const;
@@ -71,4 +72,4 @@ protected:
 
 };
 
-#endif // KRSQUEEZEDTEXTLABEL_H
+#endif // KRSTQUEEZEDTEXTLABEL_H
diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp
index c9d1f614..8c5f737e 100644
--- a/libkdepim/kscoring.cpp
+++ b/libkdepim/kscoring.cpp
@@ -15,10 +15,10 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 #ifdef KDE_USE_FINAL
-#undef QT_NO_ASCII_CAST
+#undef TQT_NO_ASCII_CAST
 #endif
 
-#undef QT_NO_COMPAT
+#undef TQT_NO_COMPAT
 
 #include <iostream>
 
@@ -39,7 +39,7 @@
 
 
 //----------------------------------------------------------------------------
-// a small function to encode attribute values, code stolen from QDom
+// a small function to encode attribute values, code stolen from TQDom
 static TQString toXml(const TQString& str)
 {
   TQString tmp(str);
@@ -101,7 +101,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s)
   if (!me) me = new NotifyDialog();
   me->msg = s;
 
-  NotesMap::Iterator i = dict.find(s);
+  NotesMap::Iterator i = dict.tqfind(s);
   if (i == dict.end() || i.data()) {
     TQString msg = i18n("Article\n<b>%1</b><br><b>%2</b><br>caused the following"
                        " note to appear:<br>%3").
@@ -348,10 +348,10 @@ NotifyCollection::~NotifyCollection()
 
 void NotifyCollection::addNote(const ScorableArticle& a, const TQString& note)
 {
-  article_list *l = notifyList.find(note);
+  article_list *l = notifyList.tqfind(note);
   if (!l) {
     notifyList.insert(note,new article_list);
-    l = notifyList.find(note);
+    l = notifyList.tqfind(note);
   }
   article_info i;
   i.from = a.from();
@@ -409,7 +409,7 @@ KScoringExpression::KScoringExpression(const TQString& h, const TQString& t, con
     expr.setCaseSensitive( true );
   }
   else if (t == "CONTAINS" ) cond = CONTAINS;
-  else if (t == "EQUALS" ) cond = EQUALS;
+  else if (t == "ETQUALS" ) cond = ETQUALS;
   else if (t == "GREATER") {
     cond = GREATER;
     expr_int = expr_str.toInt();
@@ -435,7 +435,7 @@ int KScoringExpression::getConditionForName(const TQString& s)
   if (s == getNameForCondition(CONTAINS)) return CONTAINS;
   else if (s == getNameForCondition(MATCH)) return MATCH;
   else if (s == getNameForCondition(MATCHCS)) return MATCHCS;
-  else if (s == getNameForCondition(EQUALS)) return EQUALS;
+  else if (s == getNameForCondition(ETQUALS)) return ETQUALS;
   else if (s == getNameForCondition(SMALLER)) return SMALLER;
   else if (s == getNameForCondition(GREATER)) return GREATER;
   else {
@@ -452,7 +452,7 @@ TQString KScoringExpression::getNameForCondition(int cond)
   case CONTAINS: return i18n("Contains Substring");
   case MATCH: return i18n("Matches Regular Expression");
   case MATCHCS: return i18n("Matches Regular Expression (Case Sensitive)");
-  case EQUALS: return i18n("Is Exactly the Same As");
+  case ETQUALS: return i18n("Is Exactly the Same As");
   case SMALLER: return i18n("Less Than");
   case GREATER: return i18n("Greater Than");
   default:
@@ -469,7 +469,7 @@ TQStringList KScoringExpression::conditionNames()
   l << getNameForCondition(CONTAINS);
   l << getNameForCondition(MATCH);
   l << getNameForCondition(MATCHCS);
-  l << getNameForCondition(EQUALS);
+  l << getNameForCondition(ETQUALS);
   l << getNameForCondition(SMALLER);
   l << getNameForCondition(GREATER);
   return l;
@@ -510,11 +510,11 @@ bool KScoringExpression::match(ScorableArticle& a) const
 
   if (!head.isEmpty()) {
     switch (cond) {
-    case EQUALS:
+    case ETQUALS:
       res = (head.lower() == expr_str.lower());
       break;
     case CONTAINS:
-      res = (head.lower().find(expr_str.lower()) >= 0);
+      res = (head.lower().tqfind(expr_str.lower()) >= 0);
       break;
     case MATCH:
     case MATCHCS:
@@ -569,7 +569,7 @@ TQString KScoringExpression::getTypeString(int cond)
   case CONTAINS: return "CONTAINS";
   case MATCH: return "MATCH";
   case MATCHCS: return "MATCHCS";
-  case EQUALS: return "EQUALS";
+  case ETQUALS: return "ETQUALS";
   case SMALLER: return "SMALLER";
   case GREATER: return "GREATER";
   default:
diff --git a/libkdepim/kscoring.h b/libkdepim/kscoring.h
index 9623c228..766591ed 100644
--- a/libkdepim/kscoring.h
+++ b/libkdepim/kscoring.h
@@ -186,7 +186,7 @@ class KDE_EXPORT KScoringExpression
 {
   friend class KScoringRule;
  public:
-  enum Condition { CONTAINS, MATCH, EQUALS, SMALLER, GREATER, MATCHCS };
+  enum Condition { CONTAINS, MATCH, ETQUALS, SMALLER, GREATER, MATCHCS };
 
   KScoringExpression(const TQString&,const TQString&,const TQString&, const TQString&);
   ~KScoringExpression();
@@ -300,15 +300,16 @@ private:
 
 //----------------------------------------------------------------------------
 // Manages the score rules.
-class KDE_EXPORT KScoringManager : public QObject
+class KDE_EXPORT KScoringManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
   //* this is the container for all rules
   typedef TQPtrList<KScoringRule> ScoringRuleList;
 
-  KScoringManager(const TQString& appName = TQString::null);
+  KScoringManager(const TQString& appName = TQString());
   virtual ~KScoringManager();
 
   //* returns a list of all available groups, must be overridden
@@ -409,6 +410,7 @@ class KDE_EXPORT KScoringManager : public QObject
 class KDE_EXPORT NotifyDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static void display(ScorableArticle&,const TQString&);
 protected slots:
diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp
index de76d3e8..7cec1a7d 100644
--- a/libkdepim/kscoringeditor.cpp
+++ b/libkdepim/kscoringeditor.cpp
@@ -15,7 +15,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#undef QT_NO_COMPAT
+#undef TQT_NO_COMPAT
 
 #include "kscoring.h"
 #include "kscoringeditor.h"
@@ -160,9 +160,9 @@ ConditionEditWidget::ConditionEditWidget(KScoringManager *m, TQWidget *p, const
 ConditionEditWidget::~ConditionEditWidget()
 {}
 
-TQWidget* ConditionEditWidget::createWidget(TQWidget *parent)
+TQWidget* ConditionEditWidget::createWidget(TQWidget *tqparent)
 {
-  return new SingleConditionWidget(manager,parent);
+  return new SingleConditionWidget(manager,tqparent);
 }
 
 void ConditionEditWidget::clearWidget(TQWidget *w)
@@ -226,7 +226,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha
 
   // init widget stack and the types combo box
   int index = 1;
-  types->insertItem(TQString::null);
+  types->insertItem(TQString());
   TQStringList l = ActionBase::userNames();
   for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
     TQString name = *it;
@@ -334,9 +334,9 @@ ActionEditWidget::ActionEditWidget(KScoringManager *m,TQWidget *p, const char *n
 ActionEditWidget::~ActionEditWidget()
 {}
 
-TQWidget* ActionEditWidget::createWidget( TQWidget *parent )
+TQWidget* ActionEditWidget::createWidget( TQWidget *tqparent )
 {
-  return new SingleActionWidget(manager,parent);
+  return new SingleActionWidget(manager,tqparent);
 }
 
 void ActionEditWidget::slotEditRule(KScoringRule *rule)
@@ -390,7 +390,7 @@ void ActionEditWidget::clearWidget(TQWidget *w)
 //
 //============================================================================
 RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
-  : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString::null)
+  : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString())
 {
   kdDebug(5100) << "RuleEditWidget::RuleEditWidget()" << endl;
   if ( !n ) setName( "RuleEditWidget" );
@@ -533,12 +533,12 @@ void RuleEditWidget::clearContents()
   expireEdit->setEnabled(false);
   condEditor->slotEditRule(0);
   actionEditor->slotEditRule(0);
-  oldRuleName = TQString::null;
+  oldRuleName = TQString();
 }
 
 void RuleEditWidget::updateRule(KScoringRule *rule)
 {
-  oldRuleName = TQString::null;
+  oldRuleName = TQString();
   TQString groups = groupsEdit->text();
   if (groups.isEmpty())
     rule->setGroups(TQStringList(".*"));
@@ -746,7 +746,7 @@ void RuleListWidget::slotEditRule()
     emit ruleEdited(ruleList->currentText());
   }
   else if (ruleList->count() == 0)
-    emit ruleEdited(TQString::null);
+    emit ruleEdited(TQString());
 }
 
 void RuleListWidget::slotEditRule(TQListBoxItem* item)
@@ -858,8 +858,8 @@ void RuleListWidget::slotRuleDown()
 KScoringEditor* KScoringEditor::scoreEditor = 0;
 
 KScoringEditor::KScoringEditor(KScoringManager* m,
-                               TQWidget *parent, const char *name)
-  : KDialogBase(parent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m)
+                               TQWidget *tqparent, const char *name)
+  : KDialogBase(tqparent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m)
 {
   manager->pushRuleList();
   if (!scoreEditor) scoreEditor = this;
@@ -896,10 +896,10 @@ KScoringEditor::~KScoringEditor()
 }
 
 KScoringEditor* KScoringEditor::createEditor(KScoringManager* m,
-                                             TQWidget *parent, const char *name)
+                                             TQWidget *tqparent, const char *name)
 {
   if (scoreEditor) return scoreEditor;
-  else return new KScoringEditor(m,parent,name);
+  else return new KScoringEditor(m,tqparent,name);
 }
 
 void KScoringEditor::setRule(KScoringRule* r)
diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h
index 92421cce..a4e9555d 100644
--- a/libkdepim/kscoringeditor.h
+++ b/libkdepim/kscoringeditor.h
@@ -49,9 +49,10 @@ class KColorCombo;
 /** this widget implements an editor for one condition.
     It is used in ExpressionEditWidget
 */
-class KDE_EXPORT SingleConditionWidget : public QFrame
+class KDE_EXPORT SingleConditionWidget : public TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ConditionEditWidget;
 public:
   SingleConditionWidget(KScoringManager *,TQWidget *p =0, const char *n =0);
@@ -84,6 +85,7 @@ private:
 class ConditionEditWidget: public KWidgetLister
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   ConditionEditWidget(KScoringManager *,TQWidget *p =0, const char *n =0);
   ~ConditionEditWidget();
@@ -99,9 +101,10 @@ private:
 /** this widget implements an editor for one action.
     It is used in ActionEditWidget
 */
-class SingleActionWidget : public QWidget
+class SingleActionWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ActionEditWidget;
 public:
   SingleActionWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
@@ -131,10 +134,11 @@ private:
 class KDE_EXPORT ActionEditWidget : public KWidgetLister
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~ActionEditWidget();
-  TQWidget* createWidget(TQWidget *parent);
+  TQWidget* createWidget(TQWidget *tqparent);
   void updateRule(KScoringRule*);
   void clearWidget(TQWidget *);
 public slots:
@@ -145,9 +149,10 @@ private:
 
 /** This widget implements the rule editor
  */
-class RuleEditWidget : public QWidget
+class RuleEditWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   RuleEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~RuleEditWidget();
@@ -195,9 +200,10 @@ private:
 /** This widget shows a list of rules with buttons for
     copy, delete aso.
 */
-class KDE_EXPORT RuleListWidget : public QWidget
+class KDE_EXPORT RuleListWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   RuleListWidget(KScoringManager *m, bool =false, TQWidget *p =0, const char *n =0);
   ~RuleListWidget();
@@ -248,14 +254,15 @@ private:
 class KDE_EXPORT KScoringEditor : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   ~KScoringEditor();
   void setRule(KScoringRule*);
-  static KScoringEditor *createEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0);
+  static KScoringEditor *createEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0);
   static KScoringEditor *editor() { return scoreEditor; }
   void setDirty();
 protected:
-  KScoringEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0);
+  KScoringEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0);
 private:
   /** the editor for the current rule */
   RuleEditWidget* ruleEditor;
@@ -278,8 +285,9 @@ private:
 class KScoringEditorWidgetDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0);
+  KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *tqparent=0, const char *name=0);
 protected slots:
   void slotApply();
   void slotOk();
@@ -291,9 +299,10 @@ private:
   TQString ruleName;
 };
 
-class KDE_EXPORT KScoringEditorWidget : public QWidget
+class KDE_EXPORT KScoringEditorWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   KScoringEditorWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~KScoringEditorWidget();
diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp
index f1c5b657..cff384f2 100644
--- a/libkdepim/ksubscription.cpp
+++ b/libkdepim/ksubscription.cpp
@@ -32,7 +32,7 @@
 
 KGroupInfo::KGroupInfo(const TQString &name, const TQString &description,
     bool newGroup, bool subscribed,
-    Status status, TQString path)
+    tqStatus status, TQString path)
   : name(name), description(description),
     newGroup(newGroup), subscribed(subscribed),
     status(status), path(path)
@@ -105,7 +105,7 @@ void GroupItem::setOn( bool on )
 //------------------------------------------------------------------------------
 void GroupItem::stateChange( bool on )
 {
-  // delegate to parent
+  // delegate to tqparent
   if ( !mIgnoreStateChange )
     mBrowser->changeItemState(this, on);
 }
@@ -133,7 +133,7 @@ void GroupItem::setVisible( bool b )
         TQListViewItem::setVisible(b);
       else
       {
-        // leave it visible so that children remain visible
+        // leave it visible so that tqchildren remain visible
         setOpen(true);
         setEnabled(false);
       }
@@ -156,8 +156,8 @@ void GroupItem::setVisible( bool b )
       for ( ; it.current(); ++it)
       {
         // move the checkitem to top
-        TQListViewItem* parent = it.current()->parent();
-        if (parent) parent->takeItem(it.current());
+        TQListViewItem* tqparent = it.current()->tqparent();
+        if (tqparent) tqparent->takeItem(it.current());
         listView()->insertItem(it.current());
       }
       TQListViewItem::setVisible(false);
@@ -206,9 +206,9 @@ void GroupItem::setup()
 
 //=============================================================================
 
-KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
+KSubscription::KSubscription( TQWidget *tqparent, const TQString &caption,
     KAccount * acct, int buttons, const TQString &user1, bool descriptionColumn )
-  : KDialogBase( parent, 0, true, caption, buttons | Help | Ok | Cancel, Ok,
+  : KDialogBase( tqparent, 0, true, caption, buttons | Help | Ok | Cancel, Ok,
       true, i18n("Reload &List"), user1 ),
     mAcct( acct )
 {
@@ -445,10 +445,10 @@ void KSubscription::changeItemState( GroupItem* item, bool on )
   {
     if (!itemInListView(unsubView, item->info()))
     {
-      TQListViewItem *p = item->parent();
+      TQListViewItem *p = item->tqparent();
       while (p)
       {
-        // make sure all parents are subscribed
+        // make sure all tqparents are subscribed
         GroupItem* pi = static_cast<GroupItem*>(p);
         if (pi->isCheckItem() && !pi->isOn())
         {
@@ -457,7 +457,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on )
           pi->setIgnoreStateChange(false);
           new GroupItem(subView, pi->info(), this);
         }
-        p = p->parent();
+        p = p->tqparent();
       }
       new GroupItem(subView, item->info(), this);
     }
@@ -511,7 +511,7 @@ void KSubscription::filterChanged( TQListViewItem* item, const TQString & text )
         continue;
       }
       if ( !text.isEmpty() &&
-           gr->text(0).find(text, 0, false) == -1)
+           gr->text(0).tqfind(text, 0, false) == -1)
       {
         // searchfield
         gr->setVisible(false);
@@ -560,7 +560,7 @@ void KSubscription::restoreOriginalParent()
   {
     TQListViewItem* origParent = static_cast<GroupItem*>(it.current())->
       originalParent();
-    if (origParent && origParent != it.current()->parent())
+    if (origParent && origParent != it.current()->tqparent())
     {
       // remember this to avoid messing up the iterator
       move.append(it.current());
@@ -569,7 +569,7 @@ void KSubscription::restoreOriginalParent()
   TQPtrListIterator<TQListViewItem> it2( move );
   for ( ; it2.current(); ++it2)
   {
-    // restore the original parent
+    // restore the original tqparent
     TQListViewItem* origParent = static_cast<GroupItem*>(it2.current())->
       originalParent();
     groupView->takeItem(it2.current());
@@ -612,12 +612,12 @@ void KSubscription::slotLoadingComplete()
   noTreeCB->setEnabled(true);
   subCB->setEnabled(true);
 
-  // remember the correct parent
+  // remember the correct tqparent
   TQListViewItemIterator it(groupView);
   for ( ; it.current(); ++it)
   {
     static_cast<GroupItem*>(it.current())->
-      setOriginalParent( it.current()->parent() );
+      setOriginalParent( it.current()->tqparent() );
   }
 
   emit listChanged();
diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h
index cb177d20..f9ce044a 100644
--- a/libkdepim/ksubscription.h
+++ b/libkdepim/ksubscription.h
@@ -45,20 +45,20 @@ class KAccount;
 class KDE_EXPORT KGroupInfo
 {
   public:
-    enum Status {
+    enum tqStatus {
       unknown,
       readOnly,
       postingAllowed,
       moderated
     };
 
-    KGroupInfo( const TQString &name, const TQString &description = TQString::null,
+    KGroupInfo( const TQString &name, const TQString &description = TQString(),
         bool newGroup = false, bool subscribed = false,
-        Status status = unknown, TQString path = TQString::null );
+        tqStatus status = unknown, TQString path = TQString() );
 
     TQString name, description;
     bool newGroup, subscribed;
-    Status status;
+    tqStatus status;
     TQString path;
 
     bool operator== (const KGroupInfo &gi2);
@@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo
 //==========================================================================
 
 /** A class representing a single group item (what's that?) */
-class KDE_EXPORT GroupItem : public QCheckListItem
+class KDE_EXPORT GroupItem : public TQCheckListItem
 {
   public:
     GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser,
@@ -84,10 +84,10 @@ class KDE_EXPORT GroupItem : public QCheckListItem
     void setInfo( KGroupInfo info );
 
     /**
-     * Get/Set the original parent
+     * Get/Set the original tqparent
      */
     TQListViewItem* originalParent() { return mOriginalParent; }
-    void setOriginalParent( TQListViewItem* parent ) { mOriginalParent = parent; }
+    void setOriginalParent( TQListViewItem* tqparent ) { mOriginalParent = tqparent; }
 
     /**
      * Get/Set the last open state
@@ -132,27 +132,27 @@ class KDE_EXPORT GroupItem : public QCheckListItem
 
     /**
      * Reimplemented
-     * Calls TQListViewItem or QCheckListItem
+     * Calls TQListViewItem or TQCheckListItem
      */
     virtual void paintCell( TQPainter * p, const TQColorGroup & cg,
         int column, int width, int align );
 
     /**
      * Reimplemented
-     * Calls TQListViewItem or QCheckListItem
+     * Calls TQListViewItem or TQCheckListItem
      */
     virtual void paintFocus( TQPainter *, const TQColorGroup & cg,
                  const TQRect & r );
 
     /**
      * Reimplemented
-     * Calls TQListViewItem or QCheckListItem
+     * Calls TQListViewItem or TQCheckListItem
      */
     virtual int width( const TQFontMetrics&, const TQListView*, int column) const;
 
     /**
      * Reimplemented
-     * Calls TQListViewItem or QCheckListItem
+     * Calls TQListViewItem or TQCheckListItem
      */
     virtual void setup();
 
@@ -188,6 +188,7 @@ class KDE_EXPORT GroupItem : public QCheckListItem
 class KDE_EXPORT KSubscription : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -198,8 +199,8 @@ class KDE_EXPORT KSubscription : public KDialogBase
       Right
     };
 
-    KSubscription( TQWidget *parent, const TQString &caption, KAccount* acct,
-        int buttons = 0, const TQString &user1 = TQString::null,
+    KSubscription( TQWidget *tqparent, const TQString &caption, KAccount* acct,
+        int buttons = 0, const TQString &user1 = TQString(),
         bool descriptionColumn = true );
 
     ~KSubscription();
@@ -280,7 +281,7 @@ class KDE_EXPORT KSubscription : public KDialogBase
      * criteria changed
      */
     void filterChanged( TQListViewItem* item = 0,
-        const TQString & text = TQString::null );
+        const TQString & text = TQString() );
 
     /**
      * The amount of items that are visible and enabled
diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp
index 9b955952..7512b89e 100644
--- a/libkdepim/ktimeedit.cpp
+++ b/libkdepim/ktimeedit.cpp
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqkeycode.h>
@@ -40,10 +40,10 @@
 
 // Validator for a time value with only hours and minutes (no seconds)
 // Mostly locale aware. Author: David Faure <faure@kde.org>
-class KOTimeValidator : public QValidator
+class KOTimeValidator : public TQValidator
 {
 public:
-    KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {}
+    KOTimeValidator(TQWidget* tqparent, const char* name=0) : TQValidator(tqparent, name) {}
 
     virtual State validate(TQString& str, int& /*cursorPos*/) const
     {
@@ -102,11 +102,11 @@ public:
     }
 };
 
-// KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
+// KTimeWidget/TQTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
-// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help.
-KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
-  : TQComboBox( true, parent, name )
+// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help.
+KTimeEdit::KTimeEdit( TQWidget *tqparent, TQTime qt, const char *name )
+  : TQComboBox( true, tqparent, name )
 {
   setInsertionPolicy( NoInsertion );
   setValidator( new KOTimeValidator( this ) );
diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h
index 609c6400..1bd86bdf 100644
--- a/libkdepim/ktimeedit.h
+++ b/libkdepim/ktimeedit.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef _KTIMEEDIT_H
 #define _KTIMEEDIT_H
@@ -41,12 +41,13 @@
   @short Provides a way to edit times in a user-friendly manner.
   @author Preston Brown, Ian Dawes
 */
-class KDE_EXPORT KTimeEdit : public QComboBox
+class KDE_EXPORT KTimeEdit : public TQComboBox
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /** constructs a new time edit. */
-    KTimeEdit(TQWidget *parent=0, TQTime qt=TQTime(12,0), const char *name=0);
+    KTimeEdit(TQWidget *tqparent=0, TQTime qt=TQTime(12,0), const char *name=0);
 
     virtual ~KTimeEdit();
 
diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp
index 1217d6fb..3a65b70c 100644
--- a/libkdepim/kvcarddrag.cpp
+++ b/libkdepim/kvcarddrag.cpp
@@ -41,7 +41,7 @@ KVCardDrag::KVCardDrag( TQWidget *dragsource, const char *name )
 #if defined(KABC_VCARD_ENCODING_FIX)
   setVCard( TQByteArray() );
 #else
-  setVCard( TQString::null );
+  setVCard( TQString() );
 #endif
 }
 
diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h
index 3e99a0e6..8e84f13b 100644
--- a/libkdepim/kvcarddrag.h
+++ b/libkdepim/kvcarddrag.h
@@ -35,11 +35,12 @@ class KVCardDragPrivate;
  * A drag-and-drop object for vcards. The according MIME type
  * is set to text/x-vcard.
  *
- * See the Qt drag'n'drop documentation.
+ * See the TQt drag'n'drop documentation.
  */
-class KDE_EXPORT KVCardDrag : public QStoredDrag
+class KDE_EXPORT KVCardDrag : public TQStoredDrag
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -66,7 +67,7 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag
     void setVCard( const TQString &content );
 #endif
     /**
-     * Returns true if the MIME source @p e tqcontains a vcard object.
+     * Returns true if the MIME source @p e contains a vcard object.
      */
     static bool canDecode( TQMimeSource *e );
 
diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp
index 13e1675b..bc9d8980 100644
--- a/libkdepim/kwidgetlister.cpp
+++ b/libkdepim/kwidgetlister.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,13 +43,13 @@
 #include <kpushbutton.h>
 #include <kdialog.h>
 
-KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name )
-  : TQWidget( parent, name )
+KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *tqparent, const char* name )
+  : TQWidget( tqparent, name )
 {
   mWidgetList.setAutoDelete(TRUE);
 
-  mMinWidgets = QMAX( minWidgets, 1 );
-  mMaxWidgets = QMAX( maxWidgets, mMinWidgets + 1 );
+  mMinWidgets = TQMAX( minWidgets, 1 );
+  mMaxWidgets = TQMAX( maxWidgets, mMinWidgets + 1 );
 
   //--------- the button box
   mLayout = new TQVBoxLayout(this, 0, 4);
@@ -146,15 +146,15 @@ void KWidgetLister::clearWidget( TQWidget* /*aWidget*/ )
 {
 }
 
-TQWidget* KWidgetLister::createWidget( TQWidget* parent )
+TQWidget* KWidgetLister::createWidget( TQWidget* tqparent )
 {
-  return new TQWidget( parent );
+  return new TQWidget( tqparent );
 }
 
 void KWidgetLister::setNumberOfShownWidgetsTo( int aNum )
 {
-  int superfluousWidgets = QMAX( (int)mWidgetList.count() - aNum, 0 );
-  int missingWidgets     = QMAX( aNum - (int)mWidgetList.count(), 0 );
+  int superfluousWidgets = TQMAX( (int)mWidgetList.count() - aNum, 0 );
+  int missingWidgets     = TQMAX( aNum - (int)mWidgetList.count(), 0 );
 
   // remove superfluous widgets
   for ( ; superfluousWidgets ; superfluousWidgets-- )
diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h
index 19616aa1..9af7bb9b 100644
--- a/libkdepim/kwidgetlister.h
+++ b/libkdepim/kwidgetlister.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -62,11 +62,12 @@ class TQHBox;
 
 */
 
-class KDE_EXPORT KWidgetLister : public QWidget
+class KDE_EXPORT KWidgetLister : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 );
+  KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* tqparent=0, const char* name=0 );
   virtual ~KWidgetLister();
 
 protected slots:
@@ -99,7 +100,7 @@ protected:
       when showing it on screen. Make sure you call this
       implementaion, though, since you cannot put the widget on screen
       from derived classes (@p mLayout is private).
-      Make sure the parent of the TQWidget to add is this KWidgetLister. */
+      Make sure the tqparent of the TQWidget to add is this KWidgetLister. */
   virtual void addWidgetAtEnd(TQWidget *w =0);
   /** Removes a single (always the last) widget. Doesn't care if there
       are still only @ref mMinWidgets left on screen and whether it
@@ -115,8 +116,8 @@ protected:
   /** Because QT 2.x does not support signals/slots in template
       classes, we are forced to emulate this by forcing the
       implementers of subclasses of KWidgetLister to reimplement this
-      function which tqreplaces the "@p new @p T" call. */
-  virtual TQWidget* createWidget( TQWidget *parent );
+      function which replaces the "@p new @p T" call. */
+  virtual TQWidget* createWidget( TQWidget *tqparent );
   /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't
       check if @p aNum is inside the range @p
       [mMinWidgets,mMaxWidgets]. */
diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp
index 9813da7c..6af87cef 100644
--- a/libkdepim/kxface.cpp
+++ b/libkdepim/kxface.cpp
@@ -86,7 +86,7 @@ KXFace::~KXFace()
 TQString KXFace::fromImage( const TQImage &image )
 {
   if( image.isNull() )
-    return TQString::null;
+    return TQString();
 
   TQImage scaledImg = image.smoothScale( 48, 48 );
   TQByteArray ba;
@@ -94,8 +94,8 @@ TQString KXFace::fromImage( const TQImage &image )
   buffer.open( IO_WriteOnly );
   scaledImg.save( &buffer, "XBM" );
   TQString xbm( ba );
-  xbm.remove( 0, xbm.find( "{" ) + 1 );
-  xbm.truncate( xbm.find( "}" ) );
+  xbm.remove( 0, xbm.tqfind( "{" ) + 1 );
+  xbm.truncate( xbm.tqfind( "}" ) );
   xbm.remove( " " );
   xbm.remove( "," );
   xbm.remove( "0x" );
diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h
index ca3fb8e0..921c1f24 100644
--- a/libkdepim/kxface.h
+++ b/libkdepim/kxface.h
@@ -519,9 +519,10 @@ class TQString;
 
 namespace KPIM {
 
-  class KDE_EXPORT KXFace : public QObject
+  class KDE_EXPORT KXFace : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       KXFace();
diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp
index bf4f995e..651c8615 100644
--- a/libkdepim/ldapclient.cpp
+++ b/libkdepim/ldapclient.cpp
@@ -62,8 +62,8 @@ TQString LdapObject::toString() const
 
 void LdapObject::clear()
 {
-  dn = TQString::null;
-  objectClass = TQString::null;
+  dn = TQString();
+  objectClass = TQString();
   attrs.clear();
 }
 
@@ -76,8 +76,8 @@ void LdapObject::assign( const LdapObject& that )
   }
 }
 
-LdapClient::LdapClient( int clientNumber, TQObject* parent, const char* name )
-  : TQObject( parent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false )
+LdapClient::LdapClient( int clientNumber, TQObject* tqparent, const char* name )
+  : TQObject( tqparent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false )
 {
 //  d = new LdapClientPrivate;
   mClientNumber = clientNumber;
@@ -196,7 +196,7 @@ void LdapClient::finishCurrentObject()
   mCurrentObject.dn = mLdif.dn();
   const TQString sClass( mCurrentObject.objectClass.lower() );
   if( sClass == "groupofnames" || sClass == "kolabgroupofnames" ){
-    LdapAttrMap::ConstIterator it = mCurrentObject.attrs.find("mail");
+    LdapAttrMap::ConstIterator it = mCurrentObject.attrs.tqfind("mail");
     if( it == mCurrentObject.attrs.end() ){
       // No explicit mail address found so far?
       // Fine, then we use the address stored in the DN.
@@ -423,11 +423,11 @@ void LdapSearch::startSearch( const TQString& txt )
 
   cancelSearch();
 
-  int pos = txt.find( '\"' );
+  int pos = txt.tqfind( '\"' );
   if( pos >= 0 )
   {
     ++pos;
-    int pos2 = txt.find( '\"', pos );
+    int pos2 = txt.tqfind( '\"', pos );
     if( pos2 >= 0 )
         mSearchText = txt.mid( pos , pos2 - pos );
     else
diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h
index cf3f5582..dba6f1c3 100644
--- a/libkdepim/ldapclient.h
+++ b/libkdepim/ldapclient.h
@@ -106,7 +106,7 @@ class LdapObject
 {
   public:
     LdapObject()
-      : dn( TQString::null ), client( 0 ) {}
+      : dn( TQString() ), client( 0 ) {}
     explicit LdapObject( const TQString& _dn, LdapClient* _cl ) : dn( _dn ), client( _cl ) {}
     LdapObject( const LdapObject& that ) { assign( that ); }
 
@@ -139,12 +139,13 @@ class LdapObject
   * We mean it!
   *
   */
-class KDE_EXPORT LdapClient : public QObject
+class KDE_EXPORT LdapClient : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LdapClient( int clientNumber, TQObject* parent = 0, const char* name = 0 );
+    LdapClient( int clientNumber, TQObject* tqparent = 0, const char* name = 0 );
     virtual ~LdapClient();
 
     /*! returns true if there is a query running */
@@ -242,9 +243,10 @@ typedef TQValueList<LdapResult> LdapResultList;
   * We mean it!
   *
   */
-class KDE_EXPORT LdapSearch : public QObject
+class KDE_EXPORT LdapSearch : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     LdapSearch();
diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp
index 37b29f6d..2297e17e 100644
--- a/libkdepim/ldapsearchdialog.cpp
+++ b/libkdepim/ldapsearchdialog.cpp
@@ -44,7 +44,7 @@ using namespace KPIM;
 static TQString asUtf8( const TQByteArray &val )
 {
   if ( val.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const char *data = val.data();
 
@@ -101,8 +101,8 @@ namespace KPIM {
 class ContactListItem : public TQListViewItem
 {
   public:
-    ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs )
-      : TQListViewItem( parent ), mAttrs( attrs )
+    ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs )
+      : TQListViewItem( tqparent ), mAttrs( attrs )
     {
       const KPIM::LdapAttrValue &mailAttrs = attrs[ "mail" ];
       if ( mailAttrs.isEmpty() ) {
@@ -124,9 +124,9 @@ class ContactListItem : public TQListViewItem
 
 }
 
-LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
+LDAPSearchDialog::LDAPSearchDialog( TQWidget* tqparent, const char* name )
   : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 |
-    User2 | User3 | Cancel, Default, parent, name, false, true )
+    User2 | User3 | Cancel, Default, tqparent, name, false, true )
 {
   setButtonCancel( KStdGuiItem::close() );
   TQFrame *page = plainPage();
@@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
                                        page );
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
-  groupBox->setColumnLayout( 0, Qt::Vertical );
+  groupBox->setColumnLayout( 0, TQt::Vertical );
   TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
@@ -363,7 +363,7 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
       result = result.arg( "telephoneNumber" ).arg( query );
     } else {
       // Error?
-      result = TQString::null;
+      result = TQString();
       return result;
     }
   }
@@ -375,7 +375,7 @@ void LDAPSearchDialog::slotStartSearch()
 {
   cancelQuery();
 
-  TQApplication::setOverrideCursor( Qt::waitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
   mSearchButton->setText( i18n( "Stop" ) );
 
   disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
diff --git a/libkdepim/ldapsearchdialog.h b/libkdepim/ldapsearchdialog.h
index 9b19e524..4b647aca 100644
--- a/libkdepim/ldapsearchdialog.h
+++ b/libkdepim/ldapsearchdialog.h
@@ -38,9 +38,10 @@ namespace KPIM {
 class LDAPSearchDialog : public KDialogBase
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LDAPSearchDialog( TQWidget* parent, const char* name = 0 );
+    LDAPSearchDialog( TQWidget* tqparent, const char* name = 0 );
     ~LDAPSearchDialog();
 
     bool isOK() const { return mIsOK; }
diff --git a/libkdepim/linklocator.cpp b/libkdepim/linklocator.cpp
index 46542f89..6a79dff1 100644
--- a/libkdepim/linklocator.cpp
+++ b/libkdepim/linklocator.cpp
@@ -92,14 +92,14 @@ TQString LinkLocator::getUrl()
     // handle cases like this: <link>http://foobar.org/</link>
     int start = mPos;
     while(mPos < (int)mText.length() && mText[mPos] > ' ' && mText[mPos] != '"' &&
-      TQString("<>()[]").find(mText[mPos]) == -1)
+      TQString("<>()[]").tqfind(mText[mPos]) == -1)
     {
       ++mPos;
     }
     /* some URLs really end with:  # / & - _    */
     const TQString allowedSpecialChars = TQString("#/&-_");
     while(mPos > start && mText[mPos-1].isPunct() &&
-		    allowedSpecialChars.find(mText[mPos-1]) == -1 )
+		    allowedSpecialChars.tqfind(mText[mPos-1]) == -1 )
     {
       --mPos;
     }
@@ -128,7 +128,7 @@ bool LinkLocator::atUrl() const
   // the character directly before the URL must not be a letter, a number or
   // any other character allowed in a dot-atom (RFC 2822).
   if( ( mPos > 0 ) && ( mText[mPos-1].isLetterOrNumber() ||
-                        ( allowedSpecialChars.find( mText[mPos-1] ) != -1 ) ) )
+                        ( allowedSpecialChars.tqfind( mText[mPos-1] ) != -1 ) ) )
     return false;
 
   TQChar ch = mText[mPos];
@@ -179,7 +179,7 @@ TQString LinkLocator::getEmailAddress()
     while ( start >= 0 && mText[start].tqunicode() < 128 &&
             ( mText[start].isLetterOrNumber() ||
               mText[start] == '@' || // allow @ to find invalid email addresses
-              allowedSpecialChars.find( mText[start] ) != -1 ) ) {
+              allowedSpecialChars.tqfind( mText[start] ) != -1 ) ) {
       if ( mText[start] == '@' )
         return TQString(); // local part tqcontains '@' -> no email address
       --start;
@@ -202,7 +202,7 @@ TQString LinkLocator::getEmailAddress()
       if ( mText[end] == '@' )
         return TQString(); // domain part tqcontains '@' -> no email address
       if ( mText[end] == '.' )
-        dotPos = QMIN( dotPos, end ); // remember index of first dot in domain
+        dotPos = TQMIN( dotPos, end ); // remember index of first dot in domain
       ++end;
     }
     // we assume that an email address ends with a letter or a digit
@@ -314,7 +314,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags,
         if(!str.isEmpty())
         {
           // len is the length of the local part
-          int len = str.find('@');
+          int len = str.tqfind('@');
           TQString localPart = str.left(len);
 
           // remove the local part from the result (as '&'s have been expanded to
@@ -353,11 +353,11 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags,
 TQString LinkLocator::pngToDataUrl( const TQString & iconPath )
 {
   if ( iconPath.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   TQFile pngFile( iconPath );
   if ( !pngFile.open( IO_ReadOnly | IO_Raw ) )
-    return TQString::null;
+    return TQString();
 
   TQByteArray ba = pngFile.readAll();
   pngFile.close();
@@ -370,12 +370,12 @@ TQString LinkLocator::getEmoticon()
 {
   // smileys have to be prepended by whitespace
   if ( ( mPos > 0 ) && !mText[mPos-1].isSpace() )
-    return TQString::null;
+    return TQString();
 
   // since smileys start with ':', ';', '(' or '8' short circuit method
   const TQChar ch = mText[mPos];
   if ( ch !=':' && ch != ';' && ch != '(' && ch != '8' )
-    return TQString::null;
+    return TQString();
 
   // find the end of the smiley (a smiley is at most 4 chars long and ends at
   // lineend or whitespace)
@@ -387,11 +387,11 @@ TQString LinkLocator::getEmoticon()
           !mText[mPos+smileyLen].isSpace() )
     smileyLen++;
   if ( smileyLen < MinSmileyLen || smileyLen > MaxSmileyLen )
-    return TQString::null;
+    return TQString();
 
   const TQString smiley = mText.mid( mPos, smileyLen );
   if ( !s_smileyEmoticonNameMap->tqcontains( smiley ) )
-    return TQString::null; // that's not a (known) smiley
+    return TQString(); // that's not a (known) smiley
 
   TQString htmlRep;
   if ( s_smileyEmoticonHTMLCache->tqcontains( smiley ) ) {
@@ -415,7 +415,7 @@ TQString LinkLocator::getEmoticon()
 
     const TQString dataUrl = pngToDataUrl( iconPath );
     if ( dataUrl.isEmpty() ) {
-      htmlRep = TQString::null;
+      htmlRep = TQString();
     }
     else {
       // create an image tag (the text in attribute alt is used
@@ -439,18 +439,18 @@ TQString LinkLocator::highlightedText()
 {
   // formating symbols must be prepended with a whitespace
   if ( ( mPos > 0 ) && !mText[mPos-1].isSpace() )
-    return TQString::null;
+    return TQString();
 
   const TQChar ch = mText[mPos];
   if ( ch != '/' && ch != '*' && ch != '_' )
-    return TQString::null;
+    return TQString();
 
   TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").arg( ch ).arg( ch ) );
   if ( re.search( mText, mPos ) == mPos ) {
     uint length = re.matchedLength();
     // there must be a whitespace after the closing formating symbol
     if ( mPos + length < mText.length() && !mText[mPos + length].isSpace() )
-      return TQString::null;
+      return TQString();
     mPos += length - 1;
     switch ( ch.latin1() ) {
       case '*':
@@ -461,6 +461,6 @@ TQString LinkLocator::highlightedText()
         return "<i>" + re.cap( 1 ) + "</i>";
     }
   }
-  return TQString::null;
+  return TQString();
 }
 
diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h
index 618bc6c8..662202e4 100644
--- a/libkdepim/linklocator.h
+++ b/libkdepim/linklocator.h
@@ -123,7 +123,7 @@ public:
    *                         - PreserveSpaces, preserves the appearance of
    *                                           sequences of space and tab
    *                                           characters in the resulting HTML.
-   *                         - ReplaceSmileys, tqreplace text smileys with
+   *                         - ReplaceSmileys, replace text smileys with
    *                                           emoticon images.
    *                         - IgnoreUrls, doesn't parse any URLs.
    *                         - HighlightText, interprets text highlighting markup
@@ -146,7 +146,7 @@ public:
 
   /** Embed the given PNG image into a data URL.
    *  @param iconPath path to the PNG image
-   *  @return A data URL, TQString::null if the image could not be read.
+   *  @return A data URL, TQString() if the image could not be read.
    */
   static TQString pngToDataUrl( const TQString & iconPath );
 
diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp
index 4f4a79bc..3daf889e 100644
--- a/libkdepim/maillistdrag.cpp
+++ b/libkdepim/maillistdrag.cpp
@@ -78,8 +78,8 @@ void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId,
     mDate = date;
 }
 
-MailListDrag::MailListDrag( MailList mailList, TQWidget * parent, MailTextSource *src )
-    : TQStoredDrag( MailListDrag::format(), parent ), _src(src)
+MailListDrag::MailListDrag( MailList mailList, TQWidget * tqparent, MailTextSource *src )
+    : TQStoredDrag( MailListDrag::format(), tqparent ), _src(src)
 {
     setMailList( mailList );
 }
@@ -233,7 +233,7 @@ TQByteArray MailListDrag::tqencodedData(const char *mimeType) const
         TQByteArray enc = TQStoredDrag::tqencodedData(format());
         decode(enc, ml);
 
-        KProgressDialog *dlg = new KProgressDialog(0, 0, TQString::null, i18n("Retrieving and storing messages..."), true);
+        KProgressDialog *dlg = new KProgressDialog(0, 0, TQString(), i18n("Retrieving and storing messages..."), true);
         dlg->setAllowCancel(true);
         dlg->progressBar()->setTotalSteps(ml.count());
         int i = 0;
diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h
index 7556cec5..335fa3e2 100644
--- a/libkdepim/maillistdrag.h
+++ b/libkdepim/maillistdrag.h
@@ -92,11 +92,11 @@ public:
 };
 
 // Drag and drop object for mails
-class KDE_EXPORT MailListDrag : public QStoredDrag
+class KDE_EXPORT MailListDrag : public TQStoredDrag
 {
 public:
     // Takes ownership of "src" and deletes it when done
-    MailListDrag( MailList, TQWidget * parent = 0, MailTextSource *src = 0 );
+    MailListDrag( MailList, TQWidget * tqparent = 0, MailTextSource *src = 0 );
     ~MailListDrag();
 
     const char *format(int i) const;
diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp
index 1369009f..6ffc06d3 100644
--- a/libkdepim/overlaywidget.cpp
+++ b/libkdepim/overlaywidget.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -31,8 +31,8 @@
 #include "overlaywidget.h"
 using namespace KPIM;
 
-OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name )
-  : TQHBox( parent, name ), mAlignWidget( 0 )
+OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name )
+  : TQHBox( tqparent, name ), mAlignWidget( 0 )
 {
   setAlignWidget( alignWidget );
 }
diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h
index b9918468..f49b4672 100644
--- a/libkdepim/overlaywidget.h
+++ b/libkdepim/overlaywidget.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,12 +41,13 @@ namespace KPIM {
  *
  * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame)
  */
-class OverlayWidget : public QHBox
+class OverlayWidget : public TQHBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
+  OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 );
   ~OverlayWidget();
 
   TQWidget * alignWidget() { return mAlignWidget; }
diff --git a/libkdepim/pluginloader.h b/libkdepim/pluginloader.h
index 5ae0fbf8..d73dc9fa 100644
--- a/libkdepim/pluginloader.h
+++ b/libkdepim/pluginloader.h
@@ -31,7 +31,7 @@ namespace KPIM {
    * @author Marc Mutz <mutz@kde.org> based on KABC's FormatFactory
    *
    * This is a generic plugin loader / factory for small plugins that
-   * don't want to be QObjects.
+   * don't want to be TQObjects.
    *
    * @section Usage
    *
diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp
index 8c0ab889..2788afe2 100644
--- a/libkdepim/progressdialog.cpp
+++ b/libkdepim/progressdialog.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -60,10 +60,10 @@ namespace KPIM {
 
 class TransactionItem;
 
-TransactionItemView::TransactionItemView( TQWidget * parent,
+TransactionItemView::TransactionItemView( TQWidget * tqparent,
                                           const char * name,
                                           WFlags f )
-    : TQScrollView( parent, name, f ) {
+    : TQScrollView( tqparent, name, f ) {
   setFrameStyle( NoFrame );
   mBigBox = new TQVBox( viewport() );
   mBigBox->setSpacing( 5 );
@@ -84,9 +84,9 @@ void TransactionItemView::resizeContents( int w, int h )
   // (handling of TQEvent::LayoutHint in TQScrollView calls this method)
   //kdDebug(5300) << k_funcinfo << w << "," << h << endl;
   TQScrollView::resizeContents( w, h );
-  // Tell the tqlayout in the parent (progressdialog) that our size changed
+  // Tell the tqlayout in the tqparent (progressdialog) that our size changed
   updateGeometry();
-  // Resize the parent (progressdialog) - this works but resize horizontally too often
+  // Resize the tqparent (progressdialog) - this works but resize horizontally too often
   //tqparentWidget()->adjustSize();
 
   TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted );
@@ -112,8 +112,8 @@ TQSize TransactionItemView::tqminimumSizeHint() const
   int minw = tqtopLevelWidget()->width() / 3;
   int maxh = tqtopLevelWidget()->height() / 2;
   TQSize sz( mBigBox->tqminimumSizeHint() );
-  sz.setWidth( QMAX( sz.width(), minw ) + f + vsbExt );
-  sz.setHeight( QMIN( sz.height(), maxh ) + f );
+  sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt );
+  sz.setHeight( TQMIN( sz.height(), maxh ) + f );
   return sz;
 }
 
@@ -121,7 +121,7 @@ TQSize TransactionItemView::tqminimumSizeHint() const
 void TransactionItemView::slotLayoutFirstItem()
 {
   /*
-     The below relies on some details in Qt's behaviour regarding deleting
+     The below relies on some details in TQt's behaviour regarding deleting
      objects. This slot is called from the destroyed signal of an item just
      going away. That item is at that point still in the  list of chilren, but
      since the vtable is already gone, it will have type TQObject. The first
@@ -139,9 +139,9 @@ void TransactionItemView::slotLayoutFirstItem()
 
 // ----------------------------------------------------------------------------
 
-TransactionItem::TransactionItem( TQWidget* parent,
+TransactionItem::TransactionItem( TQWidget* tqparent,
                                   ProgressItem *item, bool first )
-  : TQVBox( parent, "TransactionItem" ), mCancelButton( 0 ), mItem( item )
+  : TQVBox( tqparent, "TransactionItem" ), mCancelButton( 0 ), mItem( item )
 
 {
   setSpacing( 2 );
@@ -159,15 +159,15 @@ TransactionItem::TransactionItem( TQWidget* parent,
 
   mItemLabel = new TQLabel( item->label(), h );
   // always interpret the label text as RichText, but disable word wrapping
-  mItemLabel->setTextFormat( Qt::RichText );
-  mItemLabel->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
+  mItemLabel->setTextFormat( TQt::RichText );
+  mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
   h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mProgress = new TQProgressBar( 100, h );
   mProgress->setProgress( item->progress() );
 
   if ( item->canBeCanceled() ) {
-    mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString::null, h );
+    mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h );
     TQToolTip::add( mCancelButton, i18n("Cancel this operation.") );
     connect ( mCancelButton, TQT_SIGNAL( clicked() ),
               this, TQT_SLOT( slotItemCanceled() ));
@@ -178,14 +178,14 @@ TransactionItem::TransactionItem( TQWidget* parent,
   h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   mSSLLabel = new SSLLabel( h );
   mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  mItemStatus = new TQLabel( item->status(), h );
+  mItemtqStatus = new TQLabel( item->status(), h );
   // always interpret the status text as RichText, but disable word wrapping
-  mItemStatus->setTextFormat( Qt::RichText );
-  mItemStatus->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
+  mItemtqStatus->setTextFormat( TQt::RichText );
+  mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
   // richtext leads to tqsizeHint acting as if wrapping was enabled though,
   // so make sure we only ever have the height of one line.
-  mItemStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
-  mItemStatus->setFixedHeight( mItemLabel->tqsizeHint().height() );
+  mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() );
   setCrypto( item->usesCrypto() );
   if( first ) hideHLine();
 }
@@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label )
   mItemLabel->setText( label );
 }
 
-void TransactionItem::seStatus( const TQString& status )
+void TransactionItem::setqStatus( const TQString& status )
 {
-  mItemStatus->setText( status );
+  mItemtqStatus->setText( status );
 }
 
 void TransactionItem::setCrypto( bool on )
@@ -244,11 +244,11 @@ void TransactionItem::addSubTransaction( ProgressItem* /*item*/ )
 
 // ---------------------------------------------------------------------------
 
-ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name )
-    : OverlayWidget( alignWidget, parent, name ), mWasLastShown( false )
+ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name )
+    : OverlayWidget( alignWidget, tqparent, name ), mWasLastShown( false )
 {
-    setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // QFrame
-    setSpacing( 0 ); // QHBox
+    setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // TQFrame
+    setSpacing( 0 ); // TQHBox
     setMargin( 1 );
 
     mScrollView = new TransactionItemView( this, "ProgressScrollView" );
@@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
               this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) );
     connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ),
               this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) );
-    connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ),
-              this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) );
+    connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ),
+              this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ),
               this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
@@ -307,11 +307,11 @@ ProgressDialog::~ProgressDialog()
 
 void ProgressDialog::slotTransactionAdded( ProgressItem *item )
 {
-   TransactionItem *parent = 0;
-   if ( item->parent() ) {
-     if ( mTransactionsToListviewItems.tqcontains( item->parent() ) ) {
-       parent = mTransactionsToListviewItems[ item->parent() ];
-       parent->addSubTransaction( item );
+   TransactionItem *tqparent = 0;
+   if ( item->tqparent() ) {
+     if ( mTransactionsToListviewItems.tqcontains( item->tqparent() ) ) {
+       tqparent = mTransactionsToListviewItems[ item->tqparent() ];
+       tqparent->addSubTransaction( item );
      }
    } else {
      const bool first = mTransactionsToListviewItems.empty();
@@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item,
    }
 }
 
-void ProgressDialog::slotTransactionStatus( ProgressItem *item,
+void ProgressDialog::slotTransactiontqStatus( ProgressItem *item,
                                             const TQString& status )
 {
    if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
-     ti->seStatus( status );
+     ti->setqStatus( status );
    }
 }
 
diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h
index b9a29e4b..26d9b94d 100644
--- a/libkdepim/progressdialog.h
+++ b/libkdepim/progressdialog.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -52,8 +52,9 @@ class SSLLabel;
 
 class TransactionItemView : public TQScrollView {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  TransactionItemView( TQWidget * parent = 0,
+  TransactionItemView( TQWidget * tqparent = 0,
                        const char * name = 0,
                        WFlags f = 0 );
 
@@ -77,9 +78,10 @@ private:
 class TransactionItem : public TQVBox {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  TransactionItem( TQWidget * parent,
+  TransactionItem( TQWidget * tqparent,
                    ProgressItem* item, bool first );
 
   ~TransactionItem();
@@ -88,7 +90,7 @@ public:
 
   void setProgress( int progress );
   void setLabel( const TQString& );
-  void seStatus( const TQString& );
+  void setqStatus( const TQString& );
   void setCrypto( bool );
   void setTotalSteps( int totalSteps );
 
@@ -107,7 +109,7 @@ protected:
   TQProgressBar* mProgress;
   TQPushButton*  mCancelButton;
   TQLabel*       mItemLabel;
-  TQLabel*       mItemStatus;
+  TQLabel*       mItemtqStatus;
   TQFrame*       mFrame;
   SSLLabel*     mSSLLabel;
   ProgressItem* mItem;
@@ -116,9 +118,10 @@ protected:
 class KDE_EXPORT ProgressDialog : public OverlayWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
+  ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 );
   ~ProgressDialog();
   void setVisible( bool b );
 
@@ -130,7 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item );
   void slotTransactionCompleted( KPIM::ProgressItem *item );
   void slotTransactionCanceled( KPIM::ProgressItem *item );
   void slotTransactionProgress( KPIM::ProgressItem *item, unsigned int progress );
-  void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& );
+  void slotTransactiontqStatus( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool );
   void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool );
diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp
index 740e6c12..de305212 100644
--- a/libkdepim/progressmanager.cpp
+++ b/libkdepim/progressmanager.cpp
@@ -35,10 +35,10 @@ KPIM::ProgressManager * KPIM::ProgressManager::mInstance = 0;
 unsigned int KPIM::ProgressManager::uID = 42;
 
 ProgressItem::ProgressItem(
-       ProgressItem* parent, const TQString& id,
+       ProgressItem* tqparent, const TQString& id,
        const TQString& label, const TQString& status, bool canBeCanceled,
        bool usesCrypto )
-       :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ),
+       :mId( id ), mLabel( label ), mtqStatus( status ), mParent( tqparent ),
         mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ),
         mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ),
         mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false )
@@ -56,8 +56,8 @@ void ProgressItem::setComplete()
      if ( !mCanceled )
        setProgress( 100 );
      emit progressItemCompleted( this );
-     if ( parent() )
-       parent()->removeChild( this );
+     if ( tqparent() )
+       tqparent()->removeChild( this );
      deleteLater();
    } else {
      mWaitingForKids = true;
@@ -84,7 +84,7 @@ void ProgressItem::cancel()
    if ( mCanceled || !mCanBeCanceled ) return;
    kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl;
    mCanceled = true;
-   // Cancel all children.
+   // Cancel all tqchildren.
    TQValueList<ProgressItem*> kids = mChildren.keys();
    TQValueList<ProgressItem*>::Iterator it( kids.begin() );
    TQValueList<ProgressItem*>::Iterator end( kids.end() );
@@ -93,7 +93,7 @@ void ProgressItem::cancel()
      if ( kid->canBeCanceled() )
        kid->cancel();
    }
-   seStatus( i18n( "Aborting..." ) );
+   setqStatus( i18n( "Aborting..." ) );
    emit progressItemCanceled( this );
 }
 
@@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v )
   emit progressItemLabel( this, mLabel );
 }
 
-void ProgressItem::seStatus( const TQString& v )
+void ProgressItem::setqStatus( const TQString& v )
 {
-  mStatus = v;
-  emit progressItemStatus( this, mStatus );
+  mtqStatus = v;
+  emit progressItemtqStatus( this, mtqStatus );
 }
 
 void ProgressItem::setUsesCrypto( bool v )
@@ -147,16 +147,16 @@ ProgressManager* ProgressManager::instance()
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     ProgressItem* parent, const TQString& id,
+     ProgressItem* tqparent, const TQString& id,
      const TQString &label, const TQString &status,
      bool cancellable, bool usesCrypto )
 {
    ProgressItem *t = 0;
    if ( !mTransactions[ id ] ) {
-     t = new ProgressItem ( parent, id, label, status, cancellable, usesCrypto );
+     t = new ProgressItem ( tqparent, id, label, status, cancellable, usesCrypto );
      mTransactions.insert( id, t );
-     if ( parent ) {
-       ProgressItem *p = mTransactions[ parent->id() ];
+     if ( tqparent ) {
+       ProgressItem *p = mTransactions[ tqparent->id() ];
        if ( p ) {
          p->addChild( t );
        }
@@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl(
                this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) );
      connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ),
                this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) );
-     connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ),
-               this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) );
+     connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ),
+               this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ),
                this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
@@ -188,11 +188,11 @@ ProgressItem* ProgressManager::createProgressItemImpl(
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     const TQString& parent, const TQString &id,
+     const TQString& tqparent, const TQString &id,
      const TQString &label, const TQString& status,
      bool canBeCanceled, bool usesCrypto )
 {
-   ProgressItem * p = mTransactions[parent];
+   ProgressItem * p = mTransactions[tqparent];
    return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto );
 }
 
@@ -225,7 +225,7 @@ ProgressItem* ProgressManager::singleItem() const
     if ( (*it)->usesBusyIndicator() )
       return 0;
 
-    if ( !(*it)->parent() ) {             // if it's a top level one, only those count
+    if ( !(*it)->tqparent() ) {             // if it's a top level one, only those count
       if ( item )
         return 0; // we found more than one
       else
diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h
index 47409002..745e69a2 100644
--- a/libkdepim/progressmanager.h
+++ b/libkdepim/progressmanager.h
@@ -36,9 +36,10 @@ class ProgressItem;
 class ProgressManager;
 typedef TQMap<ProgressItem*, bool> ProgressItemMap;
 
-class KDE_EXPORT ProgressItem : public QObject
+class KDE_EXPORT ProgressItem : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class ProgressManager;
   friend class TQDict< ProgressItem >; // so it can be deleted from dicts
 
@@ -51,9 +52,9 @@ class KDE_EXPORT ProgressItem : public QObject
     const TQString& id() const { return mId; }
 
     /**
-     * @return The parent item of this one, if there is one.
+     * @return The tqparent item of this one, if there is one.
      */
-    ProgressItem *parent() const { return mParent; }
+    ProgressItem *tqparent() const { return mParent; }
 
     /**
      * @return The user visible string to be used to represent this item.
@@ -69,13 +70,13 @@ class KDE_EXPORT ProgressItem : public QObject
     /**
      * @return The string to be used for showing this item's current status.
      */
-    const TQString& status() const { return mStatus; }
+    const TQString& status() const { return mtqStatus; }
     /**
      * Set the string to be used for showing this item's current status.
      * @p v will be interpreted as rich text, so it might have to be escaped.
      * @param v The status string.
      */
-    void seStatus( const TQString& v );
+    void setqStatus( const TQString& v );
 
     /**
      * @return Whether this item can be cancelled.
@@ -131,7 +132,7 @@ class KDE_EXPORT ProgressItem : public QObject
      * Reset the progress value of this item to 0 and the status string to
      * the empty string.
      */
-    void reset() { setProgress( 0 ); seStatus( TQString::null ); mCompleted = 0; }
+    void reset() { setProgress( 0 ); setqStatus( TQString() ); mCompleted = 0; }
 
     void cancel();
 
@@ -188,7 +189,7 @@ signals:
      * @param  The updated item.
      * @param  The new message.
      */
-    void progressItemStatus( KPIM::ProgressItem*, const TQString& );
+    void progressItemtqStatus( KPIM::ProgressItem*, const TQString& );
     /**
      * Emitted when the label of an item changed. Should be used by
      * progress dialogs to update the label of an item.
@@ -216,7 +217,7 @@ signals:
 
   protected:
     /* Only to be used by our good friend the ProgressManager */
-    ProgressItem( ProgressItem* parent,
+    ProgressItem( ProgressItem* tqparent,
                              const TQString& id,
                              const TQString& label,
                              const TQString& status,
@@ -228,7 +229,7 @@ signals:
   private:
     TQString mId;
     TQString mLabel;
-    TQString mStatus;
+    TQString mtqStatus;
     ProgressItem* mParent;
     bool mCanBeCanceled;
     unsigned int mProgress;
@@ -259,13 +260,14 @@ signals:
  * one with that id, there will not be a new one created but the existing
  * one will be returned. This is convenient for accessing items that are
  * needed regularly without the to store a pointer to them or to add child
- * items to parents by id.
+ * items to tqparents by id.
  */
 
-class KDE_EXPORT ProgressManager : public QObject
+class KDE_EXPORT ProgressManager : public TQObject
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     virtual ~ProgressManager();
@@ -286,21 +288,21 @@ class KDE_EXPORT ProgressManager : public QObject
      /**
       * Creates a ProgressItem with a unique id and the given label.
       * This is the simplest way to aquire a progress item. It will not
-      * have a parent and will be set to be cancellable and not using crypto.
+      * have a tqparent and will be set to be cancellable and not using crypto.
       *
       * @param label The text to be displayed by progress handlers. It will be
       *              interpreted as rich text, so it might have to be escaped.
       */
      static ProgressItem * createProgressItem( const TQString &label ) {
        return instance()->createProgressItemImpl( 0, getUniqueID(), label,
-                                                  TQString::null, true, false );
+                                                  TQString(), true, false );
      }
 
     /**
-     * Creates a new progressItem with the given parent, id, label and initial
+     * Creates a new progressItem with the given tqparent, id, label and initial
      * status.
      *
-     * @param parent Specify an already existing item as the parent of this one.
+     * @param tqparent Specify an already existing item as the tqparent of this one.
      * @param id Used to identify this operation for cancel and progress info.
      * @param label The text to be displayed by progress handlers. It will be
      *              interpreted as rich text, so it might have to be escaped.
@@ -308,40 +310,40 @@ class KDE_EXPORT ProgressManager : public QObject
      *               interpreted as rich text, so it might have to be escaped.
      * @param canBeCanceled can the user cancel this operation?
      * @param usesCrypto does the operation use secure transports (SSL)
-     * Cancelling the parent will cancel the children as well (if they can be
-     * cancelled) and ongoing children prevent parents from finishing.
+     * Cancelling the tqparent will cancel the tqchildren as well (if they can be
+     * cancelled) and ongoing tqchildren prevent tqparents from finishing.
      * @return The ProgressItem representing the operation.
      */
-     static ProgressItem * createProgressItem( ProgressItem* parent,
+     static ProgressItem * createProgressItem( ProgressItem* tqparent,
                                                const TQString& id,
                                                const TQString& label,
-                                               const TQString& status = TQString::null,
+                                               const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( parent, id, label, status,
+       return instance()->createProgressItemImpl( tqparent, id, label, status,
                                                   canBeCanceled, usesCrypto );
      }
 
      /**
-      * Use this version if you have the id string of the parent and want to
+      * Use this version if you have the id string of the tqparent and want to
       * add a subjob to it.
       */
-     static ProgressItem * createProgressItem( const TQString& parent,
+     static ProgressItem * createProgressItem( const TQString& tqparent,
                                                const TQString& id,
                                                const TQString& label,
-                                               const TQString& status = TQString::null,
+                                               const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( parent, id, label,
+       return instance()->createProgressItemImpl( tqparent, id, label,
                                                  status, canBeCanceled, usesCrypto );
      }
 
      /**
-      * Version without a parent.
+      * Version without a tqparent.
       */
      static ProgressItem * createProgressItem( const TQString& id,
                                                const TQString& label,
-                                               const TQString& status = TQString::null,
+                                               const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
        return instance()->createProgressItemImpl( 0, id, label, status,
@@ -380,8 +382,8 @@ class KDE_EXPORT ProgressManager : public QObject
     void progressItemCompleted( KPIM::ProgressItem* );
     /** @see ProgressItem::progressItemCanceled() */
     void progressItemCanceled( KPIM::ProgressItem* );
-    /** @see ProgressItem::progressItemStatus() */
-    void progressItemStatus( KPIM::ProgressItem*, const TQString& );
+    /** @see ProgressItem::progressItemtqStatus() */
+    void progressItemtqStatus( KPIM::ProgressItem*, const TQString& );
     /** @see ProgressItem::progressItemLabel() */
     void progressItemLabel( KPIM::ProgressItem*, const TQString& );
     /** @see ProgressItem::progressItemUsesCrypto() */
@@ -417,11 +419,11 @@ class KDE_EXPORT ProgressManager : public QObject
     ProgressManager( const ProgressManager& );
 
     virtual ProgressItem* createProgressItemImpl(
-                ProgressItem* parent, const TQString& id,
+                ProgressItem* tqparent, const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     virtual ProgressItem* createProgressItemImpl(
-                const TQString& parent,  const TQString& id,
+                const TQString& tqparent,  const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     void emitShowProgressDialogImpl();
diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp
index bbee2d8c..db6589cd 100644
--- a/libkdepim/qutf7codec.cpp
+++ b/libkdepim/qutf7codec.cpp
@@ -15,7 +15,7 @@
   02110-1301, US
 
   As a special exception, permission is granted to use this plugin
-  with any version of Qt by TrollTech AS, Norway. In this case, the
+  with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
   This exception does not however tqinvalidate any other reasons why the
@@ -25,33 +25,33 @@
 
 #include "qutf7codec.h"
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 
-int QUtf7Codec::mibEnum() const {
+int TQUtf7Codec::mibEnum() const {
   return 1012;
 }
 
-int QStrictUtf7Codec::mibEnum() const {
+int TQStrictUtf7Codec::mibEnum() const {
   return -1012;
 }
 
-const char* QUtf7Codec::name() const {
+const char* TQUtf7Codec::name() const {
   return "UTF-7";
 }
 
-const char* QStrictUtf7Codec::name() const {
+const char* TQStrictUtf7Codec::name() const {
   return "X-QT-UTF-7-STRICT";
 }
 
-const char* QUtf7Codec::mimeName() const {
+const char* TQUtf7Codec::mimeName() const {
   return "UTF-7";
 }
 
-bool QUtf7Codec::canEncode( TQChar ) const {
+bool TQUtf7Codec::canEncode( TQChar ) const {
   return TRUE;
 }
 
-bool QUtf7Codec::canEncode( const TQString & ) const {
+bool TQUtf7Codec::canEncode( const TQString & ) const {
   return TRUE;
 }
 
@@ -87,7 +87,7 @@ static inline bool isOfSet(uchar ch, uchar* set) {
   return set[ ch/8 ] & (0x80 >> ( ch%8 ));
 }
 
-int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const
+int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const
 {
   int stepNo = 0;
   int i;
@@ -136,7 +136,7 @@ int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const
   return i;
 }
 
-class QUtf7Decoder : public TQTextDecoder {
+class TQUtf7Decoder : public TQTextDecoder {
   // the storage for our tqunicode char until it's finished
   ushort uc;
   // the state of the base64 decoding
@@ -156,7 +156,7 @@ class QUtf7Decoder : public TQTextDecoder {
   // of a shifted-sequence.
   bool rightAfterEscape;
 public:
-  QUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE)
+  TQUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE)
   {
   }
 
@@ -180,10 +180,10 @@ public:
       // check for 8bit char's:
       // 
       if ( ch > 127 ) {
-	qWarning("QUtf7Decoder: 8bit char found in input. "
+	qWarning("TQUtf7Decoder: 8bit char found in input. "
 		 "Parser has been re-initialized!");
 	resetParser();
-	result += TQChar::tqreplacement;
+	result += TQChar::replacement;
 	continue;
       }
 
@@ -228,12 +228,12 @@ public:
 	    // makes for an ill-formed sequence.
 	    // Note that we catch (the valid) "+-" pair
 	    // right at the beginning.
-	    qWarning("QUtf7Decoder: ill-formed input: "
+	    qWarning("TQUtf7Decoder: ill-formed input: "
 		     "non-base64 char after escaping \"+\"!");
 	  }
 	  // pending bits from base64 encoding must be all 0:
 	  if (stepNo >= 1 && uc) {
-	    qWarning("QUtf7Decoder: ill-formed sequence: "
+	    qWarning("TQUtf7Decoder: ill-formed sequence: "
 		     "non-zero bits in shifted-sequence tail!");
 	  }
 	  resetParser();
@@ -310,22 +310,22 @@ public:
 
   } // toUnicode()
 
-}; // class QUtf7Decoder
+}; // class TQUtf7Decoder
 
-TQTextDecoder* QUtf7Codec::makeDecoder() const
+TQTextDecoder* TQUtf7Codec::makeDecoder() const
 {
-  return new QUtf7Decoder;
+  return new TQUtf7Decoder;
 }
 
 
-class QUtf7Encoder : public TQTextEncoder {
+class TQUtf7Encoder : public TQTextEncoder {
   uchar dontNeedEncodingSet[16];
   ushort outbits;
   uint stepNo : 2;
   bool shifted : 1;
   bool mayContinueShiftedSequence : 1;
 public:
-  QUtf7Encoder(bool encOpt, bool encLwsp)
+  TQUtf7Encoder(bool encOpt, bool encLwsp)
     : outbits(0), stepNo(0),
       shifted(FALSE), mayContinueShiftedSequence(FALSE)
   {
@@ -537,14 +537,14 @@ public:
     return result;
   } // fromUnicode()
 
-}; // class QUtf7Encoder
+}; // class TQUtf7Encoder
 
-TQTextEncoder* QUtf7Codec::makeEncoder() const {
-  return new QUtf7Encoder( false, false );
+TQTextEncoder* TQUtf7Codec::makeEncoder() const {
+  return new TQUtf7Encoder( false, false );
 }
 
-TQTextEncoder* QStrictUtf7Codec::makeEncoder() const {
-  return new QUtf7Encoder( true, false );
+TQTextEncoder* TQStrictUtf7Codec::makeEncoder() const {
+  return new TQUtf7Encoder( true, false );
 }
 
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h
index 116fa02a..6bb5117e 100644
--- a/libkdepim/qutf7codec.h
+++ b/libkdepim/qutf7codec.h
@@ -15,23 +15,21 @@
   02110-1301, US
 
   As a special exception, permission is granted to use this plugin
-  with any version of Qt by TrollTech AS, Norway. In this case, the
+  with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
   This exception does not however tqinvalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
-#ifndef QUTF7CODEC_H
-#define QUTF7CODEC_H
+#ifndef TQUTF7CODEC_H
+#define TQUTF7CODEC_H
 
-#ifndef QT_H
 #include "tqtextcodec.h"
-#endif
 
 #include <kdepimmacros.h>
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 
 /** @short A TQTextCodec for the UTF-7 transformation of Unicode.
 
@@ -47,10 +45,10 @@
 
     @author Marc Mutz <mutz@kde.org> */
 
-class KDE_EXPORT QUtf7Codec : public TQTextCodec {
+class KDE_EXPORT TQUtf7Codec : public TQTextCodec {
     bool encOpt, encLwsp;
 public:
-    QUtf7Codec() : TQTextCodec() {}
+    TQUtf7Codec() : TQTextCodec() {}
 
     int mibEnum() const;
     const char* name() const;
@@ -65,14 +63,14 @@ public:
     int heuristicContentMatch( const char* chars, int len ) const;
 };
 
-/** This is a version of @ref QUtf7Codec, which should only be used in
-    MIME transfer. It differs from @ref QUtf7Codec only in that the
+/** This is a version of @ref TQUtf7Codec, which should only be used in
+    MIME transfer. It differs from @ref TQUtf7Codec only in that the
     encoder escapes additional characters (the RFC2152 "optional
     direct set"), which might not be allowed in RFC822/RFC2047 header
     fields.
 
     You should only use this codec for @em encoding, since it's output
-    is pure UTF-7 and can equally well be decoded by @ref QUtf7Codec's
+    is pure UTF-7 and can equally well be decoded by @ref TQUtf7Codec's
     decoder.
 
     To distinguish between the two variants, this class has MIB enum
@@ -80,12 +78,12 @@ public:
     "X-QT-UTF-7-STRICT". The MIME preferred charset name is still
     "UTF-7", though.
 
-    @short A variant of @ref QUtf7Codec, which protectes certain
+    @short A variant of @ref TQUtf7Codec, which protectes certain
     characters in MIME transport
     @author Marc Mutz <mutz@kde.org> */
-class KDE_EXPORT QStrictUtf7Codec : public QUtf7Codec {
+class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec {
 public:
-  QStrictUtf7Codec() : QUtf7Codec() {}
+  TQStrictUtf7Codec() : TQUtf7Codec() {}
 
   const char* name() const;
   int mibEnum() const;
@@ -93,6 +91,6 @@ public:
   TQTextEncoder* makeEncoder() const;
 };
 
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
 
-#endif // QUTF7CODEC_H
+#endif // TQUTF7CODEC_H
diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp
index 27b70682..49eb92c8 100644
--- a/libkdepim/qutf7codecplugin.cpp
+++ b/libkdepim/qutf7codecplugin.cpp
@@ -15,7 +15,7 @@
   02110-1301, US
 
   As a special exception, permission is granted to use this plugin
-  with any version of Qt by TrollTech AS, Norway. In this case, the
+  with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
   This exception does not however tqinvalidate any other reasons why the
@@ -33,9 +33,9 @@ class TQTextCodec;
 
 // ######### This file isn't compiled currently
 
-class QUtf7CodecPlugin : public TQTextCodecPlugin {
+class TQUtf7CodecPlugin : public TQTextCodecPlugin {
 public:
-  QUtf7CodecPlugin() {}
+  TQUtf7CodecPlugin() {}
 
   TQStringList names() const { return TQStringList() << "UTF-7" << "X-QT-UTF-7-STRICT"; }
   TQValueList<int> mibEnums() const { return TQValueList<int>() << 1012 << -1012; }
@@ -43,20 +43,20 @@ public:
   TQTextCodec * createForName( const TQString & );
 };
 
-TQTextCodec * QUtf7CodecPlugin::createForMib( int mib ) {
+TQTextCodec * TQUtf7CodecPlugin::createForMib( int mib ) {
   if ( mib == 1012 )
-    return new QUtf7Codec();
+    return new TQUtf7Codec();
   else if ( mib == -1012 )
-    return new QStrictUtf7Codec();
+    return new TQStrictUtf7Codec();
   return 0;
 }
 
-TQTextCodec * QUtf7CodecPlugin::createForName( const TQString & name ) {
+TQTextCodec * TQUtf7CodecPlugin::createForName( const TQString & name ) {
   if ( name == "UTF-7" )
-    return new QUtf7Codec();
+    return new TQUtf7Codec();
   else if ( name == "X-QT-UTF-7-STRICT" )
-    return new QStrictUtf7Codec();
+    return new TQStrictUtf7Codec();
   return 0;
 }
 
-KDE_Q_EXPORT_PLUGIN( QUtf7CodecPlugin );
+KDE_TQ_EXPORT_PLUGIN( TQUtf7CodecPlugin );
diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp
index 80fe3912..6e1054d1 100644
--- a/libkdepim/recentaddresses.cpp
+++ b/libkdepim/recentaddresses.cpp
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -157,9 +157,9 @@ TQStringList RecentAddresses::addresses() const
     return addresses;
 }
 
-RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name )
+RecentAddressDialog::RecentAddressDialog( TQWidget *tqparent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Recent Addresses" ), Ok | Cancel, Ok,
-                 parent, name, true )
+                 tqparent, name, true )
 {
   TQWidget *page = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h
index 03254031..f7ec276e 100644
--- a/libkdepim/recentaddresses.h
+++ b/libkdepim/recentaddresses.h
@@ -18,11 +18,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -44,7 +44,7 @@ namespace KRecentAddress {
 class KDE_EXPORT RecentAddressDialog : public KDialogBase
 {
  public:
-  RecentAddressDialog( TQWidget *parent, const char *name = 0 );
+  RecentAddressDialog( TQWidget *tqparent, const char *name = 0 );
   void setAddresses( const TQStringList &addrs );
   TQStringList addresses() const;
  private:
diff --git a/libkdepim/resourceabc.cpp b/libkdepim/resourceabc.cpp
index 794862e4..002f1498 100644
--- a/libkdepim/resourceabc.cpp
+++ b/libkdepim/resourceabc.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "resourceabc.h"
diff --git a/libkdepim/resourceabc.h b/libkdepim/resourceabc.h
index 90abbf72..f1509e44 100644
--- a/libkdepim/resourceabc.h
+++ b/libkdepim/resourceabc.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef RESOURCEABC_H
@@ -44,6 +44,7 @@ namespace KPIM {
 class KDE_EXPORT ResourceABC : public KABC::Resource
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceABC( const KConfig* );
diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp
index 7011c712..6a1e3541 100644
--- a/libkdepim/sendsmsdialog.cpp
+++ b/libkdepim/sendsmsdialog.cpp
@@ -27,8 +27,8 @@
 
 #include "sendsmsdialog.h"
 
-SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name )
-  : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, parent, name, true, true )
+SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name )
+  : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, tqparent, name, true, true )
 {
   TQWidget *page = plainPage();
 
@@ -37,7 +37,7 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c
   tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 );
 
   mMessageLength = new TQLabel( "0/160", page );
-  mMessageLength->tqsetAlignment( Qt::AlignRight );
+  mMessageLength->tqsetAlignment( TQt::AlignRight );
   tqlayout->addWidget( mMessageLength, 0, 2 );
 
   mText = new TQTextEdit( page );
diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h
index bd5b0ea9..43bfe72e 100644
--- a/libkdepim/sendsmsdialog.h
+++ b/libkdepim/sendsmsdialog.h
@@ -30,9 +30,10 @@ class TQTextEdit;
 class SendSMSDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name = 0 );
+    SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name = 0 );
 
     TQString text() const;
 
diff --git a/libkdepim/sidebarextension.cpp b/libkdepim/sidebarextension.cpp
index dc3413eb..1ce8e9a8 100644
--- a/libkdepim/sidebarextension.cpp
+++ b/libkdepim/sidebarextension.cpp
@@ -26,8 +26,8 @@
 
 using namespace KParts;
 
-SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name)
-: TQObject(parent, name), m_exported(exported), d(0)
+SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name)
+: TQObject(tqparent, name), m_exported(exported), d(0)
 {
 }
 
diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h
index 3a7ffbe5..98b185c1 100644
--- a/libkdepim/sidebarextension.h
+++ b/libkdepim/sidebarextension.h
@@ -35,9 +35,10 @@ namespace KParts
    * Provides a way to export a widget which will be displayed in Kontacts
    * stackview at the left
    **/
-  class KDE_EXPORT SideBarExtension : public QObject
+  class KDE_EXPORT SideBarExtension : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
       /**
@@ -45,10 +46,10 @@ namespace KParts
        *
        * @param exported A TQWidget derived widget that will be provided for the
        *                 users of SideBarExtension.
-       * @param parent   The parent widget.
+       * @param tqparent   The tqparent widget.
        * @param name     The name of the class.
        **/
-      SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name);
+      SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name);
       ~SideBarExtension();
 
       /**
diff --git a/libkdepim/spellingfilter.cpp b/libkdepim/spellingfilter.cpp
index e57745e5..a0861098 100644
--- a/libkdepim/spellingfilter.cpp
+++ b/libkdepim/spellingfilter.cpp
@@ -156,7 +156,7 @@ void SpellingFilter::TextCensor::censorString(const TQString& s)
   while(mPos != -1)
   {
     // Find start of string
-    mPos = mText.find(s, mPos);
+    mPos = mText.tqfind(s, mPos);
     if(mPos != -1)
     {
       // Replace string with spaces
@@ -187,7 +187,7 @@ bool SpellingFilter::TextCensor::atLineStart() const
 
 void SpellingFilter::TextCensor::skipLine()
 {
-  mPos = mText.find('\n', mPos);
+  mPos = mText.tqfind('\n', mPos);
   if(mPos == -1)
     mPos = static_cast<int>(mText.length());
   else
diff --git a/libkdepim/ssllabel.cpp b/libkdepim/ssllabel.cpp
index 3ad98239..1349d4e8 100644
--- a/libkdepim/ssllabel.cpp
+++ b/libkdepim/ssllabel.cpp
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -41,8 +41,8 @@
 
 namespace KPIM {
 
-SSLLabel::SSLLabel( TQWidget* parent )
-  : TQLabel( parent )
+SSLLabel::SSLLabel( TQWidget* tqparent )
+  : TQLabel( tqparent )
 {
   setState( Done );
 }
diff --git a/libkdepim/ssllabel.h b/libkdepim/ssllabel.h
index 06a63860..81f1d227 100644
--- a/libkdepim/ssllabel.h
+++ b/libkdepim/ssllabel.h
@@ -19,11 +19,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -36,7 +36,7 @@
 
 namespace KPIM {
 
-  class SSLLabel : public QLabel
+  class SSLLabel : public TQLabel
   {
   public:
     enum State {
@@ -45,7 +45,7 @@ namespace KPIM {
       Clean,
       Done
     };
-    SSLLabel( TQWidget* parent );
+    SSLLabel( TQWidget* tqparent );
 
     void setEncrypted( bool enc=true );
     void setState( State state );
diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp
index 16637663..8ca46ff9 100644
--- a/libkdepim/statusbarprogresswidget.cpp
+++ b/libkdepim/statusbarprogresswidget.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -58,8 +58,8 @@ using KPIM::ProgressManager;
 using namespace KPIM;
 
 //-----------------------------------------------------------------------------
-StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button )
-  : TQFrame( parent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ),
+StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button )
+  : TQFrame( tqparent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ),
     mDelayTimer( 0 ), mBusyTimer( 0 )
 {
   m_bShowButton = button;
@@ -87,7 +87,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
   m_pProgressBar->setMinimumWidth( w );
   stack->addWidget( m_pProgressBar, 1 );
 
-  m_pLabel = new TQLabel( TQString::null, this );
+  m_pLabel = new TQLabel( TQString(), this );
   m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
   m_pLabel->installEventFilter( this );
   m_pLabel->setMinimumWidth( w );
@@ -141,7 +141,7 @@ void StatusbarProgressWidget::updateBusyMode()
 
 void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item )
 {
-  if ( item->parent() )
+  if ( item->tqparent() )
     return; // we are only interested in top level items
 
   updateBusyMode();
@@ -149,7 +149,7 @@ void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item )
 
 void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item )
 {
-  if ( item->parent() ) return; // we are only interested in top level items
+  if ( item->tqparent() ) return; // we are only interested in top level items
   connectSingleItem(); // if going back to 1 item
   if ( ProgressManager::instance()->isEmpty() ) { // No item
     // Done. In 5s the progress-widget will close, then we can clean up the statusbar
diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h
index a3594301..3a473495 100644
--- a/libkdepim/statusbarprogresswidget.h
+++ b/libkdepim/statusbarprogresswidget.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -54,10 +54,11 @@ class ProgressDialog;
 class KDE_EXPORT StatusbarProgressWidget : public TQFrame {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button = true );
+  StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button = true );
 
 public slots:
 
diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp
index e0d1d732..6b4ef339 100644
--- a/libkdepim/tests/testdateedit.cpp
+++ b/libkdepim/tests/testdateedit.cpp
@@ -31,8 +31,8 @@
 
 #include "testdateedit.h"
 
-DateEdit::DateEdit( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+DateEdit::DateEdit( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   
diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h
index 86a9ea4e..44cb214a 100644
--- a/libkdepim/tests/testdateedit.h
+++ b/libkdepim/tests/testdateedit.h
@@ -24,12 +24,13 @@
 
 #include <tqwidget.h>
 
-class DateEdit : public QWidget
+class DateEdit : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DateEdit( TQWidget *parent = 0, const char *name = 0 );
+    DateEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     void dateChanged( const TQDate& );
diff --git a/libkdepim/tests/testdistrlist.cpp b/libkdepim/tests/testdistrlist.cpp
index b446a5a3..f588f9a9 100644
--- a/libkdepim/tests/testdistrlist.cpp
+++ b/libkdepim/tests/testdistrlist.cpp
@@ -97,9 +97,9 @@ void TestDistrList::runAll()
 bool TestDistrList::check(const TQString& txt, TQString a, TQString b)
 {
     if (a.isEmpty())
-        a = TQString::null;
+        a = TQString();
     if (b.isEmpty())
-        b = TQString::null;
+        b = TQString();
     if (a == b) {
         kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
     }
@@ -123,8 +123,8 @@ static bool removeDirAndContentsRecursively( const TQString & path )
   d.setPath( path );
   d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden );
 
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
+  const TQFileInfoList *list = d.entryInfoList();
+  TQFileInfoListIterator it( *list );
   TQFileInfo *fi;
 
   while ( (fi = it.current()) != 0 ) {
@@ -227,7 +227,7 @@ void TestDistrList::testInsertEntry()
     DistributionList::Entry::List entries = dl.entries( ab );
     check( "entries count", TQString::number( entries.count() ), "3" );
     check( "first entry", entries[0].addressee.name(), "addr1" );
-    check( "first entry", entries[0].email, TQString::null );
+    check( "first entry", entries[0].email, TQString() );
     check( "second entry", entries[1].addressee.name(), "addr2" );
     check( "second entry", entries[1].email, "addr2-alternate@kde.org" );
     check( "third entry", entries[2].addressee.name(), "addr2" );
diff --git a/libkdepim/tests/testdistrlist.h b/libkdepim/tests/testdistrlist.h
index 782c3ec5..3f64527e 100644
--- a/libkdepim/tests/testdistrlist.h
+++ b/libkdepim/tests/testdistrlist.h
@@ -21,9 +21,10 @@
 
 #include <tqobject.h>
 
-class TestDistrList : public QObject
+class TestDistrList : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     TestDistrList() {}
diff --git a/libkdepim/tests/testutf7decoder.cpp b/libkdepim/tests/testutf7decoder.cpp
index f6b8f4ad..b13fb30c 100644
--- a/libkdepim/tests/testutf7decoder.cpp
+++ b/libkdepim/tests/testutf7decoder.cpp
@@ -6,7 +6,7 @@
 
 int main( int argc, char * argv[] ) {
   if ( argc == 1 ) {
-    (void)new QUtf7Codec;
+    (void)new TQUtf7Codec;
 
     TQTextCodec * codec = TQTextCodec::codecForName("utf-7");
     assert(codec);
diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp
index 04ed8f70..2938cd66 100644
--- a/libkdepim/tests/testutf7encoder.cpp
+++ b/libkdepim/tests/testutf7encoder.cpp
@@ -5,7 +5,7 @@
 
 void main( int argc, char * argv[] ) {
   if ( argc == 2 ) {
-    QUtf7Codec * codec = new QUtf7Codec;
+    TQUtf7Codec * codec = new TQUtf7Codec;
 
     TQTextEncoder * enc;
 
diff --git a/libkdepim/tests/testutf7encoder2.cpp b/libkdepim/tests/testutf7encoder2.cpp
index 6d67bae0..65cf8b46 100644
--- a/libkdepim/tests/testutf7encoder2.cpp
+++ b/libkdepim/tests/testutf7encoder2.cpp
@@ -7,7 +7,7 @@
 
 int main( int argc, char * argv[] ) {
   if ( argc == 1 ) {
-    (void)new QUtf7Codec;
+    (void)new TQUtf7Codec;
 
     TQTextCodec * codec = TQTextCodec::codecForName("utf-7");
     assert(codec);
diff --git a/libkdepim/weaver.cpp b/libkdepim/weaver.cpp
index 36bb8fe0..0e718e01 100644
--- a/libkdepim/weaver.cpp
+++ b/libkdepim/weaver.cpp
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -28,8 +28,8 @@ namespace ThreadWeaver {
     bool Debug = true;
     int DebugLevel = 2;
 
-    Job::Job (TQObject* parent, const char* name)
-        : TQObject (parent, name),
+    Job::Job (TQObject* tqparent, const char* name)
+        : TQObject (tqparent, name),
           m_finished (false),
           m_mutex (new TQMutex (true) ),
           m_thread (0)
@@ -178,9 +178,9 @@ namespace ThreadWeaver {
 
     unsigned int Thread::sm_Id;
 
-    Thread::Thread (Weaver *parent)
+    Thread::Thread (Weaver *tqparent)
         : TQThread (),
-          m_parent ( parent ),
+          m_tqparent ( tqparent ),
           m_id ( makeId() )
     {
     }
@@ -212,7 +212,7 @@ namespace ThreadWeaver {
         {
             debug ( 3, "Thread::run [%u]: trying to execute the next job.\n", id() );
 
-            job = m_parent->applyForWork ( this, job );
+            job = m_tqparent->applyForWork ( this, job );
 
             if (job == 0)
             {
@@ -229,7 +229,7 @@ namespace ThreadWeaver {
 
     void Thread::post (Event::Action a, Job *j)
     {
-        m_parent->post ( a, this, j);
+        m_tqparent->post ( a, this, j);
     }
 
     void Thread::msleep(unsigned long msec)
@@ -237,9 +237,9 @@ namespace ThreadWeaver {
         TQThread::msleep(msec);
     }
 
-    Weaver::Weaver(TQObject* parent, const char* name,
+    Weaver::Weaver(TQObject* tqparent, const char* name,
                    int inventoryMin, int inventoryMax)
-        : TQObject(parent, name),
+        : TQObject(tqparent, name),
           m_active(0),
           m_inventoryMin(inventoryMin),
           m_inventoryMax(inventoryMax),
@@ -437,7 +437,7 @@ namespace ThreadWeaver {
             }
             return true;
         } else {
-            // others - please make sure we are a QObject!
+            // others - please make sure we are a TQObject!
             return TQObject::event ( e );
         }
     }
diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h
index 929714df..43d4368d 100644
--- a/libkdepim/weaver.h
+++ b/libkdepim/weaver.h
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -97,7 +97,7 @@ namespace ThreadWeaver {
         Note: Do not create and use SPR/APR events, use Job::triggerSPR or
         Job::triggerAPR to create the requests. */
 
-    class KDE_EXPORT Event : public QCustomEvent
+    class KDE_EXPORT Event : public TQCustomEvent
     {
     public:
         enum Action {
@@ -161,12 +161,13 @@ namespace ThreadWeaver {
         Note: When using an APR, you better make sure to receive the signal
         with some object, otherwise the calling thread will block forever!
     */
-    class KDE_EXPORT Job : public QObject
+    class KDE_EXPORT Job : public TQObject
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
         /** Construct a Job object. */
-        Job(TQObject* parent=0, const char* name=0);
+        Job(TQObject* tqparent=0, const char* name=0);
 
         /** Destructor. */
         virtual ~Job();
@@ -246,13 +247,13 @@ namespace ThreadWeaver {
 
     /** The class Thread is used to represent the worker threads in
         the weaver's inventory. It is not meant to be overloaded. */
-    class KDE_EXPORT Thread : public QThread
+    class KDE_EXPORT Thread : public TQThread
     {
     public:
         /** Create a thread.
-            These thread objects are only used inside the Weaver parent
+            These thread objects are only used inside the Weaver tqparent
             object. */
-        Thread(Weaver *parent);
+        Thread(Weaver *tqparent);
 
         /** The destructor. */
         ~Thread();
@@ -260,7 +261,7 @@ namespace ThreadWeaver {
         /** Overloaded to execute the assigned job.
             This will NOT return until shutdown() is called. The
             thread will try to execute one job after the other, asking
-            the Weaver parent for a new job when the assigned one is
+            the Weaver tqparent for a new job when the assigned one is
             finished.
             If no jobs are available, the thread will suspend.
             After shutdown() is called, the thread will end as soon as
@@ -282,7 +283,7 @@ namespace ThreadWeaver {
         void post (Event::Action, Job* = 0);
 
     private:
-        Weaver *m_parent;
+        Weaver *m_tqparent;
 
         const unsigned int m_id;
 
@@ -293,11 +294,12 @@ namespace ThreadWeaver {
 
     /** A weaver is the manager of worker threads (Thread objects) to
         which it assigns jobs from it's queue. */
-    class KDE_EXPORT Weaver : public QObject
+    class KDE_EXPORT Weaver : public TQObject
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
-        Weaver (TQObject* parent=0, const char* name=0,
+        Weaver (TQObject* tqparent=0, const char* name=0,
                 int inventoryMin = 4, // minimal number of provided threads
                 int inventoryMax = 32); // maximum number of provided threads
         virtual ~Weaver ();
diff --git a/libkdepim/weaverextensions.cpp b/libkdepim/weaverextensions.cpp
index cb8fe48f..e0cdfb38 100644
--- a/libkdepim/weaverextensions.cpp
+++ b/libkdepim/weaverextensions.cpp
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -19,8 +19,8 @@
 namespace KPIM {
 namespace ThreadWeaver {
 
-    WeaverExtension::WeaverExtension ( TQObject *parent, const char *name)
-        : TQObject (parent, name)
+    WeaverExtension::WeaverExtension ( TQObject *tqparent, const char *name)
+        : TQObject (tqparent, name)
     {
     }
 
diff --git a/libkdepim/weaverextensions.h b/libkdepim/weaverextensions.h
index f737f8a6..53eff64c 100644
--- a/libkdepim/weaverextensions.h
+++ b/libkdepim/weaverextensions.h
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -30,11 +30,12 @@ namespace ThreadWeaver {
         thread. It can be used to monitor the state of a program, but also,
         for example, to provide visualization of the Weaver's work load in GUI
         programs.  Derive from it to actually create an extension. */
-    class WeaverExtension : public QObject
+    class WeaverExtension : public TQObject
         {
             Q_OBJECT
+  TQ_OBJECT
         public:
-            WeaverExtension ( TQObject *parent = 0, const char *name = 0);
+            WeaverExtension ( TQObject *tqparent = 0, const char *name = 0);
             /** Attach() is a convenience method that will connect all our
             slots to signals emitted by the weaver. It is also possible to
             avoid attach() and only connect necessary signals. */
diff --git a/libkdepim/weaverlogger.cpp b/libkdepim/weaverlogger.cpp
index a91d505e..14b3c505 100644
--- a/libkdepim/weaverlogger.cpp
+++ b/libkdepim/weaverlogger.cpp
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -21,8 +21,8 @@ namespace ThreadWeaver {
 
     extern void debug(int severity, const char * cformat, ...);
 
-    WeaverThreadLogger::WeaverThreadLogger( TQObject *parent, const char *name)
-        : WeaverExtension (parent, name)
+    WeaverThreadLogger::WeaverThreadLogger( TQObject *tqparent, const char *name)
+        : WeaverExtension (tqparent, name)
     {
     }
 
diff --git a/libkdepim/weaverlogger.h b/libkdepim/weaverlogger.h
index c0d001b9..ece3ddea 100644
--- a/libkdepim/weaverlogger.h
+++ b/libkdepim/weaverlogger.h
@@ -8,7 +8,7 @@
          http://www.kde.org
          http://www.hackerbuero.org $
    $ License: LGPL with the following explicit clarification:
-         This code may be linked against any version of the Qt toolkit
+         This code may be linked against any version of the TQt toolkit
          from Troll Tech, Norway. $
 
 */
@@ -26,8 +26,9 @@ namespace ThreadWeaver {
     class WeaverThreadLogger : public WeaverExtension
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
-        WeaverThreadLogger( TQObject *parent = 0, const char *name = 0);
+        WeaverThreadLogger( TQObject *tqparent = 0, const char *name = 0);
         ~WeaverThreadLogger();
         void threadCreated (Thread *);
         void threadDestroyed (Thread *);
diff --git a/libkholidays/holidays/holiday_br b/libkholidays/holidays/holiday_br
index 09bb15dc..cf534a83 100644
--- a/libkholidays/holidays/holiday_br
+++ b/libkholidays/holidays/holiday_br
@@ -179,7 +179,7 @@ small         "Dia da Criança"				on october 12
 :small         "Dia do Médico"				on october 18
 :small         "Dia do Aviador"				on october 23
 :small         "Dia da ONU"				on october 24
-:small         "Dia da Democracia"			on october 25
+:small         "Dia da Detqmocracia"			on october 25
 :small         "Dia do Dentista"			on october 25
 :small         "Dia do Funcionário Público"		on october 28
 :small         "Dia do Livro"				on october 29
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp
index 686b438a..3b4ec63a 100644
--- a/libkholidays/kholidays.cpp
+++ b/libkholidays/kholidays.cpp
@@ -92,7 +92,7 @@ TQString KHolidays::shortText( const TQDate &date )
   TQValueList<KHoliday> lst = getHolidays( date );
   if ( !lst.isEmpty() )
     return lst.first().text;
-  else return TQString::null;
+  else return TQString();
 }
 
 bool KHolidays::parseFile( const TQDate &date )
@@ -118,7 +118,7 @@ TQString KHolidays::getHoliday( const TQDate &date )
   TQValueList<KHoliday> lst = getHolidays( date );
   if ( !lst.isEmpty() )
     return lst.first().text;
-  else return TQString::null;
+  else return TQString();
 }
 
 TQValueList<KHoliday> KHolidays::getHolidays( const TQDate &date )
diff --git a/libkholidays/kholidays_version.h b/libkholidays/kholidays_version.h
index a36f4203..6054e01e 100644
--- a/libkholidays/kholidays_version.h
+++ b/libkholidays/kholidays_version.h
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkholidays/lunarphase.cpp b/libkholidays/lunarphase.cpp
index 3dace7bc..65e19562 100644
--- a/libkholidays/lunarphase.cpp
+++ b/libkholidays/lunarphase.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -98,7 +98,7 @@ TQString LunarPhase::phaseName( LunarPhase::Phase phase )
     break;
   default:
   case None:
-    return( TQString::null );
+    return( TQString() );
     break;
   }
 }
@@ -174,7 +174,7 @@ LunarPhase::Phase LunarPhase::phase( const TQDate &date ) const
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/libkholidays/lunarphase.h b/libkholidays/lunarphase.h
index 98a94d75..695ed8cf 100644
--- a/libkholidays/lunarphase.h
+++ b/libkholidays/lunarphase.h
@@ -18,11 +18,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkholidays/parseholiday.c b/libkholidays/parseholiday.c
index c78d3605..1d5b84cf 100644
--- a/libkholidays/parseholiday.c
+++ b/libkholidays/parseholiday.c
@@ -1127,7 +1127,7 @@ yystpcpy (yydest, yysrc)
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
    quotes and backslashes, so that it's suitable for yyerror.  The
    heuristic is that double-quoting is unnecessary unless the string
-   tqcontains an apostrophe, a comma, or backslash (other than
+   contains an apostrophe, a comma, or backslash (other than
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
diff --git a/libkmime/CLASSTREE.bodyparts b/libkmime/CLASSTREE.bodyparts
index eeaa7726..5952c208 100644
--- a/libkmime/CLASSTREE.bodyparts
+++ b/libkmime/CLASSTREE.bodyparts
@@ -15,7 +15,7 @@
       + Message::RFC822
       + Message::Partial
       + Message::ExternalBody
-      + Message::DeliveryStatus
+      + Message::DeliverytqStatus
     + GText
       + Text::Plain
       + Text::Enriched
diff --git a/libkmime/CLASSTREE.headers b/libkmime/CLASSTREE.headers
index 0dc75926..5e7a9ee0 100644
--- a/libkmime/CLASSTREE.headers
+++ b/libkmime/CLASSTREE.headers
@@ -59,7 +59,7 @@ bool     isEmpty()
 
 const char* type();
 
-Entity* parent();
+Entity* tqparent();
 void     setParent( Content* );
 
 
diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h
index 71cf669a..586071eb 100644
--- a/libkmime/boolflags.h
+++ b/libkmime/boolflags.h
@@ -20,7 +20,7 @@
 #include <kdepimmacros.h>
 
 /** This class stores boolean values in single bytes.
-    It provides a similar functionality as QBitArray
+    It provides a similar functionality as TQBitArray
     but requires much less memory.
     We use it to store the flags of an article
     @internal
diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h
index 8f2c8bda..125fac22 100644
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@@ -12,8 +12,8 @@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
-#ifndef __KMIME_CHARFREQ_H__
-#define __KMIME_CHARFREQ_H__
+#ifndef __KMIME_CHARFRETQ_H__
+#define __KMIME_CHARFRETQ_H__
 
 #include <tqcstring.h>
 #include <kdepimmacros.h>
@@ -37,7 +37,7 @@ public:
   /** Returns true if buf has trailing whitespace, i.e. if any line ends
       with space (' ') or tab ('\t'). */
   bool hasTrailingWhitespace() const;
-  /** Returns true if buf tqcontains a line that starts with "From ". */
+  /** Returns true if buf contains a line that starts with "From ". */
   bool hasLeadingFrom() const;
   /** Returns the percentage of printable characters: printable/total.
       If total == 0, the result is undefined. */
@@ -65,4 +65,4 @@ private:
 
 } // namespace KMime
 
-#endif /* __KMIME_CHARFREQ_H__ */
+#endif /* __KMIME_CHARFRETQ_H__ */
diff --git a/libkmime/kmime_codec_base64.cpp b/libkmime/kmime_codec_base64.cpp
index e14e396a..e1c4d499 100644
--- a/libkmime/kmime_codec_base64.cpp
+++ b/libkmime/kmime_codec_base64.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkmime/kmime_codec_base64.h b/libkmime/kmime_codec_base64.h
index 11fa04b7..6d80d9b9 100644
--- a/libkmime/kmime_codec_base64.h
+++ b/libkmime/kmime_codec_base64.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp
index dd7951f6..529084d5 100644
--- a/libkmime/kmime_codec_identity.cpp
+++ b/libkmime/kmime_codec_identity.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -101,8 +101,8 @@ TQByteArray IdentityCodec::decode( const TQByteArray & src, bool withCRLF ) cons
   return src;
 }
 
-TQCString IdentityCodec::encodeToQCString( const TQByteArray & src, bool withCRLF ) const {
-  kdWarning( withCRLF, 5100 ) << "IdentityCodec::encodeToQCString(): withCRLF not yet supported!" << endl;
+TQCString IdentityCodec::encodeToTQCString( const TQByteArray & src, bool withCRLF ) const {
+  kdWarning( withCRLF, 5100 ) << "IdentityCodec::encodeToTQCString(): withCRLF not yet supported!" << endl;
   return TQCString( src.data(), src.size() + 1 );
 }
 
diff --git a/libkmime/kmime_codec_identity.h b/libkmime/kmime_codec_identity.h
index 0757351b..a18cfd1f 100644
--- a/libkmime/kmime_codec_identity.h
+++ b/libkmime/kmime_codec_identity.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,7 +45,7 @@ public:
   ~IdentityCodec() {}
 
   TQByteArray encode( const TQByteArray & src, bool withCRLF ) const;
-  TQCString encodeToQCString( const TQByteArray & src, bool withCRLF ) const;
+  TQCString encodeToTQCString( const TQByteArray & src, bool withCRLF ) const;
   TQByteArray decode( const TQByteArray & src, bool withCRLF ) const;
 
   int maxEncodedSizeFor( int insize, bool withCRLF ) const {
@@ -105,7 +105,7 @@ public:
     return insize;
   }
 
-  TQCString encodeToQCString( const TQByteArray &, bool ) const {
+  TQCString encodeToTQCString( const TQByteArray &, bool ) const {
     return TQCString();
   }
 
diff --git a/libkmime/kmime_codec_qp.cpp b/libkmime/kmime_codec_qp.cpp
index 6029a31a..7c579b6a 100644
--- a/libkmime/kmime_codec_qp.cpp
+++ b/libkmime/kmime_codec_qp.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -125,22 +125,22 @@ class QuotedPrintableDecoder : public Decoder {
       @li @p insideHexChar == @p true, @p mAccu != 0:
           saw the first nibble '=X'
    */
-  const bool mQEncoding;
+  const bool mTQEncoding;
   bool mInsideHexChar;
   bool mFlushing;
   bool mExpectLF;
   bool mHaveAccu;
 protected:
   friend class QuotedPrintableCodec;
-  friend class Rfc2047QEncodingCodec;
+  friend class Rfc2047TQEncodingCodec;
   friend class Rfc2231EncodingCodec;
   QuotedPrintableDecoder( bool withCRLF=false,
-			  bool aQEncoding=false, char aEscapeChar='=' )
+			  bool aTQEncoding=false, char aEscapeChar='=' )
     : Decoder( withCRLF ),
       mEscapeChar(aEscapeChar),
       mBadChar(0),
       mAccu(0),
-      mQEncoding(aQEncoding),
+      mTQEncoding(aTQEncoding),
       mInsideHexChar(false),
       mFlushing(false),
       mExpectLF(false),
@@ -155,15 +155,15 @@ public:
 };
 
 
-class Rfc2047QEncodingEncoder : public Encoder {
+class Rfc2047TQEncodingEncoder : public Encoder {
   uchar      mAccu;
   uchar      mStepNo;
   const char mEscapeChar;
   bool       mInsideFinishing : 1;
 protected:
-  friend class Rfc2047QEncodingCodec;
+  friend class Rfc2047TQEncodingCodec;
   friend class Rfc2231EncodingCodec;
-  Rfc2047QEncodingEncoder( bool withCRLF=false, char aEscapeChar='=' )
+  Rfc2047TQEncodingEncoder( bool withCRLF=false, char aEscapeChar='=' )
     : Encoder( withCRLF ),
       mAccu(0), mStepNo(0), mEscapeChar( aEscapeChar ),
       mInsideFinishing( false )
@@ -182,7 +182,7 @@ protected:
   }
 
 public:
-  virtual ~Rfc2047QEncodingEncoder() {}
+  virtual ~Rfc2047TQEncodingEncoder() {}
 
   bool encode( const char* & scursor, const char * const send,
 	       char* & dcursor, const char * const dend );
@@ -216,20 +216,20 @@ int QuotedPrintableCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
     return QuotedPrintableDecoder_maxDecodedSizeFor(insize, withCRLF);
 }
 
-Encoder * Rfc2047QEncodingCodec::makeEncoder( bool withCRLF ) const {
-  return new Rfc2047QEncodingEncoder( withCRLF );
+Encoder * Rfc2047TQEncodingCodec::makeEncoder( bool withCRLF ) const {
+  return new Rfc2047TQEncodingEncoder( withCRLF );
 }
 
-Decoder * Rfc2047QEncodingCodec::makeDecoder( bool withCRLF ) const {
+Decoder * Rfc2047TQEncodingCodec::makeDecoder( bool withCRLF ) const {
   return new QuotedPrintableDecoder( withCRLF, true );
 }
 
-int Rfc2047QEncodingCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
+int Rfc2047TQEncodingCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
     return QuotedPrintableDecoder_maxDecodedSizeFor(insize, withCRLF);
 }
 
 Encoder * Rfc2231EncodingCodec::makeEncoder( bool withCRLF ) const {
-  return new Rfc2047QEncodingEncoder( withCRLF, '%' );
+  return new Rfc2047TQEncodingEncoder( withCRLF, '%' );
 }
 
 Decoder * Rfc2231EncodingCodec::makeDecoder( bool withCRLF ) const {
@@ -358,7 +358,7 @@ bool QuotedPrintableDecoder::decode( const char* & scursor, const char * const s
       if ( ch <= '~' && ch >= ' ' || ch == '\t' ) {
 	if ( ch == mEscapeChar ) {
 	  mInsideHexChar = true;
-	} else if ( mQEncoding && ch == '_' ) {
+	} else if ( mTQEncoding && ch == '_' ) {
 	  *dcursor++ = char(0x20);
 	} else {
 	  *dcursor++ = char(ch);
@@ -566,7 +566,7 @@ bool QuotedPrintableEncoder::finish( char* & dcursor,
 } // finish
 
 
-bool Rfc2047QEncodingEncoder::encode( const char* & scursor, const char * const send,
+bool Rfc2047TQEncodingEncoder::encode( const char* & scursor, const char * const send,
 				      char* & dcursor, const char * const dend )
 {
   if ( mInsideFinishing ) return true;
@@ -611,7 +611,7 @@ bool Rfc2047QEncodingEncoder::encode( const char* & scursor, const char * const
 
 #include <tqstring.h>
 
-bool Rfc2047QEncodingEncoder::finish( char* & dcursor, const char * const dend ) {
+bool Rfc2047TQEncodingEncoder::finish( char* & dcursor, const char * const dend ) {
   mInsideFinishing = true;
 
   // write the last bits of mAccu, if any:
diff --git a/libkmime/kmime_codec_qp.h b/libkmime/kmime_codec_qp.h
index c067fcff..a80226f5 100644
--- a/libkmime/kmime_codec_qp.h
+++ b/libkmime/kmime_codec_qp.h
@@ -19,18 +19,18 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
-#ifndef __KMIME_CODEC_QP__
-#define __KMIME_CODEC_QP__
+#ifndef __KMIME_CODEC_TQP__
+#define __KMIME_CODEC_TQP__
 
 #include "kmime_codecs.h"
 
@@ -65,13 +65,13 @@ public:
 };
 
 
-class Rfc2047QEncodingCodec : public Codec {
+class Rfc2047TQEncodingCodec : public Codec {
 protected:
   friend class Codec;
-  Rfc2047QEncodingCodec() : Codec() {}
+  Rfc2047TQEncodingCodec() : Codec() {}
 
 public:
-  virtual ~Rfc2047QEncodingCodec() {}
+  virtual ~Rfc2047TQEncodingCodec() {}
 
   const char * name() const {
     return "q";
@@ -118,4 +118,4 @@ public:
 
 } // namespace KMime
 
-#endif // __KMIME_CODEC_QP__
+#endif // __KMIME_CODEC_TQP__
diff --git a/libkmime/kmime_codec_uuencode.cpp b/libkmime/kmime_codec_uuencode.cpp
index 2c6152a9..fe5acf4f 100644
--- a/libkmime/kmime_codec_uuencode.cpp
+++ b/libkmime/kmime_codec_uuencode.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkmime/kmime_codec_uuencode.h b/libkmime/kmime_codec_uuencode.h
index 4bccec39..80288b41 100644
--- a/libkmime/kmime_codec_uuencode.h
+++ b/libkmime/kmime_codec_uuencode.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libkmime/kmime_codecs.cpp b/libkmime/kmime_codecs.cpp
index 9a55c339..1476477b 100644
--- a/libkmime/kmime_codecs.cpp
+++ b/libkmime/kmime_codecs.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,7 +52,7 @@ namespace KMime {
 // global list of KMime::Codec's
 TQAsciiDict<Codec>* Codec::all = 0;
 static KStaticDeleter<TQAsciiDict<Codec> > sdAll;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 TQMutex* Codec::dictLock = 0;
 static KStaticDeleter<TQMutex> sdDictLock;
 #endif
@@ -66,7 +66,7 @@ void Codec::fillDictionary() {
   all->insert( "base64", new Base64Codec() );
   all->insert( "quoted-printable", new QuotedPrintableCodec() );
   all->insert( "b", new Rfc2047BEncodingCodec() );
-  all->insert( "q", new Rfc2047QEncodingCodec() );
+  all->insert( "q", new Rfc2047TQEncodingCodec() );
   all->insert( "x-kmime-rfc2231", new Rfc2231EncodingCodec() );
   all->insert( "x-uuencode", new UUCodec() );
   //all->insert( "binary", new BinaryCodec() );
@@ -74,7 +74,7 @@ void Codec::fillDictionary() {
 }
 
 Codec * Codec::codecForName( const char * name ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   if ( !dictLock )
     sdDictLock.setObject( dictLock, new TQMutex );
   dictLock->lock(); // protect "all"
@@ -84,7 +84,7 @@ Codec * Codec::codecForName( const char * name ) {
     fillDictionary();
   }
   Codec * codec = (*all)[ name ];
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   dictLock->unlock();
 #endif
 
@@ -147,7 +147,7 @@ TQByteArray Codec::encode( const TQByteArray & src, bool withCRLF ) const
   return result;
 }
 
-TQCString Codec::encodeToQCString( const TQByteArray & src, bool withCRLF ) const
+TQCString Codec::encodeToTQCString( const TQByteArray & src, bool withCRLF ) const
 {
   // allocate buffer for the worst case (remember to add one for the trailing NUL)
   TQCString result( maxEncodedSizeFor( src.size(), withCRLF ) + 1 );
diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h
index 211867bc..b60d8bb8 100644
--- a/libkmime/kmime_codecs.h
+++ b/libkmime/kmime_codecs.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -33,11 +33,11 @@
 #define __KMIME_CODECS__
 
 #include <tqasciidict.h>
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #  include <tqmutex.h>
 #endif
 
-#include <tqcstring.h> // QByteArray
+#include <tqcstring.h> // TQByteArray
 
 #include <kdebug.h> // for kdFatal()
 #include <kdepimmacros.h>
@@ -58,7 +58,7 @@ class KDE_EXPORT Codec {
 protected:
 
   static TQAsciiDict<Codec>* all;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   static TQMutex* dictLock;
 #endif
 
@@ -87,7 +87,7 @@ public:
    * This function doesn't support chaining of blocks. The returned
    * block cannot be added to, but you don't need to finalize it, too.
    *
-   * Example usage (@p in tqcontains the input data):
+   * Example usage (@p in contains the input data):
    * <pre>
    * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -123,7 +123,7 @@ public:
    * This function doesn't support chaining of blocks. The returned
    * block cannot be added to, but you don't need to finalize it, too.
    *
-   * Example usage (@p in tqcontains the input data):
+   * Example usage (@p in contains the input data):
    * <pre>
    * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -168,7 +168,7 @@ public:
    * domain (ie. not in the binary domain). Codecs that do not fall
    * into this category will return a null TQCString.
    **/
-  virtual TQCString encodeToQCString( const TQByteArray & src, bool withCRLF=false ) const;
+  virtual TQCString encodeToTQCString( const TQByteArray & src, bool withCRLF=false ) const;
 
   /**
    * Even more convenient, but also a bit slower and more memory
@@ -230,7 +230,7 @@ public:
  * the output and then delete the decoder instance. If you want to
  * process another input block sequence, you create a new instance.
  *
- * Typical usage (@p in tqcontains the (base64-encoded) input data),
+ * Typical usage (@p in contains the (base64-encoded) input data),
  * taking into account all the conventions detailed above:
  *
  * <pre>
diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp
index b6b6229f..7ac10bbb 100644
--- a/libkmime/kmime_content.cpp
+++ b/libkmime/kmime_content.cpp
@@ -85,7 +85,7 @@ void Content::setContent(TQStrList *l)
 
 void Content::setContent(const TQCString &s)
 {
-  int pos=s.find("\n\n", 0);
+  int pos=s.tqfind("\n\n", 0);
   if(pos>-1) {
     h_ead=s.left(++pos);  //header *must* end with "\n" !!
     b_ody=s.mid(pos+1, s.length()-pos-1);
@@ -327,7 +327,7 @@ TQCString Content::encodedContent(bool useCrLf)
   e+="\n";
 
   //body
-  if(!b_ody.isEmpty()) { //this message tqcontains only one part
+  if(!b_ody.isEmpty()) { //this message contains only one part
     Headers::CTEncoding *enc=contentTransferEncoding();
 
     if(enc->needToEncode()) {
@@ -630,7 +630,7 @@ void Content::changeEncoding(Headers::contentEncoding e)
 
   if(decodeText())
     enc->setCte(e); // text is not encoded until it's sent or saved so we just set the new encoding
-  else { // this content tqcontains non textual data, that has to be re-encoded
+  else { // this content contains non textual data, that has to be re-encoded
 
     if(e!=Headers::CEbase64) {
       //kdWarning(5003) << "Content::changeEncoding() : non textual data and encoding != base64 - this should not happen\n => forcing base64" << endl;
@@ -664,14 +664,14 @@ Headers::Generic*  Content::getNextHeader(TQCString &head)
   bool folded(false);
   Headers::Generic *header=0;
 
-  pos1 = head.find(": ");
+  pos1 = head.tqfind(": ");
 
   if (pos1>-1) {    //there is another header
     pos2=pos1+=2; //skip the name
 
     if (head[pos2]!='\n') {  // check if the header is not empty
       while(1) {
-        pos2=head.find("\n", pos2+1);
+        pos2=head.tqfind("\n", pos2+1);
         if(pos2==-1 || pos2==len || ( head[pos2+1]!=' ' && head[pos2+1]!='\t') ) //break if we reach the end of the string, honor folded lines
           break;
         else
diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h
index 8c828500..692f3afe 100644
--- a/libkmime/kmime_content.h
+++ b/libkmime/kmime_content.h
@@ -35,7 +35,7 @@ namespace KMime {
 
 
 /** Base class for messages in mime format
-    It tqcontains all the enums, static functions
+    It contains all the enums, static functions
     and parser-classes, that are needed for
     mime handling */
 
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 6b06c903..cf825a16 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -207,7 +207,7 @@ bool parseEncodedWord( const char* & scursor, const char * const send,
 
   // try if there's a (text)codec for the charset found:
   bool matchOK = false;
-  QTextCodec
+  TQTextCodec
     *textCodec = KGlobal::charsets()->codecForName( maybeCharset, matchOK );
 
   if ( !matchOK || !textCodec ) {
@@ -253,7 +253,7 @@ static inline void eatWhiteSpace( const char* & scursor, const char * const send
 bool parseAtom( const char * & scursor, const char * const send,
 		TQString & result, bool allow8Bit )
 {
-  QPair<const char*,int> maybeResult;
+  TQPair<const char*,int> maybeResult;
 
   if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) {
     result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
@@ -264,7 +264,7 @@ bool parseAtom( const char * & scursor, const char * const send,
 }
 
 bool parseAtom( const char * & scursor, const char * const send,
-		QPair<const char*,int> & result, bool allow8Bit ) {
+		TQPair<const char*,int> & result, bool allow8Bit ) {
   bool success = false;
   const char * start = scursor;
 
@@ -293,7 +293,7 @@ bool parseAtom( const char * & scursor, const char * const send,
 bool parseToken( const char * & scursor, const char * const send,
 		 TQString & result, bool allow8Bit )
 {
-  QPair<const char*,int> maybeResult;
+  TQPair<const char*,int> maybeResult;
 
   if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) {
     result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
@@ -304,7 +304,7 @@ bool parseToken( const char * & scursor, const char * const send,
 }
 
 bool parseToken( const char * & scursor, const char * const send,
-		 QPair<const char*,int> & result, bool allow8Bit )
+		 TQPair<const char*,int> & result, bool allow8Bit )
 {
   bool success = false;
   const char * start = scursor;
@@ -466,7 +466,7 @@ bool parseComment( const char* & scursor, const char * const send,
 	  result += cmntPart;
 	  if ( commentNestingDepth > 1 ) // don't add the outermost ')'...
 	    result += TQChar(')');
-	  maybeCmnt = TQString::null;
+	  maybeCmnt = TQString();
 	}
 	afterLastClosingParenPos = scursor;
 	--commentNestingDepth;
@@ -527,7 +527,7 @@ bool parsePhrase( const char* & scursor, const char * const send,
       }
       break;
     case '"': // quoted-string
-      tmp = TQString::null;
+      tmp = TQString();
       if ( parseGenericQuotedString( scursor, send, tmp, isCRLF, '"', '"' ) ) {
 	successfullyParsed = scursor;
 	assert( *(scursor-1) == '"' );
@@ -562,7 +562,7 @@ bool parsePhrase( const char* & scursor, const char * const send,
       break;
     case '(': // comment
       // parse it, but ignore content:
-      tmp = TQString::null;
+      tmp = TQString();
       if ( parseComment( scursor, send, tmp, isCRLF,
 			 false /*don't bother with the content*/ ) ) {
 	successfullyParsed = scursor;
@@ -577,7 +577,7 @@ bool parsePhrase( const char* & scursor, const char * const send,
       }
       break;
     case '=': // encoded-word
-      tmp = TQString::null;
+      tmp = TQString();
       oldscursor = scursor;
       lang = 0;
       if ( parseEncodedWord( scursor, send, tmp, lang ) ) {
@@ -605,7 +605,7 @@ bool parsePhrase( const char* & scursor, const char * const send,
       // fall though...
 
     default: //atom
-      tmp = TQString::null;
+      tmp = TQString();
       scursor--;
       if ( parseAtom( scursor, send, tmp, true /* allow 8bit */ ) ) {
 	successfullyParsed = scursor;
@@ -775,14 +775,14 @@ bool parseObsRoute( const char* & scursor, const char* const send,
     // empty entry:
     if ( *scursor == ',' ) {
       scursor++;
-      if ( save ) result.append( TQString::null );
+      if ( save ) result.append( TQString() );
       continue;
     }
 
     // empty entry ending the list:
     if ( *scursor == ':' ) {
       scursor++;
-      if ( save ) result.append( TQString::null );
+      if ( save ) result.append( TQString() );
       return true;
     }
 
@@ -834,7 +834,7 @@ bool parseAddrSpec( const char* & scursor, const char * const send,
       break;
 
     case '"': // quoted-string
-      tmp = TQString::null;
+      tmp = TQString();
       if ( parseGenericQuotedString( scursor, send, tmp, isCRLF, '"', '"' ) )
 	maybeLocalPart += tmp;
       else
@@ -843,7 +843,7 @@ bool parseAddrSpec( const char* & scursor, const char * const send,
 
     default: // atom
       scursor--; // re-set scursor to point to ch again
-      tmp = TQString::null;
+      tmp = TQString();
       if ( parseAtom( scursor, send, tmp, false /* no 8bit */ ) )
 	maybeLocalPart += tmp;
       else
@@ -926,7 +926,7 @@ bool parseMailbox( const char* & scursor, const char * const send,
   // first, try if it's a vanilla addr-spec:
   const char * oldscursor = scursor;
   if ( parseAddrSpec( scursor, send, maybeAddrSpec, isCRLF ) ) {
-    result.displayName = TQString::null;
+    result.displayName = TQString();
     result.addrSpec = maybeAddrSpec;
     return true;
   }
@@ -936,7 +936,7 @@ bool parseMailbox( const char* & scursor, const char * const send,
   TQString maybeDisplayName;
   if ( !parsePhrase( scursor, send, maybeDisplayName, isCRLF ) ) {
     // failed: reset cursor, note absent display-name
-    maybeDisplayName = TQString::null;
+    maybeDisplayName = TQString();
     scursor = oldscursor;
   } else {
     // succeeded: eat CFWS
@@ -1025,7 +1025,7 @@ bool parseAddress( const char* & scursor, const char * const send,
   const char * oldscursor = scursor;
   if ( parseMailbox( scursor, send, maybeMailbox, isCRLF ) ) {
     // yes, it is:
-    result.displayName = TQString::null;
+    result.displayName = TQString();
     result.mailboxList.append( maybeMailbox );
     return true;
   }
@@ -1070,7 +1070,7 @@ static TQString asteriskZero = TQString::tqfromLatin1("*0*",2);
 //static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3);
 
 bool parseParameter( const char* & scursor, const char * const send,
-		     QPair<TQString,QStringOrQPair> & result, bool isCRLF ) {
+		     TQPair<TQString,TQStringOrTQPair> & result, bool isCRLF ) {
   // parameter = regular-parameter / extended-parameter
   // regular-parameter = regular-parameter-name "=" value
   // extended-parameter =
@@ -1104,7 +1104,7 @@ bool parseParameter( const char* & scursor, const char * const send,
 	"Chopping away \"*\"." << endl;
       maybeAttribute.truncate( maybeAttribute.length() - 1 );
     }
-    result = qMakePair( maybeAttribute.lower(), QStringOrQPair() );
+    result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
     return true;
   }
 
@@ -1113,7 +1113,7 @@ bool parseParameter( const char* & scursor, const char * const send,
   //
   // parse the parameter value:
   //
-  QStringOrQPair maybeValue;
+  TQStringOrTQPair maybeValue;
   if ( *scursor == '"' ) {
     // value is a quoted-string:
     scursor++;
@@ -1128,14 +1128,14 @@ bool parseParameter( const char* & scursor, const char * const send,
 
     if ( !parseGenericQuotedString( scursor, send, maybeValue.qstring, isCRLF ) ) {
       scursor = oldscursor;
-      result = qMakePair( maybeAttribute.lower(), QStringOrQPair() );
+      result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
       return false; // this case needs further processing by upper layers!!
     }
   } else {
     // value is a token:
     if ( !parseToken( scursor, send, maybeValue.qpair, false /* no 8bit */ ) ) {
       scursor = oldscursor;
-      result = qMakePair( maybeAttribute.lower(), QStringOrQPair() );
+      result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() );
       return false; // this case needs further processing by upper layers!!
     }
   }
@@ -1147,7 +1147,7 @@ bool parseParameter( const char* & scursor, const char * const send,
 
 
 bool parseRawParameterList( const char* & scursor, const char * const send,
-			    TQMap<TQString,QStringOrQPair> & result,
+			    TQMap<TQString,TQStringOrTQPair> & result,
 			    bool isCRLF ) {
   // we use parseParameter() consecutively to obtain a map of raw
   // attributes to raw values. "Raw" here means that we don't do
@@ -1166,7 +1166,7 @@ bool parseRawParameterList( const char* & scursor, const char * const send,
     // empty list entry: ignore.
     if ( *scursor == ';' ) { scursor++; continue; }
 
-    QPair<TQString,QStringOrQPair> maybeParameter;
+    TQPair<TQString,TQStringOrTQPair> maybeParameter;
     if ( !parseParameter( scursor, send, maybeParameter, isCRLF ) ) {
       // we need to do a bit of work if the attribute is not
       // NULL. These are the cases marked with "needs further
@@ -1201,7 +1201,7 @@ bool parseRawParameterList( const char* & scursor, const char * const send,
 static void decodeRFC2231Value( Codec* & rfc2231Codec,
 				TQTextCodec* & textcodec,
 				bool isContinuation, TQString & value,
-				QPair<const char*,int> & source ) {
+				TQPair<const char*,int> & source ) {
 
   //
   // parse the raw value into (charset,language,text):
@@ -1297,7 +1297,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
 bool parseParameterList( const char* & scursor,	const char * const send,
 			 TQMap<TQString,TQString> & result, bool isCRLF ) {
   // parse the list into raw attribute-value pairs:
-  TQMap<TQString,QStringOrQPair> rawParameterList;
+  TQMap<TQString,TQStringOrTQPair> rawParameterList;
   if (!parseRawParameterList( scursor, send, rawParameterList, isCRLF ) )
     return false;
 
@@ -1314,7 +1314,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
   TQString value;
   enum Modes { NoMode = 0x0, Continued = 0x1, Encoded = 0x2 } mode;
 
-  TQMapIterator<TQString,QStringOrQPair> it, end = rawParameterList.end();
+  TQMapIterator<TQString,TQStringOrTQPair> it, end = rawParameterList.end();
 
   for ( it = rawParameterList.begin() ; it != end ; ++it ) {
     if ( attribute.isNull() || !it.key().startsWith( attribute ) ) {
@@ -1325,7 +1325,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       // store the last attribute/value pair in the result map now:
       if ( !attribute.isNull() ) result.insert( attribute, value );
       // and extract the information from the new raw attribute:
-      value = TQString::null;
+      value = TQString();
       attribute = it.key();
       mode = NoMode;
       // is the value encoded?
@@ -1361,7 +1361,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
 	// save result already:
 	result.insert( attribute, value );
 	// force begin of a new attribute:
-	attribute = TQString::null;
+	attribute = TQString();
       }
     } else /* it.key().startsWith( attribute ) */ {
       //
@@ -1491,7 +1491,7 @@ static bool parseAlphaNumericTimeZone( const char* & scursor,
 				       long int & secsEastOfGMT,
 				       bool & timeZoneKnown )
 {
-  QPair<const char*,int> maybeTimeZone(0,0);
+  TQPair<const char*,int> maybeTimeZone(0,0);
   if ( !parseToken( scursor, send, maybeTimeZone, false /*no 8bit*/ ) )
     return false;
   for ( int i = 0 ; i < timeZonesLen ; ++i )
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index 10751f03..2454c587 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -48,10 +48,10 @@ namespace KMime {
 namespace Types {
 
   // for when we can't make up our mind what to use...
-  struct KDE_EXPORT QStringOrQPair {
-    QStringOrQPair() : qstring(), qpair(0,0) {}
+  struct KDE_EXPORT TQStringOrTQPair {
+    TQStringOrTQPair() : qstring(), qpair(0,0) {}
     TQString qstring;
-    QPair<const char*,int> qpair;
+    TQPair<const char*,int> qpair;
   };
 
   struct KDE_EXPORT AddrSpec {
@@ -94,7 +94,7 @@ namespace HeaderParsing {
 	           to and including the encoding specifier. The
 		   encoded-text is quite generously parsed and @p ok
 		   is still set to @p true when e.g. the encoded-word
-		   appears to be truncated or tqcontains whitespace.
+		   appears to be truncated or contains whitespace.
       @return the decoded string the encoded word represented.
   */
   bool parseEncodedWord( const char* & scursor, const char * const send,
@@ -108,13 +108,13 @@ namespace HeaderParsing {
   bool parseAtom( const char* & scursor, const char * const send,
 		  TQString & result, bool allow8Bit=false ) KDE_EXPORT;
   bool parseAtom( const char* & scursor, const char * const send,
-		  QPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT;
+		  TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT;
   /** You may or may not have already started parsing into the
       token. This function will go on where you left off. */
   bool parseToken( const char* & scursor, const char * const send,
 		   TQString & result, bool allow8Bit=false ) KDE_EXPORT;
   bool parseToken( const char* & scursor, const char * const send,
-		   QPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT;
+		   TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT;
   /** @p scursor must be positioned after the opening openChar. */
   bool parseGenericQuotedString( const char* & scursor, const char* const send,
 				 TQString & result, bool isCRLF,
@@ -165,13 +165,13 @@ namespace HeaderParsing {
 			 Types::AddressList & result, bool isCRLF=false ) KDE_EXPORT;
 
   bool parseParameter( const char* & scursor, const char * const send,
-		       QPair<TQString,Types::QStringOrQPair> & result,
+		       TQPair<TQString,Types::TQStringOrTQPair> & result,
 		       bool isCRLF=false ) KDE_EXPORT;
   bool parseParameterList( const char* & scursor, const char * const send,
 			   TQMap<TQString,TQString> & result, bool isCRLF=false ) KDE_EXPORT;
 
   bool parseRawParameterList( const char* & scursor, const char * const send,
-			      TQMap<TQString,Types::QStringOrQPair> & result,
+			      TQMap<TQString,Types::TQStringOrTQPair> & result,
 			      bool isCRLF=false ) KDE_EXPORT;
   
   bool parseTime( const char* & scursor, const char * const send,
diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp
index cef3f7a4..a677cdd7 100644
--- a/libkmime/kmime_headers.cpp
+++ b/libkmime/kmime_headers.cpp
@@ -199,7 +199,7 @@ bool GToken::parse( const char* & scursor, const char * const send,
   // must not be empty:
   if ( scursor == send ) return false;
 
-  QPair<const char*,int> maybeToken;
+  TQPair<const char*,int> maybeToken;
   if ( !parseToken( scursor, send, maybeToken, false /* no 8bit chars */ ) )
     return false;
   mToken = TQCString( maybeToken.first, maybeToken.second );
@@ -300,7 +300,7 @@ bool GContentType::parse( const char* & scursor, const char * const send,
   // type
   //
 
-  QPair<const char*,int> maybeMimeType;
+  TQPair<const char*,int> maybeMimeType;
   if ( !parseToken( scursor, send, maybeMimeType, false /* no 8Bit */ ) )
     return false;
 
@@ -316,7 +316,7 @@ bool GContentType::parse( const char* & scursor, const char * const send,
   eatCFWS( scursor, send, isCRLF );
   if ( scursor == send ) return false;
 
-  QPair<const char*,int> maybeSubType;
+  TQPair<const char*,int> maybeSubType;
   if ( !parseToken( scursor, send, maybeSubType, false /* no 8bit */ ) )
     return false;
 
@@ -357,7 +357,7 @@ bool GCISTokenWithParameterList::parse( const char* & scursor,
   eatCFWS( scursor, send, isCRLF );
   if ( scursor == send ) return false;
 
-  QPair<const char*,int> maybeToken;
+  TQPair<const char*,int> maybeToken;
   if ( !parseToken( scursor, send, maybeToken, false /* no 8Bit */ ) )
     return false;
 
@@ -463,7 +463,7 @@ bool ReturnPath::parse( const char* & scursor, const char * const send, bool isC
 
     // prepare a Null mailbox:
     AddrSpec emptyAddrSpec;
-    maybeMailbox.displayName = TQString::null;
+    maybeMailbox.displayName = TQString();
     maybeMailbox.addrSpec = emptyAddrSpec;
   } else
     // check that there was no display-name:
@@ -582,9 +582,9 @@ void AddressField::from7BitString(const TQCString &s)
   TQCString n;
 
   //so what do we have here ?
-  if(s.find( TQRegExp("*@*(*)", false, true) )!=-1) type=2;       // From: foo@bar.com (John Doe)
-  else if(s.find( TQRegExp("*<*@*>", false, true) )!=-1) type=1;  // From: John Doe <foo@bar.com>
-  else if(s.find( TQRegExp("*@*", false, true) )!=-1) type=0;     // From: foo@bar.com
+  if(s.tqfind( TQRegExp("*@*(*)", false, true) )!=-1) type=2;       // From: foo@bar.com (John Doe)
+  else if(s.tqfind( TQRegExp("*<*@*>", false, true) )!=-1) type=1;  // From: John Doe <foo@bar.com>
+  else if(s.tqfind( TQRegExp("*@*", false, true) )!=-1) type=0;     // From: foo@bar.com
   else { //broken From header => just decode it
     n_ame=decodeRFC2047String(s, &e_ncCS, defaultCS(), forceCS());
     return;
@@ -598,11 +598,11 @@ void AddressField::from7BitString(const TQCString &s)
 
     case 1:
       pos1=0;
-      pos2=s.find('<');
+      pos2=s.tqfind('<');
       if(pos2!=-1) {
         n=s.mid(pos1, pos2-pos1).stripWhiteSpace();
         pos1=pos2+1;
-        pos2=s.find('>', pos1);
+        pos2=s.tqfind('>', pos1);
         if(pos2!=-1)
           e_mail=s.mid(pos1, pos2-pos1).stripWhiteSpace();
       }
@@ -611,11 +611,11 @@ void AddressField::from7BitString(const TQCString &s)
 
     case 2:
       pos1=0;
-      pos2=s.find('(');
+      pos2=s.tqfind('(');
       if(pos2!=-1) {
         e_mail=s.mid(pos1, pos2-pos1).stripWhiteSpace();
         pos1=pos2+1;
-        pos2=s.find(')', pos1);
+        pos2=s.tqfind(')', pos1);
         if(pos2!=-1)
           n=s.mid(pos1, pos2-pos1).stripWhiteSpace();
       }
@@ -664,9 +664,9 @@ void AddressField::fromUnicodeString(const TQString &s, const TQCString &cs)
   e_ncCS=cachedCharset(cs);
 
   //so what do we have here ?
-  if(s.find( TQRegExp("*@*(*)", false, true) )!=-1) type=2;       // From: foo@bar.com (John Doe)
-  else if(s.find( TQRegExp("*<*@*>", false, true) )!=-1) type=1;  // From: John Doe <foo@bar.com>
-  else if(s.find( TQRegExp("*@*", false, true) )!=-1) type=0;     // From: foo@bar.com
+  if(s.tqfind( TQRegExp("*@*(*)", false, true) )!=-1) type=2;       // From: foo@bar.com (John Doe)
+  else if(s.tqfind( TQRegExp("*<*@*>", false, true) )!=-1) type=1;  // From: John Doe <foo@bar.com>
+  else if(s.tqfind( TQRegExp("*@*", false, true) )!=-1) type=0;     // From: foo@bar.com
   else { //broken From header => just copy it
     n_ame=s;
     return;
@@ -680,11 +680,11 @@ void AddressField::fromUnicodeString(const TQString &s, const TQCString &cs)
 
     case 1:
       pos1=0;
-      pos2=s.find('<');
+      pos2=s.tqfind('<');
       if(pos2!=-1) {
         n_ame=s.mid(pos1, pos2-pos1).stripWhiteSpace();
         pos1=pos2+1;
-        pos2=s.find('>', pos1);
+        pos2=s.tqfind('>', pos1);
         if(pos2!=-1)
           e_mail=s.mid(pos1, pos2-pos1).latin1();
       }
@@ -693,11 +693,11 @@ void AddressField::fromUnicodeString(const TQString &s, const TQCString &cs)
 
     case 2:
       pos1=0;
-      pos2=s.find('(');
+      pos2=s.tqfind('(');
       if(pos2!=-1) {
         e_mail=s.mid(pos1, pos2-pos1).stripWhiteSpace().latin1();
         pos1=pos2+1;
-        pos2=s.find(')', pos1);
+        pos2=s.tqfind(')', pos1);
         if(pos2!=-1)
           n_ame=s.mid(pos1, pos2-pos1).stripWhiteSpace();
       }
@@ -831,7 +831,7 @@ void To::from7BitString(const TQCString &s)
     a_ddrList->setAutoDelete(true);
   }
 
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   split.init(s, ",");
   bool splitOk=split.first();
   if(!splitOk)
@@ -887,7 +887,7 @@ void To::fromUnicodeString(const TQString &s, const TQCString &cs)
 TQString To::asUnicodeString()
 {
   if(!a_ddrList)
-    return TQString::null;
+    return TQString();
 
   TQString ret;
   AddressField *it=a_ddrList->first();
@@ -978,7 +978,7 @@ TQCString Newsgroups::firstGroup()
 {
   int pos=0;
   if(!g_roups.isEmpty()) {
-    pos=g_roups.find(',');
+    pos=g_roups.tqfind(',');
     if(pos==-1)
       return g_roups;
     else
@@ -1134,7 +1134,7 @@ TQCString References::at(unsigned int i)
   }
 
   if(pos1!=-1) {
-    pos2=r_ef.find('>', pos1);
+    pos2=r_ef.tqfind('>', pos1);
     if(pos2!=-1)
       ret=r_ef.mid(pos1, pos2-pos1+1);
   }
@@ -1154,7 +1154,7 @@ void References::append(const TQCString &s)
   // remove bogus references
   TQStringList::Iterator it = lst.begin();
   while (it != lst.end()) {
-    if (-1==(*it).find(exp))
+    if (-1==(*it).tqfind(exp))
       it = lst.remove(it);
     else
       it++;
@@ -1233,7 +1233,7 @@ TQString UserAgent::asUnicodeString()
 
 void ContentType::from7BitString(const TQCString &s)
 {
-  int pos=s.find(';');
+  int pos=s.tqfind(';');
 
   if(pos==-1)
     m_imeType=s.simplifyWhiteSpace();
@@ -1274,7 +1274,7 @@ TQString ContentType::asUnicodeString()
 
 TQCString ContentType::mediaType()
 {
-  int pos=m_imeType.find('/');
+  int pos=m_imeType.tqfind('/');
   if(pos==-1)
     return m_imeType;
   else
@@ -1284,7 +1284,7 @@ TQCString ContentType::mediaType()
 
 TQCString ContentType::subType()
 {
-  int pos=m_imeType.find('/');
+  int pos=m_imeType.tqfind('/');
   if(pos==-1)
     return TQCString();
   else
@@ -1453,9 +1453,9 @@ TQCString ContentType::getParameter(const char *name)
 {
   TQCString ret;
   int pos1=0, pos2=0;
-  pos1=p_arams.find(name, 0, false);
+  pos1=p_arams.tqfind(name, 0, false);
   if(pos1!=-1) {
-    if( (pos2=p_arams.find(';', pos1))==-1 )
+    if( (pos2=p_arams.tqfind(';', pos1))==-1 )
       pos2=p_arams.length();
     pos1+=strlen(name)+1;
     ret=p_arams.mid(pos1, pos2-pos1);
@@ -1475,12 +1475,12 @@ void ContentType::setParameter(const TQCString &name, const TQCString &value, bo
   else
     param=name+"="+value;
 
-  pos1=p_arams.find(name, 0, false);
+  pos1=p_arams.tqfind(name, 0, false);
   if(pos1==-1) {
     p_arams+="; "+param;
   }
   else {
-    pos2=p_arams.find(';', pos1);
+    pos2=p_arams.tqfind(';', pos1);
     if(pos2==-1)
       pos2=p_arams.length();
     p_arams.remove(pos1, pos2-pos1);
@@ -1559,7 +1559,7 @@ void CDisposition::from7BitString(const TQCString &s)
     d_isp=CDattachment;
   else d_isp=CDinline;
 
-  int pos=s.find("filename=", 0, false);
+  int pos=s.tqfind("filename=", 0, false);
   TQCString fn;
   if(pos>-1) {
     pos+=9;
@@ -1602,7 +1602,7 @@ void CDisposition::fromUnicodeString(const TQString &s, const TQCString &cs)
     d_isp=CDattachment;
   else d_isp=CDinline;
 
-  int pos=s.find("filename=", 0, false);
+  int pos=s.tqfind("filename=", 0, false);
   if(pos>-1) {
     pos+=9;
     f_ilename=s.mid(pos, s.length()-pos);
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 1c980a04..40ae18b8 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -116,16 +116,16 @@ class KDE_EXPORT Base {
     /** Create an empty header. */
     Base() : e_ncCS(0), p_arent(0) {}
 
-    /** Create an empty header with a parent-content. */
-    Base(KMime::Content *parent) : e_ncCS(0), p_arent(parent) {}
+    /** Create an empty header with a tqparent-content. */
+    Base(KMime::Content *tqparent) : e_ncCS(0), p_arent(tqparent) {}
 
     /** Destructor */
     virtual ~Base()  {}
 
-    /** Return the parent of this header. */
-    KMime::Content* parent()  { return p_arent; }
+    /** Return the tqparent of this header. */
+    KMime::Content* tqparent()  { return p_arent; }
 
-    /** Set the parent for this header. */
+    /** Set the tqparent for this header. */
     void setParent(KMime::Content *p)  { p_arent=p; }
 
     /** Parse the given string. Take care of RFC2047-encoded
@@ -239,7 +239,7 @@ private:
 };
 
 /** This is the base class for all structured header fields. It
-    tqcontains parsing methods for all basic token types found in
+    contains parsing methods for all basic token types found in
     rfc2822.
 
     @section Parsing
@@ -283,10 +283,10 @@ protected:
 
   bool writeAtom( char* & dcursor, const char * const dend, const TQString & input );
   bool writeAtom( char* & dcursor, const char * const dend,
-		  const QPair<const char*,int> & input );
+		  const TQPair<const char*,int> & input );
   bool writeToken( char* & dcursor, const char * const dend, const TQString & input );
   bool writeToken( char* & dcursor, const char * const dend,
-		   const QPair<const char*int> & input );
+		   const TQPair<const char*int> & input );
 
   bool writeGenericQuotedString( char* & dcursor, const char * const dend,
 				 const TQString & input, bool withCRLF=false );
@@ -605,7 +605,7 @@ class KDE_EXPORT Subject : public Generics::GUnstructured {
     virtual const char* type() { return "Subject"; }
 
     bool isReply() {
-      return ( asUnicodeString().find( TQString("Re:"), 0, false ) == 0 );
+      return ( asUnicodeString().tqfind( TQString("Re:"), 0, false ) == 0 );
     }
 };
 
@@ -651,7 +651,7 @@ class KDE_EXPORT Control : public Base {
     virtual bool isEmpty()          { return (c_trlMsg.isEmpty()); }
     virtual const char* type()      { return "Control"; }
 
-    bool isCancel()                 { return (c_trlMsg.find("cancel", 0, false)!=-1); }
+    bool isCancel()                 { return (c_trlMsg.tqfind("cancel", 0, false)!=-1); }
 
   protected:
     TQCString c_trlMsg;
@@ -708,7 +708,7 @@ class KDE_EXPORT Newsgroups : public Base {
     virtual const char* type()      { return "Newsgroups"; }
 
     TQCString firstGroup();
-    bool isCrossposted()            { return ( g_roups.find(',')>-1 ); }
+    bool isCrossposted()            { return ( g_roups.tqfind(',')>-1 ); }
     TQStringList getGroups();
 
   protected:
@@ -813,7 +813,7 @@ class HeaderFactory : public TQAsciiDict<headerCreator>
 private:
   HeaderFactory();
   ~HeaderFactory() {}
-  static QAsciiDict
+  static TQAsciiDict
 
 public:
   /** Create a new header object of type @p aType, or a fitting
diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp
index 702f5f81..9d654bc7 100644
--- a/libkmime/kmime_mdn.cpp
+++ b/libkmime/kmime_mdn.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -255,7 +255,7 @@ namespace MDN {
 	return i18n( dispositionTypes[i].description );
     kdWarning() << "KMime::MDN::descriptionFor(): No such disposition type: "
 		<< (int)d << endl;
-    return TQString::null;
+    return TQString();
   }
 
 } // namespace MDN
diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h
index 3f207e31..bc1a65aa 100644
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this library with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -186,7 +186,7 @@ namespace KMime {
 	       SendingMode sendingMode,
 	       const TQValueList<DispositionModifier> & dispositionModifers
 				   =TQValueList<DispositionModifier>(),
-	       const TQString & special=TQString::null );
+	       const TQString & special=TQString() );
 
     KDE_EXPORT extern TQString descriptionFor( DispositionType d,
 				   const TQValueList<DispositionModifier> & m
diff --git a/libkmime/kmime_message.cpp b/libkmime/kmime_message.cpp
index 0d516ecc..a7ce3ca8 100644
--- a/libkmime/kmime_message.cpp
+++ b/libkmime/kmime_message.cpp
@@ -96,7 +96,7 @@ void Message::assemble()
   newHead+=contentTransferEncoding()->as7BitString()+"\n";
 
   //X-Headers
-  int pos=h_ead.find("\nX-");
+  int pos=h_ead.tqfind("\nX-");
   if(pos>-1) //we already have some x-headers => "recycle" them
     newHead+=h_ead.mid(pos+1, h_ead.length()-pos-1);
   else if(h_eaders && !h_eaders->isEmpty()) {
diff --git a/libkmime/kmime_newsarticle.cpp b/libkmime/kmime_newsarticle.cpp
index 1b16ad71..8989f6a0 100644
--- a/libkmime/kmime_newsarticle.cpp
+++ b/libkmime/kmime_newsarticle.cpp
@@ -104,7 +104,7 @@ void NewsArticle::assemble()
   newHead+=contentTransferEncoding()->as7BitString()+"\n";
 
   //X-Headers
-  int pos=h_ead.find("\nX-");
+  int pos=h_ead.tqfind("\nX-");
   if(pos>-1) //we already have some x-headers => "recycle" them
     newHead+=h_ead.mid(pos+1, h_ead.length()-pos);
   else if(h_eaders && !h_eaders->isEmpty()) {
diff --git a/libkmime/kmime_parsers.cpp b/libkmime/kmime_parsers.cpp
index 446f1af7..c9dc1e3d 100644
--- a/libkmime/kmime_parsers.cpp
+++ b/libkmime/kmime_parsers.cpp
@@ -39,7 +39,7 @@ bool MultiPart::parse()
 
   //find the first valid boundary
   while(1) {
-    if( (pos1=s_rc.find(b, pos1))==-1 || pos1==0 || s_rc[pos1-1]=='\n' ) //valid boundary found or no boundary at all
+    if( (pos1=s_rc.tqfind(b, pos1))==-1 || pos1==0 || s_rc[pos1-1]=='\n' ) //valid boundary found or no boundary at all
       break;
     pos1+=blen; //boundary found but not valid => skip it;
   }
@@ -56,11 +56,11 @@ bool MultiPart::parse()
   while(pos1>-1 && pos2>-1) {
 
     //skip the rest of the line for the first boundary - the message-part starts here
-    if( (pos1=s_rc.find('\n', pos1))>-1 ) { //now search the next linebreak
+    if( (pos1=s_rc.tqfind('\n', pos1))>-1 ) { //now search the next linebreak
       //now find the next valid boundary
       pos2=++pos1; //pos1 and pos2 point now to the beginning of the next line after the boundary
       while(1) {
-        if( (pos2=s_rc.find(b, pos2))==-1 || s_rc[pos2-1]=='\n' ) //valid boundary or no more boundaries found
+        if( (pos2=s_rc.tqfind(b, pos2))==-1 || s_rc[pos2-1]=='\n' ) //valid boundary or no more boundaries found
           break;
         pos2+=blen; //boundary is invalid => skip it;
       }
@@ -77,7 +77,7 @@ bool MultiPart::parse()
         pos2+=blen; //pos2 points now to the first charakter after the boundary
         if(s_rc[pos2]=='-' && s_rc[pos2+1]=='-') { //end-boundary
           pos1=pos2+2; //pos1 points now to the character directly after the end-boundary
-          if( (pos1=s_rc.find('\n', pos1))>-1 ) //skipt the rest of this line
+          if( (pos1=s_rc.tqfind('\n', pos1))>-1 ) //skipt the rest of this line
             e_pilouge=s_rc.mid(pos1+1, s_rc.length()-pos1-1); //everything after the end-boundary is considered as the epilouge
           pos1=-1;
           pos2=-1; //break
@@ -149,12 +149,12 @@ bool UUEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, uuStart=currentPos, endPos=0, lineCount=0, MCount=0, pos=0, len=0;
-    bool tqcontainsBegin=false, tqcontainsEnd=false;
+    bool containsBegin=false, containsEnd=false;
     TQCString tmp,fileName;
 
-    if( (beginPos=s_rc.find(TQRegExp("begin [0-9][0-9][0-9]"),currentPos))>-1 && (beginPos==0 || s_rc.at(beginPos-1)=='\n') ) {
-      tqcontainsBegin=true;
-      uuStart=s_rc.find('\n', beginPos);
+    if( (beginPos=s_rc.tqfind(TQRegExp("begin [0-9][0-9][0-9]"),currentPos))>-1 && (beginPos==0 || s_rc.at(beginPos-1)=='\n') ) {
+      containsBegin=true;
+      uuStart=s_rc.tqfind('\n', beginPos);
       if(uuStart==-1) {//no more line breaks found, we give up
         success = false;
         break;
@@ -163,12 +163,12 @@ bool UUEncoded::parse()
     }
       else beginPos=currentPos;
 
-    if ( (endPos=s_rc.find("\nend",(uuStart>0)? uuStart-1:0))==-1 )
+    if ( (endPos=s_rc.tqfind("\nend",(uuStart>0)? uuStart-1:0))==-1 )
       endPos=s_rc.length(); //no end found
     else
-      tqcontainsEnd=true;
+      containsEnd=true;
 
-    if ((tqcontainsBegin && tqcontainsEnd) || firstIteration) {
+    if ((containsBegin && containsEnd) || firstIteration) {
 
       //printf("beginPos=%d , uuStart=%d , endPos=%d\n", beginPos, uuStart, endPos);
       //all lines in a uuencoded text start with 'M'
@@ -183,18 +183,18 @@ bool UUEncoded::parse()
 
       //printf("lineCount=%d , MCount=%d\n", lineCount, MCount);
       if( MCount==0 || (lineCount-MCount)>10 ||
-          ((!tqcontainsBegin || !tqcontainsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
+          ((!containsBegin || !containsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
         success = false;
         break; //too many "non-M-Lines" found, we give up
       }
 
-      if( (!tqcontainsBegin || !tqcontainsEnd) && s_ubject) {  // message may be split up => parse subject
+      if( (!containsBegin || !containsEnd) && s_ubject) {  // message may be split up => parse subject
 	TQRegExp rx("[0-9]+/[0-9]+");
 	pos=rx.search(TQString(s_ubject), 0);
 	len=rx.matchedLength();
         if(pos!=-1) {
           tmp=s_ubject.mid(pos, len);
-          pos=tmp.find('/');
+          pos=tmp.tqfind('/');
           p_artNr=tmp.left(pos).toInt();
           t_otalNr=tmp.right(tmp.length()-pos-1).toInt();
         } else {
@@ -207,7 +207,7 @@ bool UUEncoded::parse()
       if(beginPos>0)
         t_ext.append(s_rc.mid(currentPos,beginPos-currentPos));
 
-      if(tqcontainsBegin)
+      if(containsBegin)
         fileName = s_rc.mid(beginPos+10, uuStart-beginPos-11); //everything between "begin ### " and the next LF is considered as the filename
       else
         fileName = "";
@@ -216,7 +216,7 @@ bool UUEncoded::parse()
       m_imeTypes.append(guessMimeType(fileName));
       firstIteration=false;
 
-      int next = s_rc.find('\n', endPos+1);
+      int next = s_rc.tqfind('\n', endPos+1);
       if(next==-1) { //no more line breaks found, we give up
         success = false;
         break;
@@ -249,12 +249,12 @@ bool YENCEncoded::yencMeta(TQCString& src, const TQCString& name, int* value)
   bool found = false;
   TQCString sought=name + "=";
 
-  int iPos=src.find( sought);
+  int iPos=src.tqfind( sought);
   if (iPos>-1) {
-    int pos1=src.find(' ', iPos);
-    int pos2=src.find('\r', iPos);
-    int pos3=src.find('\t', iPos);
-    int pos4=src.find('\n', iPos);
+    int pos1=src.tqfind(' ', iPos);
+    int pos2=src.tqfind('\r', iPos);
+    int pos3=src.tqfind('\t', iPos);
+    int pos4=src.tqfind('\n', iPos);
     if (pos2>=0 && (pos1<0 || pos1>pos2))
       pos1=pos2;
     if (pos3>=0 && (pos1<0 || pos1>pos3))
@@ -281,19 +281,19 @@ bool YENCEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, yencStart=currentPos;
-    bool tqcontainsPart=false;
+    bool containsPart=false;
     TQCString fileName,mimeType;
 
-    if ((beginPos=s_rc.find("=ybegin ", currentPos))>-1 && ( beginPos==0 || s_rc.at( beginPos-1)=='\n') ) {
-      yencStart=s_rc.find( '\n', beginPos);
+    if ((beginPos=s_rc.tqfind("=ybegin ", currentPos))>-1 && ( beginPos==0 || s_rc.at( beginPos-1)=='\n') ) {
+      yencStart=s_rc.tqfind( '\n', beginPos);
       if (yencStart==-1) { // no more line breaks found, give up
         success = false;
         break;
       } else {
         yencStart++;
-        if (s_rc.find("=ypart", yencStart)==yencStart) {
-          tqcontainsPart=true;
-          yencStart=s_rc.find( '\n', yencStart);
+        if (s_rc.tqfind("=ypart", yencStart)==yencStart) {
+          containsPart=true;
+          yencStart=s_rc.tqfind( '\n', yencStart);
           if ( yencStart== -1) {
             success=false;
             break;
@@ -305,14 +305,14 @@ bool YENCEncoded::parse()
 
       // Filenames can contain any embedded chars until end of line
       TQCString meta=s_rc.mid(beginPos, yencStart-beginPos);
-      int namePos=meta.find("name=");
+      int namePos=meta.tqfind("name=");
       if (namePos== -1) {
         success=false;
         break;
       }
-      int eolPos=meta.find('\r', namePos);
+      int eolPos=meta.tqfind('\r', namePos);
       if (eolPos== -1)
-      eolPos=meta.find('\n', namePos);    
+      eolPos=meta.tqfind('\n', namePos);    
       if (eolPos== -1) {
         success=false;
         break;
@@ -332,7 +332,7 @@ bool YENCEncoded::parse()
       }
 
       int partBegin, partEnd;
-      if (tqcontainsPart) {
+      if (containsPart) {
         if (!yencMeta(meta, "part", &p_artNr)) {
           success=false;
           break;
@@ -355,7 +355,7 @@ bool YENCEncoded::parse()
       int len=s_rc.length();
       bool lineStart=true;
       int lineLength=0;
-      bool tqcontainsEnd=false;
+      bool containsEnd=false;
       TQByteArray binary = TQByteArray(yencSize);
       while (pos<len) {
         int ch=s_rc.at(pos);
@@ -382,7 +382,7 @@ bool YENCEncoded::parse()
               ch=s_rc.at( pos+1);
               if (lineStart && ch=='y')
               {
-                tqcontainsEnd=true;
+                containsEnd=true;
                 break;
               }
               pos+=2;
@@ -412,7 +412,7 @@ bool YENCEncoded::parse()
         }
       }
       
-      if (!tqcontainsEnd)
+      if (!containsEnd)
       {
         success=false;
         break;
@@ -424,7 +424,7 @@ bool YENCEncoded::parse()
       }
 
       // pos now points to =yend; get end data
-      eolPos=s_rc.find('\n', pos);
+      eolPos=s_rc.tqfind('\n', pos);
       if (eolPos== -1)
       {
         success=false;
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index 2f0d04a1..167ac78d 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #include <tqtextcodec.h>
-#include <tqstrlist.h> // for QStrIList
+#include <tqstrlist.h> // for TQStrIList
 #include <tqregexp.h>
 
 #include <stdlib.h>
@@ -47,7 +47,7 @@ TQStrIList l_anguageCache;
 
 const char* cachedCharset(const TQCString &name)
 {
-  int idx=c_harsetCache.find(name.data());
+  int idx=c_harsetCache.tqfind(name.data());
   if(idx>-1)
     return c_harsetCache.at(idx);
 
@@ -58,7 +58,7 @@ const char* cachedCharset(const TQCString &name)
 
 const char* cachedLanguage(const TQCString &name)
 {
-  int idx=l_anguageCache.find(name.data());
+  int idx=l_anguageCache.tqfind(name.data());
   if(idx>-1)
     return l_anguageCache.at(idx);
 
@@ -132,7 +132,7 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS,
   const int maxLen=400;
   int i;
 
-  if(src.find("=?") < 0)
+  if(src.tqfind("=?") < 0)
     result = src.copy();
   else {
     result.truncate(src.length());
@@ -217,7 +217,7 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS,
     *dest = '\0';
   }
 
-  //find suitable QTextCodec
+  //find suitable TQTextCodec
   TQTextCodec *codec=0;
   bool ok=true;
   if (forceCS || declaredCS.isEmpty()) {
@@ -248,7 +248,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
 {
   TQCString encoded8Bit, result, usedCS;
   unsigned int start=0,end=0;
-  bool nonAscii=false, ok=true, useQEncoding=false;
+  bool nonAscii=false, ok=true, useTQEncoding=false;
   TQTextCodec *codec=0;
 
   usedCS=charset;
@@ -260,8 +260,8 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
     codec=KGlobal::charsets()->codecForName(usedCS, ok);
   }
 
-  if (usedCS.find("8859-")>=0)  // use "B"-Encoding for non iso-8859-x charsets
-    useQEncoding=true;
+  if (usedCS.tqfind("8859-")>=0)  // use "B"-Encoding for non iso-8859-x charsets
+    useTQEncoding=true;
 
   encoded8Bit=codec->fromUnicode(src);
 
@@ -297,7 +297,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
 
     result = encoded8Bit.left(start)+"=?"+usedCS;
 
-    if (useQEncoding) {
+    if (useTQEncoding) {
       result += "?Q?";
 
       char c,hexcode;                       // implementation of the "Q"-encoding described in RFC 2047
@@ -335,7 +335,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
 
 TQCString uniqueString()
 {
-  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
   time_t now;
   TQCString ret;
   char p[11];
@@ -375,7 +375,7 @@ TQCString extractHeader(const TQCString &src, const char *name)
     pos1 = 0;
   } else {
     n.prepend("\n");
-    pos1 = src.find(n,0,false);
+    pos1 = src.tqfind(n,0,false);
   }
 
   if (pos1>-1) {    //there is a header with the given name
@@ -387,7 +387,7 @@ TQCString extractHeader(const TQCString &src, const char *name)
 
     if (src[pos2]!='\n') {  // check if the header is not empty
       while(1) {
-        pos2=src.find("\n", pos2+1);
+        pos2=src.tqfind("\n", pos2+1);
         if(pos2==-1 || pos2==len || ( src[pos2+1]!=' ' && src[pos2+1]!='\t') ) //break if we reach the end of the string, honor folded lines
           break;
         else
@@ -506,7 +506,7 @@ DateFormatter::setFormat( FormatType t )
   mFormat = t;
 }
 
-QString
+TQString
 DateFormatter::dateString( time_t otime , const TQString& lang ,
 		       bool shortFormat, bool includeSecs ) const
 {
@@ -527,17 +527,17 @@ DateFormatter::dateString( time_t otime , const TQString& lang ,
     return custom( otime );
     break;
   }
-  return TQString::null;
+  return TQString();
 }
 
-QString
+TQString
 DateFormatter::dateString(const TQDateTime& dtime, const TQString& lang,
 		       bool shortFormat, bool includeSecs ) const
 {
   return DateFormatter::dateString( qdateToTimeT(dtime), lang, shortFormat, includeSecs );
 }
 
-QCString
+TQCString
 DateFormatter::rfc2822(time_t otime) const
 {
   TQDateTime tmp;
@@ -551,13 +551,13 @@ DateFormatter::rfc2822(time_t otime) const
   return ret;
 }
 
-QString
+TQString
 DateFormatter::custom(time_t t) const
 {
   if ( mCustomFormat.isEmpty() )
-    return TQString::null;
+    return TQString();
 
-  int z = mCustomFormat.find("Z");
+  int z = mCustomFormat.tqfind("Z");
   TQDateTime d;
   TQString ret = mCustomFormat;
 
@@ -578,14 +578,14 @@ DateFormatter::setCustomFormat(const TQString& format)
   mFormat = Custom;
 }
 
-QString
+TQString
 DateFormatter::getCustomFormat() const
 {
   return mCustomFormat;
 }
 
 
-QCString
+TQCString
 DateFormatter::zone(time_t otime) const
 {
   TQCString ret;
@@ -658,7 +658,7 @@ DateFormatter::qdateToTimeT(const TQDateTime& dt) const
   return drf;
 }
 
-QString
+TQString
 DateFormatter::fancy(time_t otime) const
 {
   KLocale *locale = KGlobal::locale();
@@ -710,7 +710,7 @@ DateFormatter::fancy(time_t otime) const
 
 }
 
-QString
+TQString
 DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs,
 			 const TQString& localeLanguage ) const
 {
@@ -734,13 +734,13 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs,
   return ret;
 }
 
-QString
+TQString
 DateFormatter::cTime(time_t otime) const
 {
   return TQString::tqfromLatin1( ctime(  &otime ) ).stripWhiteSpace() ;
 }
 
-QString
+TQString
 DateFormatter::isoDate(time_t otime) const
 {
   char cstr[64];
@@ -755,7 +755,7 @@ DateFormatter::reset()
   mCurrentTime = 0;
 }
 
-QString
+TQString
 DateFormatter::formatDate(DateFormatter::FormatType t, time_t otime,
 			  const TQString& data, bool shortFormat, bool includeSecs )
 {
@@ -766,7 +766,7 @@ DateFormatter::formatDate(DateFormatter::FormatType t, time_t otime,
   return f.dateString( otime, data, shortFormat, includeSecs );
 }
 
-QString
+TQString
 DateFormatter::formatCurrentDate( DateFormatter::FormatType t, const TQString& data,
 				  bool shortFormat, bool includeSecs )
 {
@@ -777,7 +777,7 @@ DateFormatter::formatCurrentDate( DateFormatter::FormatType t, const TQString& d
   return f.dateString( time(0), data, shortFormat, includeSecs );
 }
 
-QCString
+TQCString
 DateFormatter::rfc2822FormatDate( time_t t )
 {
   DateFormatter f;
diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h
index 3c710ab7..2cfe135a 100644
--- a/libkmime/kmime_util.h
+++ b/libkmime/kmime_util.h
@@ -35,7 +35,7 @@ namespace KMime {
       keeping strings in a common repository.*/
   extern const char* cachedLanguage(const TQCString &name) KDE_EXPORT;
 
-  /** checks whether @p s tqcontains any non-us-ascii characters */
+  /** checks whether @p s contains any non-us-ascii characters */
   extern bool isUsAscii(const TQString &s) KDE_EXPORT;
 
   inline bool isOfSet(const uchar map[16], unsigned char ch) {
@@ -154,20 +154,20 @@ namespace KMime {
   */
   extern TQCString LFtoCRLF(const TQCString &s) KDE_EXPORT;
 
-  /** Removes quote (DQUOTE) characters and decodes "quoted-pairs"
+  /** Removes quote (DTQUOTE) characters and decodes "quoted-pairs"
       (ie. backslash-escaped characters)
       @param str the string to work on.
       @see addQuotes
   */
   KDE_EXPORT extern void removeQuots(TQCString &str);
-  /** Removes quote (DQUOTE) characters and decodes "quoted-pairs"
+  /** Removes quote (DTQUOTE) characters and decodes "quoted-pairs"
       (ie. backslash-escaped characters)
       @param str the string to work on.
       @see addQuotes
   */
   KDE_EXPORT extern void removeQuots(TQString &str);
   /** Converts the given string into a quoted-string if
-      the string tqcontains any special characters
+      the string contains any special characters
       (ie. one of ()<>@,.;:[]=\").
       @param str us-ascii string to work on.
       @param forceQuotes if @p true, always add quote characters.
@@ -226,12 +226,12 @@ namespace KMime {
      * @param shortFormat used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime
      * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime
      */
-    TQString dateString(time_t otime, const TQString& lang = TQString::null,
+    TQString dateString(time_t otime, const TQString& lang = TQString(),
 		       bool shortFormat = true, bool includeSecs=false) const;
     /**
      * overloaded, does exactly what #dateString does (it's slower)
      */
-    TQString dateString(const TQDateTime& dtime, const TQString& lang = TQString::null,
+    TQString dateString(const TQDateTime& dtime, const TQString& lang = TQString(),
 		       bool shortFormat = true, bool includeSecs=false) const;
 
 
@@ -267,7 +267,7 @@ namespace KMime {
      * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime
      */
     static TQString  formatDate( DateFormatter::FormatType t, time_t time,
-				const TQString& data = TQString::null,
+				const TQString& data = TQString(),
 				bool shortFormat = true, bool includeSecs=false);
 
     /** convenience function, same as #formatDate
@@ -279,7 +279,7 @@ namespace KMime {
      * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime
      */
     static TQString  formatCurrentDate( DateFormatter::FormatType t,
-				       const TQString& data = TQString::null,
+				       const TQString& data = TQString(),
 				       bool shortFormat = true, bool includeSecs=false);
 
     /** convenience function, same as #rfc2822 */
@@ -301,7 +301,7 @@ namespace KMime {
      * @internal
      */
     TQString localized(time_t otime, bool shortFormat = true, bool includeSecs = false,
-		      const TQString& localeLanguage=TQString::null ) const;
+		      const TQString& localeLanguage=TQString() ) const;
     /**
      * returns string as formatted with ctime function
      * @internal
diff --git a/libkmime/kqcstringsplitter.cpp b/libkmime/kqcstringsplitter.cpp
index 2038f4f2..4f826313 100644
--- a/libkmime/kqcstringsplitter.cpp
+++ b/libkmime/kqcstringsplitter.cpp
@@ -16,7 +16,7 @@
 
 #include "kqcstringsplitter.h"
 
-KQCStringSplitter::KQCStringSplitter()
+KTQCStringSplitter::KTQCStringSplitter()
 {
   reset();
 }
@@ -24,13 +24,13 @@ KQCStringSplitter::KQCStringSplitter()
 
 
 
-KQCStringSplitter::~KQCStringSplitter()
+KTQCStringSplitter::~KTQCStringSplitter()
 {
 }
 
 
 
-void KQCStringSplitter::init(const TQCString &str, const char *s)
+void KTQCStringSplitter::init(const TQCString &str, const char *s)
 {
   sep=s;
   src=str;
@@ -38,13 +38,13 @@ void KQCStringSplitter::init(const TQCString &str, const char *s)
 
 
 
-void KQCStringSplitter::init(const char *str, const char *s)
+void KTQCStringSplitter::init(const char *str, const char *s)
 {
   sep=s;
   src=str;
 }
 
-bool KQCStringSplitter::first()
+bool KTQCStringSplitter::first()
 {
   /*int plus;
   if(incSep) plus=sep.length();
@@ -52,7 +52,7 @@ bool KQCStringSplitter::first()
   
   start=0;
   
-  end=src.find(sep, start);
+  end=src.tqfind(sep, start);
   
   if(end!=-1) {
     dst=src.mid(start, end);
@@ -68,7 +68,7 @@ bool KQCStringSplitter::first()
 
 
 
-bool KQCStringSplitter::last()
+bool KTQCStringSplitter::last()
 {
   /*int startplus, endplus;
   
@@ -96,7 +96,7 @@ bool KQCStringSplitter::last()
 
 
 
-bool KQCStringSplitter::next()
+bool KTQCStringSplitter::next()
 {
   /*int plus;
   if(incSep) plus=sep.length();
@@ -106,7 +106,7 @@ bool KQCStringSplitter::next()
   
   if(start< (int) src.length()) {
     
-    end=src.find(sep, start);
+    end=src.tqfind(sep, start);
     
     if(end!=-1) {
       dst=src.mid(start, end-start);
@@ -125,7 +125,7 @@ bool KQCStringSplitter::next()
 
 
 
-bool KQCStringSplitter::prev()
+bool KTQCStringSplitter::prev()
 {
   /*int startplus, endplus;
   
diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h
index 7e3c4dd0..652ec633 100644
--- a/libkmime/kqcstringsplitter.h
+++ b/libkmime/kqcstringsplitter.h
@@ -14,18 +14,18 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#ifndef KQCSTRINGSPLITTER_H
-#define KQCSTRINGSPLITTER_H
+#ifndef KTQCSTRINGSPLITTER_H
+#define KTQCSTRINGSPLITTER_H
 
 #include <tqcstring.h>
 
 #include <kdepimmacros.h>
 
-class KDE_EXPORT KQCStringSplitter {
+class KDE_EXPORT KTQCStringSplitter {
   
   public:
-    KQCStringSplitter();
-    ~KQCStringSplitter();
+    KTQCStringSplitter();
+    ~KTQCStringSplitter();
         
     void reset()                  { start=0; end=0; sep=""; incSep=false;}
     
diff --git a/libkmime/tests/run_codec_tests b/libkmime/tests/run_codec_tests
index 62908eee..62f5f2d6 100755
--- a/libkmime/tests/run_codec_tests
+++ b/libkmime/tests/run_codec_tests
@@ -19,7 +19,7 @@ failedTests=0
 # loop over all .expected files in the directory
 # specified by the single argument:
 
-for i in $(find "$@" -type f -name '*.expected'); do
+for i in $(tqfind "$@" -type f -name '*.expected'); do
 	dirName="$(dirname "$i")"
 	if [ "$dirName" != "$oldDirName" ]; then
 		oldDirName="$dirName"
diff --git a/libkmime/tests/test_charfreq.cpp b/libkmime/tests/test_charfreq.cpp
index 50f2809d..04f58bc0 100644
--- a/libkmime/tests/test_charfreq.cpp
+++ b/libkmime/tests/test_charfreq.cpp
@@ -1,5 +1,5 @@
 // test program for KMime::CharFreq.
-// compile with g++ -I$QTDIR/include -L$QTDIR/lib -lqt(-mt) \
+// compile with g++ -I$TQTDIR/include -L$TQTDIR/lib -lqt(-mt) \
 //                  -o test_charfreq test_charfreq.cpp
 
 #include "../kmime_charfreq.cpp"
diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp
index 68ab08ec..f27bc5b9 100644
--- a/libkmime/tests/test_kmime_codec.cpp
+++ b/libkmime/tests/test_kmime_codec.cpp
@@ -1,7 +1,7 @@
 /* test program for KMime::Codec's:
    compile with:
-   g++ -I$QTDIR/include -I$KDEDIR/include -L$QTDIR/lib -L$KDEDIR/lib \
-   -lqt-mt -lkdecore -lkdenetwork -O2 -pthread -DQT_THREAD_SUPPORT \
+   g++ -I$TQTDIR/include -I$KDEDIR/include -L$TQTDIR/lib -L$KDEDIR/lib \
+   -lqt-mt -lkdecore -lkdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \
    -o test_kmime_codec{,.cpp}
 */
 
@@ -25,7 +25,7 @@
 #include <cassert>
 
 #include <tqfile.h>
-#include <tqcstring.h> // QByteArray
+#include <tqcstring.h> // TQByteArray
 
 using namespace KMime;
 using namespace std;
@@ -72,7 +72,7 @@ void missingParameterTo( const char * option ) {
   usage();
 }
 
-static enum { Kio = 0, ChunkWise = 1, ConvenienceQBA = 3 }
+static enum { Kio = 0, ChunkWise = 1, ConvenienceTQBA = 3 }
 pattern = ChunkWise;
 static int outbufsize = 4096;
 static int inbufsize = -1; // whole file
@@ -143,7 +143,7 @@ int main( int argc, char * argv[] ) {
       else if ( !qstricmp( "chunkwise", optarg ) )
 	pattern = ChunkWise;
       else if ( !qstricmp( "convenience-qba", optarg ) )
-	pattern = ConvenienceQBA;
+	pattern = ConvenienceTQBA;
       else {
 	cerr << "Unknown usage pattern \"" << optarg << "\"" << endl;
 	usage();
@@ -218,7 +218,7 @@ int main( int argc, char * argv[] ) {
     case Kio:
       encode_decode_kio( encode, codec, infile_buffer, outfile );
       break;
-    case ConvenienceQBA:
+    case ConvenienceTQBA:
       encode_decode_convenience_qba( encode, codec, infile_buffer, outfile );
       break;
     default:
@@ -371,7 +371,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec,
   //
   uint offset = 0;
   while ( offset < infile_buffer.size() ) {
-    uint reallyRead = QMIN( indata.size(), infile_buffer.size() - offset );
+    uint reallyRead = TQMIN( indata.size(), infile_buffer.size() - offset );
     indata.duplicate( infile_buffer.begin() + offset, reallyRead );
     offset += reallyRead;
 
diff --git a/libkmime/tests/test_kmime_header_parsing.cpp b/libkmime/tests/test_kmime_header_parsing.cpp
index 93c447eb..7c93ec10 100644
--- a/libkmime/tests/test_kmime_header_parsing.cpp
+++ b/libkmime/tests/test_kmime_header_parsing.cpp
@@ -350,7 +350,7 @@ int main( int argc, char * argv[] ) {
     break;
   case 16:
     { // parameter
-      QPair<TQString,KMime::Types::QStringOrQPair> result;
+      TQPair<TQString,KMime::Types::TQStringOrTQPair> result;
       bool ok = parseParameter( iit, iend, result, withCRLF );
 
       cout << ( ok ? "OK" : "BAD" ) << endl
@@ -363,13 +363,13 @@ int main( int argc, char * argv[] ) {
     break;
   case 17:
     { // raw-parameter-list
-      TQMap<TQString,KMime::Types::QStringOrQPair> result;
+      TQMap<TQString,KMime::Types::TQStringOrTQPair> result;
       bool ok = parseRawParameterList( iit, iend, result, withCRLF );
 
       cout << ( ok ? "OK" : "BAD" ) << endl
 	   << "result: " << result.count() << " raw parameters:" << endl;
       int i = 0;
-      for ( TQMap<TQString,KMime::Types::QStringOrQPair>::ConstIterator
+      for ( TQMap<TQString,KMime::Types::TQStringOrTQPair>::ConstIterator
 	      it = result.begin() ; it != result.end() ; ++it, ++i )
 	cout << "result[" << i << "].key() (attribute):\n"
 	     << it.key() << endl
diff --git a/libkmime/tests/test_mdn.cpp b/libkmime/tests/test_mdn.cpp
index fa9290f2..dd1702bb 100644
--- a/libkmime/tests/test_mdn.cpp
+++ b/libkmime/tests/test_mdn.cpp
@@ -52,31 +52,31 @@ int main( int argc, char * argv[] ) {
 			 long_options, &option_index );
     if ( c == -1 ) break;
 
-#define EQUALS(x) !qstricmp( optarg, x )
+#define ETQUALS(x) !qstricmp( optarg, x )
 
     switch ( c ) {
 
     case 'a': // --action-mode
-      if ( EQUALS( "manual-action" ) )
+      if ( ETQUALS( "manual-action" ) )
 	actionMode = ManualAction;
-      else if ( EQUALS( "automatic-action" ) )
+      else if ( ETQUALS( "automatic-action" ) )
 	actionMode = AutomaticAction;
       else
 	usage( "unknown action mode!" );
       break;
 
     case 'd': // --disposition-type
-      if ( EQUALS( "displayed" ) )
+      if ( ETQUALS( "displayed" ) )
 	dispositionType = Displayed;
-      else if ( EQUALS( "deleted" ) )
+      else if ( ETQUALS( "deleted" ) )
 	dispositionType = Deleted;
-      else if ( EQUALS( "dispatched" ) )
+      else if ( ETQUALS( "dispatched" ) )
 	dispositionType = Dispatched;
-      else if ( EQUALS( "processed" ) )
+      else if ( ETQUALS( "processed" ) )
 	dispositionType = Processed;
-      else if ( EQUALS( "denied" ) )
+      else if ( ETQUALS( "denied" ) )
 	dispositionType = Denied;
-      else if ( EQUALS( "failed" ) )
+      else if ( ETQUALS( "failed" ) )
 	dispositionType = Failed;
       else
 	usage( "unknown disposition type!" );
@@ -97,15 +97,15 @@ int main( int argc, char * argv[] ) {
       break;
 
     case 'm': // --disposition-modifier
-      if ( EQUALS( "error" ) )
+      if ( ETQUALS( "error" ) )
 	dispositionModifiers << Error;
-      else if ( EQUALS( "warning" ) )
+      else if ( ETQUALS( "warning" ) )
 	dispositionModifiers << Warning;
-      else if ( EQUALS( "superseded" ) )
+      else if ( ETQUALS( "superseded" ) )
 	dispositionModifiers << Superseded;
-      else if ( EQUALS( "expired" ) )
+      else if ( ETQUALS( "expired" ) )
 	dispositionModifiers << Expired;
-      else if ( EQUALS( "mailbox-terminated" ) )
+      else if ( ETQUALS( "mailbox-terminated" ) )
 	dispositionModifiers << MailboxTerminated;
       else
 	usage( "unknwon disposition modifier!" );
@@ -119,9 +119,9 @@ int main( int argc, char * argv[] ) {
       break;
 
     case 's': // --sending-mode
-      if ( EQUALS( "MDN-sent-manually" ) )
+      if ( ETQUALS( "MDN-sent-manually" ) )
 	sendingMode = SentManually;
-      else if ( EQUALS( "MDN-sent-automatically" ) )
+      else if ( ETQUALS( "MDN-sent-automatically" ) )
 	sendingMode = SentAutomatically;
       else
 	usage( "unknown sending mode" );
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 53b77913..f3227ac3 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -828,7 +828,7 @@ Module::rereadKey( const KeyID& keyID, const bool readTrust /* = true */ )
   return newKey;
 }
 
-QCString
+TQCString
 Module::getAsciiPublicKey(const KeyID& keyID)
 {
   if (0 == pgp) assignPGPBase();
@@ -885,7 +885,7 @@ Module::clear(const bool erasePassPhrase)
     wipePassPhrase(true);
 }
 
-const QString
+const TQString
 Module::lastErrorMsg(void) const
 {
   return errMsg;
@@ -930,9 +930,9 @@ Module::selectSecretKey( const TQString& title,
 
 KeyID
 Module::selectPublicKey( const TQString& title,
-                         const TQString& text /* = TQString::null */,
+                         const TQString& text /* = TQString() */,
                          const KeyID& oldKeyId /* = KeyID() */,
-                         const TQString& address /* = TQString::null */,
+                         const TQString& address /* = TQString() */,
                          const unsigned int allowedKeys /* = AllKeys */ )
 {
   if( 0 == pgp ) {
@@ -966,9 +966,9 @@ Module::selectPublicKey( const TQString& title,
 
 KeyIDList
 Module::selectPublicKeys( const TQString& title,
-                          const TQString& text /* = TQString::null */,
+                          const TQString& text /* = TQString() */,
                           const KeyIDList& oldKeyIds /* = KeyIDList() */,
-                          const TQString& address /* = TQString::null */,
+                          const TQString& address /* = TQString() */,
                           const unsigned int allowedKeys /* = AllKeys */ )
 {
   if( 0 == pgp ) {
@@ -1044,7 +1044,7 @@ Module::prepareMessageForDecryption( const TQCString& msg,
     start = 0;
   else
   {
-    start = msg.find( "\n-----BEGIN PGP" ) + 1;
+    start = msg.tqfind( "\n-----BEGIN PGP" ) + 1;
     if( start == 0 )
     {
       nonPgpBlocks.append( msg );
@@ -1062,20 +1062,20 @@ Module::prepareMessageForDecryption( const TQCString& msg,
     else
       pgpBlock = UnknownBlock;
 
-    nextEnd = msg.find( "\n-----END PGP", start + 15 );
+    nextEnd = msg.tqfind( "\n-----END PGP", start + 15 );
     if( nextEnd == -1 )
     {
       nonPgpBlocks.append( msg.mid( lastEnd+1 ) );
       break;
     }
-    nextStart = msg.find( "\n-----BEGIN PGP", start + 15 );
+    nextStart = msg.tqfind( "\n-----BEGIN PGP", start + 15 );
 
     if( ( nextStart == -1 ) || ( nextEnd < nextStart ) ||
         ( pgpBlock == ClearsignedBlock ) )
     { // most likely we found a PGP block (but we don't check if it's valid)
       // store the preceding non-PGP block
       nonPgpBlocks.append( msg.mid( lastEnd+1, start-lastEnd-1 ) );
-      lastEnd = msg.find( "\n", nextEnd + 14 );
+      lastEnd = msg.tqfind( "\n", nextEnd + 14 );
       if( lastEnd == -1 )
       {
         pgpBlocks.append( new Block( msg.mid( start ) ) );
@@ -1086,7 +1086,7 @@ Module::prepareMessageForDecryption( const TQCString& msg,
       {
         pgpBlocks.append( new Block( msg.mid( start, lastEnd+1-start ) ) );
         if( ( nextStart != -1 ) && ( nextEnd > nextStart ) )
-          nextStart = msg.find( "\n-----BEGIN PGP", lastEnd+1 );
+          nextStart = msg.tqfind( "\n-----BEGIN PGP", lastEnd+1 );
       }
     }
 
@@ -1333,7 +1333,7 @@ Module::checkForPGP(void)
   havePgp=FALSE;
 
   path = getenv("PATH");
-  while((index = path.find(":",lastindex+1)) != -1)
+  while((index = path.tqfind(":",lastindex+1)) != -1)
   {
     pSearchPaths.append(path.mid(lastindex+1,index-lastindex-1));
     lastindex = index;
@@ -1478,7 +1478,7 @@ Module::assignPGPBase(void)
   }
 }
 
-QString
+TQString
 Module::canonicalAddress( const TQString& _adress )
 {
   int index,index2;
@@ -1487,12 +1487,12 @@ Module::canonicalAddress( const TQString& _adress )
   address = address.stripWhiteSpace();
 
   // just leave pure e-mail address.
-  if((index = address.find("<")) != -1)
-    if((index2 = address.find("@",index+1)) != -1)
-      if((index2 = address.find(">",index2+1)) != -1)
+  if((index = address.tqfind("<")) != -1)
+    if((index2 = address.tqfind("@",index+1)) != -1)
+      if((index2 = address.tqfind(">",index2+1)) != -1)
 	return address.mid(index,index2-index+1);
 
-  if((index = address.find("@")) == -1)
+  if((index = address.tqfind("@")) == -1)
   {
     // local address
     //char hostname[1024];
@@ -1503,7 +1503,7 @@ Module::canonicalAddress( const TQString& _adress )
   else
   {
     int index1 = address.findRev(" ",index);
-    int index2 = address.find(" ",index);
+    int index2 = address.tqfind(" ",index);
     if(index2 == -1) index2 = address.length();
     return "<" + address.mid(index1+1 ,index2-index1-1) + ">";
   }
@@ -1598,7 +1598,7 @@ Module::readSecretKeys( bool reread )
 KeyID
 Module::selectKey( const KeyList& keys,
                    const TQString& title,
-                   const TQString& text /* = TQString::null */ ,
+                   const TQString& text /* = TQString() */ ,
                    const KeyID& keyId /* = KeyID() */ ,
                    const unsigned int allowedKeys /* = AllKeys */ )
 {
@@ -1621,7 +1621,7 @@ Module::selectKey( const KeyList& keys,
 KeyIDList
 Module::selectKeys( const KeyList& keys,
                     const TQString& title,
-                    const TQString& text /* = TQString::null */ ,
+                    const TQString& text /* = TQString() */ ,
                     const KeyIDList& keyIds /* = KeyIDList() */ ,
                     const unsigned int allowedKeys /* = AllKeys */ )
 {
@@ -1646,7 +1646,7 @@ KeyID
 Module::selectKey( bool& rememberChoice,
                    const KeyList& keys,
                    const TQString& title,
-                   const TQString& text /* = TQString::null */ ,
+                   const TQString& text /* = TQString() */ ,
                    const KeyID& keyId /* = KeyID() */ ,
                    const unsigned int allowedKeys /* = AllKeys */ )
 {
@@ -1674,7 +1674,7 @@ KeyIDList
 Module::selectKeys( bool& rememberChoice,
                     const KeyList& keys,
                     const TQString& title,
-                    const TQString& text /* = TQString::null */ ,
+                    const TQString& text /* = TQString() */ ,
                     const KeyIDList& keyIds /* = KeyIDList() */ ,
                     const unsigned int allowedKeys /* = AllKeys */ )
 {
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index ec937015..da6c02e1 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -258,7 +258,7 @@ public:
       corresponding key is selected.
   */
   KeyID selectSecretKey( const TQString& title,
-                         const TQString& text = TQString::null,
+                         const TQString& text = TQString(),
                          const KeyID& keyId = KeyID() );
 
   /** Shows a key selection dialog with all public keys and the given title
@@ -268,9 +268,9 @@ public:
       <em>mode</em> specifies which keys can be selected.
   */
   KeyID selectPublicKey( const TQString& title,
-                         const TQString& text = TQString::null,
+                         const TQString& text = TQString(),
                          const KeyID& oldKeyId = KeyID(),
-                         const TQString& address = TQString::null,
+                         const TQString& address = TQString(),
                          const unsigned int allowedKeys = AllKeys );
 
   /** Shows a key selection dialog with all public keys and the given title
@@ -280,9 +280,9 @@ public:
       <em>mode</em> specifies which keys can be selected.
   */
   KeyIDList selectPublicKeys( const TQString& title,
-                              const TQString& text = TQString::null,
+                              const TQString& text = TQString(),
                               const KeyIDList& oldKeyIds = KeyIDList(),
-                              const TQString& address = TQString::null,
+                              const TQString& address = TQString(),
                               const unsigned int allowedKeys = AllKeys );
 
   // FIXME: key management
@@ -308,7 +308,7 @@ public:
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
-      Returns TRUE if the message tqcontains at least one OpenPGP block and
+      Returns TRUE if the message contains at least one OpenPGP block and
       FALSE otherwise.
       The format is then:
       <pre>
@@ -356,7 +356,7 @@ private:
    */
   KeyID selectKey( const KeyList& keys,
                    const TQString& title,
-                   const TQString& text = TQString::null,
+                   const TQString& text = TQString(),
                    const KeyID& keyId = KeyID(),
                    const unsigned int allowedKeys = AllKeys );
 
@@ -364,7 +364,7 @@ private:
    */
   KeyIDList selectKeys( const KeyList& keys,
                         const TQString& title,
-                        const TQString& text = TQString::null,
+                        const TQString& text = TQString(),
                         const KeyIDList& keyIds = KeyIDList(),
                         const unsigned int allowedKeys = AllKeys );
 
@@ -375,7 +375,7 @@ private:
   KeyID selectKey( bool& rememberChoice,
                    const KeyList& keys,
                    const TQString& title,
-                   const TQString& text = TQString::null,
+                   const TQString& text = TQString(),
                    const KeyID& keyId = KeyID(),
                    const unsigned int allowedKeys = AllKeys );
 
@@ -386,7 +386,7 @@ private:
   KeyIDList selectKeys( bool& rememberChoice,
                         const KeyList& keys,
                         const TQString& title,
-                        const TQString& text = TQString::null,
+                        const TQString& text = TQString(),
                         const KeyIDList& keyIds = KeyIDList(),
                         const unsigned int allowedKeys = AllKeys );
 
diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp
index ec2ffd12..5f31fe5a 100644
--- a/libkpgp/kpgpbase.cpp
+++ b/libkpgp/kpgpbase.cpp
@@ -53,7 +53,7 @@ Base::clear()
   input = TQCString();
   output = TQCString();
   error = TQCString();
-  errMsg = TQString::null;
+  errMsg = TQString();
   status = OK;
 }
 
@@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExiStatus;
+  int childExitqStatus;
   struct pollfd pollin, pollout, pollerr;
   int pollstatus;
 
@@ -128,7 +128,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
     _exit(127);
   }
 
-  /*Only get here if we're the parent.*/
+  /*Only get here if we're the tqparent.*/
   close(pin[0]);
   close(pout[1]);
   close(perr[1]);
@@ -157,14 +157,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
         //kdDebug(5100) << "Polling pin[1]..." << endl;
         pollstatus = poll(&pollin, 1, 5);
         if (pollstatus == 1) {
-          //kdDebug(5100) << "Status for polling pin[1]: " << pollin.revents << endl;
+          //kdDebug(5100) << "tqStatus for polling pin[1]: " << pollin.revents << endl;
           if (pollin.revents & POLLERR) {
             kdDebug(5100) << "PGP seems to have hung up" << endl;
             break;
           }
           else if (pollin.revents & POLLOUT) {
             // search end of next line
-            if ((len2 = input.find('\n', i)) == -1)
+            if ((len2 = input.tqfind('\n', i)) == -1)
               len2 = input_length - i;
             else
               len2 = len2 - i + 1;
@@ -189,7 +189,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
             //kdDebug(5100) << "Polling pout[0]..." << endl;
             pollstatus = poll(&pollout, 1, 0);
             if (pollstatus == 1) {
-              //kdDebug(5100) << "Status for polling pout[0]: " << pollout.revents << endl;
+              //kdDebug(5100) << "tqStatus for polling pout[0]: " << pollout.revents << endl;
               if (pollout.revents & POLLIN) {
                 //kdDebug(5100) << "Trying to read " << 1024 << " bytes from pout[0]" << endl;
                 if ((len = read(pout[0],str,1024))>0) {
@@ -214,7 +214,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
             //kdDebug(5100) << "Polling perr[0]..." << endl;
             pollstatus = poll(&pollerr, 1, 0);
             if (pollstatus == 1) {
-              //kdDebug(5100) << "Status for polling perr[0]: " << pollerr.revents << endl;
+              //kdDebug(5100) << "tqStatus for polling perr[0]: " << pollerr.revents << endl;
               if (pollerr.revents & POLLIN) {
                 //kdDebug(5100) << "Trying to read " << 1024 << " bytes from perr[0]" << endl;
                 if ((len = read(perr[0],str,1024))>0) {
@@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
 
   do {
     //kdDebug(5100) << "Checking if PGP is still running..." << endl;
-    childExiStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
+    childExitqStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     if (pout[0] >= 0) {
       do {
@@ -260,7 +260,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
         //kdDebug(5100) << "Polling pout[0]..." << endl;
         pollstatus = poll(&pollout, 1, 0);
         if (pollstatus == 1) {
-          //kdDebug(5100) << "Status for polling pout[0]: " << pollout.revents << endl;
+          //kdDebug(5100) << "tqStatus for polling pout[0]: " << pollout.revents << endl;
           if (pollout.revents & POLLIN) {
             //kdDebug(5100) << "Trying to read " << 1024 << " bytes from pout[0]" << endl;
             if ((len = read(pout[0],str,1024))>0) {
@@ -269,7 +269,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
               output += str;
             } else {
               /*
-               * Apparently, on NetBSD when the child dies, the pipe begins
+               * Aptqparently, on NetBSD when the child dies, the pipe begins
                * receiving empty data packets *before* waitpid() has signaled
                * that the child has died.  Also, notice that this happens
                * without any error bit being set in pollfd.revents (is this a
@@ -304,7 +304,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
         //kdDebug(5100) << "Polling perr[0]..." << endl;
         pollstatus = poll(&pollerr, 1, 0);
         if (pollstatus == 1) {
-          //kdDebug(5100) << "Status for polling perr[0]: " << pollerr.revents << endl;
+          //kdDebug(5100) << "tqStatus for polling perr[0]: " << pollerr.revents << endl;
           if (pollerr.revents & POLLIN) {
             //kdDebug(5100) << "Trying to read " << 1024 << " bytes from perr[0]" << endl;
             if ((len = read(perr[0],str,1024))>0) {
@@ -313,7 +313,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
               error += str;
             } else {
               /*
-               * Apparently, on NetBSD when the child dies, the pipe begins
+               * Aptqparently, on NetBSD when the child dies, the pipe begins
                * receiving empty data packets *before* waitpid() has signaled
                * that the child has died.  Also, notice that this happens
                * without any error bit being set in pollfd.revents (is this a
@@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExiStatus) != 0) {
+  if (WIFEXITED(childExitqStatus) != 0) {
     // Get the return code of the child
-    childExiStatus = WEXITSTATUS(childExiStatus);
-    kdDebug(5100) << "PGP exited with exit status " << childExiStatus
+    childExitqStatus = WEXITSTATUS(childExitqStatus);
+    kdDebug(5100) << "PGP exited with exit status " << childExitqStatus
                   << endl;
   }
   else {
-    childExiStatus = -1;
+    childExitqStatus = -1;
     kdDebug(5100) << "PGP exited abnormally!" << endl;
   }
 
@@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
    */
   kdDebug(5100) << error << endl;
 
-  return childExiStatus;
+  return childExitqStatus;
 }
 
 
@@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExiStatus;
+  int childExitqStatus;
   char gpgcmd[1024] = "\0";
   struct pollfd poller[3];
   int num_pollers = 0;
@@ -500,7 +500,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
     _exit(127);
   }
 
-  // Only get here if we're the parent.
+  // Only get here if we're the tqparent.
 
   close(pin[0]);
   close(pout[1]);
@@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
 
   do {
     //kdDebug(5100) << "Checking if GnuPG is still running..." << endl;
-    childExiStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
+    childExitqStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     do {
       // poll the pipes
@@ -547,7 +547,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
           else {
             // FreeBSD/NetBSD workaround
             //
-            // Apparently, on Free/NetBSD when the child dies, the pipe begins
+            // Aptqparently, on Free/NetBSD when the child dies, the pipe begins
             // receiving empty data packets *before* waitpid() has signaled
             // that the child has died.  Also, notice that this happens
             // without any error bit being set in pollfd.revents (is this a
@@ -598,7 +598,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
           else if (poller[STD_IN].revents & POLLOUT) {
             if (!input.isEmpty()) {
               // search end of next line
-              if ((len2 = input.find('\n', input_pos)) == -1)
+              if ((len2 = input.tqfind('\n', input_pos)) == -1)
                 len2 = input_length - input_pos;
               else
                 len2 = len2 - input_pos + 1;
@@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExiStatus) != 0) {
+  if (WIFEXITED(childExitqStatus) != 0) {
     // Get the return code of the child
-    childExiStatus = WEXITSTATUS(childExiStatus);
-    kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus
+    childExitqStatus = WEXITSTATUS(childExitqStatus);
+    kdDebug(5100) << "GnuPG exited with exit status " << childExitqStatus
                   << endl;
   }
   else {
-    childExiStatus = -1;
+    childExitqStatus = -1;
     kdDebug(5100) << "GnuPG exited abnormally!" << endl;
   }
 
@@ -663,11 +663,11 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   // get to know what's going on during the gpg calls.
   kdDebug(5100) << "gpg stderr:\n" << error << endl;
 
-  return childExiStatus;
+  return childExitqStatus;
 }
 
 
-QCString
+TQCString
 Base::addUserId()
 {
   TQCString cmd;
diff --git a/libkpgp/kpgpbase.h b/libkpgp/kpgpbase.h
index aaa389eb..14f849cc 100644
--- a/libkpgp/kpgpbase.h
+++ b/libkpgp/kpgpbase.h
@@ -227,7 +227,7 @@ private:
 // ---------------------------------------------------------------------------
 // inlined functions
 
-inline QString
+inline TQString
 Base::lastErrorMessage() const
 {
   return errMsg;
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 06c0d1e6..da003881 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
@@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus != 0)
+  if(exitqStatus != 0)
     status = ERROR;
 
 #if 0
@@ -118,16 +118,16 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
     bool bad = FALSE;
     unsigned int num = 0;
     TQCString badkeys = "";
-    if (error.find("Cannot find the public key") != -1)
+    if (error.tqfind("Cannot find the public key") != -1)
     {
       index = 0;
       num = 0;
-      while((index = error.find("Cannot find the public key",index))
+      while((index = error.tqfind("Cannot find the public key",index))
 	    != -1)
       {
         bad = TRUE;
-        index = error.find('\'',index);
-        int index2 = error.find('\'',index+1);
+        index = error.tqfind('\'',index);
+        int index2 = error.tqfind('\'',index+1);
         if (num++)
           badkeys += ", ";
         badkeys += error.mid(index, index2-index+1);
@@ -149,15 +149,15 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
         status |= ERROR;
       }
     }
-    if (error.find("skipping userid") != -1)
+    if (error.tqfind("skipping userid") != -1)
     {
       index = 0;
       num = 0;
-      while((index = error.find("skipping userid",index))
+      while((index = error.tqfind("skipping userid",index))
 	    != -1)
       {
         bad = TRUE;
-        int index2 = error.find('\n',index+16);
+        int index2 = error.tqfind('\n',index+16);
         if (num++)
           badkeys += ", ";
         badkeys += error.mid(index+16, index2-index-16);
@@ -187,12 +187,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 #endif
   if(passphrase != 0)
   {
-    if(error.find("Pass phrase is good") != -1)
+    if(error.tqfind("Pass phrase is good") != -1)
     {
       //kdDebug(5100) << "Base: Good Passphrase!" << endl;
       status |= SIGNED;
     }
-    if( error.find("Bad pass phrase") != -1)
+    if( error.tqfind("Bad pass phrase") != -1)
     {
       errMsg = i18n("Bad passphrase; could not sign.");
       status |= BADPHRASE;
@@ -200,7 +200,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
       status |= ERROR;
     }
   }
-  if (error.find("Signature error") != -1)
+  if (error.tqfind("Signature error") != -1)
   {
     errMsg = i18n("Signing failed: please check your PGP User Identity, "
                   "the PGP setup, and the key rings.");
@@ -208,7 +208,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
     status |= ERR_SIGNING;
     status |= ERROR;
   }
-  if (error.find("Encryption error") != -1)
+  if (error.tqfind("Encryption error") != -1)
   {
     errMsg = i18n("Encryption failed: please check your PGP setup "
                   "and the key rings.");
@@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -227,38 +227,38 @@ int
 Base2::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+  exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
   // pgp2.6 has sometimes problems with the ascii armor pgp5.0 produces
   // this hack can solve parts of the problem
-  if(error.find("ASCII armor corrupted.") != -1)
+  if(error.tqfind("ASCII armor corrupted.") != -1)
   {
     kdDebug(5100) << "removing ASCII armor header" << endl;
-    int index1 = input.find("-----BEGIN PGP SIGNED MESSAGE-----");
+    int index1 = input.tqfind("-----BEGIN PGP SIGNED MESSAGE-----");
     if(index1 != -1)
-      index1 = input.find("-----BEGIN PGP SIGNATURE-----", index1);
+      index1 = input.tqfind("-----BEGIN PGP SIGNATURE-----", index1);
     else
-      index1 = input.find("-----BEGIN PGP MESSAGE-----");
-    index1 = input.find('\n', index1);
-    index2 = input.find("\n\n", index1);
+      index1 = input.tqfind("-----BEGIN PGP MESSAGE-----");
+    index1 = input.tqfind('\n', index1);
+    index2 = input.tqfind("\n\n", index1);
     input.remove(index1, index2 - index1);
-    exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+    exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
     if( !output.isEmpty() )
       block.setProcessedText( output );
     block.setError( error );
   }
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setqStatus( status );
     return status;
   }
 
@@ -282,19 +282,19 @@ Base2::decrypt( Block& block, const char *passphrase )
    *
    * You do not have the secret key needed to decrypt this file.
    */
-  if(error.find("File is encrypted.") != -1)
+  if(error.tqfind("File is encrypted.") != -1)
   {
     //kdDebug(5100) << "kpgpbase: message is encrypted" << endl;
     status |= ENCRYPTED;
-    if((index = error.find("Key for user ID:")) != -1)
+    if((index = error.tqfind("Key for user ID:")) != -1)
     {
       // Find out the key for which the phrase is needed
       index  += 17;
-      index2 = error.find('\n', index);
+      index2 = error.tqfind('\n', index);
       block.setRequiredUserId( error.mid(index, index2 - index) );
       //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!\n";
 
-      if((passphrase != 0) && (error.find("Bad pass phrase") != -1))
+      if((passphrase != 0) && (error.tqfind("Bad pass phrase") != -1))
       {
         errMsg = i18n("Bad passphrase; could not decrypt.");
         kdDebug(5100) << "Base: passphrase is bad" << endl;
@@ -314,14 +314,14 @@ Base2::decrypt( Block& block, const char *passphrase )
 #if 0
     // ##### FIXME: This information is anyway currently not used
     //       I'll change it to always determine the recipients.
-    index = error.find("can only be read by:");
+    index = error.tqfind("can only be read by:");
     if(index != -1)
     {
-      index = error.find('\n',index);
-      int end = error.find("\n\n",index);
+      index = error.tqfind('\n',index);
+      int end = error.tqfind("\n\n",index);
 
       mRecipients.clear();
-      while( (index2 = error.find('\n',index+1)) <= end )
+      while( (index2 = error.tqfind('\n',index+1)) <= end )
       {
 	TQCString item = error.mid(index+1,index2-index-1);
 	item.stripWhiteSpace();
@@ -392,19 +392,19 @@ Base2::decrypt( Block& block, const char *passphrase )
    * Signature made 2001/09/09 16:01 GMT using 1024-bit key, key ID 12345678
    */
 
-  if((index = error.find("File has signature")) != -1)
+  if((index = error.tqfind("File has signature")) != -1)
   {
     // move index to start of next line
-    index = error.find('\n', index+18) + 1;
+    index = error.tqfind('\n', index+18) + 1;
     //kdDebug(5100) << "Base: message is signed" << endl;
     status |= SIGNED;
     // get signature date and signature key ID
-    if ((index2 = error.find("Signature made", index)) != -1) {
+    if ((index2 = error.tqfind("Signature made", index)) != -1) {
       index2 += 15;
-      int index3 = error.find("using", index2);
+      int index3 = error.tqfind("using", index2);
       block.setSignatureDate( error.mid(index2, index3-index2-1) );
       kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n";
-      index3 = error.find("key ID ", index3) + 7;
+      index3 = error.tqfind("key ID ", index3) + 7;
       block.setSignatureKeyId( error.mid(index3,8) );
       kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'\n";
     }
@@ -415,38 +415,38 @@ Base2::decrypt( Block& block, const char *passphrase )
       block.setSignatureKeyId( "" );
     }
 
-    if( ( index2 = error.find("Key matching expected", index) ) != -1)
+    if( ( index2 = error.tqfind("Key matching expected", index) ) != -1)
     {
       status |= UNKNOWN_SIG;
       status |= GOODSIG;
-      int index3 = error.find("Key ID ", index2) + 7;
+      int index3 = error.tqfind("Key ID ", index2) + 7;
       block.setSignatureKeyId( error.mid(index3,8) );
-      block.setSignatureUserId( TQString::null );
+      block.setSignatureUserId( TQString() );
     }
-    else if( (index2 = error.find("Good signature from", index)) != -1 )
+    else if( (index2 = error.tqfind("Good signature from", index)) != -1 )
     {
       status |= GOODSIG;
       // get signer
-      index = error.find('"',index2+19);
-      index2 = error.find('"', index+1);
+      index = error.tqfind('"',index2+19);
+      index2 = error.tqfind('"', index+1);
       block.setSignatureUserId( error.mid(index+1, index2-index-1) );
     }
-    else if( (index2 = error.find("Bad signature from", index)) != -1 )
+    else if( (index2 = error.tqfind("Bad signature from", index)) != -1 )
     {
       status |= ERROR;
       // get signer
-      index = error.find('"',index2+19);
-      index2 = error.find('"', index+1);
+      index = error.tqfind('"',index2+19);
+      index2 = error.tqfind('"', index+1);
       block.setSignatureUserId( error.mid(index+1, index2-index-1) );
     }
-    else if( error.find("Keyring file", index) != -1 )
+    else if( error.tqfind("Keyring file", index) != -1 )
     {
       // #### fix this hack
       status |= UNKNOWN_SIG;
       status |= GOODSIG; // this is a hack...
       // determine file name of missing keyring file
-      index = error.find('\'', index) + 1;
-      index2 = error.find('\'', index);
+      index = error.tqfind('\'', index) + 1;
+      index2 = error.tqfind('\'', index);
       block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n"
       "Please check your PGP setup.").arg(error.mid(index, index2-index)) );
     }
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+  exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
                     keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+    exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
                       0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
 KeyList
 Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
   KeyList publicKeys;
 
   status = 0;
   if ( patterns.isEmpty() ) {
-    exiStatus = run( cmd, 0, true );
+    exitqStatus = run( cmd, 0, true );
 
-    if ( exiStatus != 0 ) {
+    if ( exitqStatus != 0 ) {
       status = ERROR;
       return KeyList();
     }
@@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 
     for ( TQStringList::ConstIterator it = patterns.begin();
           it != patterns.end(); ++it ) {
-      exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+      exitqStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
                         0, true );
 
-      if ( exiStatus != 0 ) {
+      if ( exitqStatus != 0 ) {
         status = ERROR;
         return KeyList();
       }
@@ -576,16 +576,16 @@ int
 Base2::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   cmd = PGP2 " +batchmode +language=en -ks -f ";
   cmd += addUserId();
   cmd += " 0x" + keyID;
 
   status = 0;
-  exiStatus = run(cmd.data(),passphrase);
+  exitqStatus = run(cmd.data(),passphrase);
 
-  if (exiStatus != 0)
+  if (exitqStatus != 0)
     status = ERROR;
 
   return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
 
 TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+  exitqStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
                     0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -626,10 +626,10 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
   {
     /*
     if( secretKeys )
-      index = output.find( "\nsec" );
+      index = output.tqfind( "\nsec" );
     else
     */
-      index = output.find( "\npub" );
+      index = output.tqfind( "\npub" );
     if( index == -1 )
       return 0;
     else
@@ -641,12 +641,12 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
     int index2;
 
     // search the end of the current line
-    if( ( index2 = output.find( '\n', index ) ) == -1 )
+    if( ( index2 = output.tqfind( '\n', index ) ) == -1 )
       break;
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line tqcontains primary key data
+    { // line contains primary key data
       // Example 1 (nothing special):
       // pub  1024/E2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -699,25 +699,25 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
       pos = index + 4;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( '/', pos );
+      pos2 = output.tqfind( '/', pos );
       subkey->setKeyLength( output.mid( pos, pos2-pos ).toUInt() );
 
       // Key ID
       pos = pos2 + 1;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyID( output.mid( pos, pos2-pos ) );
 
       // Creation Date
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       int year = output.mid( pos, 4 ).toInt();
       int month = output.mid( pos+5, 2 ).toInt();
       int day = output.mid( pos+8, 2 ).toInt();
       TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
       TQDateTime epoch( TQDate( 1970, 01, 01 ), TQTime( 00, 00 ) );
-      // The calculated creation date isn't exactly correct because QDateTime
+      // The calculated creation date isn't exactly correct because TQDateTime
       // doesn't know anything about timezones and always assumes local time
       // although epoch is of course UTC. But as PGP 2 anyway doesn't print
       // the time this doesn't matter too much.
@@ -737,7 +737,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
       }
     }
     else if( output[index] == ' ' )
-    { // line tqcontains additional key data
+    { // line contains additional key data
 
       if( key == 0 )
         break;
@@ -748,20 +748,20 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line tqcontains a fingerprint
+      { // line contains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
-	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
+	for ( int idx = 0 ; (idx = fingerprint.tqfind(' ', idx)) >= 0 ; )
 	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line tqcontains additional key properties
+      { // line contains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -801,7 +801,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         }
       }
       else
-      { // line tqcontains an additional user id
+      { // line contains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
@@ -827,10 +827,10 @@ Base2::parseTrustDataForKey( Key* key, const TQCString& str )
   UserIDList userIDs = key->userIDs();
 
   // search the trust data belonging to this key
-  int index = str.find( '\n' ) + 1;
+  int index = str.tqfind( '\n' ) + 1;
   while( ( index > 0 ) &&
          ( strncmp( str.data() + index+2, keyID.data(), 8 ) != 0 ) )
-    index = str.find( '\n', index ) + 1;
+    index = str.tqfind( '\n', index ) + 1;
 
   if( index == 0 )
     return;
@@ -846,7 +846,7 @@ Base2::parseTrustDataForKey( Key* key, const TQCString& str )
     int index2;
 
     // search the end of the current line
-    if( ( index2 = str.find( '\n', index ) ) == -1 )
+    if( ( index2 = str.tqfind( '\n', index ) ) == -1 )
       break;
 
     // check if trust info for the next key starts
@@ -854,7 +854,7 @@ Base2::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[index+21] != ' ' )
-    { // line tqcontains a validity value for a user ID
+    { // line contains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
@@ -908,9 +908,9 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
   else
   {
     if( secretKeys )
-      index = output.find( "\nsec" );
+      index = output.tqfind( "\nsec" );
     else
-      index = output.find( "\npub" );
+      index = output.tqfind( "\npub" );
     if( index == -1 )
       return keys;
     else
@@ -922,12 +922,12 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
     int index2;
 
     // search the end of the current line
-    if( ( index2 = output.find( '\n', index ) ) == -1 )
+    if( ( index2 = output.tqfind( '\n', index ) ) == -1 )
       break;
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line tqcontains primary key data
+    { // line contains primary key data
       // Example 1:
       // pub  1024/E2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -979,25 +979,25 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
       pos = index + 4;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( '/', pos );
+      pos2 = output.tqfind( '/', pos );
       subkey->setKeyLength( output.mid( pos, pos2-pos ).toUInt() );
 
       // Key ID
       pos = pos2 + 1;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyID( output.mid( pos, pos2-pos ) );
 
       // Creation Date
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       int year = output.mid( pos, 4 ).toInt();
       int month = output.mid( pos+5, 2 ).toInt();
       int day = output.mid( pos+8, 2 ).toInt();
       TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
       TQDateTime epoch( TQDate( 1970, 01, 01 ), TQTime( 00, 00 ) );
-      // The calculated creation date isn't exactly correct because QDateTime
+      // The calculated creation date isn't exactly correct because TQDateTime
       // doesn't know anything about timezones and always assumes local time
       // although epoch is of course UTC. But as PGP 2 anyway doesn't print
       // the time this doesn't matter too much.
@@ -1017,7 +1017,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
       }
     }
     else if( output[index] == ' ' )
-    { // line tqcontains additional key data
+    { // line contains additional key data
 
       if( key == 0 )
         break;
@@ -1027,7 +1027,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line tqcontains a fingerprint
+      { // line contains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
@@ -1035,14 +1035,14 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         pos2 = pos + 18;
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
-	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
+	for ( int idx = 0 ; (idx = fingerprint.tqfind(' ', idx)) >= 0 ; )
 	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line tqcontains additional key properties
+      { // line contains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -1082,7 +1082,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         }
       }
       else
-      { // line tqcontains an additional user id
+      { // line contains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index a5988a9c..d7899847 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
   int index;
   // used to work around a bug in pgp5. pgp5 treats files
   // with non ascii chars (umlauts, etc...) as binary files, but
@@ -116,14 +116,14 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
   }
   //We have to do this otherwise it's all in vain
 
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
   block.setError( error );
 
-  if(exiStatus != 0)
+  if(exitqStatus != 0)
     status = ERROR;
 
   // now parse the returned info
-  if(error.find("Cannot unlock private key") != -1)
+  if(error.tqfind("Cannot unlock private key") != -1)
   {
     errMsg = i18n("The passphrase you entered is invalid.");
     status |= ERROR;
@@ -133,16 +133,16 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
 //{
     TQCString aStr;
     index = -1;
-    while((index = error.find("WARNING: The above key",index+1)) != -1)
+    while((index = error.tqfind("WARNING: The above key",index+1)) != -1)
     {
-      int index2 = error.find("But you previously",index);
-      int index3 = error.find("WARNING: The above key",index+1);
+      int index2 = error.tqfind("But you previously",index);
+      int index3 = error.tqfind("WARNING: The above key",index+1);
       if(index2 == -1 || (index2 > index3 && index3 != -1))
       {
 	// the key wasn't valid, no encryption to this person
 	// extract the person
-	index2 = error.find('\n',index);
-	index3 = error.find('\n',index2+1);
+	index2 = error.tqfind('\n',index);
+	index3 = error.tqfind('\n',index2+1);
 	aStr += error.mid(index2+1, index3-index2-1);
 	aStr += ", ";
       }
@@ -150,7 +150,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     if(!aStr.isEmpty())
     {
       aStr.truncate(aStr.length()-2);
-      if(error.find("No valid keys found") != -1)
+      if(error.tqfind("No valid keys found") != -1)
 	errMsg = i18n("The key(s) you want to encrypt your message "
 		      "to are not trusted. No encryption done.");
       else
@@ -161,10 +161,10 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
       status |= BADKEYS;
     }
 //}
-  if((index = error.find("No encryption keys found for")) != -1)
+  if((index = error.tqfind("No encryption keys found for")) != -1)
   {
-    index = error.find(':',index);
-    int index2 = error.find('\n',index);
+    index = error.tqfind(':',index);
+    int index2 = error.tqfind('\n',index);
 
     errMsg = i18n("Missing encryption key(s) for:\n%1")
       .arg(error.mid(index,index2-index));
@@ -178,14 +178,14 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     // dash-escape the input
     if (input[0] == '-')
       input = "- " + input;
-    for ( int idx = 0 ; (idx = input.find("\n-", idx)) >= 0 ; idx += 4 )
+    for ( int idx = 0 ; (idx = input.tqfind("\n-", idx)) >= 0 ; idx += 4 )
       input.tqreplace(idx, 2, "\n- -");
 
     output = "-----BEGIN PGP SIGNED MESSAGE-----\n\n" + input + "\n" + output;
   }
 
   block.setProcessedText( output );
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -193,26 +193,26 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
 int
 Base5::decrypt( Block& block, const char *passphrase )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run("pgpv -f +batchmode=1", passphrase);
+  exitqStatus = run("pgpv -f +batchmode=1", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("Error running PGP");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setqStatus( status );
     return status;
   }
 
   // lets parse the returned information.
   int index;
 
-  index = error.find("Cannot decrypt message");
+  index = error.tqfind("Cannot decrypt message");
   if(index != -1)
   {
     //kdDebug(5100) << "message is encrypted" << endl;
@@ -220,7 +220,7 @@ Base5::decrypt( Block& block, const char *passphrase )
 
     // ok. we have an encrypted message. Is the passphrase bad,
     // or do we not have the secret key?
-    if(error.find("Need a pass phrase") != -1)
+    if(error.tqfind("Need a pass phrase") != -1)
     {
       if(passphrase != 0)
       {
@@ -242,15 +242,15 @@ Base5::decrypt( Block& block, const char *passphrase )
 #if 0
     // ##### FIXME: This information is anyway currently not used
     //       I'll change it to always determine the recipients.
-    index = error.find("can only be decrypted by:");
+    index = error.tqfind("can only be decrypted by:");
     if(index != -1)
     {
-      index = error.find('\n',index);
-      int end = error.find("\n\n",index);
+      index = error.tqfind('\n',index);
+      int end = error.tqfind("\n\n",index);
 
       mRecipients.clear();
       int index2;
-      while( (index2 = error.find('\n',index+1)) <= end )
+      while( (index2 = error.tqfind('\n',index+1)) <= end )
       {
 	TQCString item = error.mid(index+1,index2-index-1);
 	item.stripWhiteSpace();
@@ -260,7 +260,7 @@ Base5::decrypt( Block& block, const char *passphrase )
     }
 #endif
   }
-  index = error.find("Good signature");
+  index = error.tqfind("Good signature");
   if(index != -1)
   {
     //kdDebug(5100) << "good signature" << endl;
@@ -268,18 +268,18 @@ Base5::decrypt( Block& block, const char *passphrase )
     status |= GOODSIG;
 
     // get key ID of signer
-    index = error.find("Key ID ", index) + 7;
+    index = error.tqfind("Key ID ", index) + 7;
     block.setSignatureKeyId( error.mid(index, 8) );
 
     // get signer
-    index = error.find('"',index) + 1;
-    int index2 = error.find('"', index);
+    index = error.tqfind('"',index) + 1;
+    int index2 = error.tqfind('"', index);
     block.setSignatureUserId( error.mid(index, index2-index) );
 
     /// ### FIXME get signature date
     block.setSignatureDate( "" );
   }
-  index = error.find("BAD signature");
+  index = error.tqfind("BAD signature");
   if(index != -1)
   {
     //kdDebug(5100) << "BAD signature" << endl;
@@ -287,23 +287,23 @@ Base5::decrypt( Block& block, const char *passphrase )
     status |= ERROR;
 
     // get key ID of signer
-    index = error.find("Key ID ", index) + 7;
+    index = error.tqfind("Key ID ", index) + 7;
     block.setSignatureKeyId( error.mid(index, 8) );
 
     // get signer
-    index = error.find('"',index) + 1;
-    int index2 = error.find('"', index);
+    index = error.tqfind('"',index) + 1;
+    int index2 = error.tqfind('"', index);
     block.setSignatureUserId( error.mid(index, index2-index) );
 
     /// ### FIXME get signature date
     block.setSignatureDate( "" );
   }
-  index = error.find("Signature by unknown key");
+  index = error.tqfind("Signature by unknown key");
   if(index != -1)
   {
-    index = error.find("keyid: 0x",index) + 9;
+    index = error.tqfind("keyid: 0x",index) + 9;
     block.setSignatureKeyId( error.mid(index, 8) );
-    block.setSignatureUserId( TQString::null );
+    block.setSignatureUserId( TQString() );
     // FIXME: not a very good solution...
     status |= SIGNED;
     status |= GOODSIG;
@@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase )
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase )
 Key*
 Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( "pgpk -ll 0x" + keyId, 0, true );
+  exitqStatus = run( "pgpk -ll 0x" + keyId, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 
   if( readTrust )
   {
-    exiStatus = run( "pgpk -c 0x" + keyId, 0, true );
+    exitqStatus = run( "pgpk -c 0x" + keyId, 0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 KeyList
 Base5::publicKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   TQCString cmd = "pgpk -ll";
   for ( TQStringList::ConstIterator it = patterns.begin();
@@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = run( cmd, 0, true );
+  exitqStatus = run( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns )
 KeyList
 Base5::secretKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
   TQCString cmd = "pgpk -ll";
@@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = run( cmd, 0, true );
+  exitqStatus = run( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns )
 
 TQCString Base5::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = run( "pgpk -xa 0x" + keyID, 0, true );
+  exitqStatus = run( "pgpk -xa 0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -436,7 +436,7 @@ int
 Base5::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if(passphrase == 0) return false;
 
@@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase)
   cmd += addUserId();
 
   status = 0;
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
 
-  if (exiStatus != 0)
+  if (exitqStatus != 0)
     status = ERROR;
 
   return status;
@@ -483,7 +483,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     int eol;
 
     // search the end of the current line
-    eol = output.find( '\n', offset );
+    eol = output.tqfind( '\n', offset );
     if( ( eol == -1 ) || ( eol == offset ) )
       break;
 
@@ -492,7 +492,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     if( !strncmp( output.data() + offset, "pub", 3 ) ||
         !strncmp( output.data() + offset, "sec", 3 ) ||
         !strncmp( output.data() + offset, "sub", 3 ) )
-    { // line tqcontains key data
+    { // line contains key data
       //kdDebug(5100)<<"Key data:\n";
       int pos, pos2;
 
@@ -525,7 +525,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = offset + 4;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyLength( output.mid( pos, pos2-pos ).toUInt() );
       //kdDebug(5100) << "Key Length: "<<subkey->keyLength()<<endl;
 
@@ -534,7 +534,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       while( output[pos] == ' ' )
         pos++;
       pos += 2; // skip the '0x'
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyID( output.mid( pos, pos2-pos ) );
       //kdDebug(5100) << "Key ID: "<<subkey->keyID()<<endl;
 
@@ -542,13 +542,13 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       int year = output.mid( pos, 4 ).toInt();
       int month = output.mid( pos+5, 2 ).toInt();
       int day = output.mid( pos+8, 2 ).toInt();
       TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
       TQDateTime epoch( TQDate( 1970, 01, 01 ), TQTime( 00, 00 ) );
-      // The calculated creation date isn't exactly correct because QDateTime
+      // The calculated creation date isn't exactly correct because TQDateTime
       // doesn't know anything about timezones and always assumes local time
       // although epoch is of course UTC. But as PGP 5 anyway doesn't print
       // the time this doesn't matter too much.
@@ -561,7 +561,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         pos = pos2 + 1;
         while( output[pos] == ' ' )
           pos++;
-        pos2 = output.find( ' ', pos );
+        pos2 = output.tqfind( ' ', pos );
         if( output[pos] == '-' )
         { // key doesn't expire
           subkey->setExpirationDate( -1 );
@@ -595,7 +595,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       if( !strncmp( output.data() + pos, "RSA", 3 ) )
       {
         sign = true;
@@ -647,23 +647,23 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     }
     else if( !strncmp( output.data() + offset, "f16", 3 ) ||
              !strncmp( output.data() + offset, "f20", 3 ) )
-    { // line tqcontains a fingerprint
+    { // line contains a fingerprint
       /* Examples:
          f16    Fingerprint16 = DE 2A 77 08 78 64 7C 42  72 75 B1 A7 3E 42 3F 79
          f20    Fingerprint20 = 226F 4B63 6DA2 7389 91D1  2A49 D58A 3EC1 5214 181E
 
        */
-      int pos = output.find( '=', offset+3 ) + 2;
+      int pos = output.tqfind( '=', offset+3 ) + 2;
       TQCString fingerprint = output.mid( pos, eol-pos );
       // remove white space from the fingerprint
-      for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
+      for ( int idx = 0 ; (idx = fingerprint.tqfind(' ', idx)) >= 0 ; )
 	fingerprint.tqreplace( idx, 1, "" );
       assert( subkey != 0 );
       subkey->setFingerprint( fingerprint );
       //kdDebug(5100)<<"Fingerprint: "<<fingerprint<<endl;
     }
     else if( !strncmp( output.data() + offset, "uid", 3 ) )
-    { // line tqcontains a uid
+    { // line contains a uid
       int pos = offset+5;
       TQCString uid = output.mid( pos, eol-pos );
       key->addUserID( uid );
@@ -678,7 +678,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if ( !strncmp( output.data() + offset, "sig", 3 ) ||
               !strncmp( output.data() + offset, "SIG", 3 ) ||
               !strncmp( output.data() + offset, "ret", 3 ) )
-    { // line tqcontains a signature
+    { // line contains a signature
       // SIG = sig with own key; ret = sig with revoked key
       // we ignore it for now
     }
@@ -700,13 +700,13 @@ Base5::parseSingleKey( const TQCString& output, Key* key /* = 0 */ )
     offset = 0;
   else
   {
-    offset = output.find( "\nType Bits" ) + 1;
+    offset = output.tqfind( "\nType Bits" ) + 1;
     if( offset == 0 )
       return 0;
   }
 
   // key data begins in the next line
-  offset = output.find( '\n', offset ) + 1;
+  offset = output.tqfind( '\n', offset ) + 1;
   if( offset == -1 )
     return 0;
 
@@ -730,13 +730,13 @@ Base5::parseKeyList( const TQCString& output, bool onlySecretKeys )
     offset = 0;
   else
   {
-    offset = output.find( "\nType Bits" ) + 1;
+    offset = output.tqfind( "\nType Bits" ) + 1;
     if( offset == 0 )
       return keys;
   }
 
   // key data begins in the next line
-  offset = output.find( '\n', offset ) + 1;
+  offset = output.tqfind( '\n', offset ) + 1;
   if( offset == -1 )
     return keys;
 
@@ -770,11 +770,11 @@ Base5::parseTrustDataForKey( Key* key, const TQCString& str )
   UserIDList userIDs = key->userIDs();
 
   // search the start of the trust data
-  int offset = str.find( "\n\n  KeyID" ) + 9;
+  int offset = str.tqfind( "\n\n  KeyID" ) + 9;
   if( offset == -1 + 9 )
     return;
 
-  offset = str.find( '\n', offset ) + 1;
+  offset = str.tqfind( '\n', offset ) + 1;
   if( offset == -1 + 1 )
     return;
 
@@ -788,11 +788,11 @@ Base5::parseTrustDataForKey( Key* key, const TQCString& str )
     int eol;
 
     // search the end of the current line
-    if( ( eol = str.find( '\n', offset ) ) == -1 )
+    if( ( eol = str.tqfind( '\n', offset ) ) == -1 )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line tqcontains a validity value for a user ID
+    { // line contains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index fba6d4ec..440ac6e2 100644
--- a/libkpgp/kpgpbase6.cpp
+++ b/libkpgp/kpgpbase6.cpp
@@ -49,32 +49,32 @@ int
 Base6::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+  exitqStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setqStatus( status );
     return status;
   }
 
   // encrypted message
-  if( error.find("File is encrypted.") != -1)
+  if( error.tqfind("File is encrypted.") != -1)
   {
     //kdDebug(5100) << "kpgpbase: message is encrypted" << endl;
     status |= ENCRYPTED;
-    if((index = error.find("Key for user ID")) != -1)
+    if((index = error.tqfind("Key for user ID")) != -1)
     {
       // Find out the key for which the phrase is needed
-      index  = error.find(':', index) + 2;
-      index2 = error.find('\n', index);
+      index  = error.tqfind(':', index) + 2;
+      index2 = error.tqfind('\n', index);
       block.setRequiredUserId( error.mid(index, index2 - index) );
       //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!\n";
 
@@ -90,7 +90,7 @@ Base6::decrypt( Block& block, const char *passphrase )
         status |= ERROR;
       }
     }
-    else if( error.find("You do not have the secret key needed to decrypt this file.") != -1)
+    else if( error.tqfind("You do not have the secret key needed to decrypt this file.") != -1)
     {
       errMsg = i18n("You do not have the secret key for this message.");
       //kdDebug(5100) << "Base: no secret key for this message" << endl;
@@ -123,46 +123,46 @@ Base6::decrypt( Block& block, const char *passphrase )
    * File is signed.  Good signature from user "Joe User <joe@foo.bar>".
    * Signature made 2001/12/05 13:09 GMT
    */
-  if(((index = error.find("File is signed.")) != -1)
-    || (error.find("Good signature") != -1 ))
+  if(((index = error.tqfind("File is signed.")) != -1)
+    || (error.tqfind("Good signature") != -1 ))
   {
     //kdDebug(5100) << "Base: message is signed" << endl;
     status |= SIGNED;
     // determine the signature date
-    if( ( index2 = error.find( "Signature made", index ) ) != -1 )
+    if( ( index2 = error.tqfind( "Signature made", index ) ) != -1 )
     {
       index2 += 15;
-      int eol = error.find( '\n', index2 );
+      int eol = error.tqfind( '\n', index2 );
       block.setSignatureDate( error.mid( index2, eol-index2 ) );
       kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n";
     }
     else
       block.setSignatureDate( TQCString() );
     // determine signature status and signature key
-    if( error.find("signature not checked") != -1)
+    if( error.tqfind("signature not checked") != -1)
     {
-      index = error.find("KeyID:",index);
+      index = error.tqfind("KeyID:",index);
       block.setSignatureKeyId( error.mid(index+9,8) );
-      block.setSignatureUserId( TQString::null );
+      block.setSignatureUserId( TQString() );
       status |= UNKNOWN_SIG;
       status |= GOODSIG;
     }
-    else if((index = error.find("Good signature")) != -1 )
+    else if((index = error.tqfind("Good signature")) != -1 )
     {
       status |= GOODSIG;
       // get signer
-      index = error.find('"',index)+1;
-      index2 = error.find('"', index);
+      index = error.tqfind('"',index)+1;
+      index2 = error.tqfind('"', index);
       block.setSignatureUserId( error.mid(index, index2-index) );
 
       // get key ID of signer
-      index = error.find("KeyID:",index2);
+      index = error.tqfind("KeyID:",index2);
       if (index == -1)
         block.setSignatureKeyId( TQCString() );
       else
         block.setSignatureKeyId( error.mid(index+9,8) );
     }
-    else if( error.find("Can't find the right public key") != -1 )
+    else if( error.tqfind("Can't find the right public key") != -1 )
     {
       // #### fix this hack
       // #### This doesn't happen with PGP 6.5.8 because it seems to
@@ -175,12 +175,12 @@ Base6::decrypt( Block& block, const char *passphrase )
     else
     {
       status |= ERROR;
-      block.setSignatureUserId( TQString::null );
+      block.setSignatureUserId( TQString() );
       block.setSignatureKeyId( TQCString() );
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+  exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
                     "0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+    exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
                       "0x" + keyID, 0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -234,17 +234,17 @@ Base6::publicKeys( const TQStringList & patterns )
 
 
 /*
-QStrList
+TQStrList
 Base6::pubKeys()
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
   int compatibleMode = 1;
 
   status = 0;
-  exiStatus = run("pgp +batchmode +language=C -kv -f");
+  exitqStatus = run("pgp +batchmode +language=C -kv -f");
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -253,28 +253,28 @@ Base6::pubKeys()
   if (error.length() > 1) error.truncate(error.length()-1);
 
   TQStrList publicKeys;
-  index = error.find("bits/keyID",1); // skip first to "\n"
+  index = error.tqfind("bits/keyID",1); // skip first to "\n"
   if (index ==-1)
   {
-    index = error.find("Type bits",1); // skip first to "\n"
+    index = error.tqfind("Type bits",1); // skip first to "\n"
     if (index == -1)
       return 0;
     else
       compatibleMode = 0;
   }
 
-  while( (index = error.find("\n",index)) != -1)
+  while( (index = error.tqfind("\n",index)) != -1)
   {
     //parse line
     TQCString line;
-    if( (index2 = error.find("\n",index+1)) != -1)
+    if( (index2 = error.tqfind("\n",index+1)) != -1)
       // skip last line
     {
       int index3;
       if (compatibleMode)
       {
-        int index_pub = error.find("pub ",index);
-        int index_sec = error.find("sec ",index);
+        int index_pub = error.tqfind("pub ",index);
+        int index_sec = error.tqfind("sec ",index);
         if (index_pub < 0)
           index3 = index_sec;
         else if (index_sec < 0)
@@ -284,8 +284,8 @@ Base6::pubKeys()
       }
       else
       {
-        int index_rsa = error.find("RSA ",index);
-        int index_dss = error.find("DSS ",index);
+        int index_rsa = error.tqfind("RSA ",index);
+        int index_dss = error.tqfind("DSS ",index);
         if (index_rsa < 0)
           index3 = index_dss;
         else if (index_dss < 0)
@@ -301,14 +301,14 @@ Base6::pubKeys()
 	line = line.stripWhiteSpace();
       } else {
 	// line with new key
-	int index4 = error.find(TQRegExp("/\\d{2}/\\d{2} "), index);
+	int index4 = error.tqfind(TQRegExp("/\\d{2}/\\d{2} "), index);
 	line = error.mid(index4+7,index2-index4-7);
       }
       //kdDebug(5100) << "Base: found key for " << (const char *)line << endl;
 
       // don't add PGP's comments to the key list
       if (strncmp(line.data(),"*** KEY EXPIRED ***",19) &&
-          line.find(TQRegExp("^expires \\d{4}/\\d{2}/\\d{2}")) < 0 &&
+          line.tqfind(TQRegExp("^expires \\d{4}/\\d{2}/\\d{2}")) < 0 &&
           strncmp(line.data(),"*** DEFAULT SIGNING KEY ***",27)) {
         publicKeys.append(line);
       }
@@ -319,18 +319,18 @@ Base6::pubKeys()
   }
 
   // Also look for pgp key groups
-  exiStatus = run("pgp +batchmode +language=C -gv -f");
+  exitqStatus = run("pgp +batchmode +language=C -gv -f");
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
 
   index = 0;
-  while ( (index = error.find("\n >", index)) != -1 ) {
+  while ( (index = error.tqfind("\n >", index)) != -1 ) {
     TQCString line;
     index += 4;
-    index2 = error.find(" \"", index);
+    index2 = error.tqfind(" \"", index);
     line = error.mid(index, index2-index+1).stripWhiteSpace();
 
     //kdDebug(5100) << "Base6: found key group for " << line << endl;
@@ -352,17 +352,17 @@ Base6::secretKeys( const TQStringList & patterns )
 int
 Base6::isVersion6()
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
-  exiStatus = run( PGP6, 0, true );
+  exitqStatus = run( PGP6, 0, true );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
     return 0;
   }
 
-  if( error.find("Version 6") != -1)
+  if( error.tqfind("Version 6") != -1)
   {
     //kdDebug(5100) << "kpgpbase: pgp version 6.x detected" << endl;
     return 1;
@@ -399,14 +399,14 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     int eol;
 
     // search the end of the current line
-    if( ( eol = output.find( '\n', offset ) ) == -1 )
+    if( ( eol = output.tqfind( '\n', offset ) ) == -1 )
       break;
 
     //kdDebug(5100) << "Parsing: " << output.mid(offset, eol-offset) << endl;
 
     if( firstLine && ( !strncmp( output.data() + offset, "DSS", 3 ) ||
                        !strncmp( output.data() + offset, "RSA", 3 ) ) )
-    { // line tqcontains primary key data
+    { // line contains primary key data
       // Example 1:
       // RSA  1024      0xE2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -465,7 +465,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = offset + 4;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyLength( output.mid( pos, pos2-pos ).toUInt() );
       //kdDebug(5100) << "Key Length: "<<subkey->keyLength()<<endl;
 
@@ -474,7 +474,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       while( output[pos] == ' ' )
         pos++;
       pos += 2; // skip the '0x'
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       subkey->setKeyID( output.mid( pos, pos2-pos ) );
       //kdDebug(5100) << "Key ID: "<<subkey->keyID()<<endl;
 
@@ -482,13 +482,13 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
       int year = output.mid( pos, 4 ).toInt();
       int month = output.mid( pos+5, 2 ).toInt();
       int day = output.mid( pos+8, 2 ).toInt();
       TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
       TQDateTime epoch( TQDate( 1970, 01, 01 ), TQTime( 00, 00 ) );
-      // The calculated creation date isn't exactly correct because QDateTime
+      // The calculated creation date isn't exactly correct because TQDateTime
       // doesn't know anything about timezones and always assumes local time
       // although epoch is of course UTC. But as PGP 6 anyway doesn't print
       // the time this doesn't matter too much.
@@ -554,7 +554,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if( !strncmp( output.data() + offset, "DSS", 3 ) ||
              !strncmp( output.data() + offset, " DH", 3 ) ||
              !strncmp( output.data() + offset, "RSA", 3 ) )
-    { // line tqcontains secondary key data (or data for the next key)
+    { // line contains secondary key data (or data for the next key)
       if( fpr )
         break; // here begins the next key's data
       //kdDebug(5100)<<"Secondary key data:\n";
@@ -582,19 +582,19 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       pos = offset + 4;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
 
       // Key ID (ignored as it is anyway equal to the primary key id)
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
 
       // Creation Date of secondary key (ignored)
       pos = pos2 + 1;
       while( output[pos] == ' ' )
         pos++;
-      pos2 = output.find( ' ', pos );
+      pos2 = output.tqfind( ' ', pos );
 
       // User ID or key properties
       pos = pos2 + 1;
@@ -639,11 +639,11 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       canEncr = canEncr || encr;
     }
     else if( !strncmp( output.data() + offset, "Unknown type", 12 ) )
-    { // line tqcontains key data of unknown type (ignored)
+    { // line contains key data of unknown type (ignored)
       kdDebug(5100)<<"Unknown key type.\n";
     }
     else if( output[offset] == ' ' )
-    { // line tqcontains additional key data
+    { // line contains additional key data
       if( key == 0 )
         break;
       //kdDebug(5100)<<"Additional key data:\n";
@@ -653,7 +653,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line tqcontains a fingerprint
+      { // line contains a fingerprint
         // Example:
         //           Key fingerprint =  D0 6C BB 3A F5 16 82 C4  F3 A0 8A B3 7B 16 99 70
 
@@ -662,7 +662,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         pos += 18;
         TQCString fingerprint = output.mid( pos, eol-pos );
         // remove white space from the fingerprint
-	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
+	for ( int idx = 0 ; (idx = fingerprint.tqfind(' ', idx)) >= 0 ; )
 	  fingerprint.tqreplace( idx, 1, "" );
 
         //kdDebug(5100)<<"Fingerprint: "<<fingerprint<<endl;
@@ -670,7 +670,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         subkey->setFingerprint( fingerprint );
       }
       else
-      { // line tqcontains an additional user id
+      { // line contains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
@@ -679,7 +679,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       }
     }
     else if( !strncmp( output.data() + offset, "sig", 3 ) )
-    { // line tqcontains signature data (ignored)
+    { // line contains signature data (ignored)
       //kdDebug(5100)<<"Signature.\n";
     }
     else // end of key data
@@ -712,7 +712,7 @@ Base6::parseSingleKey( const TQCString& output, Key* key /* = 0 */ )
     offset = 9;
   else
   {
-    offset = output.find( "\nType bits" );
+    offset = output.tqfind( "\nType bits" );
     if( offset == -1 )
       return 0;
     else
@@ -720,7 +720,7 @@ Base6::parseSingleKey( const TQCString& output, Key* key /* = 0 */ )
   }
 
   // key data begins in the next line
-  offset = output.find( '\n', offset ) + 1;
+  offset = output.tqfind( '\n', offset ) + 1;
   if( offset == 0 )
     return 0;
 
@@ -745,13 +745,13 @@ Base6::parseKeyList( const TQCString& output, bool secretKeys )
     offset = 0;
   else
   {
-    offset = output.find( "\nType bits" ) + 1;
+    offset = output.tqfind( "\nType bits" ) + 1;
     if( offset == 0 )
       return keys;
   }
 
   // key data begins in the next line
-  offset = output.find( '\n', offset ) + 1;
+  offset = output.tqfind( '\n', offset ) + 1;
   if( offset == -1 )
     return keys;
 
@@ -782,11 +782,11 @@ Base6::parseTrustDataForKey( Key* key, const TQCString& str )
   UserIDList userIDs = key->userIDs();
 
   // search the start of the trust data
-  int offset = str.find( "\n\n  KeyID" );
+  int offset = str.tqfind( "\n\n  KeyID" );
   if( offset == -1 )
     return;
 
-  offset = str.find( '\n', offset ) + 1;
+  offset = str.tqfind( '\n', offset ) + 1;
   if( offset == 0 )
     return;
 
@@ -800,11 +800,11 @@ Base6::parseTrustDataForKey( Key* key, const TQCString& str )
     int eol;
 
     // search the end of the current line
-    if( ( eol = str.find( '\n', offset ) ) == -1 )
+    if( ( eol = str.tqfind( '\n', offset ) ) == -1 )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line tqcontains a validity value for a user ID
+    { // line contains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index 5aa619ec..d9adb11a 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -38,7 +38,7 @@ BaseG::BaseG()
 {
   // determine the version of gpg (the method is equivalent to gpgme's method)
   runGpg( "--version", 0 );
-  int eol = output.find( '\n' );
+  int eol = output.tqfind( '\n' );
   if( eol > 0 ) {
     int pos = output.findRev( ' ', eol - 1 );
     if( pos != -1 ) {
@@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = "--batch --armor --sign --encrypt --textmode";
@@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exiStatus = runGpg(cmd.data(), passphrase);
+  exitqStatus = runGpg(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if( exiStatus != 0 )
+  if( exitqStatus != 0 )
   {
     // this error message is later hopefully overwritten
     errMsg = i18n( "Unknown error." );
@@ -138,11 +138,11 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
     // (expired or revoked key)
     // gpg: 23456789: no info to calculate a trust probability
     // (untrusted key, 23456789 is the key Id of the encryption sub key)
-    while((index = error.find("skipped: ",index)) != -1)
+    while((index = error.tqfind("skipped: ",index)) != -1)
     {
       bad = TRUE;
-      index = error.find('\'',index);
-      int index2 = error.find('\'',index+1);
+      index = error.tqfind('\'',index);
+      int index2 = error.tqfind('\'',index+1);
       badkeys += error.mid(index, index2-index+1) + ", ";
       num++;
     }
@@ -178,14 +178,14 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
     // Example 4 (unusable secret key, sign & encrypt):
     // gpg: skipped `0xAC0EB35D': unusable secret key
     // gpg: [stdin]: sign+encrypt failed: unusable secret key
-    if( error.find("bad passphrase") != -1 )
+    if( error.tqfind("bad passphrase") != -1 )
     {
       errMsg = i18n("Signing failed because the passphrase is wrong.");
       status |= BADPHRASE;
       status |= ERR_SIGNING;
       status |= ERROR;
     }
-    else if( error.find("unusable secret key") != -1 )
+    else if( error.tqfind("unusable secret key") != -1 )
     {
       errMsg = i18n("Signing failed because your secret key is unusable.");
       status |= ERR_SIGNING;
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -208,19 +208,19 @@ int
 BaseG::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = runGpg("--batch --decrypt", passphrase);
-  if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
+  exitqStatus = runGpg("--batch --decrypt", passphrase);
+  if( !output.isEmpty() && ( error.tqfind( "gpg: quoted printable" ) == -1 ) )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("Error running gpg");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setqStatus( status );
     return status;
   }
 
@@ -244,13 +244,13 @@ BaseG::decrypt( Block& block, const char *passphrase )
   // gpg: public key decryption failed: bad passphrase
   // gpg: encrypted with 2048-bit ELG-E key, ID 23456789, created 2000-02-02
   //       "Foo Bar (home) <foo@bar.xyz>"
-  if( error.find( "gpg: encrypted with" ) != -1 )
+  if( error.tqfind( "gpg: encrypted with" ) != -1 )
   {
     //kdDebug(5100) << "kpgpbase: message is encrypted" << endl;
     status |= ENCRYPTED;
-    if( error.find( "\ngpg: decryption failed" ) != -1 )
+    if( error.tqfind( "\ngpg: decryption failed" ) != -1 )
     {
-      if( ( index = error.find( "bad passphrase" ) ) != -1 )
+      if( ( index = error.tqfind( "bad passphrase" ) ) != -1 )
       {
         if( passphrase != 0 )
         {
@@ -270,7 +270,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
           kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!" << endl;
         }
       }
-      else if( error.find( "secret key not available" ) != -1 )
+      else if( error.tqfind( "secret key not available" ) != -1 )
       {
         // no secret key fitting this message
         status |= NO_SEC_KEY;
@@ -283,14 +283,14 @@ BaseG::decrypt( Block& block, const char *passphrase )
 #if 0
     // ##### FIXME: This information is anyway currently not used
     //       I'll change it to always determine the recipients.
-    index = error.find("can only be read by:");
+    index = error.tqfind("can only be read by:");
     if(index != -1)
     {
-      index = error.find('\n',index);
-      int end = error.find("\n\n",index);
+      index = error.tqfind('\n',index);
+      int end = error.tqfind("\n\n",index);
 
       mRecipients.clear();
-      while( (index2 = error.find('\n',index+1)) <= end )
+      while( (index2 = error.tqfind('\n',index+1)) <= end )
       {
 	TQCString item = error.mid(index+1,index2-index-1);
 	item.stripWhiteSpace();
@@ -304,48 +304,48 @@ BaseG::decrypt( Block& block, const char *passphrase )
   // Example 1 (unknown signature key):
   // gpg: Signature made Wed 02 Jan 2002 11:26:33 AM CET using DSA key ID 2E250C64
   // gpg: Can't check signature: public key not found
-  if((index = error.find("Signature made")) != -1)
+  if((index = error.tqfind("Signature made")) != -1)
   {
     //kdDebug(5100) << "Base: message is signed" << endl;
     status |= SIGNED;
     // get signature date and signature key ID
     // Example: Signature made Sun 06 May 2001 03:49:27 PM CEST using DSA key ID 12345678
-    index2 = error.find("using", index+15);
+    index2 = error.tqfind("using", index+15);
     block.setSignatureDate( error.mid(index+15, index2-(index+15)-1) );
     kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n";
-    index2 = error.find("key ID ", index2) + 7;
+    index2 = error.tqfind("key ID ", index2) + 7;
     block.setSignatureKeyId( error.mid(index2,8) );
     kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'\n";
     // move index to start of next line
-    index = error.find('\n', index2)+1;
+    index = error.tqfind('\n', index2)+1;
 
-    if ((error.find("Key matching expected", index) != -1)
-        || (error.find("Can't check signature", index) != -1))
+    if ((error.tqfind("Key matching expected", index) != -1)
+        || (error.tqfind("Can't check signature", index) != -1))
     {
       status |= UNKNOWN_SIG;
       status |= GOODSIG;
-      block.setSignatureUserId( TQString::null );
+      block.setSignatureUserId( TQString() );
     }
-    else if( error.find("Good signature", index) != -1 )
+    else if( error.tqfind("Good signature", index) != -1 )
     {
       status |= GOODSIG;
       // get the primary user ID of the signer
-      index = error.find('"',index);
-      index2 = error.find('\n',index+1);
+      index = error.tqfind('"',index);
+      index2 = error.tqfind('\n',index+1);
       index2 = error.findRev('"', index2-1);
       block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
     }
-    else if( error.find("BAD signature", index) != -1 )
+    else if( error.tqfind("BAD signature", index) != -1 )
     {
       //kdDebug(5100) << "BAD signature" << endl;
       status |= ERROR;
       // get the primary user ID of the signer
-      index = error.find('"',index);
-      index2 = error.find('\n',index+1);
+      index = error.tqfind('"',index);
+      index2 = error.tqfind('\n',index+1);
       index2 = error.findRev('"', index2-1);
       block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
     }
-    else if( error.find("Can't find the right public key", index) != -1 )
+    else if( error.tqfind("Can't find the right public key", index) != -1 )
     {
       // #### fix this hack
       // I think this can't happen anymore because if the pubring is missing
@@ -357,11 +357,11 @@ BaseG::decrypt( Block& block, const char *passphrase )
     else
     {
       status |= ERROR;
-      block.setSignatureUserId( TQString::null );
+      block.setSignatureUserId( TQString() );
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
   if( readTrust )
-    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+    exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
   else
-    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+    exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -389,7 +389,7 @@ BaseG::readPublicKey( const KeyID& keyID,
   if( !strncmp( output.data(), "pub:", 4 ) )
     offset = 0;
   else {
-    offset = output.find( "\npub:" );
+    offset = output.tqfind( "\npub:" );
     if( offset == -1 )
       return 0;
     else
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
 KeyList
 BaseG::publicKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = runGpg( cmd, 0, true );
+  exitqStatus = runGpg( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
 KeyList
 BaseG::secretKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = runGpg( cmd, 0, true );
+  exitqStatus = runGpg( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -470,7 +470,7 @@ int
 BaseG::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   cmd = "--batch";
   cmd += addUserId();
@@ -478,27 +478,27 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
   cmd += keyID;
 
   status = 0;
-  exiStatus = runGpg(cmd.data(), passphrase);
+  exitqStatus = runGpg(cmd.data(), passphrase);
 
-  if (exiStatus != 0)
+  if (exitqStatus != 0)
     status = ERROR;
 
   return status;
 }
 
 
-QCString
+TQCString
 BaseG::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+  exitqStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -536,13 +536,13 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
   {
     int eol;
     // search the end of the current line
-    if( ( eol = output.find( '\n', index ) ) == -1 )
+    if( ( eol = output.tqfind( '\n', index ) ) == -1 )
       break;
 
     bool bIsPublicKey = false;
     if( ( bIsPublicKey = !strncmp( output.data() + index, "pub:", 4 ) )
         || !strncmp( output.data() + index, "sec:", 4 ) )
-    { // line tqcontains primary key data
+    { // line contains primary key data
       // Example: pub:f:1024:17:63CB691DFAEBD5FC:860451781::379:-:::scESC:
 
       // abort parsing if we found the start of the next key
@@ -555,7 +555,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       Subkey *subkey = new Subkey( TQCString(), !bIsPublicKey );
 
       int pos = index + 4; // begin of 2nd field
-      int pos2 = output.find( ':', pos );
+      int pos2 = output.tqfind( ':', pos );
       for( int field = 2; field <= 12; field++ )
       {
         switch( field )
@@ -652,18 +652,18 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           break;
         }
         pos = pos2 + 1;
-        pos2 = output.find( ':', pos );
+        pos2 = output.tqfind( ':', pos );
       }
       key->addSubkey( subkey );
     }
     else if( !strncmp( output.data() + index, "uid:", 4 ) )
-    { // line tqcontains a user id
+    { // line contains a user id
       // Example: uid:f::::::::Philip R. Zimmermann <prz@pgp.com>:
 
       UserID *userID = new UserID( "" );
 
       int pos = index + 4; // begin of 2nd field
-      int pos2 = output.find( ':', pos );
+      int pos2 = output.tqfind( ':', pos );
       for( int field=2; field <= 10; field++ )
       {
         switch( field )
@@ -713,7 +713,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           // tqreplace "\xXX" with the corresponding character;
           // other escaped characters, i.e. \n, \r etc., are ignored
           // because they shouldn't appear in user IDs
-          for ( int idx = 0 ; (idx = uid.find( "\\x", idx )) >= 0 ; ++idx ) {
+          for ( int idx = 0 ; (idx = uid.tqfind( "\\x", idx )) >= 0 ; ++idx ) {
             char str[2] = "x";
             str[0] = (char) TQString( uid.mid( idx + 2, 2 ) ).toShort( 0, 16 );
             uid.tqreplace( idx, 4, str );
@@ -785,14 +785,14 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           break;
         }
         pos = pos2 + 1;
-        pos2 = output.find( ':', pos );
+        pos2 = output.tqfind( ':', pos );
       }
 
       // user IDs are printed in UTF-8 by gpg (if one uses --with-colons)
       key->addUserID( userID );
     }
     else if( !strncmp( output.data() + index, "fpr:", 4 ) )
-    { // line tqcontains a fingerprint
+    { // line contains a fingerprint
       // Example: fpr:::::::::17AFBAAF21064E513F037E6E63CB691DFAEBD5FC:
 
       if (key == 0) // invalid key data
@@ -801,8 +801,8 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       // search the fingerprint (it's in the 10th field)
       int pos = index + 4;
       for( int i = 0; i < 8; i++ )
-        pos = output.find( ':', pos ) + 1;
-      int pos2 = output.find( ':', pos );
+        pos = output.tqfind( ':', pos ) + 1;
+      int pos2 = output.tqfind( ':', pos );
 
       key->setFingerprint( keyID, output.mid( pos, pos2-pos ) );
     }
@@ -830,9 +830,9 @@ BaseG::parseKeyList( const TQCString& output, bool secretKeys )
     offset = 0;
   else {
     if( secretKeys )
-      offset = output.find( "\nsec:" );
+      offset = output.tqfind( "\nsec:" );
     else
-      offset = output.find( "\npub:" );
+      offset = output.tqfind( "\npub:" );
     if( offset == -1 )
       return keys;
     else
diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp
index 9d0a6805..4e5f9239 100644
--- a/libkpgp/kpgpblock.cpp
+++ b/libkpgp/kpgpblock.cpp
@@ -27,7 +27,7 @@ Block::Block( const TQCString& str )
   : mText(str), mProcessedText(), mError(),
     mSignatureUserId(), mSignatureKeyId(), mSignatureDate(),
     mRequiredKey(), mEncryptedFor(),
-    mStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock)
+    mtqStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock)
 {
   mEncryptedFor.setAutoDelete( true );
 }
@@ -41,12 +41,12 @@ Block::reset()
 {
   mProcessedText = TQCString();
   mError = TQCString();
-  mSignatureUserId = TQString::null;
+  mSignatureUserId = TQString();
   mSignatureKeyId = TQCString();
   mSignatureDate = TQCString();
   mRequiredKey = TQCString();
   mEncryptedFor.clear();
-  mStatus = 0;
+  mtqStatus = 0;
   mHasBeenProcessed = false;
 }
 
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index c741062a..bb36e3fd 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -58,7 +58,7 @@ typedef enum {
   NO_SEC_KEY  =  0x0100, 
   MISSINGKEY  =  0x0200,
   CANCEL      =  0x8000
-} MessageStatus;
+} MessagetqStatus;
   
 class Base;
 class Module;
@@ -103,7 +103,7 @@ class KDE_EXPORT Block
   void setProcessedText( const TQCString& str );
 
   int status() const;
-  void seStatus( const int status );
+  void setqStatus( const int status );
 
   BlockType type();
 
@@ -186,14 +186,14 @@ class KDE_EXPORT Block
   TQCString mRequiredKey;
   TQString mRequiredUserId;
   TQStrList mEncryptedFor;
-  int mStatus;
+  int mtqStatus;
   bool mHasBeenProcessed;
   BlockType mType;
 };
 
 // -- inlined member functions ---------------------------------------------
 
-inline QCString
+inline TQCString
 Block::text() const
 {
   if( mHasBeenProcessed )
@@ -216,7 +216,7 @@ Block::setProcessedText( const TQCString& str )
   mHasBeenProcessed = true;
 }
 
-inline QCString
+inline TQCString
 Block::error() const
 {
   return mError;
@@ -231,13 +231,13 @@ Block::setError( const TQCString& str )
 inline int
 Block::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
 inline void
-Block::seStatus( const int status )
+Block::setqStatus( const int status )
 {
-  mStatus = status;
+  mtqStatus = status;
 }
 
 inline BlockType
@@ -248,7 +248,7 @@ Block::type()
   return mType;
 }
 
-inline QString
+inline TQString
 Block::signatureUserId() const
 {
   return mSignatureUserId;
@@ -260,7 +260,7 @@ Block::setSignatureUserId( const TQString& userId )
   mSignatureUserId = userId;
 }
 
-inline QCString
+inline TQCString
 Block::signatureKeyId() const
 {
   return mSignatureKeyId;
@@ -272,7 +272,7 @@ Block::setSignatureKeyId( const TQCString& keyId )
   mSignatureKeyId = keyId;
 }
 
-inline QCString
+inline TQCString
 Block::signatureDate() const
 {
   return mSignatureDate;
@@ -284,7 +284,7 @@ Block::setSignatureDate( const TQCString& date )
   mSignatureDate = date;
 }
 
-inline QString
+inline TQString
 Block::requiredKey() const
 {
   return mRequiredKey;
@@ -296,7 +296,7 @@ Block::setRequiredKey( const TQCString& keyId )
   mRequiredKey = keyId;
 }
 
-inline QString
+inline TQString
 Block::requiredUserId() const
 {
   return mRequiredUserId;
@@ -308,7 +308,7 @@ Block::setRequiredUserId( const TQString& userId )
   mRequiredUserId = userId;
 }
 
-inline const QStrList
+inline const TQStrList
 Block::encryptedFor() const
 {
   return mEncryptedFor;
@@ -317,7 +317,7 @@ Block::encryptedFor() const
 inline bool 
 Block::isEncrypted() const
 {
-  if( mStatus & ENCRYPTED )
+  if( mtqStatus & ENCRYPTED )
     return true;
   return false;
 }
@@ -325,7 +325,7 @@ Block::isEncrypted() const
 inline bool 
 Block::isSigned() const
 {
-  if( mStatus & SIGNED )
+  if( mtqStatus & SIGNED )
     return true;
   return false;
 }
@@ -333,7 +333,7 @@ Block::isSigned() const
 inline bool 
 Block::goodSignature() const
 {
-  if( mStatus & GOODSIG )
+  if( mtqStatus & GOODSIG )
     return true;
   return false;
 }
@@ -342,7 +342,7 @@ Block::goodSignature() const
 inline bool
 Block::unknownSigner() const
 {
-  if( mStatus & UNKNOWN_SIG )
+  if( mtqStatus & UNKNOWN_SIG )
     return true;
   return false;
 }
diff --git a/libkpgp/kpgpkey.cpp b/libkpgp/kpgpkey.cpp
index 8a8ed48b..b646fdf1 100644
--- a/libkpgp/kpgpkey.cpp
+++ b/libkpgp/kpgpkey.cpp
@@ -209,7 +209,7 @@ bool Key::matchesUserID(const TQString& str, bool cs)
     return false;
   
   for (UserIDListIterator it(mUserIDs); it.current(); ++it) {
-    if (((*it)->text().find(str, 0, cs)) != -1)
+    if (((*it)->text().tqfind(str, 0, cs)) != -1)
       return true;
   }
 
diff --git a/libkpgp/kpgpkey.h b/libkpgp/kpgpkey.h
index a0cf9b62..63d8feb4 100644
--- a/libkpgp/kpgpkey.h
+++ b/libkpgp/kpgpkey.h
@@ -435,7 +435,7 @@ class Key
   /** Constructs a new PGP key with <em>keyid</em> as key ID of the
       primary key and <em>uid</em> as primary user ID. */
   Key( const KeyID& keyid = KeyID(),
-       const TQString& uid = TQString::null,
+       const TQString& uid = TQString(),
        const bool secret = false);
   ~Key();
 
@@ -697,7 +697,7 @@ inline TQString Key::primaryUserID() const
   if (uid)
     return uid->text();
   else
-    return TQString::null;
+    return TQString();
 }
 
 inline KeyID Key::primaryKeyID() const 
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 29456046..11bd7929 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -58,10 +58,10 @@ const int Kpgp::KeySelectionDialog::sCheckSelectionDelay = 250;
 
 namespace Kpgp {
 
-PassphraseDialog::PassphraseDialog( TQWidget *parent,
+PassphraseDialog::PassphraseDialog( TQWidget *tqparent,
                                     const TQString &caption, bool modal,
                                     const TQString &keyID )
-  :KDialogBase( parent, 0, modal, caption, Ok|Cancel )
+  :KDialogBase( tqparent, 0, modal, caption, Ok|Cancel )
 {
   TQHBox *hbox = makeHBoxMainWidget();
   hbox->setSpacing( spacingHint() );
@@ -104,8 +104,8 @@ const char * PassphraseDialog::passphrase()
 // ------------------------------------------------------------------------
 // Forbidden accels for KMail: AC GH OP
 //                  for KNode: ACE H O
-Config::Config( TQWidget *parent, const char *name, bool encrypt )
-  : TQWidget( parent, name ), pgp( Module::getKpgp() )
+Config::Config( TQWidget *tqparent, const char *name, bool encrypt )
+  : TQWidget( tqparent, name ), pgp( Module::getKpgp() )
 {
   TQGroupBox * group;
   TQLabel    * label;
@@ -116,7 +116,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
 
   group = new TQVGroupBox( i18n("Warning"), this );
   group->tqlayout()->setSpacing( KDialog::spacingHint() );
-  // (mmutz) work around Qt label bug in 3.0.0 (and possibly later):
+  // (mmutz) work around TQt label bug in 3.0.0 (and possibly later):
   // 1. Don't use rich text: No <qt><b>...</b></qt>
   label = new TQLabel( i18n("Please check if encryption really "
   	"works before you start using it seriously. Also note that attachments "
@@ -205,7 +205,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
     msg = i18n( "<qt><p>When this option is enabled, the application will "
 		"always show you a list of public keys from which you can "
 		"choose the one it will use for encryption. If it is off, "
-		"the application will only show the dialog if it cannot find "
+		"the application will only show the dialog if it cannot tqfind "
 		"the right key or if there are several which could be used. "
 		"</p></qt>" );
     TQWhatsThis::add( showKeyApprovalDlg, msg );
@@ -286,9 +286,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
                                         const bool rememberChoice,
                                         const unsigned int allowedKeys,
                                         const bool extendedSelection,
-                                        TQWidget *parent, const char *name,
+                                        TQWidget *tqparent, const char *name,
                                         bool modal )
-  : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ),
+  : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel, Ok ),
     mRememberCB( 0 ),
     mAllowedKeys( allowedKeys ),
     mCurrentContextMenuItem( 0 )
@@ -368,7 +368,7 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
     slotCheckSelection( lvi );
   }
   // make sure that the selected item is visible
-  // (ensureItemVisible(...) doesn't work correctly in Qt 3.0.0)
+  // (ensureItemVisible(...) doesn't work correctly in TQt 3.0.0)
   if( lvi != 0 )
     mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) );
 
@@ -542,13 +542,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
   dt.setTime_t( key->creationDate() );
   if( remark.isEmpty() ) {
     return " " + i18n("creation date and status of an OpenPGP key",
-                      "Creation date: %1, Status: %2")
+                      "Creation date: %1, tqStatus: %2")
                      .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
                      .arg( status );
   }
   else {
     return " " + i18n("creation date, status and remark of an OpenPGP key",
-                      "Creation date: %1, Status: %2 (%3)")
+                      "Creation date: %1, tqStatus: %2 (%3)")
                      .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
                      .arg( status )
                      .arg( remark );
@@ -670,8 +670,8 @@ void KeySelectionDialog::updateKeyInfo( const Kpgp::Key* key,
     return;
   }
 
-  if( lvi->parent() != 0 ) {
-    lvi = lvi->parent();
+  if( lvi->tqparent() != 0 ) {
+    lvi = lvi->tqparent();
   }
 
   if( 0 == key ) {
@@ -788,8 +788,8 @@ KeySelectionDialog::getKeyId( const TQListViewItem* lvi ) const
   KeyID keyId;
 
   if( 0 != lvi ) {
-    if( 0 != lvi->parent() ) {
-      keyId = lvi->parent()->text(0).local8Bit();
+    if( 0 != lvi->tqparent() ) {
+      keyId = lvi->tqparent()->text(0).local8Bit();
     }
     else {
       keyId = lvi->text(0).local8Bit();
@@ -1158,9 +1158,9 @@ void KeySelectionDialog::showAllItems()
 }
 
 // ------------------------------------------------------------------------
-KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
+KeyRequester::KeyRequester( TQWidget * tqparent, bool multipleKeys,
 			    unsigned int allowedKeys, const char * name )
-  : TQWidget( parent, name ),
+  : TQWidget( tqparent, name ),
     mDialogCaption( i18n("OpenPGP Key Selection") ),
     mDialogMessage( i18n("Please select an OpenPGP key to use.") ),
     mMulti( multipleKeys ),
@@ -1268,9 +1268,9 @@ void KeyRequester::setAllowedKeys( int allowedKeys ) {
 }
 
 
-PublicKeyRequester::PublicKeyRequester( TQWidget * parent, bool multi,
+PublicKeyRequester::PublicKeyRequester( TQWidget * tqparent, bool multi,
 					unsigned int allowed, const char * name )
-  : KeyRequester( parent, multi, allowed & ~SecretKeys, name )
+  : KeyRequester( tqparent, multi, allowed & ~SecretKeys, name )
 {
 
 }
@@ -1281,12 +1281,12 @@ PublicKeyRequester::~PublicKeyRequester() {
 
 KeyIDList PublicKeyRequester::keyRequestHook( Module * pgp ) const {
   assert( pgp );
-  return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString::null, mAllowedKeys );
+  return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString(), mAllowedKeys );
 }
 
-SecretKeyRequester::SecretKeyRequester( TQWidget * parent, bool multi,
+SecretKeyRequester::SecretKeyRequester( TQWidget * tqparent, bool multi,
 					unsigned int allowed, const char * name )
-  : KeyRequester( parent, multi, allowed & ~PublicKeys, name )
+  : KeyRequester( tqparent, multi, allowed & ~PublicKeys, name )
 {
 
 }
@@ -1310,9 +1310,9 @@ KeyIDList SecretKeyRequester::keyRequestHook( Module * pgp ) const {
 KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
                                       const TQValueVector<KeyIDList>& keyIDs,
                                       const int allowedKeys,
-                                      TQWidget *parent, const char *name,
+                                      TQWidget *tqparent, const char *name,
                                       bool modal )
-  : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"),
+  : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"),
                  Ok|Cancel, Ok ),
     mKeys( keyIDs ),
     mAllowedKeys( allowedKeys ),
@@ -1614,9 +1614,9 @@ KeyApprovalDialog::slotCancel()
 
 // ------------------------------------------------------------------------
 CipherTextDialog::CipherTextDialog( const TQCString & text,
-                                    const TQCString & charset, TQWidget *parent,
+                                    const TQCString & charset, TQWidget *tqparent,
                                     const char *name, bool modal )
-  :KDialogBase( parent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok)
+  :KDialogBase( tqparent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok)
 {
   // FIXME (post KDE2.2): show some more info, e.g. the output of GnuPG/PGP
   TQFrame *page = makeMainWidget();
@@ -1674,7 +1674,7 @@ void CipherTextDialog::setMinimumSize()
   }
 #endif
 
-  mEditBox->setMinimumWidth( QMIN( textWidth, maxWidth ) );
+  mEditBox->setMinimumWidth( TQMIN( textWidth, maxWidth ) );
 }
 
 void KeyRequester::virtual_hook( int, void* ) {}
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 8cb41953..1c24373a 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -55,10 +55,11 @@ class KeyIDList;            // needed by KeySelectionDialog
 class KDE_EXPORT PassphraseDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PassphraseDialog( TQWidget *parent=0, const TQString &caption=TQString::null,
-                      bool modal=true, const TQString &keyID=TQString::null);
+    PassphraseDialog( TQWidget *tqparent=0, const TQString &caption=TQString(),
+                      bool modal=true, const TQString &keyID=TQString());
     virtual ~PassphraseDialog();
 
     const char * passphrase();
@@ -72,12 +73,13 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase
 /** a widget for configuring the pgp interface. Can be included into
     a tabdialog. This widget by itself does not provide an apply/cancel
     button mechanism. */
-class KDE_EXPORT Config : public QWidget
+class KDE_EXPORT Config : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    Config(TQWidget *parent = 0, const char *name = 0, bool encrypt =true);
+    Config(TQWidget *tqparent = 0, const char *name = 0, bool encrypt =true);
     virtual ~Config();
 
     virtual void setValues();
@@ -102,6 +104,7 @@ class KDE_EXPORT Config : public QWidget
 class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
 {
   Q_OBJECT
+  TQ_OBJECT
 
   enum TrustCheckMode { NoExpensiveTrustCheck,
                         AllowExpensiveTrustCheck,
@@ -113,12 +116,12 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
      */
     KeySelectionDialog( const KeyList& keyList,
                         const TQString& title,
-                        const TQString& text = TQString::null,
+                        const TQString& text = TQString(),
                         const KeyIDList& keyIds = KeyIDList(),
                         const bool rememberChoice = false,
                         const unsigned int allowedKeys = AllKeys,
                         const bool extendedSelection = false,
-                        TQWidget *parent=0, const char *name=0,
+                        TQWidget *tqparent=0, const char *name=0,
                         bool modal=true );
     virtual ~KeySelectionDialog();
 
@@ -198,12 +201,13 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
   static const int sCheckSelectionDelay;
 };
 
-class KDE_EXPORT KeyRequester: public QWidget
+class KDE_EXPORT KeyRequester: public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KeyRequester( TQWidget * parent=0, bool multipleKeys=false,
+  KeyRequester( TQWidget * tqparent=0, bool multipleKeys=false,
 		unsigned int allowedKeys=AllKeys, const char * name=0 );
   virtual ~KeyRequester();
 
@@ -252,8 +256,9 @@ protected:
 
 class KDE_EXPORT PublicKeyRequester : public KeyRequester {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
+  PublicKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false,
 		      unsigned int allowedKeys=PublicKeys, const char * name=0 );
   virtual ~PublicKeyRequester();
 
@@ -271,8 +276,9 @@ protected:
 
 class KDE_EXPORT SecretKeyRequester : public KeyRequester {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
+  SecretKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false,
 		      unsigned int allowedKeys=SecretKeys, const char * name=0 );
   virtual ~SecretKeyRequester();
 
@@ -292,12 +298,13 @@ protected:
 class KDE_EXPORT KeyApprovalDialog: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KeyApprovalDialog( const TQStringList&,
                        const TQValueVector<KeyIDList>&,
                        const int allowedKeys,
-                       TQWidget *parent = 0, const char *name = 0,
+                       TQWidget *tqparent = 0, const char *name = 0,
                        bool modal = true );
     virtual ~KeyApprovalDialog() {};
 
@@ -327,10 +334,11 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase
 class KDE_EXPORT CipherTextDialog: public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     CipherTextDialog( const TQCString & text, const TQCString & charset=0,
-                      TQWidget *parent=0, const char *name=0, bool modal=true );
+                      TQWidget *tqparent=0, const char *name=0, bool modal=true );
     virtual ~CipherTextDialog() {};
 
   private:
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index a974f264..01ca1f02 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -217,7 +217,7 @@ void ExchangeAccount::calcFolderURLs()
 {
   kdDebug() << "ExchangeAccount::calcFolderURLs" << endl;
   TQDomDocument doc;
-  TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
+  TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
   TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
   addElement( doc, prop, "urn:schemas:httpmail:", "calendar" );
 // For later use:
@@ -299,13 +299,13 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
   TQString tmpFile;
   if ( !KIO::NetAccess::download( url, tmpFile, 0 ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to download " << url.prettyURL() << endl;
-    return TQString::null;
+    return TQString();
   }
   TQFile file( tmpFile );
   if ( !file.open( IO_ReadOnly ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to open temp file " << tmpFile << endl;
     KIO::NetAccess::removeTempFile( tmpFile );
-    return TQString::null;
+    return TQString();
   }
 
   TQTextStream stream( &file );
@@ -313,10 +313,10 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
   TQString result;
   while ( !stream.eof() ) {
       line = stream.readLine(); // line of text excluding '\n'
-      int pos = line.find( "<BASE href=\"", 0, FALSE );
+      int pos = line.tqfind( "<BASE href=\"", 0, FALSE );
       if ( pos < 0 )
         continue;
-      int end = line.find( "\"", pos+12, FALSE );
+      int end = line.tqfind( "\"", pos+12, FALSE );
       if ( pos < 0 ) {
         kdWarning() << "Strange, found no closing quote in " << line << endl;
         continue;
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 244fc944..3dfc266d 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -32,13 +32,14 @@
 
 namespace KPIM {
 	
-class KDE_EXPORT ExchangeAccount : public QObject
+class KDE_EXPORT ExchangeAccount : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ExchangeAccount( const TQString &host, const TQString &port,
                      const TQString &account, const TQString &password,
-                     const TQString &mailbox = TQString::null );
+                     const TQString &mailbox = TQString() );
     /** 
      Create a new account object, read data from group app data
      */
@@ -63,7 +64,7 @@ class KDE_EXPORT ExchangeAccount : public QObject
     KURL baseURL();
     KURL calendarURL();
 
-    // Returns the mailbox URL of this user. TQString::null if unsuccessful
+    // Returns the mailbox URL of this user. TQString() if unsuccessful
     static TQString tryFindMailbox( const TQString &host, const TQString &port,
                                    const TQString &user,
                                    const TQString &password );
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 1047f36e..cc84822e 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -100,7 +100,7 @@ void ExchangeClient::test()
   TQString query = 
   "<propfind xmlns=\"DAV:\" xmlns:h=\"urn:schemas:httpmail:\">\r\n"
   "  <allprop/>\r\n"
-  "</propfind>\r\n";
+  "</proptqfind>\r\n";
 
   KIO::DavJob* job = new KIO::DavJob( url, (int) KIO::DAV_PROPFIND, query, false );
   job->addMetaData( "davDepth", "0" );
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index 2a1e6b50..056bcaa1 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -47,8 +47,9 @@ class ExchangeDelete;
 
 class KDE_EXPORT ExchangeClient : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExchangeClient( ExchangeAccount* account, const TQString& mTimeZoneId=TQString::null );
+    ExchangeClient( ExchangeAccount* account, const TQString& mTimeZoneId=TQString() );
     ~ExchangeClient();
 
     /**
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index f88b22ef..eecfbd7f 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -115,7 +115,7 @@ void ExchangeDelete::slotDeleteResult( KIO::Job* job )
     emit finished( this, ExchangeClient::CommunicationError, "IO Error: " + TQString::number(job->error()) + ":" + job->errorString() );
     return;
   }
-  emit finished( this, ExchangeClient::ResultOK, TQString::null );
+  emit finished( this, ExchangeClient::ResultOK, TQString() );
 }
 
 #include "exchangedelete.moc"
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index fb91b912..9c82d86b 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -35,6 +35,7 @@ class ExchangeAccount;
 
 class KDE_EXPORT ExchangeDelete : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ExchangeDelete( KCal::Event* event, ExchangeAccount* account, TQWidget* window=0 );
     ~ExchangeDelete();
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 16b1a1a3..a13672d9 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -231,7 +231,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response,
        item = item.nextSibling().toElement() ) {
     //kdDebug() << "Current item:" << item.tagName() << endl;
     TQDomNodeList propstats = item.elementsByTagNameNS( "DAV:", "propstat" );
-    // kdDebug() << "Item has " << propstats.count() << " propstat children" << endl;
+    // kdDebug() << "Item has " << propstats.count() << " propstat tqchildren" << endl;
     for( uint i=0; i < propstats.count(); i++ ) {
       TQDomElement propstat = propstats.item(i).toElement();
       TQDomElement prop = propstat.namedItem( "prop" ).toElement();
@@ -308,7 +308,7 @@ void ExchangeDownload::handleRecurrence( TQString uid )
 void ExchangeDownload::readAppointment( const KURL& url )
 {
   TQDomDocument doc;
-  TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
+  TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
   TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
   addElement( doc, prop, "urn:schemas:calendar:", "uid" );
   addElement( doc, prop, "urn:schemas:calendar:", "timezoneid" );
@@ -401,7 +401,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString lastModified = prop.namedItem( "lastmodified" ).toElement().text();
   if ( !lastModified.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, Qt::ISODate ), localTimeZoneId );
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, TQt::ISODate ), localTimeZoneId );
     event->setLastModified( dt );
     kdDebug() << "Got lastModified:" << lastModified << ", " << dt.toString() << endl;
   }
@@ -436,7 +436,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString created = prop.namedItem( "created" ).toElement().text();
   if ( !created.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( created, Qt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( created, TQt::ISODate ),
                     localTimeZoneId );
     event->setCreated( dt );
     kdDebug() << "got created: " << dt.toString() << endl;
@@ -444,7 +444,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString dtstart = prop.namedItem( "dtstart" ).toElement().text();
   if ( !dtstart.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, Qt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, TQt::ISODate ),
                               localTimeZoneId );
     event->setDtStart( dt );
     kdDebug() << "got dtstart: " << dtstart << " becomes in timezone " << dt.toString() << endl;
@@ -457,7 +457,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString dtend = prop.namedItem( "dtend" ).toElement().text();
   if ( !dtend.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, Qt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, TQt::ISODate ),
                               localTimeZoneId );
     // Outlook thinks differently about floating event timing than libkcal
     if ( floats ) dt = dt.addDays( -1 );
@@ -510,7 +510,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
   list = exdate.elementsByTagNameNS( "xml:", "v" );
   for( uint i=0; i < list.count(); i++ ) {
     TQDomElement item = list.item(i).toElement();
-    TQDate date = utcAsZone( TQDateTime::fromString( item.text(), Qt::ISODate ), localTimeZoneId ).date();
+    TQDate date = utcAsZone( TQDateTime::fromString( item.text(), TQt::ISODate ), localTimeZoneId ).date();
     exdates.append( date );
     // kdDebug() << "Got exdate: " << date.toString() << endl;
   }
@@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
   if ( mCalendar ) {
     KCal::Event *oldEvent = mCalendar->event( event->uid() );
     if ( oldEvent ) {
-      kdWarning() << "Already got his event, tqreplace it..." << endl;
+      kdWarning() << "Already got his event, replace it..." << endl;
       mCalendar->deleteEvent( oldEvent );
     }
     kdDebug() << "ADD EVENT" << endl;
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index 6eab9f56..9993a56f 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -37,6 +37,7 @@ class ExchangeAccount;
 
 class ExchangeDownload : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ExchangeDownload( ExchangeAccount* account, TQWidget* window=0 );
    ~ExchangeDownload();
@@ -62,7 +63,7 @@ class ExchangeDownload : public TQObject {
     void handleAppointments( const TQDomDocument &, bool recurrence );
     void readAppointment( const KURL& url );
     void handleRecurrence( TQString uid );
-    void finishUp( int result, const TQString& moreInfo=TQString::null );
+    void finishUp( int result, const TQString& moreInfo=TQString() );
     void finishUp( int result, KIO::Job* job );
 
     void increaseDownloads();
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index ae33a369..ddb95313 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -129,7 +129,7 @@ ExchangeMonitor::~ExchangeMonitor()
   if ( ! mSubscriptionMap.isEmpty() ) {
     TQString headers = "Subscription-ID: " + makeIDString( mSubscriptionMap.keys() );
     kdDebug() << "Subsubscribing all watches, headers:" << endl << headers << endl;
-    KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString::null, false );
+    KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
     job->addMetaData( "customHTTPHeader", headers );
     // Can't do, this is a destructor!
     // job->addMetaData( "PropagateHttpHeader", "true" );
@@ -158,7 +158,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth )
   kdDebug() << "Headers: " << headers << endl;
 
   KURL myURL = toDAV( url );
-  KIO::DavJob *job = new KIO::DavJob( myURL, (int) KIO::DAV_SUBSCRIBE, TQString::null, false );
+  KIO::DavJob *job = new KIO::DavJob( myURL, (int) KIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", headers );
   job->addMetaData( "PropagateHttpHeader", "true" );
   connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotSubscribeResult(KIO::Job *)));
@@ -179,7 +179,7 @@ void ExchangeMonitor::removeWatch( const KURL &url )
 
 void ExchangeMonitor::removeWatch( ID id )
 {
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString::null, false );
+  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id ));
   job->addMetaData( "PropagateHttpHeader", "true" );
   connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(KIO::Job *)));
@@ -200,7 +200,7 @@ void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
 
   TQStringList headers = TQStringList::split( "\n", job->queryMetaData( "HTTP-Headers" ) );
   for ( TQStringList::Iterator it = headers.begin(); it != headers.end(); ++it ) {
-    int colon = (*it).find( ": " );
+    int colon = (*it).tqfind( ": " );
     if ( colon<0 ) continue;
     TQString tag = (*it).left( colon ).stripWhiteSpace().lower();
     TQString value = (*it).mid( colon+1 ).stripWhiteSpace();
@@ -321,7 +321,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) {
 //  }
 
   // confirm it
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_POLL, TQString::null, false );
+  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_POLL, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) );
   connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotPollResult(KIO::Job *)));
 }
@@ -366,7 +366,7 @@ void ExchangeMonitor::slotRenewTimer()
 {
   kdDebug() << "ExchangeMonitor::slotRenewTimer()" << endl;
 
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_SUBSCRIBE, TQString::null, false );
+  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) );
   connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotRenewResult(KIO::Job *)));
 }
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index e70053bf..773f65f0 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -41,6 +41,7 @@ class ExchangeAccount;
 
 class ExchangeMonitor : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     typedef long ID;
     typedef TQValueList<ID> IDList;
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index bee71b57..84be823a 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -33,8 +33,8 @@
 #include "exchangeprogress.h"
 using namespace KPIM;
 
-ExchangeProgress::ExchangeProgress(TQWidget *parent)
-  : KProgressDialog(parent, "", i18n("Exchange Download Progress"), i18n("Exchange Plugin"), "text" )
+ExchangeProgress::ExchangeProgress(TQWidget *tqparent)
+  : KProgressDialog(tqparent, "", i18n("Exchange Download Progress"), i18n("Exchange Plugin"), "text" )
 {
   m_finished = 0;
   m_total = 0;  
diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h
index a2fd05a4..17438c18 100644
--- a/libkpimexchange/core/exchangeprogress.h
+++ b/libkpimexchange/core/exchangeprogress.h
@@ -29,9 +29,10 @@ namespace KPIM {
 class ExchangeProgress : public KProgressDialog
 {
   Q_OBJECT
+  TQ_OBJECT
   
   public:
-    ExchangeProgress(TQWidget *parent=0);
+    ExchangeProgress(TQWidget *tqparent=0);
     virtual ~ExchangeProgress();
     
   public slots:
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index f62d6a32..6582e57e 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -139,7 +139,7 @@ void ExchangeUpload::tryExist()
   kdDebug() << "Trying to see whether " << url.prettyURL() << " exists" << endl;
  
   TQDomDocument doc;
-  TQDomElement root = addElement( doc, doc, "DAV:", "propfind" );
+  TQDomElement root = addElement( doc, doc, "DAV:", "proptqfind" );
   TQDomElement prop = addElement( doc, root, "DAV:", "prop" );
   addElement( doc, prop, "DAV:", "displayname" );
   addElement( doc, prop, "urn:schemas:calendar", "uid" );
@@ -262,11 +262,11 @@ void ExchangeUpload::startUpload( const KURL &url )
   kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
 
   addElement( doc, prop, "urn:schemas:calendar:", "dtstart", 
-      zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
+      zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
   //    event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzzZ" ) );
   //    2002-06-04T08:00:00.000Z" );
   addElement( doc, prop, "urn:schemas:calendar:", "dtend", 
-      zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
+      zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
 #if 0
   addElement( doc, prop, "urn:schemas:calendar:", "dtstart", 
       event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzz" )+ offsetString );
@@ -275,7 +275,7 @@ void ExchangeUpload::startUpload( const KURL &url )
   addElement( doc, prop, "urn:schemas:calendar:", "dtend", 
       event->dtEnd().toString( "yyyy-MM-ddThh:mm:ss.zzz" ) + offsetString );
 #endif
-  addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( Qt::ISODate )+"Z" );
+  addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( TQt::ISODate )+"Z" );
 
 //  addElement( doc, prop, "urn:schemas:calendar:", "meetingstatus", "confirmed" );
   addElement( doc, prop, "urn:schemas:httpmail:", "textdescription", event->description() );
@@ -308,7 +308,7 @@ void ExchangeUpload::startUpload( const KURL &url )
     KCal::DateList::iterator it;
     for ( it = exdates.begin(); it != exdates.end(); ++it ) {
       TQString date = (*it).toString( "yyyy-MM-ddT00:00:00.000" )+ offsetString;
-//      TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( Qt::ISODate );
+//      TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( TQt::ISODate );
       addElement( doc, exdate, "xml:", "v", date );
     }
   }
@@ -365,7 +365,7 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
     emit finished( this, ExchangeClient::EventWriteError,
                    "Upload error response: \n" + response.toString() ); 
   else 
-    emit finished( this, ExchangeClient::ResultOK, TQString::null );
+    emit finished( this, ExchangeClient::ResultOK, TQString() );
 }
 
 #include "exchangeupload.moc"
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index 953451a8..f2ab403c 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -35,6 +35,7 @@ class ExchangeAccount;
 
 class KDE_EXPORT ExchangeUpload : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ExchangeUpload( KCal::Event* event, ExchangeAccount* account, const TQString& timeZoneId, TQWidget* window=0 );
     ~ExchangeUpload();
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index 62eeba75..0855f8c3 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -63,7 +63,7 @@ TQString Signature::rawText( bool * ok ) const
   switch ( mType ) {
   case Disabled:
     if ( ok ) *ok = true;
-    return TQString::null;
+    return TQString();
   case Inlined:
     if ( ok ) *ok = true;
     return mText;
@@ -73,7 +73,7 @@ TQString Signature::rawText( bool * ok ) const
     return textFromCommand( ok );
   };
   kdFatal( 5006 ) << "Signature::type() returned unknown value!" << endl;
-  return TQString::null; // make compiler happy
+  return TQString(); // make compiler happy
 }
 
 TQString Signature::textFromCommand( bool * ok ) const
@@ -83,7 +83,7 @@ TQString Signature::textFromCommand( bool * ok ) const
   // handle pathological cases:
   if ( mUrl.isEmpty() ) {
     if ( ok ) *ok = true;
-    return TQString::null;
+    return TQString();
   }
 
   // create a shell process:
@@ -104,7 +104,7 @@ TQString Signature::textFromCommand( bool * ok ) const
     TQString wmsg = i18n("<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>")
       .arg( mUrl ).arg( strerror(rc) );
     KMessageBox::error(0, wmsg);
-    return TQString::null;
+    return TQString();
   }
 
   // no errors:
@@ -126,7 +126,7 @@ TQString Signature::textFromFile( bool * ok ) const
                                       && TQFileInfo(mUrl).exists()) ) {
     kdDebug( 5006 ) << "Signature::textFromFile: non-local URLs are unsupported" << endl;
     if ( ok ) *ok = false;
-    return TQString::null;
+    return TQString();
   }
   if ( ok ) *ok = true;
   // ### hmm, should we allow other encodings, too?
@@ -139,14 +139,14 @@ TQString Signature::withSeparator( bool * ok ) const
   TQString signature = rawText( &internalOK );
   if ( !internalOK ) {
     if ( ok ) *ok = false;
-    return TQString::null;
+    return TQString();
   }
   if ( ok ) *ok = true;
   if ( signature.isEmpty() ) return signature; // don't add a separator in this case
   if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
     // already have signature separator at start of sig:
     return TQString::tqfromLatin1("\n") += signature;
-  else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
+  else if ( signature.tqfind( TQString::tqfromLatin1("\n-- \n") ) != -1 )
     // already have signature separator inside sig; don't prepend '\n'
     // to improve abusing signatures as templates:
     return signature;
@@ -528,7 +528,7 @@ TQString Identity::fullEmailAddr(void) const
 
   TQString result;
 
-  // add DQUOTE's if necessary:
+  // add DTQUOTE's if necessary:
   bool needsQuotes=false;
   for (unsigned int i=0; i < mFullName.length(); i++) {
     if ( specials.tqcontains( mFullName[i] ) )
@@ -643,7 +643,7 @@ TQString Identity::signatureText( bool * ok ) const
   // Signature::withSeparator() failed, so we should probably fix the
   // cause:
   if ( ok ) *ok = false;
-  return TQString::null;
+  return TQString();
 
 #if 0 // ### FIXME: error handling
   if (mSignatureFile.endsWith("|"))
@@ -654,5 +654,5 @@ TQString Identity::signatureText( bool * ok ) const
   }
 #endif
 
-  return TQString::null;
+  return TQString();
 }
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 9baba4fa..e4d289c2 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -125,11 +125,11 @@ public:
   }
 
   /** Constructor */
-  explicit Identity( const TQString & id=TQString::null,
-		     const TQString & realName=TQString::null,
-		     const TQString & emailAddr=TQString::null,
-		     const TQString & organization=TQString::null,
-		     const TQString & replyToAddress=TQString::null );
+  explicit Identity( const TQString & id=TQString(),
+		     const TQString & realName=TQString(),
+		     const TQString & emailAddr=TQString(),
+		     const TQString & organization=TQString(),
+		     const TQString & replyToAddress=TQString() );
 
   /** Destructor */
   ~Identity();
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index 55c78e2a..e1ae08b3 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -43,8 +43,8 @@
 
 using namespace KPIM;
 
-IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const char * name )
-  : TQComboBox( false, parent, name ), mIdentityManager( manager )
+IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * tqparent, const char * name )
+  : TQComboBox( false, tqparent, name ), mIdentityManager( manager )
 {
   reloadCombo();
   reloadUoidList();
@@ -70,7 +70,7 @@ void IdentityCombo::setCurrentIdentity( const TQString & name ) {
   if ( idx < 0 ) return;
   if ( idx == currentItem() ) return;
 
-  blockSignals( true ); // just in case Qt gets fixed to emit activated() here
+  blockSignals( true ); // just in case TQt gets fixed to emit activated() here
   setCurrentItem( idx );
   blockSignals( false );
 
@@ -82,7 +82,7 @@ void IdentityCombo::setCurrentIdentity( uint uoid ) {
   if ( idx < 0 ) return;
   if ( idx == currentItem() ) return;
 
-  blockSignals( true ); // just in case Qt gets fixed to emit activated() here
+  blockSignals( true ); // just in case TQt gets fixed to emit activated() here
   setCurrentItem( idx );
   blockSignals( false );
 
@@ -117,7 +117,7 @@ void IdentityCombo::slotIdentityManagerChanged() {
   blockSignals( false );
 
   if ( idx < 0 )
-    // apparently our oldIdentity got deleted:
+    // aptqparently our oldIdentity got deleted:
     slotEmitChanged( currentItem() );
 }
 
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index 0d198521..b76c6cc8 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,8 +50,9 @@ class Identity;
 
 class KDE_EXPORT IdentityCombo : public TQComboBox {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  IdentityCombo( IdentityManager* manager, TQWidget * parent=0, const char * name=0 );
+  IdentityCombo( IdentityManager* manager, TQWidget * tqparent=0, const char * name=0 );
 
   TQString currentIdentityName() const;
   uint currentIdentity() const;
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 939cb704..dd8479d8 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -66,8 +66,8 @@ static TQCString newDCOPObjectName()
     return name;
 }
 
-IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char * name )
-  : ConfigManager( parent, name ), DCOPObject( newDCOPObjectName() )
+IdentityManager::IdentityManager( bool readonly, TQObject * tqparent, const char * name )
+  : ConfigManager( tqparent, name ), DCOPObject( newDCOPObjectName() )
 {
   mReadOnly = readonly;
   mConfig = new KConfig( "emailidentities", readonly );
@@ -117,7 +117,7 @@ void IdentityManager::commit()
   // find added and changed identities:
   for ( TQValueList<Identity>::ConstIterator it = mShadowIdentities.begin() ;
 	it != mShadowIdentities.end() ; ++it ) {
-    TQValueList<uint>::Iterator uoid = seenUOIDs.find( (*it).uoid() );
+    TQValueList<uint>::Iterator uoid = seenUOIDs.tqfind( (*it).uoid() );
     if ( uoid != seenUOIDs.end() ) {
       const Identity & orig = identityForUoid( *uoid ); // look it up in mIdentities
       if ( *it != orig ) {
@@ -326,7 +326,7 @@ Identity & IdentityManager::modifyIdentityForName( const TQString & name )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).identityName() == name ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() tqreplacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() replacement!"
 		    << "\n  name == \"" << name << "\"" << endl;
   return newFromScratch( name );
 }
@@ -335,7 +335,7 @@ Identity & IdentityManager::modifyIdentityForUoid( uint uoid )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).uoid() == uoid ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() tqreplacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() replacement!"
 		    << "\n  uoid == \"" << uoid << "\"" << endl;
   return newFromScratch( i18n("Unnamed") );
 }
@@ -351,7 +351,7 @@ const Identity & IdentityManager::defaultIdentity() const {
 bool IdentityManager::setAsDefault( const TQString & name ) {
   // First, check if the identity actually exists:
   TQStringList names = shadowIdentities();
-  if ( names.find( name ) == names.end() ) return false;
+  if ( names.tqfind( name ) == names.end() ) return false;
   // Then, change the default as requested:
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     (*it).setIsDefault( (*it).identityName() == name );
@@ -448,7 +448,7 @@ void IdentityManager::createDefaultIdentity() {
             emailAddress += '@' + defaultdomain;
           }
           else {
-            emailAddress = TQString::null;
+            emailAddress = TQString();
           }
         }
       }
@@ -488,7 +488,7 @@ int IdentityManager::newUoid()
 
   do {
     uoid = kapp->random();
-  } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() );
+  } while ( usedUOIDs.tqfind( uoid ) != usedUOIDs.end() );
 
   return uoid;
 }
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 4c8587be..f02cca90 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -55,6 +55,7 @@ class IdentityManager : public ConfigManager, public DCOPObject
 #undef IdentityManager
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
 public:
@@ -65,7 +66,7 @@ public:
    * This means in particular that if there is no identity configured,
    * the default identity created here will not be saved.
    */
-  IdentityManager( bool readonly = false, TQObject * parent=0, const char * name=0 );
+  IdentityManager( bool readonly = false, TQObject * tqparent=0, const char * name=0 );
   virtual ~IdentityManager();
 
 public:
@@ -101,7 +102,7 @@ public:
   **/
   const Identity & identityForAddress( const TQString & addresses ) const;
 
-  /** @return true if @p addressList tqcontains any of our addresses,
+  /** @return true if @p addressList contains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
@@ -177,7 +178,7 @@ public:
   Identity & newFromScratch( const TQString & name );
   Identity & newFromControlCenter( const TQString & name );
   Identity & newFromExisting( const Identity & other,
-				const TQString & name=TQString::null );
+				const TQString & name=TQString() );
 
   /** Returns the list of all email addresses (only name@host) from all identities */
   TQStringList allEmails() const;
diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h
index 5dbb3407..1620f29d 100644
--- a/libksieve/impl/lexer.h
+++ b/libksieve/impl/lexer.h
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h
index d337f0f9..dd8b8228 100644
--- a/libksieve/impl/parser.h
+++ b/libksieve/impl/parser.h
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -90,7 +90,7 @@ namespace KSieve {
     bool obtainToken();
     void consumeToken() {
       mToken = Lexer::None;
-      mTokenValue = TQString::null;
+      mTokenValue = TQString();
     }
     void makeError( Error::Type e, int line, int col ) {
       mError = Error( e, line, col );
diff --git a/libksieve/impl/utf8validator.h b/libksieve/impl/utf8validator.h
index aa10bad2..e0f11222 100644
--- a/libksieve/impl/utf8validator.h
+++ b/libksieve/impl/utf8validator.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index de84b204..dc6b63bc 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -107,7 +107,7 @@ namespace KSieve {
     static const char * typeToString( Type type );
 
     Error( Type type=None,
-	   const TQString & s1=TQString::null, const TQString & s2=TQString::null,
+	   const TQString & s1=TQString(), const TQString & s2=TQString(),
 	   int line=-1, int col=-1 )
       : mType( type ), mLine( line ), mCol( col ),
         mStringOne( s1 ), mStringTwo( s2 ) {}
diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h
index 8acb908d..d4dc7a97 100644
--- a/libksieve/ksieve/lexer.h
+++ b/libksieve/ksieve/lexer.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index eadd00ff..26e55a05 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h
index 71100d52..f365adfa 100644
--- a/libksieve/ksieve/scriptbuilder.h
+++ b/libksieve/ksieve/scriptbuilder.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index be0c493f..a38c6102 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -192,7 +192,7 @@ namespace KSieve {
 
   Lexer::Token Lexer::Impl::nextToken( TQString & result ) {
     assert( !atEnd() );
-    result = TQString::null;
+    result = TQString();
     //clearErrors();
 
     const int oldLine = line();
@@ -499,8 +499,8 @@ namespace KSieve {
   }
 
   bool Lexer::Impl::parseNumber( TQString & result ) {
-    // number     := 1*DIGIT [QUANTIFIER]
-    // QUANTIFIER := "K" / "M" / "G"
+    // number     := 1*DIGIT [TQUANTIFIER]
+    // TQUANTIFIER := "K" / "M" / "G"
 
     assert( isdigit( *mState.cursor ) );
 
@@ -592,7 +592,7 @@ namespace KSieve {
 	if ( line == "." )
 	  break;
       } else {
-	lines.push_back( TQString::null );
+	lines.push_back( TQString() );
       }
     }
 
@@ -608,7 +608,7 @@ namespace KSieve {
   }
 
   bool Lexer::Impl::parseQuotedString( TQString & result ) {
-    // quoted-string := DQUOTE *CHAR DQUOTE
+    // quoted-string := DTQUOTE *CHAR DTQUOTE
 
     // check that caller plays by the rules:
     assert( *(mState.cursor-1) == '"' );
diff --git a/libksieve/parser/parser.cpp b/libksieve/parser/parser.cpp
index 0a136e71..e823ac3f 100644
--- a/libksieve/parser/parser.cpp
+++ b/libksieve/parser/parser.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -332,7 +332,7 @@ namespace KSieve {
       return true;
     } else if ( isStringToken() ) {
       if ( scriptBuilder() )
-	scriptBuilder()->stringArgument( tokenValue(), token() == Lexer::MultiLineString, TQString::null );
+	scriptBuilder()->stringArgument( tokenValue(), token() == Lexer::MultiLineString, TQString() );
       consumeToken();
       return true;
     } else if ( token() == Lexer::Special && tokenValue() == "[" ) {
@@ -590,7 +590,7 @@ namespace KSieve {
 	}
 	lastWasComma = false;
 	if ( scriptBuilder() )
-	  scriptBuilder()->stringListEntry( tokenValue(), token() == Lexer::MultiLineString, TQString::null );
+	  scriptBuilder()->stringListEntry( tokenValue(), token() == Lexer::MultiLineString, TQString() );
 	consumeToken();
 	break;
 
diff --git a/libksieve/parser/utf8validator.cpp b/libksieve/parser/utf8validator.cpp
index ac94281e..b8600e7b 100644
--- a/libksieve/parser/utf8validator.cpp
+++ b/libksieve/parser/utf8validator.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index 527370b8..faf20bcc 100644
--- a/libksieve/shared/error.cpp
+++ b/libksieve/shared/error.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -103,7 +103,7 @@ namespace KSieve {
     TQString err;
     switch( type() ) {
     case None:
-      return TQString::null;
+      return TQString();
     case Custom:
       return mStringOne;
 
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index df5ac6e1..43d641fc 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index 9d0d8e14..ea718e4d 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -397,7 +397,7 @@ public:
     write( multiLine ? "string type=\"multiline\"" : "string type=\"quoted\"", string );
   }
   void numberArgument( unsigned long number, char quantifier ) {
-    const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString::null ) ;
+    const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString() ) ;
     write( txt.latin1(), TQString::number( number ) );
   }
   void commandStart( const TQString & identifier ) {
diff --git a/mimelib/LICENSE b/mimelib/LICENSE
index 623b6258..aaf47afb 100644
--- a/mimelib/LICENSE
+++ b/mimelib/LICENSE
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/mimelib/Tutorial b/mimelib/Tutorial
index 358fab7e..25c139ed 100644
--- a/mimelib/Tutorial
+++ b/mimelib/Tutorial
@@ -18,7 +18,7 @@ following objectives in mind:
 MIME++ classes directly model the elements of the BNF grammar specified in
 RFC-822, RFC-2045, and RFC-2046.  For this reason, I recommend that you
 understand these RFCs and keep a copy of them handy as you learn MIME++. 
-If you know C++ well, and if you are familiar with the RFCs, you should find
+If you know C++ well, and if you are familiar with the RFCs, you should tqfind
 MIME++ easy to learn and use.  If you are new to C++ and object-oriented
 programming, you will find in MIME++ some very good object-oriented
 techinques, and hopefully you will learn a lot.
@@ -94,10 +94,10 @@ broken-down representation.  If you add a new DwField object (representing a
 new header field) to the DwHeaders object (representing the header), the
 is-modified flag will be set for the DwHeaders object, indicating that the
 string representation of the DwHeaders object will have to be re-assembled
-from the header fields that it contains.  When a node's is-modified flag is
-set, it also notifies its parent node to set its is-modified flag.  Thus,
+from the header fields that it tqcontains.  When a node's is-modified flag is
+set, it also notifies its tqparent node to set its is-modified flag.  Thus,
 when the DwHeaders object's is-modified flag is set, the DwMessage object
-that is its parent will also have its is-modified flag set.  That way, when
+that is its tqparent will also have its is-modified flag set.  That way, when
 Assemble() is called for the DwMessage object, it will call the Assemble()
 member function for the DwHeaders object, as required.  Notice that the value
 of having an is-modified flag is that it can purge the tree traversal when
@@ -278,7 +278,7 @@ following simple example shows how to accomplish this.
                       cout << fullName << '\n';
                   }
                   else {
-                      // Apparently, there is no full name, so use the email
+                      // Aptqparently, there is no full name, so use the email
                       // address
                       cout << mb->LocalPart() << '@' << mb->Domain() << '\n';
                   }
diff --git a/mimelib/address.cpp b/mimelib/address.cpp
index 6d64abce..b6c830c3 100644
--- a/mimelib/address.cpp
+++ b/mimelib/address.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/addrlist.cpp b/mimelib/addrlist.cpp
index ab444744..3f041f20 100644
--- a/mimelib/addrlist.cpp
+++ b/mimelib/addrlist.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/attach.cpp b/mimelib/attach.cpp
index 27b35dfd..47365785 100644
--- a/mimelib/attach.cpp
+++ b/mimelib/attach.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/attach.h b/mimelib/attach.h
index 1ababc56..f4415e26 100644
--- a/mimelib/attach.h
+++ b/mimelib/attach.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/basicmsg.cpp b/mimelib/basicmsg.cpp
index 2e04a04a..fde3c0f9 100644
--- a/mimelib/basicmsg.cpp
+++ b/mimelib/basicmsg.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/basicmsg.h b/mimelib/basicmsg.h
index eca41518..cc0c42ed 100644
--- a/mimelib/basicmsg.h
+++ b/mimelib/basicmsg.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -25,7 +25,7 @@
 // library easier to use.  Second, it provides good example code to show
 // you how to create your own customized wrapper classes.
 
-// BasicMessage tqcontains a DwMessage by reference.  The reason BasicMessage
+// BasicMessage contains a DwMessage by reference.  The reason BasicMessage
 // "has-a" DwMessage and not "is-a" DwMessage is because we can assign
 // the DwMessage to an appropriately specialized subclass of BasicMessage
 // *after* the DwMessage is parsed.  For example, after we parse a DwMessage,
diff --git a/mimelib/binhex.cpp b/mimelib/binhex.cpp
index db857f72..6ea07961 100644
--- a/mimelib/binhex.cpp
+++ b/mimelib/binhex.cpp
@@ -7,7 +7,7 @@ const char * const kPreamble =
     "(This file must be converted with BinHex 4.0)";
 
 const char kBinhexChars[] =
-  "!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr";
+  "!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPTQRSTUVXYZ[`abcdefhijklmpqr";
 //            1         2         3         4         5         6
 // 0 123456789012345678901234567890123456789012345678901234567890123
 
@@ -662,14 +662,14 @@ int DwBinhex::Decode()
     DwBinhexDecodeCtx ctx;
     ctx.mBinhexChars = mBinhexChars;
 	// Find the preamble
-    ctx.mPos = ctx.mBinhexChars.find("(This file must be converted "
+    ctx.mPos = ctx.mBinhexChars.tqfind("(This file must be converted "
         "with BinHex", 0);
     if (ctx.mPos == DwString::npos) {
         return -1; // error!
     }
     ctx.mPos += 40;
     // Advance to just past the colon
-    ctx.mPos = ctx.mBinhexChars.find((char) ':', ctx.mPos);
+    ctx.mPos = ctx.mBinhexChars.tqfind((char) ':', ctx.mPos);
     if (ctx.mPos == DwString::npos) {
         return -1; // error!
     }
diff --git a/mimelib/body.cpp b/mimelib/body.cpp
index f5a56772..9b2cbf50 100644
--- a/mimelib/body.cpp
+++ b/mimelib/body.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/bodypart.cpp b/mimelib/bodypart.cpp
index fac2bba2..69c6d781 100644
--- a/mimelib/bodypart.cpp
+++ b/mimelib/bodypart.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/boyermor.cpp b/mimelib/boyermor.cpp
index 5ee007ae..13d8f4c9 100644
--- a/mimelib/boyermor.cpp
+++ b/mimelib/boyermor.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/datetime.cpp b/mimelib/datetime.cpp
index 64f2eef2..40536bbb 100644
--- a/mimelib/datetime.cpp
+++ b/mimelib/datetime.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/disptype.cpp b/mimelib/disptype.cpp
index f93dc21b..c1cf36c8 100644
--- a/mimelib/disptype.cpp
+++ b/mimelib/disptype.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/doc/address.html b/mimelib/doc/address.html
index c85046aa..f7eb71fa 100644
--- a/mimelib/doc/address.html
+++ b/mimelib/doc/address.html
@@ -128,16 +128,16 @@ DwAddress(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwAddress</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which copies the string
-representation and all attributes from <B><TT>aAddress</TT></B>. The parent
+representation and all attributes from <B><TT>aAddress</TT></B>. The tqparent
 of the new <B><TT>DwAddress</TT></B> object is set to
 <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwAddress</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -147,7 +147,7 @@ a class derived from <B><TT>DwField</TT></B>.
 (const DwAddress&amp; aAddr) </FONT></B>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aAddr</TT></B>. The parent node of the <B><TT>DwAddress</TT></B> object
+<B><TT>aAddr</TT></B>. The tqparent node of the <B><TT>DwAddress</TT></B> object
 is not changed.
 <P>
 </BODY></HTML>
diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html
index 80845fc0..5a5a413f 100644
--- a/mimelib/doc/addrlist.html
+++ b/mimelib/doc/addrlist.html
@@ -69,16 +69,16 @@ DwAddressList(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwAddressList</TT></B> object's string representation to the empty
-string and sets its parent to <B><TT>NULL</TT></B>.
+string and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which copies the string
 representation and all <B><TT>DwAddress</TT></B> objects from
-<B><TT>aList</TT></B>. The parent of the new
+<B><TT>aList</TT></B>. The tqparent of the new
 <B><TT>DwAddressList</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwAddressList</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -88,7 +88,7 @@ a class derived from <B><TT>DwField</TT></B>.
 =</A> (const DwAddressList&amp; aList) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aList</TT></B>. The parent node of the
+<B><TT>aList</TT></B>. The tqparent node of the
 <B><TT>DwAddressList</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/body.html b/mimelib/doc/body.html
index c9856e24..06a3e822 100644
--- a/mimelib/doc/body.html
+++ b/mimelib/doc/body.html
@@ -65,9 +65,9 @@ protected:
 A body is always part of an <I>entity</I>, which could be either a
 <I>message</I> or a <I>body part</I>. An entity has a collection of <I>header
 fields</I> and a body. If the content type of a body is ``multipart,'' then
-the body tqcontains one or more body parts. If the content type is ``message,''
-then the body tqcontains an encapsulated message. In all content types, the
-body tqcontains a string of characters.
+the body contains one or more body parts. If the content type is ``message,''
+then the body contains an encapsulated message. In all content types, the
+body contains a string of characters.
 <P>
 In MIME++, a <B><TT>DwBody</TT></B> object is contained in a
 <B><TT><A HREF="entity.html">DwEntity</A></TT></B> object. The
@@ -79,15 +79,15 @@ or a single contained
 way to determine the type of <B><TT>DwBody</TT></B> is to access the Content-Type
 header field from the
 <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object of the
-<B><TT>DwEntity</TT></B> that tqcontains it. For this reason, a
+<B><TT>DwEntity</TT></B> that contains it. For this reason, a
 <B><TT>DwBody</TT></B> should always be part of a
 <B><TT>DwEntity</TT></B>.
 <P>
 In the tree (broken-down) representation of a message, a
 <B><TT>DwBody</TT></B> object can be an intermediate node, having both a
-parent node and one or more child nodes, or a leaf node, having a parent
-but no child nodes. In either case, the parent node is the
-<B><TT>DwEntity</TT></B> object that tqcontains it. If it is an intermediate
+tqparent node and one or more child nodes, or a leaf node, having a tqparent
+but no child nodes. In either case, the tqparent node is the
+<B><TT>DwEntity</TT></B> object that contains it. If it is an intermediate
 node, it must be of type multipart with <B><TT>DwBodyPart</TT></B> objects
 as child nodes, or of type message with a single
 <B><TT>DwMessage</TT></B> object as its child node.
@@ -117,15 +117,15 @@ DwBody(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwBody</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aBody</TT></B>. The parent of the new <B><TT>DwBody</TT></B> object
+of <B><TT>aBody</TT></B>. The tqparent of the new <B><TT>DwBody</TT></B> object
 is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwBody</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -135,7 +135,7 @@ a class derived from <B><TT>DwEntity</TT></B>.
 DwBody&amp; aBody) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aBody</TT></B>. The parent node of the <B><TT>DwBody</TT></B> object
+<B><TT>aBody</TT></B>. The tqparent node of the <B><TT>DwBody</TT></B> object
 is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -150,7 +150,7 @@ collection of <B><TT>DwBodyPart</TT></B> objects. For a message
 <B><TT>DwBody</TT></B>, the parse method does nothing. This member function
 calls the <B><TT>Parse()</TT></B> member function of any objects it creates.
 <P>
-Note: If the <B><TT>DwBody</TT></B> object has no parent node -- that is,
+Note: If the <B><TT>DwBody</TT></B> object has no tqparent node -- that is,
 it is not contained by a <B><TT>DwEntity</TT></B> object -- then the parse
 method does nothing, since it is unable to determine the type of body.
 <P>
@@ -169,7 +169,7 @@ method creates or updates the string representation from the broken-down
 representation. Only <B><TT>DwBody</TT></B> objects with content type of
 multipart or message require assembling. In either case, the
 <B><TT>DwBody</TT></B> object must be able to find the headers of the message
-or body part that tqcontains it. Therefore, if the <B><TT>DwBody</TT></B> object
+or body part that contains it. Therefore, if the <B><TT>DwBody</TT></B> object
 is not the child of a <B><TT>DwEntity</TT></B> (<I>i.e.</I>,
 <B><TT>DwMessage</TT></B> or <B><TT>DwBodyPart</TT></B>) object, the
 <B><TT>DwBody</TT></B> cannot be assembled because the content type cannot
diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html
index c74f716f..4021b4de 100644
--- a/mimelib/doc/bodypart.html
+++ b/mimelib/doc/bodypart.html
@@ -66,15 +66,15 @@ DwBodyPart(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwBodyPart</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aPart</TT></B>. The parent of the new
+of <B><TT>aPart</TT></B>. The tqparent of the new
 <B><TT>DwBodyPart</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwBodyPart</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -84,7 +84,7 @@ a class derived from <B><TT>DwBody</TT></B>.
 (const DwBodyPart&amp; aPart) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aPart</TT></B>. The parent node of the <B><TT>DwBodyPart</TT></B>
+<B><TT>aPart</TT></B>. The tqparent node of the <B><TT>DwBodyPart</TT></B>
 object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual DwMessageComponent*
@@ -120,7 +120,7 @@ This advanced function sets <B><TT>aPart</TT></B> as the next
 <B><TT>DwBodyPart</TT></B> object following this
 <B><TT>DwBodyPart</TT></B> in the list of <B><TT>DwBodyPart</TT></B> objects
 contained in a multipart <B><TT>DwBody</TT></B>. Since
-<B><TT>DwBody</TT></B> tqcontains a member function for adding a
+<B><TT>DwBody</TT></B> contains a member function for adding a
 <B><TT>DwBodyPart</TT></B> object to its list, this function should be avoided
 for most applications.
 <P>
diff --git a/mimelib/doc/datetime.html b/mimelib/doc/datetime.html
index 0516d929..8461b260 100644
--- a/mimelib/doc/datetime.html
+++ b/mimelib/doc/datetime.html
@@ -94,12 +94,12 @@ DwDateTime(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 The first constructor is the default constructor, which assigns the current
 date and time as reported by the operating system.
 <P>
-The second constructor is the copy constructor. The parent of the new
+The second constructor is the copy constructor. The tqparent of the new
 <B><TT>DwDateTime</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor sets <B><TT>aStr</TT></B> as the
 <B><TT>DwDateTime</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called after this constructor to extract
 the date and time information from the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -130,7 +130,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>,
 executes the assemble method for <B><TT>DwDateTime</TT></B> objects. It should
 be called whenever one of the object's attributes is changed in order to
 assemble the string representation from its broken-down representation. It
-will be called automatically for this object by the parent object's
+will be called automatically for this object by the tqparent object's
 <B><TT>Assemble()</TT></B> member function if the is-modified flag is set.
 <P>
 This function clears the is-modified flag.
diff --git a/mimelib/doc/disptype.html b/mimelib/doc/disptype.html
index c64b1dc1..9d6c71a5 100644
--- a/mimelib/doc/disptype.html
+++ b/mimelib/doc/disptype.html
@@ -90,15 +90,15 @@ DwDispositionType(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwDispositionType</TT></B> object's string representation to the empty
-string and sets its parent to <B><TT>NULL</TT></B>.
+string and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs deep copy
-of <B><TT>aDispType</TT></B>. The parent of the new
+of <B><TT>aDispType</TT></B>. The tqparent of the new
 <B><TT>DwDispositionType</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwDispositionType</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -108,7 +108,7 @@ a class derived from <B><TT>DwField</TT></B>.
 =</A> (const DwDispositionType&amp; aDispType) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aDispType</TT></B>. The parent node of the
+<B><TT>aDispType</TT></B>. The tqparent node of the
 <B><TT>DwDipositionType</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -127,7 +127,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>,
 executes the assemble method for <B><TT>DwDispositionType</TT></B> objects.
 It should be called whenever one of the object's attributes is changed in
 order to assemble the string representation from its broken-down representation.
-It will be called automatically for this object by the parent object's
+It will be called automatically for this object by the tqparent object's
 <B><TT>Assemble()</TT></B> member function if the is-modified flag is set.
 <P>
 This function clears the is-modified flag.
diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html
index 9a2d0018..c2f8d316 100644
--- a/mimelib/doc/entity.html
+++ b/mimelib/doc/entity.html
@@ -47,15 +47,15 @@ protected:
 RFC-2045 defines an <I>entity</I> as either a <I>message</I> or a <I>body
 part</I>, both of which have a collection of headers and a <I>body</I>. In
 MIME++, an entity is represented by the class <B><TT>DwEntity</TT></B>, which
-tqcontains both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object
+contains both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object
 and a <B><TT><A HREF="body.html">DwBody</A></TT></B> object.
 <P>
 In the tree (broken-down) representation of message, a
 <B><TT>DwEntity</TT></B> object may be either a root node, having child nodes
-but no parent node, or an intermediate node, having both a parent node and
+but no tqparent node, or an intermediate node, having both a tqparent node and
 child nodes. A <B><TT>DwEntity</TT></B> object that is a root node must also
 be a <B><TT><A HREF="message.html">DwMessage</A></TT></B> object. If a
-<B><TT>DwEntity</TT></B> object is an intermediate node, its parent must
+<B><TT>DwEntity</TT></B> object is an intermediate node, its tqparent must
 be a <B><TT>DwBody</TT></B> object. The child nodes of a
 <B><TT>DwEntity</TT></B> object are the <B><TT>DwHeaders</TT></B> and
 <B><TT>DwBody</TT></B> objects it tqcontains.
@@ -80,15 +80,15 @@ DwEntity(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwEntity</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aEntity</TT></B>. The parent of the new
+of <B><TT>aEntity</TT></B>. The tqparent of the new
 <B><TT>DwEntity</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwEntity</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -98,7 +98,7 @@ a class derived from <B><TT>DwBody</TT></B>.
 (const DwEntity&amp; aEntity) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aEntity</TT></B>. The parent node of the <B><TT>DwEntity</TT></B>
+<B><TT>aEntity</TT></B>. The tqparent node of the <B><TT>DwEntity</TT></B>
 object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/field.html b/mimelib/doc/field.html
index 1a4a74b9..68d4a9ed 100644
--- a/mimelib/doc/field.html
+++ b/mimelib/doc/field.html
@@ -65,16 +65,16 @@ protected:
 </H2>
 <P>
 <B><TT>DwField</TT></B> represents a header field as described in RFC-822.
-According to RFC-822, a field tqcontains a field name and a field body. In
-MIME++, a <B><TT>DwField</TT></B> tqcontains three elements: a
-<B><TT><A HREF="string.html">DwString</A></TT></B> that tqcontains its field
-name, a <B><TT>DwString</TT></B> that tqcontains its field body, and a
+According to RFC-822, a field contains a field name and a field body. In
+MIME++, a <B><TT>DwField</TT></B> contains three elements: a
+<B><TT><A HREF="string.html">DwString</A></TT></B> that contains its field
+name, a <B><TT>DwString</TT></B> that contains its field body, and a
 <B><TT><A HREF="fieldbdy.html">DwFieldBody</A></TT></B> object that tqcontains
 a broken-down (that is, parsed) version of its field body.
 <P>
 In the tree (broken-down) representation of message, a
-<B><TT>DwField</TT></B> object is always an intermediate node, having a parent
-node and a single child node. The parent node is the
+<B><TT>DwField</TT></B> object is always an intermediate node, having a tqparent
+node and a single child node. The tqparent node is the
 <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object that tqcontains
 it. The child node is the <B><TT>DwFieldBody</TT></B> object it tqcontains.
 <P>
@@ -87,7 +87,7 @@ get and set the <B><TT>DwFieldBody</TT></B> object, use
 <P>
 A <B><TT>DwField</TT></B> object can be included in a list of
 <B><TT>DwField</TT></B> objects; usually this is the list of
-<B><TT>DwField</TT></B> objects maintained by its parent
+<B><TT>DwField</TT></B> objects maintained by its tqparent
 <B><TT>DwHeaders</TT></B> object. To get the next <B><TT>DwField</TT></B>
 object in a list, use the member function <B><TT>Next()</TT></B>.
 <H2>
@@ -100,16 +100,16 @@ DwField(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwField</TT></B> object's field name and field body to the empty string,
-set its parent to <B><TT>NULL</TT></B>, and sets its
+set its tqparent to <B><TT>NULL</TT></B>, and sets its
 <B><TT>DwFieldBody</TT></B> object to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aField</TT></B>. The parent of the new <B><TT>DwField</TT></B>
+of <B><TT>aField</TT></B>. The tqparent of the new <B><TT>DwField</TT></B>
 object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwField</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -119,7 +119,7 @@ a class derived from <B><TT>DwHeaders</TT></B>.
 (const DwField&amp; aField) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aField</TT></B>. The parent node of the <B><TT>DwField</TT></B> object
+<B><TT>aField</TT></B>. The tqparent node of the <B><TT>DwField</TT></B> object
 is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -212,7 +212,7 @@ aField) </B></FONT>
 <P>
 This <I>advanced</I> function sets <B><TT>aField</TT></B> as the next field
 following this field in the list of fields contained in the headers. Since
-<B><TT>DwHeaders</TT></B> tqcontains member functions for adding
+<B><TT>DwHeaders</TT></B> contains member functions for adding
 <B><TT>DwField</TT></B> objects to its list, this function should be avoided
 for most applications.
 <P>
diff --git a/mimelib/doc/fieldbdy.html b/mimelib/doc/fieldbdy.html
index 47b9a6ac..1da30ab5 100644
--- a/mimelib/doc/fieldbdy.html
+++ b/mimelib/doc/fieldbdy.html
@@ -50,10 +50,10 @@ grammar specified by RFC-822. It is an abstract base class that defines the
 interface common to all structured field bodies.
 <P>
 In the tree (broken-down) representation of a message, a
-<B><TT>DwFieldBody</TT></B> object may be either a leaf node, having a parent
-but no child nodes, or an intermediate node, having a parent and one or more
-child nodes. The parent node is the
-<B><TT><A HREF="field.html">DwField</A></TT></B> object that tqcontains it.
+<B><TT>DwFieldBody</TT></B> object may be either a leaf node, having a tqparent
+but no child nodes, or an intermediate node, having a tqparent and one or more
+child nodes. The tqparent node is the
+<B><TT><A HREF="field.html">DwField</A></TT></B> object that contains it.
 Child nodes, if present, depend on the particular subclass of
 <B><TT>DwFieldBody</TT></B> that is instantiated. A
 <B><TT>DwAddressList</TT></B> object, for example, has
@@ -80,15 +80,15 @@ DwFieldBody(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwFieldBody</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aFieldBody</TT></B>. The parent of the new
+of <B><TT>aFieldBody</TT></B>. The tqparent of the new
 <B><TT>DwFieldBody</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwFieldBody</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -98,7 +98,7 @@ a class derived from <B><TT>DwField</TT></B>.
 (const DwFieldBody&amp; aFieldBody) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aFieldBody</TT></B>. The parent node of the
+<B><TT>aFieldBody</TT></B>. The tqparent node of the
 <B><TT>DwFieldBody</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> void <A NAME="SetOffset">SetOffset</A>(int aOffset)
diff --git a/mimelib/doc/group.html b/mimelib/doc/group.html
index 683ff3a9..27c8397e 100644
--- a/mimelib/doc/group.html
+++ b/mimelib/doc/group.html
@@ -51,15 +51,15 @@ protected:
 </H2>
 <P>
 <B><TT>DwGroup</TT></B> represents a <I>group</I> as described in RFC-822.
-A group tqcontains a group name and a (possibly empty) list of
-<I>mailboxes</I>. In MIME++, a <B><TT>DwGroup</TT></B> object tqcontains a
+A group contains a group name and a (possibly empty) list of
+<I>mailboxes</I>. In MIME++, a <B><TT>DwGroup</TT></B> object contains a
 string for the group name and a
 <B><TT><A HREF="mboxlist.html">DwMailboxList</A></TT></B> object for the
 list of mailboxes.
 <P>
 In the tree (broken-down) representation of message, a
 <B><TT>DwGroup</TT></B> object may be only an intermediate node, having both
-a parent and a single child node. Its parent node must be a
+a tqparent and a single child node. Its tqparent node must be a
 <B><TT><A HREF="field.html">DwField</A></TT></B> or a
 <B><TT><A HREF="addrlist.html">DwAddressList</A></TT></B>. Its child is a
 <B><TT>DwMailboxList</TT></B>.
@@ -79,15 +79,15 @@ DwGroup(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwGroup</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aGroup</TT></B>. The parent of the new <B><TT>DwGroup</TT></B>
+of <B><TT>aGroup</TT></B>. The tqparent of the new <B><TT>DwGroup</TT></B>
 object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwGroup</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -98,7 +98,7 @@ a class derived from <B><TT>DwField</TT></B> or
 (const DwGroup&amp; aGroup) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aGroup</TT></B>. The parent node of the <B><TT>DwGroup</TT></B> object
+<B><TT>aGroup</TT></B>. The tqparent node of the <B><TT>DwGroup</TT></B> object
 is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html
index 35519c39..97b063ad 100644
--- a/mimelib/doc/headers.html
+++ b/mimelib/doc/headers.html
@@ -153,9 +153,9 @@ or body part), as described in RFC-822 and RFC-2045. A
 the individual header fields.
 <P>
 In the tree (broken-down) representation of a message, a
-<B><TT>DwHeaders</TT></B> object is an intermediate node, having both a parent
-node and several child nodes. The parent node is the
-<B><TT><A HREF="entity.html">DwEntity</A></TT></B> object that tqcontains it.
+<B><TT>DwHeaders</TT></B> object is an intermediate node, having both a tqparent
+node and several child nodes. The tqparent node is the
+<B><TT><A HREF="entity.html">DwEntity</A></TT></B> object that contains it.
 The child nodes are the <B><TT>DwField</TT></B> objects in the list it manages.
 (See the man page for
 <B><TT><A HREF="msgcmp.html">DwMessageComponent</A></TT></B> for a discussion
@@ -208,15 +208,15 @@ DwHeaders(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwHeaders</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aHeaders</TT></B>. The parent of the new
+of <B><TT>aHeaders</TT></B>. The tqparent of the new
 <B><TT>DwHeaders</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwHeaders</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -226,7 +226,7 @@ a class derived from <B><TT>DwEntity</TT></B>.
 (const DwHeaders&amp; aHeaders) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aHeaders</TT></B>. The parent node of the
+<B><TT>aHeaders</TT></B>. The tqparent node of the
 <B><TT>DwHeaders</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -416,7 +416,7 @@ function: most applications should use the
 </B></FONT>
 <P>
 Adds a <B><TT>DwField</TT></B> object to the list. If a header field with
-the same field name already exists, it is tqreplaced by the new header field.
+the same field name already exists, it is replaced by the new header field.
 <P>
 <B><TT>DwHeaders</TT></B> takes responsibility for deleting the added
 <B><TT>DwField</TT></B> object.
@@ -430,7 +430,7 @@ to add header fields.
 </B></FONT>
 <P>
 Adds a <B><TT>DwField</TT></B> object to the list. If a header field with
-the same field name already exists, it is <I>not</I> tqreplaced; thus, duplicate
+the same field name already exists, it is <I>not</I> replaced; thus, duplicate
 header fields may occur when using this member function. (This is what you
 want for some header fields, such as the "Received" header field).
 <P>
diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html
index 72b509cd..4a25dc4e 100644
--- a/mimelib/doc/mailbox.html
+++ b/mimelib/doc/mailbox.html
@@ -53,7 +53,7 @@ protected:
 <P>
 RFC-822 defines a <I>mailbox</I> as an entity that can be the recipient of
 a message. A mailbox is more specific than an <I>address</I>, which may be
-either a mailbox or a <I>group</I>. An RFC-822 mailbox tqcontains a full name,
+either a mailbox or a <I>group</I>. An RFC-822 mailbox contains a full name,
 a <I>local-part</I>, an optional <I>route</I>, and a <I>domain</I>. For example,
 in the mailbox
 <P>
@@ -70,8 +70,8 @@ fact that a mailbox is also an address. A <B><TT>DwMailbox</TT></B> tqcontains
 strings representing the full name, local-part, route, and domain of a mailbox.
 <P>
 In the tree (broken-down) representation of message, a
-<B><TT>DwMailbox</TT></B> object may be only a leaf node, having a parent
-but no child nodes. Its parent node must be a
+<B><TT>DwMailbox</TT></B> object may be only a leaf node, having a tqparent
+but no child nodes. Its tqparent node must be a
 <B><TT><A HREF="field.html">DwField</A></TT></B>, a
 <B><TT><A HREF="addrlist.html">DwAddressList</A></TT></B>, or a
 <B><TT><A HREF="mboxlist.html">DwMailboxList</A></TT></B> object.
@@ -94,15 +94,15 @@ DwMailbox(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMailbox</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aMailbox</TT></B>. The parent of the new
+of <B><TT>aMailbox</TT></B>. The tqparent of the new
 <B><TT>DwMailbox</TT></B> is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMailbox</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -112,7 +112,7 @@ a class derived from <B><TT>DwField</TT></B>.
 (const DwMailbox&amp; aMailbox) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aMailbox</TT></B>. The parent node of the
+<B><TT>aMailbox</TT></B>. The tqparent node of the
 <B><TT>DwMailbox</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/mboxlist.html b/mimelib/doc/mboxlist.html
index 541eae28..e68b41e5 100644
--- a/mimelib/doc/mboxlist.html
+++ b/mimelib/doc/mboxlist.html
@@ -71,16 +71,16 @@ DwMailboxList(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMailboxList</TT></B> object's string representation to the empty
-string and sets its parent to <B><TT>NULL</TT></B>.
+string and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which copies the string
 representation and all <B><TT>DwMailbox</TT></B> objects from
-<B><TT>aList</TT></B>. The parent of the new
+<B><TT>aList</TT></B>. The tqparent of the new
 <B><TT>DwMailboxList</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMailboxList</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -90,7 +90,7 @@ a class derived from <B><TT>DwField</TT></B>.
 =</A> (const DwMailboxList&amp; aList) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aList</TT></B>. The parent node of the
+<B><TT>aList</TT></B>. The tqparent node of the
 <B><TT>DwMailboxList</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/mechansm.html b/mimelib/doc/mechansm.html
index 9880b5fa..9e5f525f 100644
--- a/mimelib/doc/mechansm.html
+++ b/mimelib/doc/mechansm.html
@@ -59,15 +59,15 @@ DwMechanism(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMechanism</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which copies the string
-representation from <B><TT>aCte</TT></B>. The parent of the new
+representation from <B><TT>aCte</TT></B>. The tqparent of the new
 <B><TT>DwMechanism</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMechanism</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -77,7 +77,7 @@ a class derived from <B><TT>DwField</TT></B>.
 (const DwMechanism&amp; aCte) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aCte</TT></B>. The parent node of the <B><TT>DwMechanism</TT></B>
+<B><TT>aCte</TT></B>. The tqparent node of the <B><TT>DwMechanism</TT></B>
 object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -96,7 +96,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>,
 executes the assemble method for <B><TT>DwMechanism</TT></B> objects. It
 should be called whenever one of the object's attributes is changed in order
 to assemble the string representation. It will be called automatically for
-this object by the parent object's <B><TT>Assemble()</TT></B> member function
+this object by the tqparent object's <B><TT>Assemble()</TT></B> member function
 if the is-modified flag is set.
 <P>
 This function clears the is-modified flag.
diff --git a/mimelib/doc/mediatyp.html b/mimelib/doc/mediatyp.html
index 83e5c127..e603a269 100644
--- a/mimelib/doc/mediatyp.html
+++ b/mimelib/doc/mediatyp.html
@@ -84,7 +84,7 @@ type model.
 <P>
 <B><TT>DwMediaType</TT></B> has member functions that allow you to set or
 get the type and subtype as either enumerated values or as strings. It also
-tqcontains a list of
+contains a list of
 <B><TT><A HREF="param.html">DwParameter</A></TT></B> objects that represent
 the parameters of the field body. You can use convenience functions to directly
 access the boundary parameter of a multipart media type, or to access the
@@ -107,15 +107,15 @@ DwMediaType(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMediaType</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs deep copy
-of <B><TT>aMediaType</TT></B>. The parent of the new
+of <B><TT>aMediaType</TT></B>. The tqparent of the new
 <B><TT>DwMediaType</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMediaType</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is
 <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of
@@ -125,7 +125,7 @@ a class derived from <B><TT>DwField</TT></B>.
 (const DwMediaType&amp; aMediaType) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aMediaType</TT></B>. The parent node of the
+<B><TT>aMediaType</TT></B>. The tqparent node of the
 <B><TT>DwMediaType</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
@@ -144,7 +144,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>,
 executes the assemble method for <B><TT>DwMediaType</TT></B> objects. It
 should be called whenever one of the object's attributes is changed in order
 to assemble the string representation from its broken-down representation.
-It will be called automatically for this object by the parent object's
+It will be called automatically for this object by the tqparent object's
 <B><TT>Assemble()</TT></B> member function if the is-modified flag is set.
 <P>
 This function clears the is-modified flag.
diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html
index 193236f8..1a3892f7 100644
--- a/mimelib/doc/message.html
+++ b/mimelib/doc/message.html
@@ -40,7 +40,7 @@ protected:
 <P>
 <B><TT>DwMessage</TT></B> represents an RFC-822/MIME <I>message</I>.
 <P>
-A <I>message</I> tqcontains both a collection of <I>header fields</I> and a
+A <I>message</I> contains both a collection of <I>header fields</I> and a
 <I>body</I>. In the terminology of RFC-2045, the general term for the
 headers-body combination is <I>entity</I>. In MIME++,
 <B><TT>DwMessage</TT></B> is a direct subclass of
@@ -50,10 +50,10 @@ both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object and a
 <P>
 In the tree (broken-down) representation of message, a
 <B><TT>DwMessage</TT></B> object is almost always a root node, having child
-nodes but no parent node. The child nodes are the
+nodes but no tqparent node. The child nodes are the
 <B><TT>DwHeaders</TT></B> object and the <B><TT>DwBody</TT></B> object it
 tqcontains. A <B><TT>DwMessage</TT></B> may sometimes be an intermediate node.
-In this special case, the parent node is a <B><TT>DwBody</TT></B> object
+In this special case, the tqparent node is a <B><TT>DwBody</TT></B> object
 of type "message/*" and the <B><TT>DwMessage</TT></B> object represents an
 encapsulated message.
 <P>
@@ -72,15 +72,15 @@ DwMessage(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMessage</TT></B> object's string representation to the empty string
-and sets its parent to <B><TT>NULL</TT></B>.
+and sets its tqparent to <B><TT>NULL</TT></B>.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aMessage</TT></B>. The parent of the new
+of <B><TT>aMessage</TT></B>. The tqparent of the new
 <B><TT>DwMessage</TT></B> object is set to <B><TT>NULL</TT></B>.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMessage</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation.
 <P>
@@ -88,7 +88,7 @@ in order to parse the string representation.
 (const DwMessage&amp; aMessage) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aMessage</TT></B>. The parent node of the
+<B><TT>aMessage</TT></B>. The tqparent node of the
 <B><TT>DwMessage</TT></B> object is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual DwMessageComponent*
diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html
index 2469c371..4eae3993 100644
--- a/mimelib/doc/msgcmp.html
+++ b/mimelib/doc/msgcmp.html
@@ -130,26 +130,26 @@ These features are the following:
     <B><TT>SetModified()</TT></B> which forces the is-modified flag to be set.
     <P>
   <LI>
-    A parent. Most message components are part of another component. A collection
+    A tqparent. Most message components are part of another component. A collection
     of headers is part of a message or body part, a header field is part of a
     collection of headers, a field-body is part of a header field, and so on.
-    The parent of a component is the component that tqcontains it. This tree structure
-    is important, since a component's parent must be parsed before the component
+    The tqparent of a component is the component that contains it. This tree structure
+    is important, since a component's tqparent must be parsed before the component
     can be. Also, a component's string representation must be assembled before
-    its parent's. To maintain consistency in the tree, whenever a component's
-    is-modified flag is set, the component notifies its parent to also set its
+    its tqparent's. To maintain consistency in the tree, whenever a component's
+    is-modified flag is set, the component notifies its tqparent to also set its
     is-modified flag. In this way, an is-modified flag set anywhere in the tree
     always propagates up to the root component.
     <P>
   <LI>
-    Children. The preceding discussion about a component's parent is relevant
-    to an understanding of a component's children. A component's parse method
-    calls the parse methods of its children after it has executed its own parse
-    method (and, in some cases, created all of its children). Also, a component
-    typically calls the assemble method of its children before it executes its
+    Children. The preceding discussion about a component's tqparent is relevant
+    to an understanding of a component's tqchildren. A component's parse method
+    calls the parse methods of its tqchildren after it has executed its own parse
+    method (and, in some cases, created all of its tqchildren). Also, a component
+    typically calls the assemble method of its tqchildren before it executes its
     own. A component's child may request that the component set its is-modified
-    flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with children.
-    Derived classes bear all the responsibility for handling their children.
+    flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with tqchildren.
+    Derived classes bear all the responsibility for handling their tqchildren.
 </UL>
 <H2>
   <FONT COLOR="navy"> Public Member Functions </FONT>
@@ -163,18 +163,18 @@ DwMessageComponent(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMessageComponent</TT></B> object's string representation to the
-empty string and sets its parent to NULL.
+empty string and sets its tqparent to NULL.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aCmp</TT></B>. The parent of the new
+of <B><TT>aCmp</TT></B>. The tqparent of the new
 <B><TT>DwMessageComponent</TT></B> object is set to NULL.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the new
 <B><TT>DwMessageComponent</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. In typical cases, the virtual member
+<B><TT>aParent</TT></B> as its tqparent. In typical cases, the virtual member
 function <B><TT>Parse()</TT></B> should be called immediately after this
 constructor to parse the new <B><TT>DwMessageComponent</TT></B> object and
-all of its children into their broken-down representations.
+all of its tqchildren into their broken-down representations.
 <P>
 <FONT COLOR="teal"><B> const DwMessageComponent&amp; <A NAME="op_eq">operator
 =</A> (const DwMessageComponent&amp; aCmp) </B></FONT>
@@ -189,11 +189,11 @@ A pure virtual function which provides an interface to the parse method.
 The parse method, implemented in derived classes, is responsible for extracting
 the broken-down representation from the string representation. In some derived
 classes, such as <B><TT>DwHeaders</TT></B>, the parse method is also responsible
-for creating the children of the object. (In the case of
-<B><TT>DwHeaders</TT></B>, the children created are the
+for creating the tqchildren of the object. (In the case of
+<B><TT>DwHeaders</TT></B>, the tqchildren created are the
 <B><TT>DwField</TT></B> objects that represent the <I>field</I>s contained
 in the <I>headers</I>.) The <B><TT>Parse()</TT></B> function always calls
-the <B><TT>Parse()</TT></B> function of all of its children.
+the <B><TT>Parse()</TT></B> function of all of its tqchildren.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Assemble">Assemble</A>() = 0
 </B></FONT>
@@ -203,11 +203,11 @@ The assemble method, implemented in derived classes, is responsible for creating
 the string representation from the broken-down representation. In other words,
 the assemble method is the opposite of the parse method. Before assembling
 its string representation, the assemble method calls the assemble method
-of each of its children. In this way, the entire tree structure that represents
+of each of its tqchildren. In this way, the entire tree structure that represents
 a message may be traversed. If the is-modifed flag for a
 <B><TT>DwMessageComponent</TT></B> is cleared, the
 <B><TT>Assemble()</TT></B> function will return immediately without calling
-the <B><TT>Assemble()</TT></B> function of any of its children.
+the <B><TT>Assemble()</TT></B> function of any of its tqchildren.
 <P>
 <FONT COLOR="teal"><B> virtual DwMessageComponent*
 <A NAME="Clone">Clone</A>() const = 0 </B></FONT>
@@ -224,7 +224,7 @@ Sets the object's string representation. <B><TT>aCstr</TT></B> must be
 NUL-terminated. This member function does not invoke the parse method. Typically,
 the virtual member function <B><TT>Parse()</TT></B> should be called immediately
 after this member function to parse the
-<B><TT>DwMessageComponent</TT></B> object and all of its children into their
+<B><TT>DwMessageComponent</TT></B> object and all of its tqchildren into their
 broken-down representations. See also
 <B><TT>DwMessageComponent::Parse()</TT></B>
 <P>
@@ -241,14 +241,14 @@ string representation are consistent. See also
 <FONT COLOR="teal"><B> DwMessageComponent* <A NAME="Parent">Parent</A>()
 </B></FONT>
 <P>
-Returns the <B><TT>DwMessageComponent</TT></B> object that is the parent
+Returns the <B><TT>DwMessageComponent</TT></B> object that is the tqparent
 of this object.
 <P>
 <FONT COLOR="teal"><B> void
 <A NAME="SetParent">SetParent</A>(DwMessageComponent* aParent) </B></FONT>
 <P>
 Sets <B><TT>aParent</TT></B> as the <B><TT>DwMessageComponent</TT></B> object's
-parent.
+tqparent.
 <P>
 <FONT COLOR="teal"><B> DwBool <A NAME="IsModified">IsModified</A>() const
 </B></FONT>
@@ -260,7 +260,7 @@ Returns 1 if the is-modified flag is set for this
 </B></FONT>
 <P>
 Sets the is-modified (dirty) flag for this
-<B><TT>DwMessageComponent</TT></B> object and notifies the object's parent
+<B><TT>DwMessageComponent</TT></B> object and notifies the object's tqparent
 to also set its is-modified flag.
 <P>
 <FONT COLOR="teal"><B> int <A NAME="ClassId">ClassId</A>() const </B></FONT>
diff --git a/mimelib/doc/msgid.html b/mimelib/doc/msgid.html
index da64d38a..0f5b7c36 100644
--- a/mimelib/doc/msgid.html
+++ b/mimelib/doc/msgid.html
@@ -49,12 +49,12 @@ protected:
 <P>
 <B><TT>DwMsgId</TT></B> represents a <I>msg-id</I> as described in RFC-822.
 In the BNF grammar in RFC-822, a msg-id has a <I>local-part</I> and a
-<I>domain</I>. In MIME++, a <B><TT>DwMsgId</TT></B> tqcontains strings that
+<I>domain</I>. In MIME++, a <B><TT>DwMsgId</TT></B> contains strings that
 contain the local-part and the domain.
 <P>
 In the tree (broken-down) representation of message, a
-<B><TT>DwMsgId</TT></B> object may only be a leaf node, having a parent but
-no child nodes. Its parent node must be a
+<B><TT>DwMsgId</TT></B> object may only be a leaf node, having a tqparent but
+no child nodes. Its tqparent node must be a
 <A HREF="field.html"><B><TT>DwField</TT></B> </A>object.
 <P>
 <B><TT>DwMsgId</TT></B> has member functions for getting or setting its
@@ -71,15 +71,15 @@ DwMsgId(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwMsgId</TT></B> object's string representation to the empty string
-and sets its parent to NULL.
+and sets its tqparent to NULL.
 <P>
 The second constructor is the copy constructor, which performs a deep copy
-of <B><TT>aMsgId</TT></B>. The parent of the new <B><TT>DwMsgId</TT></B>
+of <B><TT>aMsgId</TT></B>. The tqparent of the new <B><TT>DwMsgId</TT></B>
 object is set to NULL.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwMsgId</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is NULL,
 <B><TT>aParent</TT></B> should point to an object of a class derived from
@@ -89,7 +89,7 @@ in order to parse the string representation. Unless it is NULL,
 (const DwMsgId&amp; aMsgId) </B></FONT>
 <P>
 This is the assignment operator, which performs a deep copy of
-<B><TT>aMsgId</TT></B>. The parent node of the <B><TT>DwMsgId</TT></B> object
+<B><TT>aMsgId</TT></B>. The tqparent node of the <B><TT>DwMsgId</TT></B> object
 is not changed.
 <P>
 <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT>
diff --git a/mimelib/doc/nntp.html b/mimelib/doc/nntp.html
index 75b8b71f..b8cf8030 100644
--- a/mimelib/doc/nntp.html
+++ b/mimelib/doc/nntp.html
@@ -354,7 +354,7 @@ returns zero.
 <P>
 <FONT COLOR="teal"><B> int <A NAME="Quit">Quit</A>() </B></FONT>
 <P>
-Sends the NNTP QUIT command and returns the reply code received from the
+Sends the NNTP TQUIT command and returns the reply code received from the
 server. If no response is received, perhaps because of an error, the function
 returns zero.
 <P>
diff --git a/mimelib/doc/param.html b/mimelib/doc/param.html
index 786f65bc..3ca10ee8 100644
--- a/mimelib/doc/param.html
+++ b/mimelib/doc/param.html
@@ -69,15 +69,15 @@ DwParameter(const DwString&amp; aStr, DwMessageComponent* aParent=0)
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwParameter</TT></B> object's string representation to the empty string
-and sets its parent to NULL.
+and sets its tqparent to NULL.
 <P>
 The second constructor is the copy constructor, which copies the string
-representation, attribute, and value from <B><TT>aParam</TT></B>. The parent
+representation, attribute, and value from <B><TT>aParam</TT></B>. The tqparent
 of the new <B><TT>DwParameter</TT></B> object is set to NULL.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwParameter</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is NULL,
 <B><TT>aParent</TT></B> should point to an object of a class derived from
@@ -102,7 +102,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>,
 executes the assemble method for <B><TT>DwParameter</TT></B> objects. It
 should be called whenever one of the object's attributes is changed in order
 to assemble the string representation from its broken-down representation.
-It will be called automatically for this object by the parent object's
+It will be called automatically for this object by the tqparent object's
 <B><TT>Assemble()</TT></B> member function if the is-modified flag is set.
 <P>
 <FONT COLOR="teal"><B> virtual DwMessageComponent*
diff --git a/mimelib/doc/pop.html b/mimelib/doc/pop.html
index 5bb4ed67..f3cbc1cf 100644
--- a/mimelib/doc/pop.html
+++ b/mimelib/doc/pop.html
@@ -224,7 +224,7 @@ If no response is received, the function returns zero.
 <P>
 <FONT COLOR="teal"><B> int <A NAME="Quit">Quit</A>() </B></FONT>
 <P>
-Sends the QUIT command and returns the status code received from the server.
+Sends the TQUIT command and returns the status code received from the server.
 If no response is received, the function returns zero.
 <P>
 <FONT COLOR="teal"><B> int <A NAME="Stat">Stat</A>() </B></FONT>
diff --git a/mimelib/doc/string.html b/mimelib/doc/string.html
index 7c2f4f23..fe16aed4 100644
--- a/mimelib/doc/string.html
+++ b/mimelib/doc/string.html
@@ -70,14 +70,14 @@ public:
     void <A HREF="string.html#swap">swap</A>(DwString&amp; aStr);
     const char* <A HREF="string.html#c_str">c_str</A>() const;
     const char* <A HREF="string.html#data">data</A>() const;
-    size_t <A HREF="string.html#find">find</A>(const DwString&amp; aStr, size_t aPos=0) const;
-    size_t <A HREF="string.html#find">find</A>(const char* aBuf, size_t aPos, size_t aLen) const;
-    size_t <A HREF="string.html#find">find</A>(const char* aCstr, size_t aPos=0) const;
-    size_t <A HREF="string.html#find">find</A>(char aChar, size_t aPos=0) const;
-    size_t <A HREF="string.html#rfind">rfind</A>(const DwString&amp; aStr, size_t aPos=npos) const;
-    size_t <A HREF="string.html#rfind">rfind</A>(const char* aBuf, size_t aPos, size_t aLen) const;
-    size_t <A HREF="string.html#rfind">rfind</A>(const char* aCstr, size_t aPos=npos) const;
-    size_t <A HREF="string.html#rfind">rfind</A>(char aChar, size_t aPos=npos) const;
+    size_t <A HREF="string.html#tqfind">tqfind</A>(const DwString&amp; aStr, size_t aPos=0) const;
+    size_t <A HREF="string.html#tqfind">tqfind</A>(const char* aBuf, size_t aPos, size_t aLen) const;
+    size_t <A HREF="string.html#tqfind">tqfind</A>(const char* aCstr, size_t aPos=0) const;
+    size_t <A HREF="string.html#tqfind">tqfind</A>(char aChar, size_t aPos=0) const;
+    size_t <A HREF="string.html#rtqfind">rtqfind</A>(const DwString&amp; aStr, size_t aPos=npos) const;
+    size_t <A HREF="string.html#rtqfind">rtqfind</A>(const char* aBuf, size_t aPos, size_t aLen) const;
+    size_t <A HREF="string.html#rtqfind">rtqfind</A>(const char* aCstr, size_t aPos=npos) const;
+    size_t <A HREF="string.html#rtqfind">rtqfind</A>(char aChar, size_t aPos=npos) const;
     size_t <A HREF="string.html#find_first_of">find_first_of</A>(const DwString&amp; aStr, size_t aPos=0) const;
     size_t <A HREF="string.html#find_first_of">find_first_of</A>(const char* aBuf, size_t aPos, size_t aLen) const;
     size_t <A HREF="string.html#find_first_of">find_first_of</A>(const char* aCstr, size_t aPos=0) const;
@@ -441,11 +441,11 @@ The characters in the returned string should not be modified, and should
 be considered invalid after any call to a non-const member function or another
 call to <B><TT>c_str()</TT></B>.
 <P>
-<FONT COLOR="teal"><B> size_t <A NAME="find">find</A>(const DwString&amp;
+<FONT COLOR="teal"><B> size_t <A NAME="tqfind">tqfind</A>(const DwString&amp;
 aStr, size_t aPos=0) const <BR>
-size_t find(const char* aBuf, size_t aPos, size_t aLen) const <BR>
-size_t find(const char* aCstr, size_t aPos=0) const <BR>
-size_t find(char aChar, size_t aPos=0) const </B></FONT>
+size_t tqfind(const char* aBuf, size_t aPos, size_t aLen) const <BR>
+size_t tqfind(const char* aCstr, size_t aPos=0) const <BR>
+size_t tqfind(char aChar, size_t aPos=0) const </B></FONT>
 <P>
 Performs a forward search for a sequence of characters in the
 <B><TT>DwString</TT></B> object. The return value is the position of the
@@ -466,11 +466,11 @@ the sequence of characters in the NUL-terminated string
 The fourth version searches beginning at position <B><TT>aPos</TT></B> for
 the character <B><TT>aChar</TT></B>.
 <P>
-<FONT COLOR="teal"><B> size_t <A NAME="rfind">rfind</A>(const DwString&amp;
+<FONT COLOR="teal"><B> size_t <A NAME="rtqfind">rtqfind</A>(const DwString&amp;
 aStr, size_t aPos=npos) const <BR>
-size_t rfind(const char* aBuf, size_t aPos, size_t aLen) const <BR>
-size_t rfind(const char* aCstr, size_t aPos=npos) const <BR>
-size_t rfind(char aChar, size_t aPos=npos) const </B></FONT>
+size_t rtqfind(const char* aBuf, size_t aPos, size_t aLen) const <BR>
+size_t rtqfind(const char* aCstr, size_t aPos=npos) const <BR>
+size_t rtqfind(char aChar, size_t aPos=npos) const </B></FONT>
 <P>
 Performs a reverse search for a sequence of characters in the
 <B><TT>DwString</TT></B> object. The return value is the position of the
@@ -579,7 +579,7 @@ The third version searches for any character not in the NUL-terminated string
 <FONT COLOR="teal"><B> DwString <A NAME="substr">substr</A>(size_t aPos=0,
 size_t aLen=npos) const </B></FONT>
 <P>
-Returns a string that tqcontains at most <B><TT>aLen</TT></B> characters from
+Returns a string that contains at most <B><TT>aLen</TT></B> characters from
 the <B><TT>DwString</TT></B> object beginning at position
 <B><TT>aPos</TT></B>. The returned substring will not contain more characters
 than what are available in the superstring <B><TT>DwString</TT></B> object.
diff --git a/mimelib/doc/text.html b/mimelib/doc/text.html
index 3fc637ca..4a32ce30 100644
--- a/mimelib/doc/text.html
+++ b/mimelib/doc/text.html
@@ -53,15 +53,15 @@ DwText(const DwString&amp; aStr, DwMessageComponent* aParent=0) </B></FONT>
 <P>
 The first constructor is the default constructor, which sets the
 <B><TT>DwText</TT></B> object's string representation to the empty string
-and sets its parent to NULL.
+and sets its tqparent to NULL.
 <P>
 The second constructor is the copy constructor, which copies the string
-representation from <B><TT>aText</TT></B>. The parent of the new
+representation from <B><TT>aText</TT></B>. The tqparent of the new
 <B><TT>DwText</TT></B> object is set to NULL.
 <P>
 The third constructor copies <B><TT>aStr</TT></B> to the
 <B><TT>DwText</TT></B> object's string representation and sets
-<B><TT>aParent</TT></B> as its parent. The virtual member function
+<B><TT>aParent</TT></B> as its tqparent. The virtual member function
 <B><TT>Parse()</TT></B> should be called immediately after this constructor
 in order to parse the string representation. Unless it is NULL,
 <B><TT>aParent</TT></B> should point to an object of a class derived from
diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp
index 4498597d..9714d252 100644
--- a/mimelib/dw_cte.cpp
+++ b/mimelib/dw_cte.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -353,7 +353,7 @@ static int to_cr(const char* srcBuf, size_t srcLen, char* destBuf,
 }
 
 
-static char base64tab[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+static char base64tab[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz0123456789+/";
 
 static char base64idx[128] = {
diff --git a/mimelib/dw_date.cpp b/mimelib/dw_date.cpp
index e4436bbe..5d8b3c33 100644
--- a/mimelib/dw_date.cpp
+++ b/mimelib/dw_date.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/dw_mime.cpp b/mimelib/dw_mime.cpp
index cca2fded..a5637c39 100644
--- a/mimelib/dw_mime.cpp
+++ b/mimelib/dw_mime.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp
index 52e42bef..b8686e41 100644
--- a/mimelib/dwstring.cpp
+++ b/mimelib/dwstring.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -755,13 +755,13 @@ void DwString::swap(DwString& aStr)
 }
 
 
-size_t DwString::find(const DwString& aStr, size_t aPos) const
+size_t DwString::tqfind(const DwString& aStr, size_t aPos) const
 {
-    return find(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength);
+    return tqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength);
 }
 
 
-size_t DwString::find(const char* aBuf, size_t aPos, size_t aLen) const
+size_t DwString::tqfind(const char* aBuf, size_t aPos, size_t aLen) const
 {
     assert(aBuf != 0);
     if (aBuf == 0) return (size_t)-1;
@@ -781,16 +781,16 @@ size_t DwString::find(const char* aBuf, size_t aPos, size_t aLen) const
 }
 
 
-size_t DwString::find(const char* aCstr, size_t aPos) const
+size_t DwString::tqfind(const char* aCstr, size_t aPos) const
 {
     assert(aCstr != 0);
     if (aCstr == 0) return (size_t)-1;
     size_t len = strlen(aCstr);
-    return find(aCstr, aPos, len);
+    return tqfind(aCstr, aPos, len);
 }
 
 
-size_t DwString::find(char aChar, size_t aPos) const
+size_t DwString::tqfind(char aChar, size_t aPos) const
 {
     if (aPos >= mLength) return (size_t)-1;
     const char* buf = mRep->mBuffer + mStart;
@@ -801,13 +801,13 @@ size_t DwString::find(char aChar, size_t aPos) const
 }
 
 
-size_t DwString::rfind(const DwString& aStr, size_t aPos) const
+size_t DwString::rtqfind(const DwString& aStr, size_t aPos) const
 {
-    return rfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength);
+    return rtqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength);
 }
 
 
-size_t DwString::rfind(const char* aBuf, size_t aPos, size_t aLen) const
+size_t DwString::rtqfind(const char* aBuf, size_t aPos, size_t aLen) const
 {
     assert(aBuf != 0);
     if (aBuf == 0) return (size_t)-1;
@@ -827,15 +827,15 @@ size_t DwString::rfind(const char* aBuf, size_t aPos, size_t aLen) const
 }
 
 
-size_t DwString::rfind(const char* aCstr, size_t aPos) const
+size_t DwString::rtqfind(const char* aCstr, size_t aPos) const
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    return rfind(aCstr, aPos, len);
+    return rtqfind(aCstr, aPos, len);
 }
 
 
-size_t DwString::rfind(char aChar, size_t aPos) const
+size_t DwString::rtqfind(char aChar, size_t aPos) const
 {
     size_t pos = DW_MIN(aPos, mLength - 1);
     const char* buf = mRep->mBuffer + mStart;
@@ -1291,7 +1291,7 @@ void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t a
             }
         }
     }
-    // Is the tqreplacement smaller than the tqreplaced?
+    // Is the replacement smaller than the replaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         from = aBuf;
@@ -1381,7 +1381,7 @@ void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
             }
         }
     }
-    // Is the tqreplacement smaller than the tqreplaced?
+    // Is the replacement smaller than the replaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         for (i=0; i < len2; ++i) *to++ = aChar;
diff --git a/mimelib/entity.cpp b/mimelib/entity.cpp
index a97d96e5..2858c3c4 100644
--- a/mimelib/entity.cpp
+++ b/mimelib/entity.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/field.cpp b/mimelib/field.cpp
index a9f140b8..f1b07c85 100644
--- a/mimelib/field.cpp
+++ b/mimelib/field.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/fieldbdy.cpp b/mimelib/fieldbdy.cpp
index 9c387169..5b1729cd 100644
--- a/mimelib/fieldbdy.cpp
+++ b/mimelib/fieldbdy.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/group.cpp b/mimelib/group.cpp
index 319e7844..9d2e7645 100644
--- a/mimelib/group.cpp
+++ b/mimelib/group.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/headers.cpp b/mimelib/headers.cpp
index 58846188..44f53001 100644
--- a/mimelib/headers.cpp
+++ b/mimelib/headers.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -336,7 +336,7 @@ void DwHeaders::AddOrReplaceField(DwField* aField)
             mFirstField = aField;
         }
         aField->SetNext(field->Next());
-        // Check whether we've tqreplaced the last field
+        // Check whether we've replaced the last field
         if ( !aField->Next() )
             mLastField = aField;
         delete field;
diff --git a/mimelib/mailbox.cpp b/mimelib/mailbox.cpp
index b5dc7cc3..e4fbe17d 100644
--- a/mimelib/mailbox.cpp
+++ b/mimelib/mailbox.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mboxlist.cpp b/mimelib/mboxlist.cpp
index 9dde322b..88015185 100644
--- a/mimelib/mboxlist.cpp
+++ b/mimelib/mboxlist.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mechansm.cpp b/mimelib/mechansm.cpp
index bf9d3707..ac72f28d 100644
--- a/mimelib/mechansm.cpp
+++ b/mimelib/mechansm.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp
index 7c766fe3..e0a6ea79 100644
--- a/mimelib/mediatyp.cpp
+++ b/mimelib/mediatyp.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -231,7 +231,7 @@ void DwMediaType::SetBoundary(const DwString& aStr)
 void DwMediaType::CreateBoundary(unsigned aLevel)
 {
     // Create a random printable string and set it as the boundary parameter
-    static const char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    static const char c[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     const int cLen = 64;
     char buf[80];
     strcpy(buf, "Boundary-");
diff --git a/mimelib/message.cpp b/mimelib/message.cpp
index 608e4fa5..d36c52d1 100644
--- a/mimelib/message.cpp
+++ b/mimelib/message.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/address.h b/mimelib/mimelib/address.h
index 7ed56ba8..dbd657ba 100644
--- a/mimelib/mimelib/address.h
+++ b/mimelib/mimelib/address.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -96,14 +96,14 @@ protected:
     DwAddress(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwAddress} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation and all attributes from {\tt aAddress}.
-    //. The parent of the new {\tt DwAddress} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwAddress} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwAddress}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -111,7 +111,7 @@ protected:
 
     const DwAddress& operator = (const DwAddress& aAddr);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aAddr}.  The parent node of the {\tt DwAddress} object
+    //. {\tt aAddr}.  The tqparent node of the {\tt DwAddress} object
     //. is not changed.
 
     int mIsValid;
diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h
index 1225494d..c02e3897 100644
--- a/mimelib/mimelib/addrlist.h
+++ b/mimelib/mimelib/addrlist.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -32,7 +32,7 @@
 //+ Description
 //. {\tt DwAddressList} represents a list of {\it addresses} as described
 //. in RFC-822.  In MIME++, {\tt DwAddressList} is a container for objects
-//. of type {\tt DwAddress}, and it tqcontains various member functions
+//. of type {\tt DwAddress}, and it contains various member functions
 //. to manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the ``To'' header field, have a list of addresses
@@ -51,14 +51,14 @@ public:
     DwAddressList(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwAddressList} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation and all {\tt DwAddress} objects from {\tt aList}.
-    //. The parent of the new {\tt DwAddressList} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwAddressList} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwAddressList}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -68,7 +68,7 @@ public:
 
     const DwAddressList& operator = (const DwAddressList& aList);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aList}.  The parent node of the {\tt DwAddressList} object
+    //. {\tt aList}.  The tqparent node of the {\tt DwAddressList} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/binhex.h b/mimelib/mimelib/binhex.h
index 468dcfd7..3ccc747d 100644
--- a/mimelib/mimelib/binhex.h
+++ b/mimelib/mimelib/binhex.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h
index f19efa0c..d62cb608 100644
--- a/mimelib/mimelib/body.h
+++ b/mimelib/mimelib/body.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -46,9 +46,9 @@ class DwBodyPart;
 //. is always part of an {\it entity}, which could be either a {\it message}
 //. or a {\it body part}.  An entity has a collection of {\it header fields}
 //. and a body.  If the content type of a body is ``multipart,'' then the
-//. body tqcontains one or more body parts.  If the content type is ``message,''
-//. then the body tqcontains an encapsulated message.  In all content types,
-//. the body tqcontains a string of characters.
+//. body contains one or more body parts.  If the content type is ``message,''
+//. then the body contains an encapsulated message.  In all content types,
+//. the body contains a string of characters.
 //.
 //. In MIME++, a {\tt DwBody} object is contained in a {\tt DwEntity} object.
 //. The {\tt DwBody} object may contain a discrete body consisting only of a
@@ -56,14 +56,14 @@ class DwBodyPart;
 //. contained {\tt DwBodyPart} objects or a single contained {\tt DwMessage}
 //. object.  The only reliable way to determine the type of {\tt DwBody} is
 //. to access the Content-Type header field from the {\tt DwHeaders} object
-//. of the {\tt DwEntity} that tqcontains it.  For this reason, a {\tt DwBody}
+//. of the {\tt DwEntity} that contains it.  For this reason, a {\tt DwBody}
 //. should always be part of a {\tt DwEntity}.
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwBody}
-//. object can be an intermediate node, having both a parent node and
-//. one or more child nodes, or a leaf node, having a parent but no child
-//. nodes.  In either case, the parent node is the {\tt DwEntity} object
-//. that tqcontains it.  If it is an intermediate node, it must be of type
+//. object can be an intermediate node, having both a tqparent node and
+//. one or more child nodes, or a leaf node, having a tqparent but no child
+//. nodes.  In either case, the tqparent node is the {\tt DwEntity} object
+//. that contains it.  If it is an intermediate node, it must be of type
 //. multipart with {\tt DwBodyPart} objects as child nodes, or of type
 //. message with a single {\tt DwMessage} object as its child node.
 //.
@@ -96,14 +96,14 @@ public:
     DwBody(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwBody} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aBody}.
-    //. The parent of the new {\tt DwBody} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwBody} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwBody}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -113,7 +113,7 @@ public:
 
     const DwBody& operator = (const DwBody& aBody);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aBody}.  The parent node of the {\tt DwBody} object
+    //. {\tt aBody}.  The tqparent node of the {\tt DwBody} object
     //. is not changed.
 
     virtual void Parse();
@@ -127,7 +127,7 @@ public:
     //. the parse method does nothing.  This member function calls the
     //. {\tt Parse()} member function of any objects it creates.
     //.
-    //. Note: If the {\tt DwBody} object has no parent node -- that is,
+    //. Note: If the {\tt DwBody} object has no tqparent node -- that is,
     //. it is not contained by a {\tt DwEntity} object -- then the parse
     //. method does nothing, since it is unable to determine the type of
     //. body.
@@ -145,7 +145,7 @@ public:
     //. from the broken-down representation.  Only {\tt DwBody} objects
     //. with content type of multipart or message require assembling.
     //. In either case, the {\tt DwBody} object must be able to find the
-    //. headers of the message or body part that tqcontains it.  Therefore,
+    //. headers of the message or body part that contains it.  Therefore,
     //. if the {\tt DwBody} object is not the child of a {\tt DwEntity}
     //. ({\it i.e.}, {\tt DwMessage} or {\tt DwBodyPart}) object, the
     //. {\tt DwBody} cannot be assembled because the content type cannot
diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h
index 78e0db59..7a9b3275 100644
--- a/mimelib/mimelib/bodypart.h
+++ b/mimelib/mimelib/bodypart.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -49,7 +49,7 @@ class DwBody;
 //. in that a body part is part of a multipart body.
 //.
 //. In MIME++, a {\tt DwBodyPart} is a subclass of {\tt DwEntity}; therefore,
-//. it tqcontains both a {\tt DwHeaders} object and a {\tt DwBody} object,
+//. it contains both a {\tt DwHeaders} object and a {\tt DwBody} object,
 //. and it is contained in a multipart {\tt DwBody} object.
 //.
 //. As with {\tt DwMessage}, most of the functionality of {\tt DwBodyPart} is
@@ -69,14 +69,14 @@ public:
     DwBodyPart(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwBodyPart} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aPart}.
-    //. The parent of the new {\tt DwBodyPart} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwBodyPart} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwBodyPart}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -86,7 +86,7 @@ public:
 
     const DwBodyPart& operator = (const DwBodyPart& aPart);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aPart}.  The parent node of the {\tt DwBodyPart} object
+    //. {\tt aPart}.  The tqparent node of the {\tt DwBodyPart} object
     //. is not changed.
 
     virtual DwMessageComponent* Clone() const;
@@ -114,7 +114,7 @@ public:
     //. This advanced function sets {\tt aPart} as the next {\tt DwBodyPart}
     //. object following this {\tt DwBodyPart} in the list of {\tt DwBodyPart}
     //. objects contained in a multipart {\tt DwBody}.  Since {\tt DwBody}
-    //. tqcontains a member function for adding a {\tt DwBodyPart} object to
+    //. contains a member function for adding a {\tt DwBodyPart} object to
     //. its list, this function should be avoided for most applications.
 
     //+ Var sNewBodyPart
diff --git a/mimelib/mimelib/boyermor.h b/mimelib/mimelib/boyermor.h
index f04e573b..e23e6ae6 100644
--- a/mimelib/mimelib/boyermor.h
+++ b/mimelib/mimelib/boyermor.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/config.h b/mimelib/mimelib/config.h
index 9467d30d..e47fb8de 100644
--- a/mimelib/mimelib/config.h
+++ b/mimelib/mimelib/config.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/datetime.h b/mimelib/mimelib/datetime.h
index d23eba0b..ef888d57 100644
--- a/mimelib/mimelib/datetime.h
+++ b/mimelib/mimelib/datetime.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -57,11 +57,11 @@ public:
     //. The first constructor is the default constructor, which assigns
     //. the current date and time as reported by the operating system.
     //.
-    //. The second constructor is the copy constructor.  The parent of
+    //. The second constructor is the copy constructor.  The tqparent of
     //. the new {\tt DwDateTime} object is set to {\tt NULL}.
     //.
     //. The third constructor sets {\tt aStr} as the {\tt DwDateTime}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called after
     //. this constructor to extract the date and time information from the
     //. string representation.  Unless it is {\tt NULL}, {\tt aParent} should
@@ -89,7 +89,7 @@ public:
     //. It should be called whenever one of the object's attributes
     //. is changed in order to assemble the string representation from
     //. its broken-down representation.  It will be called
-    //. automatically for this object by the parent object's
+    //. automatically for this object by the tqparent object's
     //. {\tt Assemble()} member function if the is-modified flag is set.
     //.
     //. This function clears the is-modified flag.
diff --git a/mimelib/mimelib/debug.h b/mimelib/mimelib/debug.h
index 95325af5..bb52ca60 100644
--- a/mimelib/mimelib/debug.h
+++ b/mimelib/mimelib/debug.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/disptype.h b/mimelib/mimelib/disptype.h
index 59c740cb..ad12e8c4 100644
--- a/mimelib/mimelib/disptype.h
+++ b/mimelib/mimelib/disptype.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -73,15 +73,15 @@ public:
     DwDispositionType(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwDispositionType} object's string representation to the empty
-    //. string and sets its parent to {\tt NULL}.
+    //. string and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. deep copy of {\tt aDispType}.
-    //. The parent of the new {\tt DwDispositionType} object is set to
+    //. The tqparent of the new {\tt DwDispositionType} object is set to
     //. {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwDispositionType}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -91,7 +91,7 @@ public:
 
     const DwDispositionType& operator = (const DwDispositionType& aDispType);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aDispType}.  The parent node of the {\tt DwDipositionType}
+    //. {\tt aDispType}.  The tqparent node of the {\tt DwDipositionType}
     //. object is not changed.
 
     virtual void Parse();
@@ -109,7 +109,7 @@ public:
     //. It should be called whenever one of the object's attributes
     //. is changed in order to assemble the string representation from
     //. its broken-down representation.  It will be called
-    //. automatically for this object by the parent object's
+    //. automatically for this object by the tqparent object's
     //. {\tt Assemble()} member function if the is-modified flag is set.
     //.
     //. This function clears the is-modified flag.
diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h
index 1bb4662b..d1f60e7f 100644
--- a/mimelib/mimelib/entity.h
+++ b/mimelib/mimelib/entity.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -44,14 +44,14 @@ class DwBody;
 //. RFC-2045 defines an {\it entity} as either a {\it message} or a
 //. {\it body part}, both of which have a collection of headers and
 //. a {\it body}.  In MIME++, an entity is represented by the class
-//. {\tt DwEntity}, which tqcontains both a {\tt DwHeaders} object and
+//. {\tt DwEntity}, which contains both a {\tt DwHeaders} object and
 //. a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwEntity}
-//. object may be either a root node, having child nodes but no parent
-//. node, or an intermediate node, having both a parent node and child nodes.
+//. object may be either a root node, having child nodes but no tqparent
+//. node, or an intermediate node, having both a tqparent node and child nodes.
 //. A {\tt DwEntity} object that is a root node must also be a {\tt DwMessage}
-//. object.  If a {\tt DwEntity} object is an intermediate node, its parent
+//. object.  If a {\tt DwEntity} object is an intermediate node, its tqparent
 //. must be a {\tt DwBody} object.  The child nodes of a {\tt DwEntity}
 //. object are the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains.
 //.
@@ -75,14 +75,14 @@ public:
     DwEntity(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwEntity} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aEntity}.
-    //. The parent of the new {\tt DwEntity} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwEntity} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwEntity}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -92,7 +92,7 @@ public:
 
     const DwEntity& operator = (const DwEntity& aEntity);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aEntity}.  The parent node of the {\tt DwEntity} object
+    //. {\tt aEntity}.  The tqparent node of the {\tt DwEntity} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/enum.h b/mimelib/mimelib/enum.h
index 93cfe010..7f2e2c44 100644
--- a/mimelib/mimelib/enum.h
+++ b/mimelib/mimelib/enum.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h
index 7cd8f97c..70f58466 100644
--- a/mimelib/mimelib/field.h
+++ b/mimelib/mimelib/field.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -44,15 +44,15 @@ class DwFieldBody;
 //+ Name DwField -- Class representing a MIME header field
 //+ Description
 //. {\tt DwField} represents a header field as described in RFC-822.
-//. According to RFC-822, a field tqcontains a field name and a field body.
-//. In MIME++, a {\tt DwField} tqcontains three elements: a {\tt DwString}
-//. that tqcontains its field name, a {\tt DwString} that tqcontains its
-//. field body, and a {\tt DwFieldBody} object that tqcontains a broken-down
+//. According to RFC-822, a field contains a field name and a field body.
+//. In MIME++, a {\tt DwField} contains three elements: a {\tt DwString}
+//. that contains its field name, a {\tt DwString} that contains its
+//. field body, and a {\tt DwFieldBody} object that contains a broken-down
 //. (that is, parsed) version of its field body.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwField}
-//. object is always an intermediate node, having a parent node and a single
-//. child node.  The parent node is the {\tt DwHeaders} object that tqcontains
+//. object is always an intermediate node, having a tqparent node and a single
+//. child node.  The tqparent node is the {\tt DwHeaders} object that tqcontains
 //. it.  The child node is the {\tt DwFieldBody} object it tqcontains.
 //.
 //. To get and set the field name, use the member functions
@@ -64,7 +64,7 @@ class DwFieldBody;
 //.
 //. A {\tt DwField} object can be included in a list of {\tt DwField}
 //. objects; usually this is the list of {\tt DwField} objects maintained
-//. by its parent {\tt DwHeaders} object.  To get the next {\tt DwField}
+//. by its tqparent {\tt DwHeaders} object.  To get the next {\tt DwField}
 //. object in a list, use the member function {\tt Next()}.
 //=============================================================================
 // Last updated 1997-08-23
@@ -82,15 +82,15 @@ public:
     DwField(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwField} object's field name and field body to the empty
-    //. string, set its parent to {\tt NULL}, and sets its {\tt DwFieldBody}
+    //. string, set its tqparent to {\tt NULL}, and sets its {\tt DwFieldBody}
     //. object to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aField}.
-    //. The parent of the new {\tt DwField} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwField} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwField}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -100,7 +100,7 @@ public:
 
     const DwField& operator = (const DwField& aField);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aField}.  The parent node of the {\tt DwField} object
+    //. {\tt aField}.  The tqparent node of the {\tt DwField} object
     //. is not changed.
 
     virtual void Parse();
@@ -169,7 +169,7 @@ public:
     void SetNext(const DwField* aField);
     //. This {\it advanced} function sets {\tt aField} as the next field
     //. following this field in the list of fields contained in the headers.
-    //. Since {\tt DwHeaders} tqcontains member functions for adding
+    //. Since {\tt DwHeaders} contains member functions for adding
     //. {\tt DwField} objects to its list, this function should be
     //. avoided for most applications.
 
diff --git a/mimelib/mimelib/fieldbdy.h b/mimelib/mimelib/fieldbdy.h
index 24a0c0b9..71a2164f 100644
--- a/mimelib/mimelib/fieldbdy.h
+++ b/mimelib/mimelib/fieldbdy.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -45,9 +45,9 @@
 //. interface common to all structured field bodies.
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwFieldBody}
-//. object may be either a leaf node, having a parent but no child nodes, or
-//. an intermediate node, having a parent and one or more child nodes.  The
-//. parent node is the {\tt DwField} object that tqcontains it.  Child nodes,
+//. object may be either a leaf node, having a tqparent but no child nodes, or
+//. an intermediate node, having a tqparent and one or more child nodes.  The
+//. tqparent node is the {\tt DwField} object that contains it.  Child nodes,
 //. if present, depend on the particular subclass of {\tt DwFieldBody} that
 //. is instantiated.  A {\tt DwAddressList} object, for example, has
 //. {\tt DwAddress} objects as its child nodes.
@@ -78,14 +78,14 @@ public:
     DwFieldBody(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwFieldBody} object's string representation to the empty
-    //. string and sets its parent to {\tt NULL}.
+    //. string and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs a
     //. deep copy of {\tt aFieldBody}.
-    //. The parent of the new {\tt DwFieldBody} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwFieldBody} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwFieldBody}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -95,7 +95,7 @@ public:
 
     const DwFieldBody& operator = (const DwFieldBody& aFieldBody);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aFieldBody}.  The parent node of the {\tt DwFieldBody} object
+    //. {\tt aFieldBody}.  The tqparent node of the {\tt DwFieldBody} object
     //. is not changed.
 
     void SetOffset(int aOffset);
diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h
index ea0e7260..06600af2 100644
--- a/mimelib/mimelib/group.h
+++ b/mimelib/mimelib/group.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -47,13 +47,13 @@
 //+ Name DwGroup -- Class representing an RFC-822 address group
 //+ Description
 //. {\tt DwGroup} represents a {\it group} as described in RFC-822.  A group
-//. tqcontains a group name and a (possibly empty) list of {\it mailboxes}.
-//. In MIME++, a {\tt DwGroup} object tqcontains a string for the group name
+//. contains a group name and a (possibly empty) list of {\it mailboxes}.
+//. In MIME++, a {\tt DwGroup} object contains a string for the group name
 //. and a {\tt DwMailboxList} object for the list of mailboxes.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwGroup}
-//. object may be only an intermediate node, having both a parent and a single
-//. child node.  Its parent node must be a {\tt DwField} or a
+//. object may be only an intermediate node, having both a tqparent and a single
+//. child node.  Its tqparent node must be a {\tt DwField} or a
 //. {\tt DwAddressList}.  Its child is a {\tt DwMailboxList}.
 //.
 //. A {\tt DwGroup} is a {\tt DwAddress}, and therefore it can be included
@@ -74,14 +74,14 @@ public:
     DwGroup(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwGroup} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aGroup}.
-    //. The parent of the new {\tt DwGroup} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwGroup} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwGroup}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -91,7 +91,7 @@ public:
 
     const DwGroup& operator = (const DwGroup& aGroup);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aGroup}.  The parent node of the {\tt DwGroup} object
+    //. {\tt aGroup}.  The tqparent node of the {\tt DwGroup} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h
index 5debab9b..6598cc52 100644
--- a/mimelib/mimelib/headers.h
+++ b/mimelib/mimelib/headers.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -86,8 +86,8 @@ class DwText;
 //. header fields.
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwHeaders}
-//. object is an intermediate node, having both a parent node and several
-//. child nodes.  The parent node is the {\tt DwEntity} object that tqcontains
+//. object is an intermediate node, having both a tqparent node and several
+//. child nodes.  The tqparent node is the {\tt DwEntity} object that tqcontains
 //. it.  The child nodes are the {\tt DwField} objects in the list it manages.
 //. (See the man page for {\tt DwMessageComponent} for a discussion of
 //. the tree representation of a message.)
@@ -138,14 +138,14 @@ public:
     DwHeaders(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwHeaders} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs a
     //. deep copy of {\tt aHeaders}.
-    //. The parent of the new {\tt DwHeaders} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwHeaders} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwHeaders}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of a class
@@ -155,7 +155,7 @@ public:
 
     const DwHeaders& operator = (const DwHeaders& aHeaders);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aHeaders}.  The parent node of the {\tt DwHeaders} object
+    //. {\tt aHeaders}.  The tqparent node of the {\tt DwHeaders} object
     //. is not changed.
 
     virtual void Parse();
@@ -347,7 +347,7 @@ public:
 
     void AddOrReplaceField(DwField* aField);
     //. Adds a {\tt DwField} object to the list.  If a header field with
-    //. the same field name already exists, it is tqreplaced by the new
+    //. the same field name already exists, it is replaced by the new
     //. header field.
     //.
     //. {\tt DwHeaders} takes responsibility for deleting the added
@@ -359,7 +359,7 @@ public:
 
     void AddField(DwField* aField);
     //. Adds a {\tt DwField} object to the list. If a header field with
-    //. the same field name already exists, it is {\it not} tqreplaced;
+    //. the same field name already exists, it is {\it not} replaced;
     //. thus, duplicate header fields may occur when using this member
     //. function.  (This is what you want for some header fields, such as
     //. the "Received" header field).
diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h
index 2ef28258..0d158ecf 100644
--- a/mimelib/mimelib/mailbox.h
+++ b/mimelib/mimelib/mailbox.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -58,8 +58,8 @@
 //. of a mailbox.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMailbox}
-//. object may be only a leaf node, having a parent but no child nodes.
-//. Its parent node must be a {\tt DwField}, a {\tt DwAddressList}, or a
+//. object may be only a leaf node, having a tqparent but no child nodes.
+//. Its tqparent node must be a {\tt DwField}, a {\tt DwAddressList}, or a
 //. {\tt DwMailboxList} object.
 //.
 //. {\tt DwMailbox} has member functions for getting or setting the strings
@@ -85,14 +85,14 @@ public:
     DwMailbox(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMailbox} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aMailbox}.
-    //. The parent of the new {\tt DwMailbox} is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwMailbox} is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMailbox}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of a class
@@ -102,7 +102,7 @@ public:
 
     const DwMailbox& operator = (const DwMailbox& aMailbox);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aMailbox}.  The parent node of the {\tt DwMailbox} object
+    //. {\tt aMailbox}.  The tqparent node of the {\tt DwMailbox} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h
index adbd9363..8d6f59c9 100644
--- a/mimelib/mimelib/mboxlist.h
+++ b/mimelib/mimelib/mboxlist.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -42,7 +42,7 @@
 //+ Description
 //. {\tt DwMailboxList} represents a list of {\it mailboxes} as described
 //. in RFC-822.  In MIME++, {\tt DwMailboxList} is a container for objects
-//. of type {\tt DwMailbox}, and it tqcontains various member functions to
+//. of type {\tt DwMailbox}, and it contains various member functions to
 //. manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the "From" header field, have a list of mailboxes as
@@ -60,14 +60,14 @@ public:
     DwMailboxList(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMailboxList} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation and all {\tt DwMailbox} objects from {\tt aList}.
-    //. The parent of the new {\tt DwMailboxList} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwMailboxList} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMailboxList}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -77,7 +77,7 @@ public:
 
     const DwMailboxList& operator = (const DwMailboxList& aList);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aList}.  The parent node of the {\tt DwMailboxList} object
+    //. {\tt aList}.  The tqparent node of the {\tt DwMailboxList} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/mechansm.h b/mimelib/mimelib/mechansm.h
index 05a80fe9..ace3c29b 100644
--- a/mimelib/mimelib/mechansm.h
+++ b/mimelib/mimelib/mechansm.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -58,14 +58,14 @@ public:
     DwMechanism(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMechanism} object's string representation to the empty
-    //. string and sets its parent to {\tt NULL}.
+    //. string and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation from {\tt aCte}.
-    //. The parent of the new {\tt DwMechanism} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwMechanism} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMechanism}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -75,7 +75,7 @@ public:
 
     const DwMechanism& operator = (const DwMechanism& aCte);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aCte}.  The parent node of the {\tt DwMechanism} object
+    //. {\tt aCte}.  The tqparent node of the {\tt DwMechanism} object
     //. is not changed.
 
     virtual void Parse();
@@ -91,7 +91,7 @@ public:
     //. executes the assemble method for {\tt DwMechanism} objects.
     //. It should be called whenever one of the object's attributes
     //. is changed in order to assemble the string representation.
-    //. It will be called automatically for this object by the parent
+    //. It will be called automatically for this object by the tqparent
     //. object's {\tt Assemble()} member function if the is-modified
     //. flag is set.
     //.
diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h
index 7fa16414..6484f1e3 100644
--- a/mimelib/mimelib/mediatyp.h
+++ b/mimelib/mimelib/mediatyp.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -50,7 +50,7 @@ class DwParameter;
 //.
 //. {\tt DwMediaType} has member functions that allow you to set or get
 //. the type and subtype as either enumerated values or as strings.  It
-//. also tqcontains a list of {\tt DwParameter} objects that represent the
+//. also contains a list of {\tt DwParameter} objects that represent the
 //. parameters of the field body.  You can use convenience functions to
 //. directly access the boundary parameter of a multipart media type, or
 //. to access the name parameter that is often used with several media
@@ -79,14 +79,14 @@ public:
     DwMediaType(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMediaType} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. deep copy of {\tt aMediaType}.
-    //. The parent of the new {\tt DwMediaType} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwMediaType} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMediaType}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of
@@ -96,7 +96,7 @@ public:
 
     const DwMediaType& operator = (const DwMediaType& aMediaType);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aMediaType}.  The parent node of the {\tt DwMediaType}
+    //. {\tt aMediaType}.  The tqparent node of the {\tt DwMediaType}
     //. object is not changed.
 
     virtual void Parse();
@@ -114,7 +114,7 @@ public:
     //. It should be called whenever one of the object's attributes
     //. is changed in order to assemble the string representation from
     //. its broken-down representation.  It will be called
-    //. automatically for this object by the parent object's
+    //. automatically for this object by the tqparent object's
     //. {\tt Assemble()} member function if the is-modified flag is set.
     //.
     //. This function clears the is-modified flag.
diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h
index 17ada56a..8ce31abc 100644
--- a/mimelib/mimelib/message.h
+++ b/mimelib/mimelib/message.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -36,17 +36,17 @@
 //+ Description
 //. {\tt DwMessage} represents an RFC-822/MIME {\it message}.
 //.
-//. A {\it message} tqcontains both a collection of {\it header fields} and
+//. A {\it message} contains both a collection of {\it header fields} and
 //. a {\it body}. In the terminology of RFC-2045, the general term for the
 //. headers-body combination is {\it entity}. In MIME++, {\tt DwMessage}
-//. is a direct subclass of {\tt DwEntity}, and therefore tqcontains both
+//. is a direct subclass of {\tt DwEntity}, and therefore contains both
 //. a {\tt DwHeaders} object and a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMessage}
-//. object is almost always a root node, having child nodes but no parent node.
+//. object is almost always a root node, having child nodes but no tqparent node.
 //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object
 //. it tqcontains.  A {\tt DwMessage} may sometimes be an intermediate node.  In
-//. this special case, the parent node is a {\tt DwBody} object of type
+//. this special case, the tqparent node is a {\tt DwBody} object of type
 //. "message/*" and the {\tt DwMessage} object represents an encapsulated
 //. message.
 //.
@@ -66,14 +66,14 @@ public:
     DwMessage(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMessage} object's string representation to the empty string
-    //. and sets its parent to {\tt NULL}.
+    //. and sets its tqparent to {\tt NULL}.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aMessage}.
-    //. The parent of the new {\tt DwMessage} object is set to {\tt NULL}.
+    //. The tqparent of the new {\tt DwMessage} object is set to {\tt NULL}.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMessage}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
 
@@ -81,7 +81,7 @@ public:
 
     const DwMessage& operator = (const DwMessage& aMessage);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aMessage}.  The parent node of the {\tt DwMessage} object
+    //. {\tt aMessage}.  The tqparent node of the {\tt DwMessage} object
     //. is not changed.
 
     virtual DwMessageComponent* Clone() const;
diff --git a/mimelib/mimelib/mimepp.h b/mimelib/mimelib/mimepp.h
index cecb2044..bf40108f 100644
--- a/mimelib/mimelib/mimepp.h
+++ b/mimelib/mimelib/mimepp.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h
index cc2cefb2..46ff95cb 100644
--- a/mimelib/mimelib/msgcmp.h
+++ b/mimelib/mimelib/msgcmp.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -94,31 +94,31 @@
 //.    to be set.
 //.
 //. \item
-//.    A parent.  Most message components are part of another component.
+//.    A tqparent.  Most message components are part of another component.
 //.    A collection of headers is part of a message or body part, a header
 //.    field is part of a collection of headers, a field-body is part
-//.    of a header field, and so on.  The parent of
-//.    a component is the component that tqcontains it.  This tree structure
-//.    is important, since a component's parent must be parsed before the
+//.    of a header field, and so on.  The tqparent of
+//.    a component is the component that contains it.  This tree structure
+//.    is important, since a component's tqparent must be parsed before the
 //.    component can be.  Also, a component's string representation must
-//.    be assembled before its parent's.  To maintain consistency in the
+//.    be assembled before its tqparent's.  To maintain consistency in the
 //.    tree, whenever a component's is-modified flag is set,
-//.    the component notifies its parent to also set its is-modified flag.
+//.    the component notifies its tqparent to also set its is-modified flag.
 //.    In this way, an is-modified flag set anywhere in the tree always
 //.    propagates up to the root component.
 //.
 //. \item
-//.    Children.  The preceding discussion about a component's parent is
-//.    relevant to an understanding of a component's children.  A component's
-//.    parse method calls the parse methods of its children
+//.    Children.  The preceding discussion about a component's tqparent is
+//.    relevant to an understanding of a component's tqchildren.  A component's
+//.    parse method calls the parse methods of its tqchildren
 //.    after it has executed its own parse method (and, in some cases, created
-//.    all of its children).
+//.    all of its tqchildren).
 //.    Also, a component typically calls the assemble method of its
-//.    children before it executes its own.  A component's child may request
+//.    tqchildren before it executes its own.  A component's child may request
 //.    that the component set its is-modified flag.
-//.    {\tt DwMessageComponent} does not deal directly with children.
+//.    {\tt DwMessageComponent} does not deal directly with tqchildren.
 //.    Derived classes bear all the responsibility for handling their
-//.    children.
+//.    tqchildren.
 //. \end{enumerate}
 //=============================================================================
 //+ Noentry ~DwMessageComponent _PrintDebugInfo mString mIsModified mParent
@@ -163,18 +163,18 @@ public:
     DwMessageComponent(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMessageComponent} object's string representation to the
-    //. empty string and sets its parent to NULL.
+    //. empty string and sets its tqparent to NULL.
     //.
     //. The second constructor is the copy constructor, which performs
-    //. a deep copy of {\tt aCmp}.  The parent of the new
+    //. a deep copy of {\tt aCmp}.  The tqparent of the new
     //. {\tt DwMessageComponent} object is set to NULL.
     //.
     //. The third constructor copies {\tt aStr} to the new
     //. {\tt DwMessageComponent} object's string representation and sets
-    //. {\tt aParent} as its parent.  In typical cases, the virtual
+    //. {\tt aParent} as its tqparent.  In typical cases, the virtual
     //. member function {\tt Parse()} should be called immediately after
     //. this constructor to parse the new {\tt DwMessageComponent} object
-    //. and all of its children into their broken-down representations.
+    //. and all of its tqchildren into their broken-down representations.
 
     virtual ~DwMessageComponent();
 
@@ -188,10 +188,10 @@ public:
     //. responsible for extracting the broken-down representation from
     //. the string representation.  In some derived classes, such as
     //. {\tt DwHeaders}, the parse method is also responsible for creating the
-    //. children of the object.  (In the case of {\tt DwHeaders}, the children
+    //. tqchildren of the object.  (In the case of {\tt DwHeaders}, the tqchildren
     //. created are the {\tt DwField} objects that represent the {\it field}s
     //. contained in the {\it headers}.)  The {\tt Parse()} function always
-    //. calls the {\tt Parse()} function of all of its children.
+    //. calls the {\tt Parse()} function of all of its tqchildren.
 
     virtual void Assemble() = 0;
     //. A pure virtual function which provides an interface to the
@@ -200,11 +200,11 @@ public:
     //. from the broken-down representation.  In other words, the
     //. assemble method is the opposite of the parse method.  Before
     //. assembling its string representation, the assemble method calls
-    //. the assemble method of each of its children.  In this way, the
+    //. the assemble method of each of its tqchildren.  In this way, the
     //. entire tree structure that represents a message may be traversed.
     //. If the is-modifed flag for a {\tt DwMessageComponent} is cleared,
     //. the {\tt Assemble()} function will return immediately without
-    //. calling the {\tt Assemble()} function of any of its children.
+    //. calling the {\tt Assemble()} function of any of its tqchildren.
 
     virtual DwMessageComponent* Clone() const = 0;
     //. Creates a new {\tt DwMessageComponent} on the free store that is of
@@ -217,7 +217,7 @@ public:
     //. NUL-terminated. This member function does not invoke the parse
     //. method.  Typically, the virtual member function {\tt Parse()}
     //. should be called immediately after this member function to parse
-    //. the {\tt DwMessageComponent} object and all of its children into
+    //. the {\tt DwMessageComponent} object and all of its tqchildren into
     //. their broken-down representations.  See also
     //. {\tt DwMessageComponent::Parse()}
 
@@ -230,11 +230,11 @@ public:
     //. {\tt DwMessageComponent::Assemble()}.
 
     DwMessageComponent* Parent();
-    //. Returns the {\tt DwMessageComponent} object that is the parent
+    //. Returns the {\tt DwMessageComponent} object that is the tqparent
     //. of this object.
 
     void SetParent(DwMessageComponent* aParent);
-    //. Sets {\tt aParent} as the {\tt DwMessageComponent} object's parent.
+    //. Sets {\tt aParent} as the {\tt DwMessageComponent} object's tqparent.
 
     DwBool IsModified() const;
     //. Returns 1 if the is-modified flag is set for this
@@ -242,7 +242,7 @@ public:
 
     void SetModified();
     //. Sets the is-modified (dirty) flag for this {\tt DwMessageComponent}
-    //. object and notifies the object's parent to also set its is-modified
+    //. object and notifies the object's tqparent to also set its is-modified
     //. flag.
 
     int ClassId() const;
@@ -269,7 +269,7 @@ protected:
     // Is-modified flag
 
     DwMessageComponent* mParent;
-    // Component that tqcontains this component
+    // Component that contains this component
 
     componentType mClassId;
     // Class identifier for runtime type identification
diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h
index 7e891bbf..11c1edb1 100644
--- a/mimelib/mimelib/msgid.h
+++ b/mimelib/mimelib/msgid.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -36,12 +36,12 @@
 //+ Description
 //. {\tt DwMsgId} represents a {\it msg-id} as described in RFC-822.  In
 //. the BNF grammar in RFC-822, a msg-id has a {\it local-part} and a
-//. {\it domain}.  In MIME++, a {\tt DwMsgId} tqcontains strings that
+//. {\it domain}.  In MIME++, a {\tt DwMsgId} contains strings that
 //. contain the local-part and the domain.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMsgId}
-//. object may only be a leaf node, having a parent but no child nodes.
-//. Its parent node must be a {\tt DwField} object.
+//. object may only be a leaf node, having a tqparent but no child nodes.
+//. Its tqparent node must be a {\tt DwField} object.
 //.
 //. {\tt DwMsgId} has member functions for getting or setting its local-part
 //. and its domain.  You can have the library to create the contents of a
@@ -61,14 +61,14 @@ public:
     DwMsgId(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwMsgId} object's string representation to the empty string
-    //. and sets its parent to NULL.
+    //. and sets its tqparent to NULL.
     //.
     //. The second constructor is the copy constructor, which performs
     //. a deep copy of {\tt aMsgId}.
-    //. The parent of the new {\tt DwMsgId} object is set to NULL.
+    //. The tqparent of the new {\tt DwMsgId} object is set to NULL.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwMsgId}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is NULL, {\tt aParent} should point to an object of a class
@@ -78,7 +78,7 @@ public:
 
     const DwMsgId& operator = (const DwMsgId& aMsgId);
     //. This is the assignment operator, which performs a deep copy of
-    //. {\tt aMsgId}.  The parent node of the {\tt DwMsgId} object
+    //. {\tt aMsgId}.  The tqparent node of the {\tt DwMsgId} object
     //. is not changed.
 
     virtual void Parse();
diff --git a/mimelib/mimelib/nntp.h b/mimelib/mimelib/nntp.h
index bd617903..d98ebb5e 100644
--- a/mimelib/mimelib/nntp.h
+++ b/mimelib/mimelib/nntp.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -329,7 +329,7 @@ public:
     //. the function returns zero.
 
     int Quit();
-    //. Sends the NNTP QUIT command and returns the reply code received from
+    //. Sends the NNTP TQUIT command and returns the reply code received from
     //. the server.  If no response is received, perhaps because of an error,
     //. the function returns zero.
 
diff --git a/mimelib/mimelib/param.h b/mimelib/mimelib/param.h
index 94458a7a..b1b7560b 100644
--- a/mimelib/mimelib/param.h
+++ b/mimelib/mimelib/param.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -62,14 +62,14 @@ public:
     DwParameter(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwParameter} object's string representation to the empty string
-    //. and sets its parent to NULL.
+    //. and sets its tqparent to NULL.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation, attribute, and value from {\tt aParam}.
-    //. The parent of the new {\tt DwParameter} object is set to NULL.
+    //. The tqparent of the new {\tt DwParameter} object is set to NULL.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwParameter}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is NULL, {\tt aParent} should point to an object of a class
@@ -93,7 +93,7 @@ public:
     //. It should be called whenever one of the object's attributes
     //. is changed in order to assemble the string representation from
     //. its broken-down representation.  It will be called
-    //. automatically for this object by the parent object's
+    //. automatically for this object by the tqparent object's
     //. {\tt Assemble()} member function if the is-modified flag is set.
 
     virtual DwMessageComponent* Clone() const;
diff --git a/mimelib/mimelib/pop.h b/mimelib/mimelib/pop.h
index 5bd90ea7..b5627e4d 100644
--- a/mimelib/mimelib/pop.h
+++ b/mimelib/mimelib/pop.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -213,7 +213,7 @@ public:
     //. {\tt aPasswd} is the password, which is sent in the command.
 
     int Quit();
-    //. Sends the QUIT command and returns the status code received from
+    //. Sends the TQUIT command and returns the status code received from
     //. the server.  If no response is received, the function returns zero.
 
     int Stat();
diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h
index 32186a82..847b02fb 100644
--- a/mimelib/mimelib/protocol.h
+++ b/mimelib/mimelib/protocol.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h
index 83242c6a..556d6794 100644
--- a/mimelib/mimelib/string.h
+++ b/mimelib/mimelib/string.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -88,7 +88,7 @@ public:
 //. other string classes.  {\tt DwString} also handles binary data, which can
 //. contain embedded NUL characters.
 //=============================================================================
-//+ Noentry _copy _tqreplace Length AsCharBuf Substring Prefix Suffix Prepend
+//+ Noentry _copy _replace Length AsCharBuf Substring Prefix Suffix Prepend
 //+ Noentry Append Insert Replace Delete mRep mStart mLength sEmptyString
 //+ Noentry ~DwString
 
@@ -338,10 +338,10 @@ public:
     //. should be considered invalid after any call to a non-const member
     //. function or another call to {\tt c_str()}.
 
-    size_t find(const DwString& aStr, size_t aPos=0) const;
-    size_t find(const char* aBuf, size_t aPos, size_t aLen) const;
-    size_t find(const char* aCstr, size_t aPos=0) const;
-    size_t find(char aChar, size_t aPos=0) const;
+    size_t tqfind(const DwString& aStr, size_t aPos=0) const;
+    size_t tqfind(const char* aBuf, size_t aPos, size_t aLen) const;
+    size_t tqfind(const char* aCstr, size_t aPos=0) const;
+    size_t tqfind(char aChar, size_t aPos=0) const;
     //. Performs a forward search for a sequence of characters in the
     //. {\tt DwString} object.  The return value is the position of the
     //. sequence in the string if found, or {\tt DwString::npos} if not
@@ -360,10 +360,10 @@ public:
     //. The fourth version searches beginning at position {\tt aPos} for
     //. the character {\tt aChar}.
 
-    size_t rfind(const DwString& aStr, size_t aPos=npos) const;
-    size_t rfind(const char* aBuf, size_t aPos, size_t aLen) const;
-    size_t rfind(const char* aCstr, size_t aPos=npos) const;
-    size_t rfind(char aChar, size_t aPos=npos) const;
+    size_t rtqfind(const DwString& aStr, size_t aPos=npos) const;
+    size_t rtqfind(const char* aBuf, size_t aPos, size_t aLen) const;
+    size_t rtqfind(const char* aCstr, size_t aPos=npos) const;
+    size_t rtqfind(char aChar, size_t aPos=npos) const;
     //. Performs a reverse search for a sequence of characters in the
     //. {\tt DwString} object.  The return value is the position of the
     //. sequence in the string if found, or {\tt DwString::npos} if not
@@ -453,7 +453,7 @@ public:
     //. string {\tt aCstr}.
 
     DwString substr(size_t aPos=0, size_t aLen=npos) const;
-    //. Returns a string that tqcontains at most {\tt aLen} characters from
+    //. Returns a string that contains at most {\tt aLen} characters from
     //. the {\tt DwString} object beginning at position {\tt aPos}.  The
     //. returned substring will not contain more characters than what are
     //. available in the superstring {\tt DwString} object.
diff --git a/mimelib/mimelib/text.h b/mimelib/mimelib/text.h
index 89b908ad..c3e084da 100644
--- a/mimelib/mimelib/text.h
+++ b/mimelib/mimelib/text.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -55,14 +55,14 @@ public:
     DwText(const DwString& aStr, DwMessageComponent* aParent=0);
     //. The first constructor is the default constructor, which sets the
     //. {\tt DwText} object's string representation to the empty string
-    //. and sets its parent to NULL.
+    //. and sets its tqparent to NULL.
     //.
     //. The second constructor is the copy constructor, which copies the
     //. string representation from {\tt aText}.
-    //. The parent of the new {\tt DwText} object is set to NULL.
+    //. The tqparent of the new {\tt DwText} object is set to NULL.
     //.
     //. The third constructor copies {\tt aStr} to the {\tt DwText}
-    //. object's string representation and sets {\tt aParent} as its parent.
+    //. object's string representation and sets {\tt aParent} as its tqparent.
     //. The virtual member function {\tt Parse()} should be called immediately
     //. after this constructor in order to parse the string representation.
     //. Unless it is NULL, {\tt aParent} should point to an object of a class
diff --git a/mimelib/mimelib/token.h b/mimelib/mimelib/token.h
index 7168ea09..771cef97 100644
--- a/mimelib/mimelib/token.h
+++ b/mimelib/mimelib/token.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/utility.h b/mimelib/mimelib/utility.h
index 8cda35ea..15a8e58e 100644
--- a/mimelib/mimelib/utility.h
+++ b/mimelib/mimelib/utility.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/mimelib/uuencode.h b/mimelib/mimelib/uuencode.h
index c87efbda..e44d41df 100644
--- a/mimelib/mimelib/uuencode.h
+++ b/mimelib/mimelib/uuencode.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/msgcmp.cpp b/mimelib/msgcmp.cpp
index 4b154dc3..fcaaaa4e 100644
--- a/mimelib/msgcmp.cpp
+++ b/mimelib/msgcmp.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/msgid.cpp b/mimelib/msgid.cpp
index 29a8d955..bfd9487d 100644
--- a/mimelib/msgid.cpp
+++ b/mimelib/msgid.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -226,7 +226,7 @@ DwMessageComponent* DwMsgId::Clone() const
 }
 
 
-static char base35chars[] = "0123456789ABCDEFGHIJKLMNPQRSTUVWXYZ";
+static char base35chars[] = "0123456789ABCDEFGHIJKLMNPTQRSTUVWXYZ";
 
 void DwMsgId::CreateDefault()
 {
diff --git a/mimelib/multipar.cpp b/mimelib/multipar.cpp
index 75825a84..ab675e92 100644
--- a/mimelib/multipar.cpp
+++ b/mimelib/multipar.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -305,7 +305,7 @@ void MultipartMessage::SetBodyPart(int aIdx, const MultipartBodyPart& aPart)
     DwBody& body = mMessage->Body();
     int numParts = NumberOfParts();
     DwBodyPart* part = 0;
-    // If indexed part exists already, just tqreplace its values
+    // If indexed part exists already, just replace its values
     if (0 <= aIdx && aIdx < numParts) {
         part = body.FirstBodyPart();
         for (int curIdx=0; curIdx < aIdx; ++curIdx) {
diff --git a/mimelib/multipar.h b/mimelib/multipar.h
index f6de628a..41c3ca2d 100644
--- a/mimelib/multipar.h
+++ b/mimelib/multipar.h
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp
index a89293ae..b6b20917 100644
--- a/mimelib/nntp.cpp
+++ b/mimelib/nntp.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -467,7 +467,7 @@ int DwNntpClient::Quit()
     mReplyCode = 0;
     mStatusResponse = mTextResponse = "";
     mLastCommand = kCmdQuit;
-    strlcpy(mSendBuffer, "QUIT\r\n", SEND_BUFFER_SIZE);
+    strlcpy(mSendBuffer, "TQUIT\r\n", SEND_BUFFER_SIZE);
     DBG_NNTP_STMT(cout << "C: " << mSendBuffer << flush;)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
diff --git a/mimelib/param.cpp b/mimelib/param.cpp
index f928be55..a289603e 100644
--- a/mimelib/param.cpp
+++ b/mimelib/param.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/pop.cpp b/mimelib/pop.cpp
index 78bb6475..88f9b654 100644
--- a/mimelib/pop.cpp
+++ b/mimelib/pop.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
@@ -143,7 +143,7 @@ int DwPopClient::Quit()
     mStatusCode = 0;
     mSingleLineResponse = mMultiLineResponse = "";
     mLastCommand = kCmdQuit;
-    strlcpy(mSendBuffer, "QUIT\r\n", SEND_BUFFER_SIZE);
+    strlcpy(mSendBuffer, "TQUIT\r\n", SEND_BUFFER_SIZE);
     DBG_POP_STMT(cout << "C: " << mSendBuffer << flush;)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp
index b0685aa7..733b8792 100644
--- a/mimelib/protocol.cpp
+++ b/mimelib/protocol.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/test/exampl01.cpp b/mimelib/test/exampl01.cpp
index 497383bf..3ab827e2 100644
--- a/mimelib/test/exampl01.cpp
+++ b/mimelib/test/exampl01.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/test/exampl02.cpp b/mimelib/test/exampl02.cpp
index 600df8a6..263f3f71 100644
--- a/mimelib/test/exampl02.cpp
+++ b/mimelib/test/exampl02.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/test/exampl03.cpp b/mimelib/test/exampl03.cpp
index 02350e9d..6dd4462c 100644
--- a/mimelib/test/exampl03.cpp
+++ b/mimelib/test/exampl03.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/test/exampl04.cpp b/mimelib/test/exampl04.cpp
index 7a0b5d07..a7cac1a7 100644
--- a/mimelib/test/exampl04.cpp
+++ b/mimelib/test/exampl04.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/test/exampl05.cpp b/mimelib/test/exampl05.cpp
index 5e3b16d8..e75d9612 100644
--- a/mimelib/test/exampl05.cpp
+++ b/mimelib/test/exampl05.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 // 
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/text.cpp b/mimelib/text.cpp
index 81fe1a71..c3b390d4 100644
--- a/mimelib/text.cpp
+++ b/mimelib/text.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/token.cpp b/mimelib/token.cpp
index 654d764f..8a79e46f 100644
--- a/mimelib/token.cpp
+++ b/mimelib/token.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/mimelib/uuencode.cpp b/mimelib/uuencode.cpp
index bbd3c856..8a7317e7 100644
--- a/mimelib/uuencode.cpp
+++ b/mimelib/uuencode.cpp
@@ -8,7 +8,7 @@
 // All rights reserved.
 //
 // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT,
-// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF
 // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER
 // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 57c54642..02b02e21 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -28,8 +28,8 @@
 
 #include <tqlayout.h>
 
-AttendeeSelector::AttendeeSelector(TQWidget * parent)
-  : KDialogBase( parent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true )
+AttendeeSelector::AttendeeSelector(TQWidget * tqparent)
+  : KDialogBase( tqparent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true )
 {
   ui = new AttendeeSelectorWidget( this );
   setMainWidget( ui );
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h
index eb843f1f..8484d5b1 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.h
+++ b/plugins/kmail/bodypartformatter/attendeeselector.h
@@ -30,8 +30,9 @@ class AttendeeSelectorWidget;
 class AttendeeSelector : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AttendeeSelector( TQWidget *parent = 0 );
+    AttendeeSelector( TQWidget *tqparent = 0 );
 
     TQStringList attendees() const;
 
diff --git a/plugins/kmail/bodypartformatter/delegateselector.cpp b/plugins/kmail/bodypartformatter/delegateselector.cpp
index 0f20da93..b85edc9f 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.cpp
+++ b/plugins/kmail/bodypartformatter/delegateselector.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 
-DelegateSelector::DelegateSelector(TQWidget * parent)
-  : KDialogBase( parent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true )
+DelegateSelector::DelegateSelector(TQWidget * tqparent)
+  : KDialogBase( tqparent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true )
 {
   TQVBox *page = makeVBoxMainWidget();
 
diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h
index 8f1d87d1..c2be8950 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.h
+++ b/plugins/kmail/bodypartformatter/delegateselector.h
@@ -34,9 +34,10 @@ class TQCheckBox;
 class DelegateSelector : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DelegateSelector( TQWidget *parent = 0 );
+    DelegateSelector( TQWidget *tqparent = 0 );
 
     TQString delegate() const;
     bool rsvp() const;
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 66ed33c3..87d29875 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -116,12 +116,12 @@ CalendarManager::CalendarManager()
   for ( CalendarResourceManager::ActiveIterator it = mgr->activeBegin(); it != mgr->activeEnd(); ++it ) {
     if ( (*it)->type() == "imap" || (*it)->type() == "kolab" ) {
       const TQStringList subResources = (*it)->subresources();
-      TQMap<TQString, int> prefixSet; // KDE4: QSet
+      TQMap<TQString, int> prefixSet; // KDE4: TQSet
       for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) {
         if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) )
           // we don't care about shared folders
           continue;
-        prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 );
+        prefixSet.insert( (*subIt).left( (*subIt).tqfind( "/.INBOX.directory/" ) ), 0 );
       }
       if ( prefixSet.count() > 1 )
         multipleKolabResources = true;
@@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter
     }
 };
 
-static TQString directoryForStatus( Attendee::PartStat status )
+static TQString directoryFortqStatus( Attendee::PartStat status )
 {
   TQString dir;
   switch ( status ) {
@@ -310,7 +310,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
                                 true, // RSVP, otherwise we would not be here
                                 status,
                                 myself ? myself->role() : heuristicalRole( incidence ),
-                                myself ? myself->uid() : TQString::null );
+                                myself ? myself->uid() : TQString() );
       if ( myself ) {
         newMyself->setDelegate( myself->delegate() );
         newMyself->setDelegator( myself->delegator() );
@@ -333,7 +333,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     bool mail( Incidence* incidence, KMail::Callback& callback,
                Attendee::PartStat status,
                Scheduler::Method method = Scheduler::Reply,
-               const TQString &to = TQString::null, MailType type = Answer ) const
+               const TQString &to = TQString(), MailType type = Answer ) const
     {
       ICalFormat format;
       format.setTimeZone( KPimPrefs::timezone(), false );
@@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       TQString recv = to;
       if ( recv.isEmpty() )
         recv = incidence->organizer().fullName();
-      TQString statusString = directoryForStatus( status );  //it happens to return the right strings
+      TQString statusString = directoryFortqStatus( status );  //it happens to return the right strings
       return callback.mailICal( recv, msg, subject, statusString, type != Forward );
     }
 
@@ -375,7 +375,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     {
       TQString error;
       TQCString dcopService;
-      int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+      int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString(), TQString(), &error, &dcopService );
       if ( result == 0 ) {
         // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
         // [that's not the case when kontact was already running, but korganizer not loaded into it...]
@@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       }
 
       // First, save it for KOrganizer to handle
-      TQString dir = directoryForStatus( status );
+      TQString dir = directoryFortqStatus( status );
       if ( dir.isEmpty() )
         return true; // unknown status
       if ( status != Attendee::Delegated ) // we do that below for delegated incidences
@@ -632,7 +632,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
                                     true, // RSVP, otherwise we would not be here
                                     status,
                                     heuristicalRole( incidence ),
-                                    TQString::null );
+                                    TQString() );
           incidence->clearAttendees();
           incidence->addAttendee( newMyself );
           ok = mail( incidence, callback, status, Scheduler::Reply );
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       if ( status == Attendee::Delegated ) {
         incidence = icalToString( iCal );
         myself = findMyself( incidence, receiver );
-        myself->seStatus( status );
+        myself->setqStatus( status );
         myself->setDelegate( delegateString );
         TQString name, email;
         KPIM::getNameAndMail( delegateString, name, email );
@@ -932,7 +932,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
         }
       }
 
-      return TQString::null;
+      return TQString();
     }
 };
 
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 3fd76b8e..014493a9 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -221,7 +221,7 @@ namespace {
       // get the saveas file name
       KURL saveAsUrl =
         KFileDialog::getSaveURL( fileName,
-                                 TQString::null, 0,
+                                 TQString(), 0,
                                  i18n( "Save Business Card" ) );
       if ( saveAsUrl.isEmpty() ||
            ( TQFileInfo( saveAsUrl.path() ).exists() &&
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 26c366ab..6da849bd 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index 54efee6c..d929a46d 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AttendeeSelectorWidget</class>
 <author>Volker Krause &lt;vkrause@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AttendeeSelectorWidget</cstring>
     </property>
diff --git a/translate b/translate
index 0a19b1bf..232c2c04 100644
--- a/translate
+++ b/translate
@@ -58,7 +58,7 @@ scripts/merge_all.sh
 
 svn diff
 
-for i in `find -name kdepim`; do
+for i in `tqfind -name kdepim`; do
   cd $i || exit 1
 
   for t in `svn status 2>&1 | grep '^M' | gawk '{print $2}'`; do
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index 4ab53c3b..8fbb579a 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -366,7 +366,7 @@ TQString EGroupwareWizard::validate()
       mXMLRPC->text().isEmpty() )
     return i18n( "Please fill in all fields." );
 
-  return TQString::null;
+  return TQString();
 }
 
 void EGroupwareWizard::usrReadConfig()
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index 48ac3b5a..12d1f7fe 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -28,8 +28,8 @@
 
 #include "groupwarewizard.h"
 
-GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+GroupwareWizard::GroupwareWizard( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h
index 6946c360..b5b6a526 100644
--- a/wizards/groupwarewizard.h
+++ b/wizards/groupwarewizard.h
@@ -29,9 +29,10 @@ class OverViewPage;
 class GroupwareWizard : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GroupwareWizard( TQWidget *parent, const char *name = 0 );
+    GroupwareWizard( TQWidget *tqparent, const char *name = 0 );
     ~GroupwareWizard();
 
   private:
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 0bddf3da..bb527530 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -129,7 +129,7 @@ class CreateGroupwiseKabcResource : public KConfigPropagator::Change
       KABC::ResourceGroupwise *r = new KABC::ResourceGroupwise( url, user,
                                                                 password,
                                                                 TQStringList(),
-                                                                TQString::null );
+                                                                TQString() );
       r->setResourceName( i18n("GroupWise") );
       m.add( r );
       m.writeConfig();
@@ -370,7 +370,7 @@ TQString GroupwiseWizard::validate()
       return i18n( "Please fill in all fields." );
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 void GroupwiseWizard::usrReadConfig()
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index d186e9ce..bd8252b1 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -31,6 +31,7 @@ class TQGroupBox;
 class KDE_EXPORT GroupwiseWizard : public KConfigWizard
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwiseWizard();
     ~GroupwiseWizard();
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 4ad256f7..66fdd216 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -285,11 +285,11 @@ void CreateDisconnectedImapAccount::apply()
     // let's use the server name after that.
     TQString accountName = mAccountName;
     const TQStringList identities = identityManager.identities();
-    if ( identities.find( accountName ) != identities.end() ) {
+    if ( identities.tqfind( accountName ) != identities.end() ) {
       accountName = mServer;
       int i = 2;
       // And if there's already one, number them
-      while ( identities.find( accountName ) != identities.end() ) {
+      while ( identities.tqfind( accountName ) != identities.end() ) {
         accountName = mServer + " " + TQString::number( i++ );
       }
     }
diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index 97e3a83a..68ff847a 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -108,7 +108,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
   TQString defaultDomain = KolabConfig::self()->server();
   const TQString server = KolabConfig::self()->server();
   TQString user = KolabConfig::self()->user();
-  int pos = user.find( "@" );
+  int pos = user.tqfind( "@" );
   // with kolab the userid _is_ the full email
   if ( pos > 0 ) {
     // The user typed in a full email address. Assume it's correct
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index 59b7a251..9deaa373 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -59,7 +59,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       // If the user gave a full email address, the domain name
       // of that overrides the server name for the ldap dn
       const TQString user = KolabConfig::self()->user();
-      int pos = user.find( "@" );
+      int pos = user.tqfind( "@" );
       if ( pos > 0 ) {
         const TQString h = user.mid( pos+1 );
         if ( !h.isEmpty() )
@@ -181,7 +181,7 @@ class KolabPropagator : public KConfigPropagator
 
       TQString user = KolabConfig::self()->user();
       // We now use the full email address in the freebusy URL
-      //int pos = user.find( "@" );
+      //int pos = user.tqfind( "@" );
       //if ( pos > 0 ) user = user.left( pos );
 
       KURL publishURL = freeBusyBaseUrl;
@@ -311,7 +311,7 @@ TQString KolabWizard::validate()
       mRealNameEdit->text().isEmpty() ||
       mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
-  return TQString::null;
+  return TQString();
 }
 
 void KolabWizard::usrReadConfig()
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index a15b580e..74933d67 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -40,8 +40,8 @@
 
 #include "overviewpage.h"
 
-OverViewPage::OverViewPage( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+OverViewPage::OverViewPage( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h
index 487b14ce..ebe85030 100644
--- a/wizards/overviewpage.h
+++ b/wizards/overviewpage.h
@@ -24,12 +24,13 @@
 
 #include <tqwidget.h>
 
-class OverViewPage : public QWidget
+class OverViewPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    OverViewPage( TQWidget *parent, const char *name = 0 );
+    OverViewPage( TQWidget *tqparent, const char *name = 0 );
     ~OverViewPage();
 
   private slots:
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index beb05948..0291a22e 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -210,8 +210,8 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
       TQString error;
       TQCString dcopService;
       int result = KDCOPServiceStarter::self()->
-        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                        TQString::null, &error, &dcopService );
+        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                        TQString(), &error, &dcopService );
       if ( result != 0 ) {
         KMessageBox::error( 0, i18n( "Unable to start KMail to trigger initial synchronization with Scalix server" ) );
         delete msg;
@@ -458,7 +458,7 @@ TQString ScalixWizard::validate()
        mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
 
-  return TQString::null;
+  return TQString();
 }
 
 void ScalixWizard::usrReadConfig()
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 8e6954b4..2f660dc5 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -27,7 +27,7 @@
 
 #include <tqobject.h>
 
-class ServerType : public QObject
+class ServerType : public TQObject
 {
   public:
     class ConnectionInfo
@@ -50,12 +50,12 @@ class ServerType : public QObject
     };
 
     /**
-      This map tqcontains the uids and the user visible names
+      This map contains the uids and the user visible names
       of a server type.
      */
     typedef TQValueList<ConnectionInfo> ConnectionInfoList;
 
-    ServerType( TQObject *parent, const char *name ):TQObject(parent, name) {}
+    ServerType( TQObject *tqparent, const char *name ):TQObject(tqparent, name) {}
     virtual ~ServerType() {}
 
     /**
@@ -104,7 +104,7 @@ class ServerType : public QObject
 class ServerTypeFactory : public KLibFactory
 {
   public:
-    virtual ServerType *serverType( TQObject *parent, const char *name = 0 ) = 0;
+    virtual ServerType *serverType( TQObject *tqparent, const char *name = 0 ) = 0;
 
     /**
       Returns the identifier.
diff --git a/wizards/servertypemanager.cpp b/wizards/servertypemanager.cpp
index bedb4e28..d7c9287f 100644
--- a/wizards/servertypemanager.cpp
+++ b/wizards/servertypemanager.cpp
@@ -28,8 +28,8 @@
 ServerTypeManager* ServerTypeManager::mSelf = 0;
 static KStaticDeleter<ServerTypeManager> serverManagerDeleter;
 
-ServerTypeManager::ServerTypeManager( TQObject *parent, const char *name )
-  : TQObject( parent, name )
+ServerTypeManager::ServerTypeManager( TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name )
 {
   loadPlugins();
 }
@@ -54,18 +54,18 @@ TQStringList ServerTypeManager::identifiers() const
 
 TQString ServerTypeManager::title( const TQString& identifier ) const
 {
-  ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.find( identifier );
+  ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.tqfind( identifier );
   if ( it == mServerTypeFactoryMap.end() )
-    return TQString::null;
+    return TQString();
   else
     return it.data()->title();
 }
 
 ServerType* ServerTypeManager::serverType( const TQString& identifier )
 {
-  ServerTypeMap::ConstIterator serverIt = mServerTypeMap.find( identifier );
+  ServerTypeMap::ConstIterator serverIt = mServerTypeMap.tqfind( identifier );
   if ( serverIt == mServerTypeMap.end() ) { // none server type loaded yet
-    ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.find( identifier );
+    ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.tqfind( identifier );
     if ( it == mServerTypeFactoryMap.end() ) // no factory for this type
       return 0;
 
diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h
index 4d2ae289..c3070dd4 100644
--- a/wizards/servertypemanager.h
+++ b/wizards/servertypemanager.h
@@ -26,9 +26,10 @@
 
 #include "servertype.h"
 
-class ServerTypeManager : public QObject
+class ServerTypeManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     static ServerTypeManager* self();
@@ -60,7 +61,7 @@ class ServerTypeManager : public QObject
 
     void loadPlugins();
 
-    ServerTypeManager( TQObject *parent, const char *name = 0 );
+    ServerTypeManager( TQObject *tqparent, const char *name = 0 );
 
     static ServerTypeManager* mSelf;
 
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index 5cfdd2bb..d717f24c 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -269,7 +269,7 @@ TQString SloxWizard::validate()
       mUserEdit->text().isEmpty() ||
       mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
-  return TQString::null;
+  return TQString();
 }
 
 void SloxWizard::usrReadConfig()