From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kmail/searchwindow.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kmail/searchwindow.cpp')

diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index dfaa0942..ff224883 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -44,7 +44,7 @@
 #include <kiconloader.h>
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
   mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
 
-  connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
+  connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updtqStatus()));
   connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
           TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
 
@@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool)
 }
 
 //-----------------------------------------------------------------------------
-void SearchWindow::updStatus(void)
+void SearchWindow::updtqStatus(void)
 {
     TQString genMsg, detailMsg, procMsg;
     int numMatches = 0, numProcessed = 0;
@@ -418,17 +418,17 @@ void SearchWindow::updStatus(void)
         if(!mStopped) {
             genMsg = i18n("Done.");
             detailMsg = i18n("%n match in %1", "%n matches in %1",
-                             numMatches).arg(procMsg);
+                             numMatches).tqarg(procMsg);
         } else {
             genMsg = i18n("Search canceled.");
             detailMsg = i18n("%n match so far in %1", "%n matches so far in %1",
-                             numMatches).arg(procMsg);
+                             numMatches).tqarg(procMsg);
         }
     } else {
         procMsg = i18n("%n message", "%n messages", numProcessed);
         genMsg = i18n("%n match", "%n matches", numMatches);
         detailMsg = i18n("Searching in %1. %2 searched so far")
-                    .arg(folderName).arg(procMsg);
+                    .tqarg(folderName).tqarg(procMsg);
     }
 
     mStatusBar->changeItem(genMsg, 0);
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
 //-----------------------------------------------------------------------------
 void SearchWindow::slotSearch()
 {
-    mLastFocus = focusWidget();
+    mLastFocus = tqfocusWidget();
     mBtnSearch->setFocus();     // set focus so we don't miss key event
 
     mStopped = false;
@@ -497,7 +497,7 @@ void SearchWindow::slotSearch()
       while ((folder = mgr->find(fullName))) {
         if (folder->storage()->inherits("KMFolderSearch"))
           break;
-        fullName = TQString("%1 %2").arg(baseName).arg(++count);
+        fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count);
       }
 
       if (!folder)
@@ -541,7 +541,7 @@ void SearchWindow::slotSearch()
 void SearchWindow::searchDone()
 {
     mTimer->stop();
-    updStatus();
+    updtqStatus();
 
     TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
     if(mLastFocus)
-- 
cgit v1.2.3