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

189 files changed, 1368 insertions, 1279 deletions

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:
        /**