1 files changed, 36 insertions, 36 deletions

diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index d02a2fad..647056ab 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -43,7 +43,7 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kedittoolbar.h>
@@ -68,17 +68,17 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name
   mCentralWidget->setTextFormat( TQTextEdit::LogText );
   setCentralWidget( mCentralWidget );
 
-  mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
-  connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
-		   this, TQT_SLOT( slotWatcherExited() ) );
-  connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ),
-		   this, TQT_SLOT( slotReadStdout() ) );
+  mWatcher = new TDEProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
+  connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+		   this, TQ_SLOT( slotWatcherExited() ) );
+  connect( mWatcher, TQ_SIGNAL( readReady(TDEProcIO*) ),
+		   this, TQ_SLOT( slotReadStdout() ) );
 
   slotReadConfig();
   mSysTray = new KWatchGnuPGTray( this );
   mSysTray->show();
-  connect( mSysTray, TQT_SIGNAL( quitSelected() ),
-		   this, TQT_SLOT( slotQuit() ) );
+  connect( mSysTray, TQ_SIGNAL( quitSelected() ),
+		   this, TQ_SLOT( slotQuit() ) );
   setAutoSaveSettings();
 }
 
@@ -90,24 +90,24 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( i18n("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
 {
   (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
-		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
+		     this, TQ_SLOT( slotClear() ),
 		     actionCollection(), "clear_log" );
-  (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
-  (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
-  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
-  (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
-  (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
-  (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
+  (void)KStdAction::saveAs( this, TQ_SLOT(slotSaveAs()), actionCollection() );
+  (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() );
+  (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() );
+  (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection());
+  (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
   (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
-					 0, this, TQT_SLOT( slotConfigure() ),
+					 0, this, TQ_SLOT( slotConfigure() ),
 					 actionCollection(), "configure" );
 #endif
 
@@ -127,18 +127,18 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars()
 
 void KWatchGnuPGMainWindow::startWatcher()
 {
-  disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
-			  this, TQT_SLOT( slotWatcherExited() ) );
+  disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+			  this, TQ_SLOT( slotWatcherExited() ) );
   if( mWatcher->isRunning() ) {
 	mWatcher->kill();
 	while( mWatcher->isRunning() ) {
-	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+	  tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
-	mCentralWidget->append(tqtr("[%1] Log stopped")
-						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
+	mCentralWidget->append(i18n("[%1] Log stopped")
+						   .arg( TQDateTime::currentDateTime().toString(TQt::ISODate)));
   }
   mWatcher->clearArguments();
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
@@ -147,11 +147,11 @@ void KWatchGnuPGMainWindow::startWatcher()
   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( tqtr("[%1] Log started")
-							.arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+	mCentralWidget->append( i18n("[%1] Log started")
+							.arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) );
   }
-  connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
-		   this, TQT_SLOT( slotWatcherExited() ) );
+  connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+		   this, TQ_SLOT( slotWatcherExited() ) );
 }
 
 void KWatchGnuPGMainWindow::setGnuPGConfig()
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
   if ( !cconfig )
     return;
   //Q_ASSERT( cconfig );
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   TQStringList comps = cconfig->componentList();
   for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout()
 	  mSysTray->setAttention(true);
 	}
   }
-  TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) );
 }
 
 void KWatchGnuPGMainWindow::slotAckRead() {
@@ -251,18 +251,18 @@ void KWatchGnuPGMainWindow::slotSaveAs()
 
 void KWatchGnuPGMainWindow::slotQuit()
 {
-  disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
-			  this, TQT_SLOT( slotWatcherExited() ) );
+  disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+			  this, TQ_SLOT( slotWatcherExited() ) );
   mWatcher->kill();
-  kapp->quit();
+  tdeApp->quit();
 }
 
 void KWatchGnuPGMainWindow::slotConfigure()
 {
   if( !mConfig ) {
 	mConfig = new KWatchGnuPGConfig( this, "config dialog" );
-	connect( mConfig, TQT_SIGNAL( reconfigure() ),
-			 this, TQT_SLOT( slotReadConfig() ) );
+	connect( mConfig, TQ_SIGNAL( reconfigure() ),
+			 this, TQ_SLOT( slotReadConfig() ) );
   }
   mConfig->loadConfig();
   mConfig->exec();
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
 
 void KWatchGnuPGMainWindow::slotReadConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("LogWindow");
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
 							   ?TQTextEdit::WidgetWidth
@@ -282,7 +282,7 @@ void KWatchGnuPGMainWindow::slotReadConfig()
 
 bool KWatchGnuPGMainWindow::queryClose()
 {
-  if ( !kapp->sessionSaving() ) {
+  if ( !tdeApp->sessionSaving() ) {
     hide();
     return false;
   }