summaryrefslogtreecommitdiffstats
path: root/kmail/searchwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/searchwindow.cpp')
-rw-r--r--kmail/searchwindow.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index ff2248832..dfaa09429 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -44,7 +44,7 @@
#include <kiconloader.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.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(updtqStatus()));
+ connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
@@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool)
}
//-----------------------------------------------------------------------------
-void SearchWindow::updtqStatus(void)
+void SearchWindow::updStatus(void)
{
TQString genMsg, detailMsg, procMsg;
int numMatches = 0, numProcessed = 0;
@@ -418,17 +418,17 @@ void SearchWindow::updtqStatus(void)
if(!mStopped) {
genMsg = i18n("Done.");
detailMsg = i18n("%n match in %1", "%n matches in %1",
- numMatches).tqarg(procMsg);
+ numMatches).arg(procMsg);
} else {
genMsg = i18n("Search canceled.");
detailMsg = i18n("%n match so far in %1", "%n matches so far in %1",
- numMatches).tqarg(procMsg);
+ numMatches).arg(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")
- .tqarg(folderName).tqarg(procMsg);
+ .arg(folderName).arg(procMsg);
}
mStatusBar->changeItem(genMsg, 0);
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
//-----------------------------------------------------------------------------
void SearchWindow::slotSearch()
{
- mLastFocus = tqfocusWidget();
+ mLastFocus = focusWidget();
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").tqarg(baseName).tqarg(++count);
+ fullName = TQString("%1 %2").arg(baseName).arg(++count);
}
if (!folder)
@@ -541,7 +541,7 @@ void SearchWindow::slotSearch()
void SearchWindow::searchDone()
{
mTimer->stop();
- updtqStatus();
+ updStatus();
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
if(mLastFocus)