Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 38 insertions, 38 deletions

diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 940350590..55f991c23 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -189,7 +189,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
       object = list->first();
   delete list;
   if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object))
-      static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject"));
+      static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject"));
 
   vbl->addWidget( mPatternEdit );
 
@@ -199,7 +199,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
            mChkSubFolders, TQT_SLOT(setEnabled(bool)) );
   connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)),
-           TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) );
+           this, TQT_SLOT(setEnabledSearchButton(bool)) );
 
   mLbxMatches = new MatchListView(searchWidget, this, "Find Messages");
 
@@ -237,13 +237,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mLbxMatches->setDragEnabled( true );
 
   connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) );
+           this, TQT_SLOT(slotShowMsg(TQListViewItem *)) );
   connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) );
+           this, TQT_SLOT(slotViewMsg(TQListViewItem *)) );
   connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
+           this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
   connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
+           this, TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
   vbl->addWidget( mLbxMatches );
 
   TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" );
@@ -261,16 +261,16 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mSearchFolderOpenBtn->setEnabled(false);
   hbl2->addWidget(mSearchFolderOpenBtn);
   connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)),
-           TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & )));
+           this, TQT_SLOT( scheduleRename( const TQString & )));
   connect( &mRenameTimer, TQT_SIGNAL( timeout() ),
-           TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() ));
+           this, TQT_SLOT( renameSearchFolder() ));
   connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ),
-           TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() ));
+           this, TQT_SLOT( openSearchFolder() ));
   mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget);
   mSearchResultOpenBtn->setEnabled(false);
   hbl2->addWidget(mSearchResultOpenBtn);
   connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ),
-           TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() ));
+           this, TQT_SLOT( slotViewSelectedMsg() ));
   mStatusBar = new KStatusBar(searchWidget);
   mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
   mStatusBar->changeItem(i18n("Ready."), 0);
@@ -294,12 +294,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
 
   connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch()));
   connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop()));
-  connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater()));
+  connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(deleteLater()));
 
   // give focus to the value field of the first search rule
   object = mPatternEdit->child( "regExpLineEdit" );
   if ( object && object->isWidgetType() ) {
-      TQT_TQWIDGET(object)->setFocus();
+      static_cast<TQWidget*>(object)->setFocus();
       //kdDebug(5006) << "SearchWindow: focus has been given to widget "
       //              << object->name() << endl;
   }
@@ -309,13 +309,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   //set up actions
   TDEActionCollection *ac = actionCollection();
   ac->setWidget( this );
-  mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this),
+  mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this,
                               TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
   mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all",
-                                 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()),
+                                 0, this, TQT_SLOT(slotReplyAllToMsg()),
                                  ac, "search_reply_all" );
   mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
-                                  "mail_replylist", 0, TQT_TQOBJECT(this),
+                                  "mail_replylist", 0, this,
                                   TQT_SLOT(slotReplyListToMsg()), ac,
                                   "search_reply_list" );
   mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
@@ -324,11 +324,11 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
            TQT_SLOT(slotForwardInlineMsg()) );
   mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
-                                        "mail-forward", 0, TQT_TQOBJECT(this),
+                                        "mail-forward", 0, this,
                                         TQT_SLOT(slotForwardAttachedMsg()), ac,
                                         "search_message_forward_as_attachment" );
   mForwardInlineAction = new TDEAction( i18n("&Inline..."),
-                                      "mail-forward", 0, TQT_TQOBJECT(this),
+                                      "mail-forward", 0, this,
                                       TQT_SLOT(slotForwardInlineMsg()), ac,
                                       "search_message_forward_inline" );
   if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
@@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   }
 
   mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
-                                      "mail-forward", 0, TQT_TQOBJECT(this),
+                                      "mail-forward", 0, this,
                                       TQT_SLOT(slotForwardDigestMsg()), ac,
                                       "search_message_forward_as_digest" );
   mForwardActionMenu->insert( mForwardDigestAction );
   mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
-                                      "mail-forward", 0, TQT_TQOBJECT(this),
+                                      "mail-forward", 0, this,
                                       TQT_SLOT(slotRedirectMsg()), ac,
                                       "search_message_forward_redirect" );
   mForwardActionMenu->insert( mRedirectAction );
-  mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
+  mSaveAsAction = KStdAction::saveAs( this, TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
   mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0,
-                                 TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
+                                 this, TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
 
-  mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" );
-  mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
+  mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrintMsg()), ac, "search_print" );
+  mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this,
                               TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
 
-  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" );
+  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()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
+  connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus()));
   connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
-          TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
+          this, TQT_SLOT(folderInvalidated(KMFolder*)));
 
   connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated()));
+          this, TQT_SLOT(slotFolderActivated()));
 
 }
 
@@ -508,17 +508,17 @@ void SearchWindow::slotSearch()
     }
     mFolder->stopSearch();
     disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
-            TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
+            this, TQT_SLOT(slotAddMsg(int)));
     disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
-            TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     connect(mFolder, TQT_SIGNAL(msgAdded(int)),
-            TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
+            this, TQT_SLOT(slotAddMsg(int)));
     connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
-            TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     mSearchFolderEdt->setEnabled(false);
     KMSearch *search = new KMSearch();
     connect(search, TQT_SIGNAL(finished(bool)),
-            TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+            this, TQT_SLOT(searchDone()));
     if (mChkbxAllFolders->isChecked()) {
         search->setRecursive(true);
     } else {
@@ -543,7 +543,7 @@ void SearchWindow::searchDone()
     mTimer->stop();
     updStatus();
 
-    TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
+    TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
     if(mLastFocus)
         mLastFocus->setFocus();
     if (mCloseRequested)
@@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e)
       //Cancel search in progress by setting the search folder search to
       //the null search
       mFolder->setSearch(new KMSearch());
-      TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
+      TQTimer::singleShot(0, this, TQT_SLOT(slotClose()));
     } else {
       KDialogBase::closeEvent(e);
     }
@@ -677,7 +677,7 @@ void SearchWindow::folderInvalidated(KMFolder *folder)
         mLbxMatches->clear();
         if (mFolder->search())
             connect(mFolder->search(), TQT_SIGNAL(finished(bool)),
-                    TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+                    this, TQT_SLOT(searchDone()));
         mTimer->start(200);
         enableGUI();
     }
@@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint
     mMenuToFolder.clear();
     TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
     mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage,
-        TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu );
+        this, &mMenuToFolder, msgMoveMenu );
     TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
     mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage,
-        TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu );
+        this, &mMenuToFolder, msgCopyMenu );
 
     // show most used actions
     mReplyAction->plug(menu);