From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp')

diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 01340ecd2..4c6ecbfb5 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -90,20 +90,20 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
+  mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
 {
   (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
-		     this, TQT_SLOT( slotClear() ),
+		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
 		     actionCollection(), "clear_log" );
-  (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());
+  (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());
 
 #if 0
   (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
@@ -134,8 +134,8 @@ void KWatchGnuPGMainWindow::startWatcher()
 	while( mWatcher->isRunning() ) {
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
-	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate)));
+	mCentralWidget->append(tqtr("[%1] Log stopped")
+						   .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -147,8 +147,8 @@ 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( tr("[%1] Log started")
-							.arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
+	mCentralWidget->append( tqtr("[%1] Log started")
+							.tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
   }
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
 		   this, TQT_SLOT( slotWatcherExited() ) );
@@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
 		entry->setStringValue( TQString("socket://")+
 							   config->readEntry("Socket",
 												 WATCHGNUPGSOCKET ));
-		logclients << TQString("%1 (%2)").arg(*it).arg(comp->description());
+		logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description());
 	  }
 	  entry = group->entry("debug-level");
 	  if( entry ) {
@@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs()
 	if( KMessageBox::Yes !=
 		KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already "
 											  "exists. Are you sure you want "
-											  "to overwrite it?").arg(filename),
+											  "to overwrite it?").tqarg(filename),
 								   i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) {
 	  return;
 	}
-- 
cgit v1.2.1