11 files changed, 78 insertions, 73 deletions
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index e0893233e..90720508a 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 4713e262d..90c6bc13d 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 77a97bb48..33f4189b8 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 5e7c1f8cb..917a1cfbf 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 60e10c21a..9fb7af203 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 aa161fc74..349f3070c 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 436816dd1..456bc7807 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 73fad674a..fb367fd32 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 bb440d4bb..24f5f9df0 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 bc358f912..f84bb1e7c 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 aedc0e829..5108b3a0b 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();