Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

2 files changed, 11 insertions, 11 deletions

diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 4f84c7866..20c474a44 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
   TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
 
   group = new TQVGroupBox( i18n("WatchGnuPG"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
 
   /******************* Log Window group *******************/
   group = new TQVGroupBox( i18n("Log Window"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index f8dc45a6e..e7690d4ff 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -49,11 +49,11 @@
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqdir.h>
 #include <tqeventloop.h>
 #include <tqtimer.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #define WATCHGNUPGBINARY "watchgnupg"
 #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket")
@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
@@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions()
   (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
-  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
+  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
 					 0, this, TQT_SLOT( slotConfigure() ),
 					 actionCollection(), "configure" );
 #endif
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(tqtr("[%1] Log stopped")
-						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
+						   .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	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) ) );
+							.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;
 	}