Trinity Qt initial conversion

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

6 files changed, 103 insertions, 103 deletions

diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index b621e92b8..aa8e52f72 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -37,18 +37,18 @@
 #include <kconfig.h>
 #include <kapplication.h>
 
-#include <qframe.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdir.h>
-#include <qvgroupbox.h>
+#include <tqframe.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqdir.h>
+#include <tqvgroupbox.h>
 
 static const char* log_levels[] = { "none", "basic", "advanced", "expert", "guru" };
 
-static int log_level_to_int( const QString& loglevel )
+static int log_level_to_int( const TQString& loglevel )
 {
   if( loglevel == "none" ) {
 	return 0;
@@ -66,89 +66,89 @@ static int log_level_to_int( const QString& loglevel )
   }
 }
 
-KWatchGnuPGConfig::KWatchGnuPGConfig( QWidget* parent, const char* name )
+KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
   : KDialogBase( Plain, i18n("Configure KWatchGnuPG"),
 		 Ok|Cancel, Ok, parent, name )
 {
   // tmp vars:
-  QWidget * w;
-  QGridLayout * glay;
-  QGroupBox * group;
+  TQWidget * w;
+  TQGridLayout * glay;
+  TQGroupBox * group;
 
-  QWidget * top = plainPage();
+  TQWidget * top = plainPage();
 
-  QVBoxLayout * vlay = new QVBoxLayout( top, 0, spacingHint() );
+  TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
 
-  group = new QVGroupBox( i18n("WatchGnuPG"), top );
+  group = new TQVGroupBox( i18n("WatchGnuPG"), top );
   group->layout()->setSpacing( spacingHint() );
 
-  w = new QWidget( group );
+  w = new TQWidget( group );
 
-  glay = new QGridLayout( w, 3, 2, 0, spacingHint() );
+  glay = new TQGridLayout( w, 3, 2, 0, spacingHint() );
   glay->setColStretch( 1, 1 );
 
   int row = -1;
 
   ++row;
   mExeED = new KURLRequester( w );
-  glay->addWidget( new QLabel( mExeED, i18n("&Executable:"), w ), row, 0 );
+  glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 );
   glay->addWidget( mExeED, row, 1 );
-  connect( mExeED, SIGNAL(textChanged(const QString&)), SLOT(slotChanged()) );
+  connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
 
   ++row;
   mSocketED = new KURLRequester( w );
-  glay->addWidget( new QLabel( mSocketED, i18n("&Socket:"), w ), row, 0 );
+  glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 );
   glay->addWidget( mSocketED, row, 1 );
-  connect( mSocketED, SIGNAL(textChanged(const QString&)), SLOT(slotChanged()) );
+  connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
 
   ++row;
-  mLogLevelCB = new QComboBox( false, w );
+  mLogLevelCB = new TQComboBox( false, w );
   mLogLevelCB->insertItem( i18n("None") );
   mLogLevelCB->insertItem( i18n("Basic") );
   mLogLevelCB->insertItem( i18n("Advanced") );
   mLogLevelCB->insertItem( i18n("Expert") );
   mLogLevelCB->insertItem( i18n("Guru") );
-  glay->addWidget( new QLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 );
+  glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 );
   glay->addWidget( mLogLevelCB, row, 1 );
-  connect( mLogLevelCB, SIGNAL(activated(int)), SLOT(slotChanged()) );
+  connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) );
 
   vlay->addWidget( group );
 
   /******************* Log Window group *******************/
-  group = new QVGroupBox( i18n("Log Window"), top );
+  group = new TQVGroupBox( i18n("Log Window"), top );
   group->layout()->setSpacing( spacingHint() );
 
-  w = new QWidget( group );
+  w = new TQWidget( group );
 
-  glay = new QGridLayout( w, 2, 3, 0, spacingHint() );
+  glay = new TQGridLayout( w, 2, 3, 0, spacingHint() );
   glay->setColStretch( 1, 1 );
 
   row = -1;
 
   ++row;
-  mLoglenSB = new QSpinBox( 0, 1000000, 100, w );
+  mLoglenSB = new TQSpinBox( 0, 1000000, 100, w );
   mLoglenSB->setSuffix( i18n("history size spinbox suffix"," lines") );
   mLoglenSB->setSpecialValueText( i18n("unlimited") );
-  glay->addWidget( new QLabel( mLoglenSB, i18n("&History size:"), w ), row, 0 );
+  glay->addWidget( new TQLabel( mLoglenSB, i18n("&History size:"), w ), row, 0 );
   glay->addWidget( mLoglenSB, row, 1 );
-  QPushButton * button = new QPushButton( i18n("Set &Unlimited"), w );
+  TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w );
   glay->addWidget( button, row, 2 );
 
-  connect( mLoglenSB, SIGNAL(valueChanged(int)), SLOT(slotChanged()) );
-  connect( button, SIGNAL(clicked()), SLOT(slotSetHistorySizeUnlimited()) );
+  connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) );
+  connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) );
 
   ++row;
-  mWordWrapCB = new QCheckBox( i18n("Enable &word wrapping"), w );
-  mWordWrapCB->hide(); // QTextEdit doesn't support word wrapping in LogText mode
+  mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w );
+  mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode
   glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 );
 
-  connect( mWordWrapCB, SIGNAL(clicked()), SLOT(slotChanged()) );
+  connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) );
 
   vlay->addWidget( group );
   vlay->addStretch( 1 );
 
-  connect( this, SIGNAL(applyClicked()), SLOT(slotSave()) );
-  connect( this, SIGNAL(okClicked()), SLOT(slotSave()) );
+  connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) );
+  connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) );
 }
 
 void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
@@ -160,7 +160,7 @@ void KWatchGnuPGConfig::loadConfig()
   KConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
-  mSocketED->setURL( config->readEntry( "Socket", QDir::home().canonicalPath()
+  mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
 										+ "/.gnupg/log-socket") );
   mLogLevelCB->setCurrentItem( log_level_to_int( config->readEntry( "LogLevel", "basic" ) ) );
 
@@ -168,7 +168,7 @@ void KWatchGnuPGConfig::loadConfig()
   mLoglenSB->setValue( config->readNumEntry( "MaxLogLen", 10000 ) );
   mWordWrapCB->setChecked( config->readBoolEntry("WordWrap", false ) );
 
-  config->setGroup( QString::null );
+  config->setGroup( TQString::null );
   enableButtonOK( false );
   enableButtonApply( false );
 }
@@ -185,7 +185,7 @@ void KWatchGnuPGConfig::saveConfig()
   config->writeEntry( "MaxLogLen", mLoglenSB->value() );
   config->writeEntry( "WordWrap", mWordWrapCB->isChecked() );
 
-  config->setGroup( QString::null );
+  config->setGroup( TQString::null );
   config->sync();
   enableButtonOK( false );
   enableButtonApply( false );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
index 4a93b463b..e95959e50 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
@@ -43,7 +43,7 @@ class KURLRequester;
 class KWatchGnuPGConfig : public KDialogBase {
   Q_OBJECT
 public:
-  KWatchGnuPGConfig( QWidget* parent, const char* name = 0 );
+  KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 );
 
   void loadConfig();
   void saveConfig();
@@ -59,9 +59,9 @@ private slots:
 private:
   KURLRequester* mExeED;
   KURLRequester* mSocketED;
-  QComboBox* mLogLevelCB;
-  QSpinBox* mLoglenSB;
-  QCheckBox* mWordWrapCB;
+  TQComboBox* mLogLevelCB;
+  TQSpinBox* mLoglenSB;
+  TQCheckBox* mWordWrapCB;
 };
 
 #endif /* KWATCHGNUPGCONFIG_H */
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 19bda278b..234973b6e 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -49,36 +49,36 @@
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 
-#include <qtextedit.h>
-#include <qdir.h>
-#include <qeventloop.h>
-#include <qtimer.h>
-#include <qtextcodec.h>
+#include <tqtextedit.h>
+#include <tqdir.h>
+#include <tqeventloop.h>
+#include <tqtimer.h>
+#include <tqtextcodec.h>
 
 #define WATCHGNUPGBINARY "watchgnupg"
-#define WATCHGNUPGSOCKET ( QDir::home().canonicalPath() + "/.gnupg/log-socket")
+#define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket")
 
-KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( QWidget* parent, const char* name )
+KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name )
   : KMainWindow( parent, name, WType_TopLevel ), mConfig(0)
 {
   createActions();
   createGUI();
 
-  mCentralWidget = new QTextEdit( this, "central log view" );
-  mCentralWidget->setTextFormat( QTextEdit::LogText );
+  mCentralWidget = new TQTextEdit( this, "central log view" );
+  mCentralWidget->setTextFormat( TQTextEdit::LogText );
   setCentralWidget( mCentralWidget );
 
-  mWatcher = new KProcIO( QTextCodec::codecForMib( 106 /*utf-8*/ ) );
-  connect( mWatcher, SIGNAL( processExited(KProcess*) ),
-		   this, SLOT( slotWatcherExited() ) );
-  connect( mWatcher, SIGNAL( readReady(KProcIO*) ),
-		   this, SLOT( slotReadStdout() ) );
+  mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
+  connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
+		   this, TQT_SLOT( slotWatcherExited() ) );
+  connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ),
+		   this, TQT_SLOT( slotReadStdout() ) );
 
   slotReadConfig();
   mSysTray = new KWatchGnuPGTray( this );
   mSysTray->show();
-  connect( mSysTray, SIGNAL( quitSelected() ),
-		   this, SLOT( slotQuit() ) );
+  connect( mSysTray, TQT_SIGNAL( quitSelected() ),
+		   this, TQT_SLOT( slotQuit() ) );
   setAutoSaveSettings();
 }
 
@@ -90,24 +90,24 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( QDateTime::currentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
 {
   (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
-		     this, SLOT( slotClear() ),
+		     this, TQT_SLOT( slotClear() ),
 		     actionCollection(), "clear_log" );
-  (void)KStdAction::saveAs( this, SLOT(slotSaveAs()), actionCollection() );
-  (void)KStdAction::close( this, SLOT(close()), actionCollection() );
-  (void)KStdAction::quit( this, SLOT(slotQuit()), actionCollection() );
-  (void)KStdAction::preferences( this, SLOT(slotConfigure()), actionCollection() );
-  ( void )KStdAction::keyBindings(this, SLOT(configureShortcuts()), actionCollection());
-  ( void )KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
+  (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
+  (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
+  (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
+  ( void )KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
+  ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
-  (void)new KAction( i18n("Configure KWatchGnuPG..."), QString::fromLatin1("configure"),
-					 0, this, SLOT( slotConfigure() ),
+  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
+					 0, this, TQT_SLOT( slotConfigure() ),
 					 actionCollection(), "configure" );
 #endif
 
@@ -127,15 +127,15 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars()
 
 void KWatchGnuPGMainWindow::startWatcher()
 {
-  disconnect( mWatcher, SIGNAL( processExited(KProcess*) ),
-			  this, SLOT( slotWatcherExited() ) );
+  disconnect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
+			  this, TQT_SLOT( slotWatcherExited() ) );
   if( mWatcher->isRunning() ) {
 	mWatcher->kill();
 	while( mWatcher->isRunning() ) {
-	  kapp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( QDateTime::currentDateTime().toString(Qt::ISODate)));
+						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -143,20 +143,20 @@ void KWatchGnuPGMainWindow::startWatcher()
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
   *mWatcher << config->readEntry("Socket", WATCHGNUPGSOCKET);
-  config->setGroup(QString::null);
+  config->setGroup(TQString::null);
   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( QDateTime::currentDateTime().toString(Qt::ISODate) ) );
+							.arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
   }
-  connect( mWatcher, SIGNAL( processExited(KProcess*) ),
-		   this, SLOT( slotWatcherExited() ) );
+  connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
+		   this, TQT_SLOT( slotWatcherExited() ) );
 }
 
 void KWatchGnuPGMainWindow::setGnuPGConfig()
 {
-  QStringList logclients;
+  TQStringList logclients;
   // Get config object
   Kleo::CryptoConfig* cconfig = Kleo::CryptoBackendFactory::instance()->config();
   if ( !cconfig )
@@ -164,8 +164,8 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
   //Q_ASSERT( cconfig );
   KConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
-  QStringList comps = cconfig->componentList();
-  for( QStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
+  TQStringList comps = cconfig->componentList();
+  for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
 	Kleo::CryptoConfigComponent* comp = cconfig->component( *it );
 	Q_ASSERT(comp);
 	// Look for log-file entry in Debug group
@@ -173,10 +173,10 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
 	if( group ) {
 	  Kleo::CryptoConfigEntry* entry = group->entry("log-file");
 	  if( entry ) {
-		entry->setStringValue( QString("socket://")+
+		entry->setStringValue( TQString("socket://")+
 							   config->readEntry("Socket",
 												 WATCHGNUPGSOCKET ));
-		logclients << QString("%1 (%2)").arg(*it).arg(comp->description());
+		logclients << TQString("%1 (%2)").arg(*it).arg(comp->description());
 	  }
 	  entry = group->entry("debug-level");
 	  if( entry ) {
@@ -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?"), QString::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::null, i18n("Try Restart"), i18n("Do Not Try") ) == KMessageBox::Yes ) {
 	mCentralWidget->append( i18n("====== Restarting logging process =====") );
 	startWatcher();
   } else {
@@ -204,7 +204,7 @@ void KWatchGnuPGMainWindow::slotReadStdout()
 {
   if ( !mWatcher )
     return;
-  QString str;
+  TQString str;
   while( mWatcher->readln(str,false) > 0 ) {
 	mCentralWidget->append( str );
 	if( !isVisible() ) {
@@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout()
 	  mSysTray->setAttention(true);
 	}
   }
-  QTimer::singleShot( 0, this, SLOT(slotAckRead()) );
+  TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) );
 }
 
 void KWatchGnuPGMainWindow::slotAckRead() {
@@ -229,10 +229,10 @@ void KWatchGnuPGMainWindow::show()
 
 void KWatchGnuPGMainWindow::slotSaveAs()
 {
-  QString filename = KFileDialog::getSaveFileName( QString::null, QString::null,
+  TQString filename = KFileDialog::getSaveFileName( TQString::null, TQString::null,
 												   this, i18n("Save Log to File") );
   if( filename.isEmpty() ) return;
-  QFile file(filename);
+  TQFile file(filename);
   if( file.exists() ) {
 	if( KMessageBox::Yes !=
 		KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already "
@@ -243,7 +243,7 @@ void KWatchGnuPGMainWindow::slotSaveAs()
 	}
   }
   if( file.open( IO_WriteOnly ) ) {
-	QTextStream st(&file);
+	TQTextStream st(&file);
 	st << mCentralWidget->text();
 	file.close();
   }
@@ -251,8 +251,8 @@ void KWatchGnuPGMainWindow::slotSaveAs()
 
 void KWatchGnuPGMainWindow::slotQuit()
 {
-  disconnect( mWatcher, SIGNAL( processExited(KProcess*) ),
-			  this, SLOT( slotWatcherExited() ) );
+  disconnect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
+			  this, TQT_SLOT( slotWatcherExited() ) );
   mWatcher->kill();
   kapp->quit();
 }
@@ -261,8 +261,8 @@ void KWatchGnuPGMainWindow::slotConfigure()
 {
   if( !mConfig ) {
 	mConfig = new KWatchGnuPGConfig( this, "config dialog" );
-	connect( mConfig, SIGNAL( reconfigure() ),
-			 this, SLOT( slotReadConfig() ) );
+	connect( mConfig, TQT_SIGNAL( reconfigure() ),
+			 this, TQT_SLOT( slotReadConfig() ) );
   }
   mConfig->loadConfig();
   mConfig->exec();
@@ -273,8 +273,8 @@ void KWatchGnuPGMainWindow::slotReadConfig()
   KConfig* config = kapp->config();
   config->setGroup("LogWindow");
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
-							   ?QTextEdit::WidgetWidth
-							   :QTextEdit::NoWrap );
+							   ?TQTextEdit::WidgetWidth
+							   :TQTextEdit::NoWrap );
   mCentralWidget->setMaxLogLines( config->readNumEntry( "MaxLogLen", 10000 ) );
   setGnuPGConfig();
   startWatcher();
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 2021a6579..64d0bbe54 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -43,7 +43,7 @@ class QTextEdit;
 class KWatchGnuPGMainWindow : public KMainWindow {
   Q_OBJECT
 public:
-  KWatchGnuPGMainWindow( QWidget* parent = 0, const char* name = 0 );
+  KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 );
   virtual ~KWatchGnuPGMainWindow();
 public slots:
   void slotWatcherExited();
@@ -69,7 +69,7 @@ private:
 
   KProcIO* mWatcher;
 
-  QTextEdit* mCentralWidget;
+  TQTextEdit* mCentralWidget;
   KWatchGnuPGTray* mSysTray;
   KWatchGnuPGConfig* mConfig;
 };
diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp
index 62024b14a..c58f1b123 100644
--- a/certmanager/kwatchgnupg/tray.cpp
+++ b/certmanager/kwatchgnupg/tray.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <qtooltip.h>
+#include <tqtooltip.h>
 
 KWatchGnuPGTray::KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin )
   : KSystemTray( mainwin, "KWatchGnuPG Tray Window" )
@@ -50,7 +50,7 @@ KWatchGnuPGTray::KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin )
   mAttentionPix = loadIcon("kwatchgnupg2");
 
   setPixmap( mNormalPix );
-  QToolTip::add( this, i18n("KWatchGnuPG Log Viewer") );
+  TQToolTip::add( this, i18n("KWatchGnuPG Log Viewer") );
 }
 
 KWatchGnuPGTray::~KWatchGnuPGTray()
diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h
index 7f220ecad..85695f8f5 100644
--- a/certmanager/kwatchgnupg/tray.h
+++ b/certmanager/kwatchgnupg/tray.h
@@ -34,7 +34,7 @@
 #define TRAY_H
 
 #include <ksystemtray.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
 class KWatchGnuPGMainWindow;
 
@@ -47,8 +47,8 @@ public:
 public slots:
   void setAttention( bool att );
 private:
-  QPixmap mNormalPix;
-  QPixmap mAttentionPix;
+  TQPixmap mNormalPix;
+  TQPixmap mAttentionPix;
 };
 
 #endif /* TRAY_H */