1 files changed, 10 insertions, 10 deletions

diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 2f4b3565..ee7e090b 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -71,8 +71,8 @@ const int SearchWindow::MSGID_COLUMN = 4;
 class MatchListView : public KListView
 {
   public:
-    MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) :
-      KListView( parent, name ),
+    MatchListView( TQWidget *tqparent, SearchWindow* sw, const char* name = 0 ) :
+      KListView( tqparent, name ),
       mSearchWindow( sw )
     {}
 
@@ -110,7 +110,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
                          KMFolder *curFolder, bool modal):
   KDialogBase(0, name, modal, i18n("Find Messages"),
               User1 | User2 | Close, User1, false,
-              KGuiItem( i18n("&Search"), "find" ),
+              KGuiItem( i18n("&Search"), "tqfind" ),
               KStdGuiItem::stop()),
   mStopped(false),
   mCloseRequested(false),
@@ -275,7 +275,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
   mStatusBar->changeItem(i18n("Ready."), 0);
   mStatusBar->setItemAlignment(0, AlignLeft | AlignVCenter);
-  mStatusBar->insertItem(TQString::null, 1, 1, true);
+  mStatusBar->insertItem(TQString(), 1, 1, true);
   mStatusBar->setItemAlignment(1, AlignLeft | AlignVCenter);
   vbl->addWidget(mStatusBar);
 
@@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
   mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
 
-  connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus()));
+  connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updtqStatus()));
   connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
           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;
@@ -494,7 +494,7 @@ void SearchWindow::slotSearch()
       TQString fullName = baseName;
       int count = 0;
       KMFolder *folder;
-      while ((folder = mgr->find(fullName))) {
+      while ((folder = mgr->tqfind(fullName))) {
         if (folder->storage()->inherits("KMFolderSearch"))
           break;
         fullName = TQString("%1 %2").arg(baseName).arg(++count);
@@ -541,7 +541,7 @@ void SearchWindow::slotSearch()
 void SearchWindow::searchDone()
 {
     mTimer->stop();
-    updStatus();
+    updtqStatus();
 
     TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
     if(mLastFocus)
@@ -562,7 +562,7 @@ void SearchWindow::slotAddMsg(int idx)
     bool unget = !mFolder->isMessage(idx);
     KMMessage *msg = mFolder->getMsg(idx);
     TQString from, fName;
-    KMFolder *pFolder = msg->parent();
+    KMFolder *pFolder = msg->tqparent();
     if (!mFolders.tqcontains(pFolder)) {
         mFolders.append(pFolder);
         pFolder->open("searchwindow");
@@ -648,7 +648,7 @@ void SearchWindow::renameSearchFolder()
         int i = 1;
         TQString name =  mSearchFolderEdt->text();
         while (i < 100) {
-            if (!kmkernel->searchFolderMgr()->find( name )) {
+            if (!kmkernel->searchFolderMgr()->tqfind( name )) {
                 mFolder->rename( name );
                 kmkernel->searchFolderMgr()->contentsChanged();
                 break;