Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 213 insertions, 213 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 7e19c81e..3790c5d3 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -115,7 +115,7 @@ void CatalogManager::init()
     _foundFilesList.clear();
     _toBeSearched.clear();
     _timerFind = new TQTimer( this );
-    connect(_timerFind, TQT_SIGNAL( timeout() ), this, TQT_SLOT(findNextFile()) );
+    connect(_timerFind, TQ_SIGNAL( timeout() ), this, TQ_SLOT(findNextFile()) );
     _searchStopped = false;
 
    _prefDialog=0;
@@ -132,8 +132,8 @@ void CatalogManager::init()
 	_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
    }
    
-   connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	, this, TQT_SLOT (updateSettings()));
+   connect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	, this, TQ_SLOT (updateSettings()));
 
    TQWidget *view = new TQWidget(this);
    TQVBoxLayout* layout= new TQVBoxLayout(view);
@@ -144,20 +144,20 @@ void CatalogManager::init()
    layout->addWidget(_catalogManager);
    layout->setStretchFactor(_catalogManager,1);
 
-   connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
-            ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings)));
-   connect(_catalogManager,TQT_SIGNAL(openFile(TQString,TQString))
-           ,this,TQT_SLOT(openFile(TQString,TQString)));
-   connect(_catalogManager,TQT_SIGNAL(openFileInNewWindow(TQString,TQString))
-           ,this,TQT_SLOT(openFileInNewWindow(TQString,TQString)));
-   connect(_catalogManager,TQT_SIGNAL(openTemplate(TQString,TQString,TQString))
-           ,this,TQT_SLOT(openTemplate(TQString,TQString,TQString)));
-   connect(_catalogManager,TQT_SIGNAL(openTemplateInNewWindow(TQString,TQString,TQString))
-           ,this,TQT_SLOT(openTemplateInNewWindow(TQString,TQString,TQString)));
-   connect(_catalogManager,TQT_SIGNAL(gotoFileEntry(TQString,TQString,int))
-           ,this,TQT_SLOT(openFile(TQString,TQString,int)));
-   connect(_catalogManager, TQT_SIGNAL(selectedChanged(uint)),
-           this, TQT_SLOT(selectedChanged(uint)));
+   connect(this,TQ_SIGNAL(settingsChanged(KBabel::CatManSettings))
+            ,_catalogManager,TQ_SLOT(setSettings(KBabel::CatManSettings)));
+   connect(_catalogManager,TQ_SIGNAL(openFile(TQString,TQString))
+           ,this,TQ_SLOT(openFile(TQString,TQString)));
+   connect(_catalogManager,TQ_SIGNAL(openFileInNewWindow(TQString,TQString))
+           ,this,TQ_SLOT(openFileInNewWindow(TQString,TQString)));
+   connect(_catalogManager,TQ_SIGNAL(openTemplate(TQString,TQString,TQString))
+           ,this,TQ_SLOT(openTemplate(TQString,TQString,TQString)));
+   connect(_catalogManager,TQ_SIGNAL(openTemplateInNewWindow(TQString,TQString,TQString))
+           ,this,TQ_SLOT(openTemplateInNewWindow(TQString,TQString,TQString)));
+   connect(_catalogManager,TQ_SIGNAL(gotoFileEntry(TQString,TQString,int))
+           ,this,TQ_SLOT(openFile(TQString,TQString,int)));
+   connect(_catalogManager, TQ_SIGNAL(selectedChanged(uint)),
+           this, TQ_SLOT(selectedChanged(uint)));
 
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
@@ -172,20 +172,20 @@ void CatalogManager::init()
    _progressLabel->hide();
    _progressBar->hide();
 
-   connect(_catalogManager,TQT_SIGNAL(prepareProgressBar(TQString,int))
-           , this, TQT_SLOT(prepareProgressBar(TQString,int)));
-   connect(_catalogManager,TQT_SIGNAL(clearProgressBar())
-           , this, TQT_SLOT(clearProgressBar()));
-   connect(_catalogManager,TQT_SIGNAL(progress(int))
-           , _progressBar, TQT_SLOT(setProgress(int)));
-//   connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
-//	   , this, TQT_SLOT(enableMenuForFiles(bool)));
-   connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
-	   , this, TQT_SLOT(enableActions(bool)));
-   connect(this, TQT_SIGNAL(searchStopped())
-	   , _catalogManager, TQT_SLOT(stopSearch()));
-   connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int))
-	   , this, TQT_SLOT(prepareStatusProgressBar(int)));
+   connect(_catalogManager,TQ_SIGNAL(prepareProgressBar(TQString,int))
+           , this, TQ_SLOT(prepareProgressBar(TQString,int)));
+   connect(_catalogManager,TQ_SIGNAL(clearProgressBar())
+           , this, TQ_SLOT(clearProgressBar()));
+   connect(_catalogManager,TQ_SIGNAL(progress(int))
+           , _progressBar, TQ_SLOT(setProgress(int)));
+//   connect(_catalogManager, TQ_SIGNAL(signalBuildTree(bool))
+//	   , this, TQ_SLOT(enableMenuForFiles(bool)));
+   connect(_catalogManager, TQ_SIGNAL(signalBuildTree(bool))
+	   , this, TQ_SLOT(enableActions(bool)));
+   connect(this, TQ_SIGNAL(searchStopped())
+	   , _catalogManager, TQ_SLOT(stopSearch()));
+   connect(_catalogManager, TQ_SIGNAL(prepareFindProgressBar(int))
+	   , this, TQ_SLOT(prepareStatusProgressBar(int)));
 
    setCentralWidget(view);
    resize( 600,300);
@@ -206,8 +206,8 @@ void CatalogManager::init()
        _catalogManager->setRMBMenuDir(popup);
    }
 
-   connect(_catalogManager, TQT_SIGNAL(signalSearchedFile(int))
-           , _statusProgressBar, TQT_SLOT(advance(int)));
+   connect(_catalogManager, TQ_SIGNAL(signalSearchedFile(int))
+           , _statusProgressBar, TQ_SLOT(advance(int)));
 
    restoreView();
 }
@@ -220,60 +220,60 @@ void CatalogManager::setupActions()
 
     // the file menu
     action = new TDEAction( i18n("&Open"), CTRL+Key_O, _catalogManager,
-                          TQT_SLOT(slotOpenFile()),actionCollection(), "open");
+                          TQ_SLOT(slotOpenFile()),actionCollection(), "open");
     action->setEnabled(false);
     action = new TDEAction(i18n("&Open Template"),Key_Space,_catalogManager,
-                         TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
+                         TQ_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
     action->setEnabled(false);
     action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager,
-                         TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
+                         TQ_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
     action->setEnabled(false);
 
-    action = KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()), actionCollection());
+    action = KStdAction::quit(kapp, TQ_SLOT (closeAllWindows()), actionCollection());
 
     actionMap["open_template"] = NEEDS_POT;
 
     // the edit menu
     action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this,
-                          TQT_SLOT(find()), actionCollection(), "find_in_files");
+                          TQ_SLOT(find()), actionCollection(), "find_in_files");
     action->setEnabled(false);
     action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, this,
-                          TQT_SLOT(replace()), actionCollection(), "replace_in_files");
+                          TQ_SLOT(replace()), actionCollection(), "replace_in_files");
     action->setEnabled(false);
     action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, this,
-                          TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
+                          TQ_SLOT(stopSearching()), actionCollection(), "stop_search");
     action->setEnabled(false);
     action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), _catalogManager,
-                          TQT_SLOT(updateCurrent()), actionCollection(), "reload");
+                          TQ_SLOT(updateCurrent()), actionCollection(), "reload");
     action->setEnabled(false);
 
     // the marking menu
     action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager,
-                          TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking");
+                          TQ_SLOT(toggleMark()), actionCollection(), "toggle_marking");
     action->setEnabled(false);
     action = new TDEAction( i18n("Remove Marking"), 0, _catalogManager,
-                          TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
+                          TQ_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
     action->setEnabled(false);
     action = new TDEAction( i18n("Toggle All Markings"), 0, _catalogManager,
-                          TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
+                          TQ_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
     action->setEnabled(false);
     action = new TDEAction( i18n("Remove All Markings"), 0, _catalogManager,
-                          TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
+                          TQ_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
     action->setEnabled(false);
     action = new TDEAction( i18n("Mark Modified Files"), 0, _catalogManager,
-                          TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files");
+                          TQ_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files");
     // fixme to enabling this when loading is done using updateFinished() signal
     action->setEnabled(true);
     action = new TDEAction( i18n("&Load Markings..."), 0, _catalogManager,
-                          TQT_SLOT(loadMarks()), actionCollection(), "load_marking");
+                          TQ_SLOT(loadMarks()), actionCollection(), "load_marking");
     action->setEnabled(false);
     action = new TDEAction( i18n("&Save Markings..."), 0, _catalogManager,
-                          TQT_SLOT(saveMarks()), actionCollection(), "save_marking");
+                          TQ_SLOT(saveMarks()), actionCollection(), "save_marking");
     action->setEnabled(false);
     (void)new TDEAction(i18n("&Mark Files..."), 0, _catalogManager,
-                      TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
+                      TQ_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
     (void)new TDEAction(i18n("&Unmark Files..."), 0, _catalogManager,
-                      TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
+                      TQ_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
 
     actionMap["remove_marking"]     = NEEDS_MARK;
     actionMap["remove_all_marking"] = NEEDS_MARK;
@@ -282,102 +282,102 @@ void CatalogManager::setupActions()
 
     // go menu
     action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
-                         _catalogManager, TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
+                         _catalogManager, TQ_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
     action->setEnabled(false);
     action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
-                         _catalogManager, TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
+                         _catalogManager, TQ_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
     action->setEnabled(false);
     action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
-                         _catalogManager, TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
+                         _catalogManager, TQ_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
     action->setEnabled(false);
     action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
-                         _catalogManager, TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
+                         _catalogManager, TQ_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
     action->setEnabled(false);
     action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
-                         _catalogManager, TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
+                         _catalogManager, TQ_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
     action->setEnabled(false);
     action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
-                         _catalogManager, TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
+                         _catalogManager, TQ_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
     action->setEnabled(false);
 
     action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
-                         _catalogManager, TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
+                         _catalogManager, TQ_SLOT(gotoNextError()),actionCollection(), "go_next_error");
     action->setEnabled(false);
     action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
-                         _catalogManager, TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
+                         _catalogManager, TQ_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
     action->setEnabled(false);
     action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
-                         _catalogManager, TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
+                         _catalogManager, TQ_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
     action->setEnabled(false);
     action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
-                         _catalogManager, TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
+                         _catalogManager, TQ_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
     action->setEnabled(false);
     action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
-                         _catalogManager, TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
+                         _catalogManager, TQ_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
     action->setEnabled(false);
     action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
-                         _catalogManager, TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
+                         _catalogManager, TQ_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
     action->setEnabled(false);
 
     action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
-                         _catalogManager, TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
+                         _catalogManager, TQ_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
     action->setEnabled(false);
     action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
-                         _catalogManager, TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
+                         _catalogManager, TQ_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
     action->setEnabled(false);
 
     // project menu
     // the project menu
    action = new TDEAction(i18n("&New..."), "document-new"
-           , this, TQT_SLOT(projectNew()),actionCollection()
+           , this, TQ_SLOT(projectNew()),actionCollection()
            ,"project_new");
 
    action = new TDEAction(i18n("&Open..."), "document-open"
-           , this, TQT_SLOT(projectOpen()),actionCollection()
+           , this, TQ_SLOT(projectOpen()),actionCollection()
            ,"project_open");
 
    action = new TDEAction(i18n("C&lose"), "window-close"
-           , this, TQT_SLOT(projectClose()),actionCollection()
+           , this, TQ_SLOT(projectClose()),actionCollection()
            ,"project_close");
 
    action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
 
    action = new TDEAction(i18n("&Configure..."), "configure"
-           , this, TQT_SLOT(projectConfigure()),actionCollection()
+           , this, TQ_SLOT(projectConfigure()),actionCollection()
            ,"project_settings");
 
     // tools menu
     action = new TDEAction( i18n("&Statistics"), "statistics",  CTRL+Key_S,
-                          _catalogManager, TQT_SLOT(statistics()), actionCollection(), "statistics");
+                          _catalogManager, TQ_SLOT(statistics()), actionCollection(), "statistics");
     action->setEnabled(false);
     action = new TDEAction( i18n("S&tatistics in Marked"), "statistics",  CTRL+ALT+Key_S,
-                          _catalogManager, TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
+                          _catalogManager, TQ_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
     action->setEnabled(false);
     action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
-                          _catalogManager, TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
+                          _catalogManager, TQ_SLOT(checkSyntax()), actionCollection(), "syntax");
     action->setEnabled(false);
     action = new TDEAction( i18n("S&pell Check"), "tools-check-spelling",  CTRL+Key_I,
-                          this, TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
+                          this, TQ_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
     action->setEnabled(false);
     action = new TDEAction( i18n("Spell Check in &Marked"), "tools-check-spelling", CTRL+ALT+Key_I,
-                          this, TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
+                          this, TQ_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
     action->setEnabled(false);
     action = new TDEAction( i18n("&Rough Translation"),  CTRL+Key_T,
-                          _catalogManager, TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
+                          _catalogManager, TQ_SLOT(roughTranslation()), actionCollection(), "rough_translation");
     action->setEnabled(false);
     action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
-                          _catalogManager, TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
+                          _catalogManager, TQ_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
     action->setEnabled(false);
     action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A,
-                          _catalogManager, TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
+                          _catalogManager, TQ_SLOT(mailFiles()), actionCollection(), "mail_file");
     action->setEnabled(false);
     action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A,
-                          _catalogManager, TQT_SLOT(mailMarkedFiles()), actionCollection(),	"mail_file_marked");
+                          _catalogManager, TQ_SLOT(mailMarkedFiles()), actionCollection(),	"mail_file_marked");
     action->setEnabled(false);
 
     action = new TDEAction( i18n("&Pack"), "application-x-tar", CTRL+Key_B,
-                         _catalogManager, TQT_SLOT(packageFiles()), actionCollection(), "package_file");
-    action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, _catalogManager, TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+                         _catalogManager, TQ_SLOT(packageFiles()), actionCollection(), "package_file");
+    action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, _catalogManager, TQ_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
     action->setEnabled(false);
 
     actionMap["statistics_marked"]        = NEEDS_DIR | NEEDS_MARK;
@@ -393,7 +393,7 @@ void CatalogManager::setupActions()
     TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
 
     TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
-	tools, _catalogManager, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
+	tools, _catalogManager, TQ_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
 	,"validate", false, actionCollection() );
 
     TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(),
@@ -407,7 +407,7 @@ void CatalogManager::setupActions()
     }
 
     actions = ToolAction::dataToolActionList(
-	tools, _catalogManager, TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
+	tools, _catalogManager, TQ_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
 	,"validate", false, actionCollection(), "marked_" );
     m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(),
           "dynamic_validation_marked");
@@ -423,19 +423,19 @@ void CatalogManager::setupActions()
     // CVS submenu
     // Actions for PO files
     (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
-      TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
+      TQ_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
     (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
-      TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
+      TQ_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
     (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
-      TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
+      TQ_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
     (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
-      TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
+      TQ_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
     (void)new TDEAction( i18n( "Status" ), 0, _catalogManager,
-      TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
+      TQ_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
     (void)new TDEAction( i18n( "Status for Marked" ), 0, _catalogManager,
-      TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
+      TQ_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
     (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
-      TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
+      TQ_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
 
     // CVS
     actionMap["cvs_update"]        = NEEDS_PO | NEEDS_PO_CVS;
@@ -449,27 +449,27 @@ void CatalogManager::setupActions()
     // SVN submenu
     // Actions for PO files
     (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
-    TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
+    TQ_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
     (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
-    TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
+    TQ_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
     (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
-    TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
+    TQ_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
     (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
-    TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
+    TQ_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
     (void)new TDEAction( i18n( "Status (Local)" ), 0, _catalogManager,
-    TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
+    TQ_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
     (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager,
-    TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
+    TQ_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
     (void)new TDEAction( i18n( "Status (Remote)" ), 0, _catalogManager,
-    TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
+    TQ_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
     (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager,
-    TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
+    TQ_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
     (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
-    TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
+    TQ_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
     (void)new TDEAction( i18n( "Show Information" ), 0, _catalogManager,
-    TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
+    TQ_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
     (void)new TDEAction( i18n( "Show Information for Marked" ), 0, _catalogManager,
-    TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" );
+    TQ_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" );
 
     // SVN
     actionMap["svn_update"]        = NEEDS_PO | NEEDS_PO_SVN;
@@ -486,13 +486,13 @@ void CatalogManager::setupActions()
 
     // CVS Actions for POT files
     (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
-      TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
+      TQ_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
     (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
-      TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
+      TQ_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
     (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
-      TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
+      TQ_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
     (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
-      TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" );
+      TQ_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" );
 
     actionMap["cvs_update_template"]        = NEEDS_POT | NEEDS_POT_CVS;
     actionMap["cvs_update_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK;
@@ -501,13 +501,13 @@ void CatalogManager::setupActions()
 
     // SVN Actions for POT files
     (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
-    TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
+    TQ_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
     (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
-    TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
+    TQ_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
     (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
-    TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
+    TQ_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
     (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
-    TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" );
+    TQ_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" );
 
     actionMap["svn_update_template"]        = NEEDS_POT | NEEDS_POT_SVN;
     actionMap["svn_update_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK;
@@ -515,7 +515,7 @@ void CatalogManager::setupActions()
     actionMap["svn_commit_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK;
 
     // settings menu
-    // FIXME: KStdAction::preferences(this, TQT_SLOT( optionsPreferences()), actionCollection());
+    // FIXME: KStdAction::preferences(this, TQ_SLOT( optionsPreferences()), actionCollection());
 
     createStandardStatusBarAction();
 
@@ -530,7 +530,7 @@ void CatalogManager::setupActions()
                                actionCollection(), "file_commands");
     _catalogManager->setFileCommandsMenu( actionMenu->popupMenu());
 
-    action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
+    action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQ_SLOT(slotDeleteFile()),actionCollection(), "delete");
     action->setEnabled(false);
 
 #if KDE_IS_VERSION( 3, 2, 90 )
@@ -1188,11 +1188,11 @@ void CatalogManager::projectNew()
     KBabel::Project::Ptr p = KBabel::ProjectWizard::newProject();
     if( p )
     {
-	disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+	disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
         _project = p;
-	connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+	connect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
 
 	_configFile = _project->filename();
         restoreSettings();
@@ -1217,11 +1217,11 @@ void CatalogManager::projectOpen()
     KBabel::Project::Ptr p = KBabel::ProjectManager::open(file);
     if( p )
     {
-	disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+	disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
         _project = p;
-	connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+	connect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
 
 	_configFile = p->filename();
         restoreSettings();
@@ -1238,11 +1238,11 @@ void CatalogManager::projectOpen()
 
 void CatalogManager::projectClose()
 {
-    disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+    disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
     _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
-    connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
-	    , this, TQT_SLOT (updateSettings()));
+    connect( _project, TQ_SIGNAL (signalCatManSettingsChanged())
+	    , this, TQ_SLOT (updateSettings()));
     _configFile = _project->filename();
     restoreSettings();
     updateSettings();
@@ -1262,8 +1262,8 @@ void CatalogManager::projectConfigure()
 {
     KBabel::ProjectDialog* _projectDialog = new ProjectDialog(_project);
 
-    connect (_projectDialog, TQT_SIGNAL (settingsChanged())
-	, this, TQT_SLOT (updateSettings()));
+    connect (_projectDialog, TQ_SIGNAL (settingsChanged())
+	, this, TQ_SLOT (updateSettings()));
 
     // settings are updated via signals
     _projectDialog->exec();
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 8eed87f5..f8de3fc5 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -132,7 +132,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
    _dictBox->hide();
 
    _updateTimer = new TQTimer(this);
-   connect(_updateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdate()));
+   connect(_updateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(checkUpdate()));
 
    addColumn(COLTEXT(COL_NAME));
    addColumn(COLTEXT(COL_MARKER),25);
@@ -154,21 +154,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
 
    if(KContextMenuManager::showOnButtonPress())
    {
-      connect(this,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &, int))
-           ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int)));
+      connect(this,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &, int))
+           ,this, TQ_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int)));
    }
    else
    {
-      connect(this,TQT_SIGNAL(rightButtonClicked(TQListViewItem*,const TQPoint &, int))
-           ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int)));
+      connect(this,TQ_SIGNAL(rightButtonClicked(TQListViewItem*,const TQPoint &, int))
+           ,this, TQ_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int)));
    }
-   connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*))
-           ,this, TQT_SLOT(activateItem(TQListViewItem*)));
-   connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*))
-           ,this, TQT_SLOT(activateItem(TQListViewItem*)));
-   connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkSelected()));
-   connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint &, int)),
-    	   this, TQT_SLOT( columnClicked(TQListViewItem *, const TQPoint &, int)));
+   connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*))
+           ,this, TQ_SLOT(activateItem(TQListViewItem*)));
+   connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*))
+           ,this, TQ_SLOT(activateItem(TQListViewItem*)));
+   connect(this,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(checkSelected()));
+   connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint &, int)),
+    	   this, TQ_SLOT( columnClicked(TQListViewItem *, const TQPoint &, int)));
 
    _dirCommandsMenu = 0;
    _fileCommandsMenu = 0;
@@ -189,7 +189,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
 
    _logWindow->setMainWidget(_logView);
 
-   connect(_logWindow,TQT_SIGNAL(user1Clicked()),_logView,TQT_SLOT(clear()));
+   connect(_logWindow,TQ_SIGNAL(user1Clicked()),_logView,TQ_SLOT(clear()));
 
    TQWhatsThis::add(this,i18n("<qt><p><b>Catalog Manager</b></p>\n"
 "<p>The Catalog Manager merges two folders into one tree and displays all\n"
@@ -205,21 +205,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
 
    // CVS
    cvshandler = new CVSHandler( );
-   connect( cvshandler, TQT_SIGNAL( signalIsPORepository( bool ) ),
-            this, TQT_SLOT( slotValidPOCVSRepository( bool ) ) );
-   connect( cvshandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ),
-            this, TQT_SLOT( slotValidPOTCVSRepository( bool ) ) );
-   connect( cvshandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
-            this, TQT_SLOT( updateFiles( const TQStringList& ) ) );
+   connect( cvshandler, TQ_SIGNAL( signalIsPORepository( bool ) ),
+            this, TQ_SLOT( slotValidPOCVSRepository( bool ) ) );
+   connect( cvshandler, TQ_SIGNAL( signalIsPOTRepository( bool ) ),
+            this, TQ_SLOT( slotValidPOTCVSRepository( bool ) ) );
+   connect( cvshandler, TQ_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
+            this, TQ_SLOT( updateFiles( const TQStringList& ) ) );
 
    // SVN
    svnhandler = new SVNHandler( );
-   connect( svnhandler, TQT_SIGNAL( signalIsPORepository( bool ) ),
-            this, TQT_SLOT( slotValidPOSVNRepository( bool ) ) );
-   connect( svnhandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ),
-            this, TQT_SLOT( slotValidPOTSVNRepository( bool ) ) );
-   connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
-            this, TQT_SLOT( updateFiles( const TQStringList& ) ) );
+   connect( svnhandler, TQ_SIGNAL( signalIsPORepository( bool ) ),
+            this, TQ_SLOT( slotValidPOSVNRepository( bool ) ) );
+   connect( svnhandler, TQ_SIGNAL( signalIsPOTRepository( bool ) ),
+            this, TQ_SLOT( slotValidPOTSVNRepository( bool ) ) );
+   connect( svnhandler, TQ_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
+            this, TQ_SLOT( updateFiles( const TQStringList& ) ) );
 
    TDEConfig *config = TDEGlobal::config();
    restoreView(config);
@@ -284,13 +284,13 @@ void CatalogManagerView::setRMBMenuDir( TQPopupMenu *m )
 void CatalogManagerView::setDirCommandsMenu( TQPopupMenu *m )
 {
     _dirCommandsMenu = m;
-    connect(_dirCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotDirCommand(int)));
+    connect(_dirCommandsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotDirCommand(int)));
 }
 
 void CatalogManagerView::setFileCommandsMenu( TQPopupMenu *m )
 {
     _fileCommandsMenu = m;
-    connect(_fileCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotFileCommand(int)));
+    connect(_fileCommandsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotFileCommand(int)));
 }
 
 void CatalogManagerView::checkUpdate()
@@ -353,12 +353,12 @@ void CatalogManagerView::clear()
       delete _dirWatch;
 
    _dirWatch= new KDirWatch();
-   connect(_dirWatch,TQT_SIGNAL(deleted(const TQString&)),this
-				   ,TQT_SLOT(directoryDeleted(const TQString&)));
-   connect(_dirWatch,TQT_SIGNAL(dirty(const TQString&)),this
-				   ,TQT_SLOT(directoryChanged(const TQString&)));
-   connect(_dirWatch,TQT_SIGNAL(created(const TQString&)),this
-				   ,TQT_SLOT(directoryChanged(const TQString&)));
+   connect(_dirWatch,TQ_SIGNAL(deleted(const TQString&)),this
+				   ,TQ_SLOT(directoryDeleted(const TQString&)));
+   connect(_dirWatch,TQ_SIGNAL(dirty(const TQString&)),this
+				   ,TQ_SLOT(directoryChanged(const TQString&)));
+   connect(_dirWatch,TQ_SIGNAL(created(const TQString&)),this
+				   ,TQ_SLOT(directoryChanged(const TQString&)));
 
    _dirList.clear();
    _fileList.clear();
@@ -1620,12 +1620,12 @@ void CatalogManagerView::slotDirCommand(int index)
       TDEProcess* proc = new KShellProcess();
       _pendingProcesses.append(proc);
 
-      connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this
-               ,TQT_SLOT( processEnded(TDEProcess*) ) );
-      connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
-               ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
-      connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
-               ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
+      connect( proc,TQ_SIGNAL( processExited(TDEProcess *) ), this
+               ,TQ_SLOT( processEnded(TDEProcess*) ) );
+      connect( proc,TQ_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
+               ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) );
+      connect( proc,TQ_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
+               ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) );
 
       *proc << "cd" << item->poFile() << ";" << cmd;
       proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
@@ -1653,12 +1653,12 @@ void CatalogManagerView::slotFileCommand(int index)
       TDEProcess* proc = new KShellProcess();
       _pendingProcesses.append(proc);
 
-      connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this
-               ,TQT_SLOT( processEnded(TDEProcess*) ) );
-      connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
-               ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
-      connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
-               ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
+      connect( proc,TQ_SIGNAL( processExited(TDEProcess *) ), this
+               ,TQ_SLOT( processEnded(TDEProcess*) ) );
+      connect( proc,TQ_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
+               ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) );
+      connect( proc,TQ_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
+               ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) );
 
       *proc << "cd" << parent->poFile() << ";" << cmd;
       proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
@@ -1741,7 +1741,7 @@ void CatalogManagerView::updateAfterSave(TQString fileWithPath, PoInfo &newInfo)
 void CatalogManagerView::buildTree()
 {
    // in case we were called after settings update
-   disconnect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) );
+   disconnect( this, TQ_SIGNAL( updateFinished() ), this, TQ_SLOT(buildTree() ) );
 
    emit signalBuildTree(false); // announce start of building
 
@@ -2444,7 +2444,7 @@ void CatalogManagerView::setSettings(CatManSettings newSettings)
       counter++;
    }
    _dirCommandsMenu->insertSeparator();
-   _dirCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog()));
+   _dirCommandsMenu->insertItem(i18n("Log Window"),this,TQ_SLOT(showLog()));
 
    _fileCommandsMenu->clear();
    counter=0;
@@ -2455,7 +2455,7 @@ void CatalogManagerView::setSettings(CatManSettings newSettings)
       counter++;
    }
    _fileCommandsMenu->insertSeparator();
-   _fileCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog()));
+   _fileCommandsMenu->insertItem(i18n("Log Window"),this,TQ_SLOT(showLog()));
 
    const bool pathChanged = (oldSettings.poBaseDir!=_settings.poBaseDir)
            || (oldSettings.potBaseDir!=_settings.potBaseDir);
@@ -2463,10 +2463,10 @@ void CatalogManagerView::setSettings(CatManSettings newSettings)
    if(pathChanged)
    {
       if( !isActive() ) {
-        TQTimer::singleShot(100,this,TQT_SLOT(buildTree()));
+        TQTimer::singleShot(100,this,TQ_SLOT(buildTree()));
       } else {
         stop();
-        connect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) );
+        connect( this, TQ_SIGNAL( updateFinished() ), this, TQ_SLOT(buildTree() ) );
       }
    }
 
@@ -2497,7 +2497,7 @@ void CatalogManagerView::hideEvent(TQHideEvent*)
 
 void CatalogManagerView::showEvent(TQShowEvent*)
 {
-   TQTimer::singleShot(1,this,TQT_SLOT(checkUpdate()));
+   TQTimer::singleShot(1,this,TQ_SLOT(checkUpdate()));
 
    pause(false);
 
@@ -3025,8 +3025,8 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
     if( !_validateDialog )
     {
 	_validateDialog = new ValidateProgressDialog(_settings.ignoreURL, this);
-	connect( _validateDialog, TQT_SIGNAL( errorDoubleClicked(const TQString,const int)),
-	    this, TQT_SLOT(showError( const TQString, const int )));
+	connect( _validateDialog, TQ_SIGNAL( errorDoubleClicked(const TQString,const int)),
+	    this, TQ_SLOT(showError( const TQString, const int )));
     }
 
     _markAsFuzzy = _validateOptions->markAsFuzzy->isChecked();
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index c2d03d53..ecb783b7 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -870,8 +870,8 @@ void CatManListItem::checkErrors(KDataTool* tool, TQObject* progressSignalHandle
     _errors.clear();
     Catalog* cat = new Catalog();
 
-    TQObject::connect( cat, TQT_SIGNAL( signalProgress(int) ), progressSignalHandler, TQT_SIGNAL( setValidationProgressBar(int)));
-    TQObject::connect( cat, TQT_SIGNAL( signalResetProgressBar(TQString, int) ), progressSignalHandler, TQT_SLOT( setupFileProgressBar(TQString, int)));
+    TQObject::connect( cat, TQ_SIGNAL( signalProgress(int) ), progressSignalHandler, TQ_SIGNAL( setValidationProgressBar(int)));
+    TQObject::connect( cat, TQ_SIGNAL( signalResetProgressBar(TQString, int) ), progressSignalHandler, TQ_SLOT( setupFileProgressBar(TQString, int)));
 
     if( cat->openURL(KURL( poFile() )) == OK )
     {
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 9568eff3..d7f1ba4f 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -123,8 +123,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* conf
     encodingList += TDEGlobal::charsets()->descriptiveEncodingNames();
     m_encodingComboBox->insertStringList( encodingList );
     
-    connect( oldMessages, TQT_SIGNAL( activated( int ) ),
-      this, TQT_SLOT( slotComboActivated( int ) ) );
+    connect( oldMessages, TQ_SIGNAL( activated( int ) ),
+      this, TQ_SLOT( slotComboActivated( int ) ) );
   }
 
   TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" );
@@ -175,8 +175,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* conf
 
   readSettings( );
 
-  connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) );
-  connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) );
+  connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotExecuteCommand( ) ) );
+  connect( cancelBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( reject( ) ) );
 }
 
 void CVSDialog::slotComboActivated( int index )
@@ -301,12 +301,12 @@ void CVSDialog::slotExecuteCommand( )
   // Set the TDEProcess' command line.
   *p << _commandLine;
 
-  connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ),
-    this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+  connect( p, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+    this, TQ_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
+  connect( p, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+    this, TQ_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
+  connect( p, TQ_SIGNAL( processExited( TDEProcess* ) ),
+    this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
 
   output->append( i18n( "[ Starting command ]" ) );
 
@@ -358,7 +358,7 @@ void CVSDialog::slotProcessExited( TDEProcess * p )
     mainBtn->setText( i18n( "&Show Diff" ) );
   else
     mainBtn->setText( i18n( "&Close" ) );
-  connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) );
+  connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( accept( ) ) );
 
   // Reenable the button and the log edit now that the process is finished.
   mainBtn->setEnabled( true );
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index feecd162..f40fc45e 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -114,8 +114,8 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* conf
     layout->addWidget( label );
     layout->addWidget( logedit );
 
-    connect( oldMessages, TQT_SIGNAL( activated( int ) ),
-      this, TQT_SLOT( slotComboActivated( int ) ) );
+    connect( oldMessages, TQ_SIGNAL( activated( int ) ),
+      this, TQ_SLOT( slotComboActivated( int ) ) );
   }
 
   TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" );
@@ -170,8 +170,8 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* conf
 
   readSettings( );
 
-  connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) );
-  connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) );
+  connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotExecuteCommand( ) ) );
+  connect( cancelBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( reject( ) ) );
 }
 
 void SVNDialog::slotComboActivated( int index )
@@ -280,12 +280,12 @@ void SVNDialog::slotExecuteCommand( )
   // Set the TDEProcess' command line.
   *p << _commandLine;
 
-  connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ),
-    this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+  connect( p, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+    this, TQ_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
+  connect( p, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+    this, TQ_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
+  connect( p, TQ_SIGNAL( processExited( TDEProcess* ) ),
+    this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
 
   output->append( i18n( "[ Starting command ]" ) );
 
@@ -337,7 +337,7 @@ void SVNDialog::slotProcessExited( TDEProcess * p )
     mainBtn->setText( i18n( "&Show Diff" ) );
   else
     mainBtn->setText( i18n( "&Close" ) );
-  connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) );
+  connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( accept( ) ) );
 
   // Reenable the button and the log edit now that the process is finished.
   mainBtn->setEnabled( true );
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 31bdd5ad..fc4058fd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -516,10 +516,10 @@ void SVNOutputCollector::setProcess( TDEProcess* p )
 
   m_process = p;
   if( p ) {
-    connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-             this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
-    connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-             this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
+    connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+             this, TQ_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
+    connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+             this, TQ_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
   }
 
   m_gatheredOutput.truncate( 0 );
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index bcb0c40c..5ffffc08 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -54,14 +54,14 @@ MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name)
   
   mainWidget = new MarkPatternWidget(this);
   
-  connect (mainWidget->combo, TQT_SIGNAL(textChanged(const TQString&)), 
-            this, TQT_SLOT(slotComboTextChanged(const TQString&)));
+  connect (mainWidget->combo, TQ_SIGNAL(textChanged(const TQString&)), 
+            this, TQ_SLOT(slotComboTextChanged(const TQString&)));
   
   comboCompletion = mainWidget->combo->completionObject( );
   
   regexpEditDialog = 0;
   if (!TDETrader::self( )->query("KRegExpEditor/KRegExpEditor").isEmpty( )) {
-    connect(mainWidget->regexpButton, TQT_SIGNAL(clicked( )), this, TQT_SLOT(slotRegexpButtonClicked( )));
+    connect(mainWidget->regexpButton, TQ_SIGNAL(clicked( )), this, TQ_SLOT(slotRegexpButtonClicked( )));
   } else {
     disconnect(mainWidget->useRegExp, 0, mainWidget->regexpButton, 0);
     delete mainWidget->regexpButton;
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 7cabd133..9cd7b904 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -72,12 +72,12 @@ ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidg
     _errorMenu->insertItem(i18n("&Open"),ID_ERROR_OPEN);
     _errorMenu->insertItem(i18n("&Ignore"),ID_ERROR_IGNORE);
 
-    connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(stop()));
-    connect( _mainWidget->_errorList, TQT_SIGNAL( doubleClicked(TQListBoxItem *)),
-	this, TQT_SLOT( errorItemDoubleClicked(TQListBoxItem *)));
+    connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(stop()));
+    connect( _mainWidget->_errorList, TQ_SIGNAL( doubleClicked(TQListBoxItem *)),
+	this, TQ_SLOT( errorItemDoubleClicked(TQListBoxItem *)));
 
-    connect( _mainWidget->_errorList, TQT_SIGNAL( contextMenuRequested(TQListBoxItem *, const TQPoint &)),
-	this, TQT_SLOT( showContextMenu(TQListBoxItem *, const TQPoint &)));
+    connect( _mainWidget->_errorList, TQ_SIGNAL( contextMenuRequested(TQListBoxItem *, const TQPoint &)),
+	this, TQ_SLOT( showContextMenu(TQListBoxItem *, const TQPoint &)));
 }
 
 ValidateProgressDialog::~ValidateProgressDialog()
@@ -111,7 +111,7 @@ void ValidateProgressDialog::validate( const KDataToolInfo &tool, const TQPtrLis
 
     _stopped = false;
 
-    TQTimer::singleShot( 0, this, TQT_SLOT(validate_internal()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(validate_internal()) );
 
     exec();