From b0c86264e0cd10a0d3a47de3b05be453d9417bcd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 13:10:18 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kbabel/catalogmanager/catalogmanager.cpp | 246 ++++++------- kbabel/catalogmanager/catalogmanagerview.cpp | 106 +++--- kbabel/catalogmanager/catmanlistitem.cpp | 4 +- kbabel/catalogmanager/libcvs/cvsdialog.cpp | 22 +- kbabel/catalogmanager/libsvn/svndialog.cpp | 22 +- kbabel/catalogmanager/libsvn/svnhandler.cpp | 8 +- kbabel/catalogmanager/markpatterndialog.cpp | 6 +- kbabel/catalogmanager/validateprogress.cpp | 12 +- kbabel/common/catalog.cpp | 80 ++--- kbabel/common/msgfmt.cpp | 16 +- kbabel/commonui/cmdedit.cpp | 26 +- kbabel/commonui/context.cpp | 2 +- kbabel/commonui/finddialog.cpp | 12 +- kbabel/commonui/projectpref.cpp | 16 +- kbabel/commonui/projectprefwidgets.cpp | 36 +- kbabel/commonui/projectwizard.cpp | 6 +- kbabel/commonui/roughtransdlg.cpp | 8 +- kbabel/commonui/tdeactionselector.cpp | 24 +- kbabel/commonui/toolaction.cpp | 2 +- kbabel/kbabel/charselectview.cpp | 8 +- kbabel/kbabel/commentview.cpp | 8 +- kbabel/kbabel/contextview.cpp | 2 +- kbabel/kbabel/headereditor.cpp | 4 +- kbabel/kbabel/hidingmsgedit.cpp | 16 +- kbabel/kbabel/kbabel.cpp | 400 ++++++++++----------- kbabel/kbabel/kbabelpref.cpp | 12 +- kbabel/kbabel/kbabelview.cpp | 224 ++++++------ kbabel/kbabel/kbabelview2.cpp | 6 +- kbabel/kbabel/kbbookmarkhandler.cpp | 2 +- kbabel/kbabel/kbcataloglistview.cpp | 2 +- kbabel/kbabel/kbcatalogview.cpp | 4 +- kbabel/kbabel/kbcharselect.cpp | 4 +- kbabel/kbabel/kbhighlighting.cpp | 10 +- kbabel/kbabel/mymultilineedit.cpp | 10 +- kbabel/kbabel/sourceview.cpp | 2 +- kbabel/kbabel/taglistview.cpp | 12 +- kbabel/kbabeldict/dictchooser.cpp | 22 +- kbabel/kbabeldict/dictionarymenu.cpp | 14 +- kbabel/kbabeldict/kbabeldict.cpp | 10 +- kbabel/kbabeldict/kbabeldictbox.cpp | 90 ++--- kbabel/kbabeldict/kbabeldictview.cpp | 34 +- kbabel/kbabeldict/main.cpp | 4 +- .../modules/dbsearchengine/KDBSearchEngine.cpp | 122 +++---- .../kbabeldict/modules/dbsearchengine/dbscan.cpp | 2 +- .../modules/dbsearchengine/preferenceswidget.cpp | 2 +- .../modules/dbsearchengine2/KDBSearchEngine2.cpp | 24 +- .../modules/dbsearchengine2/algorithms.cpp | 4 +- .../kbabeldict/modules/dbsearchengine2/dbscan.cpp | 2 +- .../modules/dbsearchengine2/preferenceswidget.cpp | 2 +- .../kbabeldict/modules/poauxiliary/poauxiliary.cpp | 16 +- .../modules/poauxiliary/preferenceswidget.cpp | 4 +- .../modules/pocompendium/compendiumdata.cpp | 6 +- .../modules/pocompendium/pocompendium.cpp | 32 +- .../modules/pocompendium/preferenceswidget.cpp | 58 +-- .../kbabeldict/modules/tmx/preferenceswidget.cpp | 54 +-- kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp | 32 +- 56 files changed, 957 insertions(+), 957 deletions(-) (limited to 'kbabel') 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 tools = ToolAction::validationTools(); TQPtrList 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("

Catalog Manager

\n" "

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(); diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index fcf50750..eb963796 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -930,15 +930,15 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) filter = static_cast(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); - - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); + + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) d->_active = true; @@ -1027,15 +1027,15 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons filter = static_cast(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) d->_active = true; @@ -1229,7 +1229,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) kdDebug(KBABEL) << "checkUsingTool active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); int index = 0; bool hasErrors=false; @@ -1256,7 +1256,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) kdDebug(KBABEL) << "checkUsingTool not active" << endl; d->_active=false; d->_stop=false; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); emit signalClearProgressBar(); @@ -1268,7 +1268,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command) kdDebug(KBABEL) << "modifyUsingTool active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); int index = 0; bool modified = false; @@ -1334,7 +1334,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command) kdDebug(KBABEL) << "modifyUsingTool not active" << endl; d->_active=false; d->_stop=false; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); emit signalClearProgressBar(); } @@ -2093,15 +2093,15 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) filter = static_cast(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) kdDebug(KBABEL) << "writeFile active" << endl; @@ -2504,7 +2504,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le kdDebug(KBABEL) << "findNext active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); MiscSettings miscOptions = miscSettings(); @@ -2554,7 +2554,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le if( d->_stop || endReached) { kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findNext not active" << endl; d->_active=false; d->_stop=false; @@ -2763,7 +2763,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } } - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findNext not active" << endl; d->_active=false; d->_stop=false; @@ -2779,7 +2779,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le kdDebug(KBABEL) << "findPrev active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); MiscSettings miscOptions = miscSettings(); @@ -2803,7 +2803,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le if( d->_stop || beginReached) { kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findPrev active" << endl; d->_active=false; d->_stop=false; @@ -3034,7 +3034,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } } - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findPrev active" << endl; d->_active=false; d->_stop=false; @@ -3080,7 +3080,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) return DiffOk; } - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "diffv active" << endl; d->_active=true; d->_stop=false; @@ -3159,7 +3159,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) if( d->_stop ) { - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug (KBABEL) << "diffv not active" << endl; @@ -3199,7 +3199,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) if( !d->diffCache.insert(entry,s) ) delete s; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "diffv not active" << endl; d->_active=false; d->_stop=false; @@ -3209,7 +3209,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) void Catalog::setDiffList( const TQValueList& list) { - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "setDiffList active" << endl; d->_active=true; d->_stop=false; @@ -3259,7 +3259,7 @@ void Catalog::setDiffList( const TQValueList& list) emit signalClearProgressBar(); - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "setDiffList not active" << endl; d->_active=false; d->_stop=false; diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 5e359a91..d54d0712 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.cpp @@ -58,10 +58,10 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) TDEProcess proc; - connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int ))); - connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int))); + connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int ))); + connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int))); // remove last output _output=""; @@ -100,10 +100,10 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o TDEProcess proc; proc.setUseShell(true); - connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int ))); - connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int))); + connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int ))); + connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int))); // remove last output _output=""; diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index e6db0b5b..4fcc675e 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.cpp @@ -107,19 +107,19 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name) setMinimumSize(layout->sizeHint()); - connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ; - connect(_editButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(editCmd()) ); - connect(_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(removeCmd()) ); - connect(_upButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(upCmd()) ) ; - connect(_downButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(downCmd()) ); - - connect(_commands , TQT_SIGNAL(highlighted(int)) , this, TQT_SLOT(cmdHighlighted(int)) ); - connect(_commandNames , TQT_SIGNAL(highlighted(int)) , this, TQT_SLOT(cmdNameHighlighted(int)) ); - connect(_commands , TQT_SIGNAL(selected(int)) , this, TQT_SLOT(editCmd()) ); - connect(_commandNames , TQT_SIGNAL(selected(int)) , this, TQT_SLOT(editCmd()) ); - - connect(_cmdEdit, TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(checkAdd()) ); - connect(_cmdNameEdit, TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(checkAdd()) ); + connect(_addButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(addCmd()) ) ; + connect(_editButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(editCmd()) ); + connect(_removeButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(removeCmd()) ); + connect(_upButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(upCmd()) ) ; + connect(_downButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(downCmd()) ); + + connect(_commands , TQ_SIGNAL(highlighted(int)) , this, TQ_SLOT(cmdHighlighted(int)) ); + connect(_commandNames , TQ_SIGNAL(highlighted(int)) , this, TQ_SLOT(cmdNameHighlighted(int)) ); + connect(_commands , TQ_SIGNAL(selected(int)) , this, TQ_SLOT(editCmd()) ); + connect(_commandNames , TQ_SIGNAL(selected(int)) , this, TQ_SLOT(editCmd()) ); + + connect(_cmdEdit, TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(checkAdd()) ); + connect(_cmdNameEdit, TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(checkAdd()) ); } void CmdEdit::setCommands(const TQStringList& commands,const TQStringList& commandNames) diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index a0a83351..6b1719a7 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -72,7 +72,7 @@ SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQ { _referenceList.clear(); _referenceCombo = new TQComboBox( this ); - connect( _referenceCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateToSelected(int))); + connect( _referenceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateToSelected(int))); _layout= new TQVBoxLayout(this); _layout->addWidget(_referenceCombo); diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index df1d887b..797b6c71 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -106,7 +106,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) } _buttonGrp = new TQButtonGroup(3, TQt::Horizontal, i18n("Where to Search"), page); - connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int))); + connect(_buttonGrp,TQ_SIGNAL(clicked(int)), this, TQ_SLOT(inButtonsClicked(int))); layout->addWidget(_buttonGrp); _inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp); @@ -136,8 +136,8 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), regexp ); - connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); - connect( _isRegExp, TQT_SIGNAL( toggled(bool) ), _regExpButton, TQT_SLOT(setEnabled(bool))); + connect( _regExpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( regExpButtonClicked())); + connect( _isRegExp, TQ_SIGNAL( toggled(bool) ), _regExpButton, TQ_SLOT(setEnabled(bool))); } if(forReplace) @@ -541,9 +541,9 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent) TQLabel *label = new TQLabel(i18n("Replace this string?"),page); layout->addWidget(label); - connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace())); - connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next())); - connect(this,TQT_SIGNAL(user3Clicked()),this,TQT_SIGNAL(replaceAll())); + connect(this,TQ_SIGNAL(user1Clicked()),this,TQ_SIGNAL(replace())); + connect(this,TQ_SIGNAL(user2Clicked()),this,TQ_SIGNAL(next())); + connect(this,TQ_SIGNAL(user3Clicked()),this,TQ_SIGNAL(replaceAll())); } ReplaceDialog::~ReplaceDialog() diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 1f53f2f1..7d940acb 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -82,15 +82,15 @@ ProjectDialog::ProjectDialog(Project::Ptr project) addPage(_spellPage, i18n("title of page in preferences dialog","Spelling") , "tools-check-spelling" , i18n("Options for Spell Checking")); - connect( _spellPage, TQT_SIGNAL( settingsChanged() ) - , this, TQT_SLOT(updateButtons()) ); + connect( _spellPage, TQ_SIGNAL( settingsChanged() ) + , this, TQ_SLOT(updateButtons()) ); _sourcePage = new SourceContextPreferences(0); addPage(_sourcePage, i18n("title of page in preferences dialog","Source") , "text-x-src" ,i18n("Options for Showing Source Context")); - connect(_sourcePage, TQT_SIGNAL (itemsChanged()) - , this, TQT_SLOT (updateButtons()) ); + connect(_sourcePage, TQ_SIGNAL (itemsChanged()) + , this, TQ_SLOT (updateButtons()) ); _miscPage = new MiscPreferences(0); addPage(_miscPage, i18n("title of page in preferences dialog","Miscellaneous") @@ -106,15 +106,15 @@ ProjectDialog::ProjectDialog(Project::Ptr project) addPage(_dirCommandsPage, i18n("title of page in preferences dialog","Folder Commands") , "folder" , i18n("User-Defined Commands for Folder Items")); - connect( _dirCommandsPage, TQT_SIGNAL( settingsChanged() ), - this, TQT_SLOT(updateButtons()) ); + connect( _dirCommandsPage, TQ_SIGNAL( settingsChanged() ), + this, TQ_SLOT(updateButtons()) ); _fileCommandsPage = new FileCommandsPreferences(0); addPage(_fileCommandsPage, i18n("title of page in preferences dialog","File Commands") , "files" , i18n("User-Defined Commands for File Items")); - connect( _fileCommandsPage, TQT_SIGNAL( settingsChanged() ), - this, TQT_SLOT(updateButtons()) ); + connect( _fileCommandsPage, TQ_SIGNAL( settingsChanged() ), + this, TQ_SLOT(updateButtons()) ); _viewPage = new ViewPreferences(0); addPage(_viewPage, i18n("title of page in preferences dialog","Catalog Manager") diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 29b051ff..53be602c 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -220,7 +220,7 @@ SavePreferences::SavePreferences(TQWidget *parent) _dateFormatEdit = new TQLineEdit(dateBox, "kcfg_CustomDateFormat"); _dateFormatEdit->setEnabled(false); - connect( _customDateButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( customDateActivated(bool) ) ); + connect( _customDateButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( customDateActivated(bool) ) ); TQGroupBox* projectBox = new TQGroupBox(1,TQt::Horizontal,i18n("Project String") ,page); @@ -438,8 +438,8 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje tempLabel=new TQLabel(i18n("Lan&guage code:"),hbox); _langCodeEdit = new TQLineEdit(hbox, "kcfg_LanguageCode"); tempLabel->setBuddy(_langCodeEdit); - connect(_langCodeEdit,TQT_SIGNAL(textChanged(const TQString&)), this - , TQT_SLOT(checkTestPluralButton())); + connect(_langCodeEdit,TQ_SIGNAL(textChanged(const TQString&)), this + , TQ_SLOT(checkTestPluralButton())); tempLabel=new TQLabel(i18n("&Language mailing list:"),group); _listEdit = new TQLineEdit(group, "kcfg_Mailinglist"); @@ -473,15 +473,15 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje _pluralFormsBox->setSpecialValueText( i18n("automatic choose number of plural forms","Automatic")); label->setBuddy(_pluralFormsBox); - connect(_pluralFormsBox,TQT_SIGNAL(valueChanged(int)), this - , TQT_SLOT(checkTestPluralButton())); + connect(_pluralFormsBox,TQ_SIGNAL(valueChanged(int)), this + , TQ_SLOT(checkTestPluralButton())); hbox->setStretchFactor(_pluralFormsBox,1); _testPluralButton = new TQPushButton(i18n("Te&st"),hbox); _testPluralButton->setEnabled(false); - connect(_testPluralButton, TQT_SIGNAL(clicked()), this - , TQT_SLOT(testPluralForm())); + connect(_testPluralButton, TQ_SIGNAL(clicked()), this + , TQ_SLOT(testPluralForm())); const TQString msg=i18n("

Number of singular/plural forms

" "

Note: This option is TDE specific. " @@ -512,8 +512,8 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje hbox->setStretchFactor(_gnuPluralFormHeaderEdit,1); _testGnuPluralFormButton = new TQPushButton(i18n("&Lookup"),hbox); - connect(_testGnuPluralFormButton, TQT_SIGNAL(clicked()), this - , TQT_SLOT(lookupGnuPluralFormHeader())); + connect(_testGnuPluralFormButton, TQ_SIGNAL(clicked()), this + , TQ_SLOT(lookupGnuPluralFormHeader())); _checkPluralArgumentBox = new TQCheckBox( i18n("Re&quire plural form arguments in translation") , group, "kcfg_CheckPluralArgument" ); @@ -706,7 +706,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), hbox ); - connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); + connect( _regExpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( regExpButtonClicked())); } @@ -811,8 +811,8 @@ SpellPreferences::SpellPreferences(TQWidget* parent) remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored"); layout->addWidget(remIgnoredBtn); - connect( spellConfig, TQT_SIGNAL( configChanged() ) - , this, TQT_SIGNAL ( settingsChanged() ) ); + connect( spellConfig, TQ_SIGNAL( configChanged() ) + , this, TQ_SIGNAL ( settingsChanged() ) ); TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page); layout->addWidget(tempLabel); @@ -820,8 +820,8 @@ SpellPreferences::SpellPreferences(TQWidget* parent) layout->addWidget(ignoreURLEdit); tempLabel->setBuddy(ignoreURLEdit); - connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit - ,TQT_SLOT(setEnabled(bool))); + connect(remIgnoredBtn,TQ_SIGNAL(toggled(bool)),ignoreURLEdit + ,TQ_SLOT(setEnabled(bool))); TQString msg = i18n("

Remember ignored words

" @@ -993,7 +993,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n" "@POFILES@, @MARKEDPOFILES@"), box); - connect (_dirCmdEdit, TQT_SIGNAL(widgetChanged()), this, TQT_SIGNAL(settingsChanged())); + connect (_dirCmdEdit, TQ_SIGNAL(widgetChanged()), this, TQ_SIGNAL(settingsChanged())); TQWhatsThis::add( box , i18n("

Commands for folders

" "

Insert here the commands you want to execute in folders from " @@ -1056,7 +1056,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) new TQLabel( i18n("Replaceables:\n" "@PACKAGE@, @POFILE@,@POTFILE@,\n@PODIR@, @POTDIR@"), box); - connect (_fileCmdEdit, TQT_SIGNAL(widgetChanged()), this, TQT_SIGNAL(settingsChanged())); + connect (_fileCmdEdit, TQ_SIGNAL(widgetChanged()), this, TQ_SIGNAL(settingsChanged())); TQWhatsThis::add( box , i18n("

Commands for files

" "

Insert here the commands you want to execute on files from " @@ -1168,8 +1168,8 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p _pathsEditor->setTitle(i18n("Path Patterns")); layout->addWidget(_pathsEditor); - connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ()) - , this, TQT_SIGNAL (itemsChanged ())); + connect ( _pathsEditor, TQ_SIGNAL (itemsChanged ()) + , this, TQ_SIGNAL (itemsChanged ())); _pathsEditor->installEventFilter(this); diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 79266489..8eac4b06 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -71,9 +71,9 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) } } - connect( _wizard->_projectName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); - connect( _wizard->_projectFile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); - connect( this, TQT_SIGNAL( helpClicked( void ) ), this, TQT_SLOT( slotHelpClicked( void ) ) ); + connect( _wizard->_projectName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &))); + connect( _wizard->_projectFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &))); + connect( this, TQ_SIGNAL( helpClicked( void ) ), this, TQ_SLOT( slotHelpClicked( void ) ) ); addPage(_wizard, i18n("Basic Project Information")); diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 654bee27..507e7988 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -103,7 +103,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat fuzzyButton = new TQCheckBox(i18n("&Fuzzy entries"),bBox); transButton = new TQCheckBox(i18n("T&ranslated entries"),bBox); - connect(bBox,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(msgButtonClicked(int))); + connect(bBox,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(msgButtonClicked(int))); TQWhatsThis::add(bBox,i18n("

What entries to translate

" "

Choose here, for which entries of the file KBabel " @@ -144,8 +144,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat "you know what you are doing.

")); - connect(markFuzzyButton, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(fuzzyButtonToggled(bool))); + connect(markFuzzyButton, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(fuzzyButtonToggled(bool))); kdeButton = new TQCheckBox(i18n("Initialize &TDE-specific entries"),box); kdeButton->setChecked(true); @@ -249,7 +249,7 @@ void RoughTransDlg::slotUser1() partTransCounter=0; totalTried=0; - TQTimer::singleShot(0,this, TQT_SLOT(translate())); + TQTimer::singleShot(0,this, TQ_SLOT(translate())); } void RoughTransDlg::translate() diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp index 7cb5160c..27fcd215 100644 --- a/kbabel/commonui/tdeactionselector.cpp +++ b/kbabel/commonui/tdeactionselector.cpp @@ -109,18 +109,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 6e594834..d9245239 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -76,7 +76,7 @@ TQPtrList ToolAction::dataToolActionList( const TQValueListlibrary()+"_"+(*cit)).utf8() ); - connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), + connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); actionList.append( action ); diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 4522201e..8214dcf9 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -74,11 +74,11 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent scroll->addChild(_table); layout->addWidget (scroll); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), this, TQT_SLOT (setDisabled (bool))); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), _table, TQT_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), this, TQ_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), _table, TQ_SLOT (setDisabled (bool))); TQWhatsThis::add(this, i18n("

Character Selector

" diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 0ca858d3..27ac26fd 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -94,12 +94,12 @@ Hints from other translators are also sometimes contained in comments.

\n\ Options->Show Comments.

")); commentEdit->setReadOnly(true); - connect(commentEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); + connect(commentEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); - connect(commentEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); + connect(commentEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void CommentView::update(EditCommand* cmd, bool undo) diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index de5263a9..c6839480 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -67,7 +67,7 @@ ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje "

You can hide the tools window by deactivating " "Options->Show Tools.

")); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void ContextView::updateView() diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 4a7624cb..9b63f071 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -54,8 +54,8 @@ HeaderEditor::HeaderEditor(Catalog* cat,const char* name) restoreSettings(); _catalog=cat; - connect(_catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(readHeader(bool))); - connect(_catalog,TQT_SIGNAL(signalHeaderChanged()),this,TQT_SLOT(updateHeader())); + connect(_catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(readHeader(bool))); + connect(_catalog,TQ_SIGNAL(signalHeaderChanged()),this,TQ_SLOT(updateHeader())); setButtonText(User1,i18n("&Apply Settings")); setButtonWhatsThis (User1, i18n("

This button " diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 11bf219c..13d3ce2f 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -54,8 +54,8 @@ HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell _allEdits.clear(); setNumberOfPlurals( _numberOfPlurals ); - connect( _multipleEdit, TQT_SIGNAL(currentChanged( TQWidget* )), - this, TQT_SLOT( newCurrentMultiple( TQWidget* ))); + connect( _multipleEdit, TQ_SIGNAL(currentChanged( TQWidget* )), + this, TQ_SLOT( newCurrentMultiple( TQWidget* ))); showSingle(); } @@ -189,12 +189,12 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) for( MsgMultiLineEdit* e = _allEdits.first() ; e ; e = _allEdits.next() ) { - connect( e, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), - this, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SIGNAL( textChanged() )); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SLOT( emitTextChanged() )); - connect( e, TQT_SIGNAL( cursorPositionChanged( int, int )), - this, TQT_SLOT( emitCursorPositionChanged( int, int )) ); + connect( e, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), + this, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SIGNAL( textChanged() )); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SLOT( emitTextChanged() )); + connect( e, TQ_SIGNAL( cursorPositionChanged( int, int )), + this, TQ_SLOT( emitCursorPositionChanged( int, int )) ); } showPlurals( plurals ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 3a8da899..0f1bc0bf 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -171,8 +171,8 @@ void KBabelMW::init(KBCatalog* catalog) prefDialogs.setAutoDelete(true); _statusbarTimer = new TQTimer(this, "statusbartimer"); - connect(_statusbarTimer,TQT_SIGNAL(timeout()),this - ,TQT_SLOT(clearStatusbarMsg())); + connect(_statusbarTimer,TQ_SIGNAL(timeout()),this + ,TQ_SLOT(clearStatusbarMsg())); // FIXME: Q_ASSERT(_project); @@ -206,74 +206,74 @@ void KBabelMW::init(KBCatalog* catalog) } - connect(catalog,TQT_SIGNAL(signalUndoAvailable(bool)),this - ,TQT_SLOT(enableUndo(bool))); - connect(catalog,TQT_SIGNAL(signalRedoAvailable(bool)),this - ,TQT_SLOT(enableRedo(bool))); - connect(catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)),this - ,TQT_SLOT(setNumberOfFuzzies(uint))); - connect(catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this - ,TQT_SLOT(setNumberOfUntranslated(uint))); - connect(catalog,TQT_SIGNAL(signalTotalNumberChanged(uint)),this - ,TQT_SLOT(setNumberOfTotal(uint))); - connect(catalog,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(catalog,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar())); - connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,this,TQT_SLOT(prepareProgressBar(TQString,int))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(enableDefaults(bool))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),m_view,TQT_SLOT(newFileOpened(bool))); - connect(catalog,TQT_SIGNAL(signalModified(bool)),this,TQT_SLOT(showModified(bool))); + connect(catalog,TQ_SIGNAL(signalUndoAvailable(bool)),this + ,TQ_SLOT(enableUndo(bool))); + connect(catalog,TQ_SIGNAL(signalRedoAvailable(bool)),this + ,TQ_SLOT(enableRedo(bool))); + connect(catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)),this + ,TQ_SLOT(setNumberOfFuzzies(uint))); + connect(catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this + ,TQ_SLOT(setNumberOfUntranslated(uint))); + connect(catalog,TQ_SIGNAL(signalTotalNumberChanged(uint)),this + ,TQ_SLOT(setNumberOfTotal(uint))); + connect(catalog,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(catalog,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(catalog,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(enableDefaults(bool))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),m_view,TQ_SLOT(newFileOpened(bool))); + connect(catalog,TQ_SIGNAL(signalModified(bool)),this,TQ_SLOT(showModified(bool))); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); - connect(m_view,TQT_SIGNAL(signalFirstDisplayed(bool, bool)),this - ,TQT_SLOT(firstEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalLastDisplayed(bool, bool)),this - ,TQT_SLOT(lastEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyDisplayed(bool)),this - ,TQT_SLOT(fuzzyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedDisplayed(bool)),this - ,TQT_SLOT(untranslatedDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalFaultyDisplayed(bool)),this - ,TQT_SLOT(faultyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this - ,TQT_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); - connect(m_view,TQT_SIGNAL(signalFuzzyAfterwards(bool)),this - ,TQT_SLOT(hasFuzzyAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyInFront(bool)),this - ,TQT_SLOT(hasFuzzyInFront(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedAfterwards(bool)),this - ,TQT_SLOT(hasUntranslatedAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedInFront(bool)),this - ,TQT_SLOT(hasUntranslatedInFront(bool))); - connect(m_view,TQT_SIGNAL(signalErrorAfterwards(bool)),this - ,TQT_SLOT(hasErrorAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalErrorInFront(bool)),this - ,TQT_SLOT(hasErrorInFront(bool))); - connect(m_view,TQT_SIGNAL(signalBackHistory(bool)),this - ,TQT_SLOT(enableBackHistory(bool))); - connect(m_view,TQT_SIGNAL(signalForwardHistory(bool)),this - ,TQT_SLOT(enableForwardHistory(bool))); - - - connect(m_view,TQT_SIGNAL(ledColorChanged(const TQColor&)),this - ,TQT_SLOT(setLedColor(const TQColor&))); - - - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_SLOT(enableStop(bool))); - - connect(m_view,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(m_view,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar())); - connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,this,TQT_SLOT(prepareProgressBar(TQString,int))); - - connect(m_view,TQT_SIGNAL(signalDictionariesChanged()) - , this, TQT_SLOT(buildDictMenus())); - connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this - , TQT_SLOT(updateCursorPosition(int,int))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); + connect(m_view,TQ_SIGNAL(signalFirstDisplayed(bool, bool)),this + ,TQ_SLOT(firstEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalLastDisplayed(bool, bool)),this + ,TQ_SLOT(lastEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyDisplayed(bool)),this + ,TQ_SLOT(fuzzyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedDisplayed(bool)),this + ,TQ_SLOT(untranslatedDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalFaultyDisplayed(bool)),this + ,TQ_SLOT(faultyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this + ,TQ_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); + connect(m_view,TQ_SIGNAL(signalFuzzyAfterwards(bool)),this + ,TQ_SLOT(hasFuzzyAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyInFront(bool)),this + ,TQ_SLOT(hasFuzzyInFront(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedAfterwards(bool)),this + ,TQ_SLOT(hasUntranslatedAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedInFront(bool)),this + ,TQ_SLOT(hasUntranslatedInFront(bool))); + connect(m_view,TQ_SIGNAL(signalErrorAfterwards(bool)),this + ,TQ_SLOT(hasErrorAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalErrorInFront(bool)),this + ,TQ_SLOT(hasErrorInFront(bool))); + connect(m_view,TQ_SIGNAL(signalBackHistory(bool)),this + ,TQ_SLOT(enableBackHistory(bool))); + connect(m_view,TQ_SIGNAL(signalForwardHistory(bool)),this + ,TQ_SLOT(enableForwardHistory(bool))); + + + connect(m_view,TQ_SIGNAL(ledColorChanged(const TQColor&)),this + ,TQ_SLOT(setLedColor(const TQColor&))); + + + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(enableStop(bool))); + + connect(m_view,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(m_view,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(m_view,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + + connect(m_view,TQ_SIGNAL(signalDictionariesChanged()) + , this, TQ_SLOT(buildDictMenus())); + connect(m_view,TQ_SIGNAL(signalCursorPosChanged(int,int)), this + , TQ_SLOT(updateCursorPosition(int,int))); if(!catalog->currentURL().isEmpty()) { @@ -296,14 +296,14 @@ void KBabelMW::init(KBCatalog* catalog) // the earlier created TDEAction for "clear_bookmarks" is now reconnected TDEAction* action = actionCollection()->action("clear_bookmarks"); if (action) { - action->disconnect(TQT_SIGNAL(activated())); - connect(action, TQT_SIGNAL(activated()), - bmHandler, TQT_SLOT(slotClearBookmarks())); + action->disconnect(TQ_SIGNAL(activated())); + connect(action, TQ_SIGNAL(activated()), + bmHandler, TQ_SLOT(slotClearBookmarks())); } - connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)), - this, TQT_SLOT(slotOpenBookmark(int))); - connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)), - bmHandler, TQT_SLOT(slotClearBookmarks())); + connect(bmHandler, TQ_SIGNAL(signalBookmarkSelected(int)), + this, TQ_SLOT(slotOpenBookmark(int))); + connect(m_view, TQ_SIGNAL(signalNewFileOpened(KURL)), + bmHandler, TQ_SLOT(slotClearBookmarks())); _config = TDESharedConfig::openConfig( "kbabelrc" ); restoreSettings(); @@ -335,7 +335,7 @@ void KBabelMW::init(KBCatalog* catalog) "set to %1. You may want to change this setting " "according to the settings of your language team.").arg(encodingStr)); - TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure())); + TQTimer::singleShot(1,this,TQ_SLOT(projectConfigure())); } _config->writeEntry("Version",VERSION); @@ -404,289 +404,289 @@ void KBabelMW::setupActions() TDEAction* action; // the file menu - action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - a_recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), actionCollection()); + a_recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); a_recent->setMaxItems(MAX_RECENT); - action = KStdAction::revert(m_view,TQT_SLOT(revertToSaved()),actionCollection()); - action=KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - action = new TDEAction(i18n("Save Sp&ecial..."), 0, this, TQT_SLOT(fileSaveSpecial()), + action = KStdAction::revert(m_view,TQ_SLOT(revertToSaved()),actionCollection()); + action=KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + action = new TDEAction(i18n("Save Sp&ecial..."), 0, this, TQ_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQT_SLOT(setFilePackage()), + action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQ_SLOT(setFilePackage()), actionCollection(), "set_package" ); - action = KStdAction::mail(this, TQT_SLOT(fileMail()), actionCollection()); + action = KStdAction::mail(this, TQ_SLOT(fileMail()), actionCollection()); - action = new TDEAction(i18n("&New View"), 0, this, TQT_SLOT(fileNewView()), + action = new TDEAction(i18n("&New View"), 0, this, TQ_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new TDEAction(i18n("New &Window"), 0, this, TQT_SLOT(fileNewWindow()), + action = new TDEAction(i18n("New &Window"), 0, this, TQ_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); action->setShortcut( TDEStdAccel::openNew() ); - action = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); + action = KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); // the edit menu - action = KStdAction::undo(m_view, TQT_SLOT(undo()), actionCollection()); - action = KStdAction::redo(m_view, TQT_SLOT(redo()), actionCollection()); - action = KStdAction::cut(m_view, TQT_SIGNAL(signalCut()), actionCollection()); - action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection()); - action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection()); - action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(m_view, TQT_SLOT(find()), actionCollection()); - action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection()); - action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(m_view, TQT_SLOT(replace()), actionCollection()); - - action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" ); + action = KStdAction::undo(m_view, TQ_SLOT(undo()), actionCollection()); + action = KStdAction::redo(m_view, TQ_SLOT(redo()), actionCollection()); + action = KStdAction::cut(m_view, TQ_SIGNAL(signalCut()), actionCollection()); + action = KStdAction::copy(m_view, TQ_SIGNAL(signalCopy()), actionCollection()); + action = KStdAction::paste(m_view, TQ_SIGNAL(signalPaste()), actionCollection()); + action = KStdAction::selectAll(m_view, TQ_SIGNAL(signalSelectAll()), actionCollection()); + action = KStdAction::find(m_view, TQ_SLOT(find()), actionCollection()); + action = KStdAction::findNext(m_view, TQ_SLOT(findNext()), actionCollection()); + action = KStdAction::findPrev(m_view, TQ_SLOT(findPrev()), actionCollection()); + action = KStdAction::replace(m_view, TQ_SLOT(replace()), actionCollection()); + + action = KStdAction::clear( m_view, TQ_SLOT(clear()), actionCollection(), "clear" ); action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view - ,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); + ,TQ_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", - CTRL+ALT+Key_Space, m_view, TQT_SLOT(search2msgstr()), + CTRL+ALT+Key_Space, m_view, TQ_SLOT(search2msgstr()), actionCollection(), "search2msgstr"); action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view - ,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); + ,TQ_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview - ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); + ,TQ_SLOT(emitChar()), actionCollection(), "char2msgstr"); a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view - , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); - action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()), + , TQ_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQ_SLOT(editHeader()), actionCollection(), "edit_edit_header"); action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N - , m_view, TQT_SLOT(insertNextTag()) + , m_view, TQ_SLOT(insertNextTag()) , actionCollection(),"insert_next_tag"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M - , m_view, TQT_SLOT(insertNextTagMsgid()) + , m_view, TQ_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); TDEActionMenu *actionMenu= new TDEActionMenu(i18n("Inser&t Tag"), "insert_tag" , actionCollection(),"insert_tag"); m_view->setTagsMenu(actionMenu->popupMenu()); - connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),actionMenu - ,TQT_SLOT(setEnabled(bool))); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag())); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextTag())); action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less - , m_view, TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); + , m_view, TQ_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M - , m_view, TQT_SLOT(skipToNextTag()) + , m_view, TQ_SLOT(skipToNextTag()) , actionCollection(),"move_to_next_tag"); action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B - , m_view, TQT_SLOT(skipToPreviousTag()) + , m_view, TQ_SLOT(skipToPreviousTag()) , actionCollection(),"move_to_prev_tag"); action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G - , m_view, TQT_SLOT(insertNextArg()) + , m_view, TQ_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); - connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextArgAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); actionMenu= new TDEActionMenu(i18n("Inser&t Argument"), "insert_arg" , actionCollection(),"insert_arg"); m_view->setArgsMenu(actionMenu->popupMenu()); - connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),actionMenu - ,TQT_SLOT(setEnabled(bool))); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg())); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextArg())); action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent - , m_view, TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); + , m_view, TQ_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); // next, the go-menu action = new TDEAction(i18n("&Previous"), "go-previous", - TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQT_SLOT(gotoPrev()), + TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQ_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); action = new TDEAction(i18n("&Next"), "go-next", - TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQT_SLOT(gotoNext()), + TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQ_SLOT(gotoNext()), actionCollection(),"go_next_entry"); - action = KStdAction::goTo(m_view, TQT_SLOT(gotoEntry()), actionCollection()); + action = KStdAction::goTo(m_view, TQ_SLOT(gotoEntry()), actionCollection()); action->setShortcut( TDEStdAccel::gotoLine()); - action = KStdAction::firstPage(m_view, TQT_SLOT(gotoFirst()),actionCollection()); + action = KStdAction::firstPage(m_view, TQ_SLOT(gotoFirst()),actionCollection()); action->setText(i18n("&First Entry")); action->setShortcut(CTRL+ALT+Key_Home); - action = KStdAction::lastPage(m_view, TQT_SLOT(gotoLast()),actionCollection()); + action = KStdAction::lastPage(m_view, TQ_SLOT(gotoLast()),actionCollection()); action->setText(i18n("&Last Entry")); action->setShortcut(CTRL+ALT+Key_End); a_prevFoU = new TDEAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans", CTRL+SHIFT+Key_Prior, m_view, - TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); + TQ_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", CTRL+SHIFT+Key_Next, m_view, - TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); + TQ_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", CTRL+Key_Prior, m_view, - TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); + TQ_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, m_view, - TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); + TQ_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, m_view, - TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); + TQ_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, m_view, - TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); + TQ_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action = new TDEAction(i18n("Previo&us Error"), "preverror", SHIFT+Key_Prior, m_view, - TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); + TQ_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); action = new TDEAction(i18n("Next Err&or"), "nexterror", SHIFT+Key_Next, m_view, - TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); + TQ_SLOT(gotoNextError()),actionCollection(), "go_next_error"); action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view, - TQT_SLOT(backHistory()),actionCollection(), "go_back_history"); + TQ_SLOT(backHistory()),actionCollection(), "go_back_history"); action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view, - TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); + TQ_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); // the search menu actionMenu=new TDEActionMenu(i18n("&Find Text"), "transsearch",actionCollection(),"dict_search_all"); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch())); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSearch())); dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(dictMenu,TQT_SIGNAL(activated(const TQString)), m_view - , TQT_SLOT(startSearch(const TQString))); + connect(dictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSearch(const TQString))); actionMenu=new TDEActionMenu(i18n("F&ind Selected Text"), "transsearch",actionCollection(),"dict_search_selected"); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSelectionSearch())); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSelectionSearch())); selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), m_view - , TQT_SLOT(startSelectionSearch(const TQString))); + connect(selectionDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSelectionSearch(const TQString))); actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"), "transsearch",actionCollection(),"dict_edit"); editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), m_view - , TQT_SLOT(editDictionary(const TQString))); + connect(editDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(editDictionary(const TQString))); actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"), "transsearch",actionCollection(),"dict_configure"); configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), m_view - , TQT_SLOT(configureDictionary(const TQString))); + connect(configDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(configureDictionary(const TQString))); actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch", actionCollection(), "dict_about"); aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), m_view - , TQT_SLOT(aboutDictionary(const TQString))); + connect(aboutDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(aboutDictionary(const TQString))); buildDictMenus(); // 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"); - a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQ_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); // the tools menu action = new TDEAction(i18n("&Spell Check..."), "tools-check-spelling", CTRL+Key_I - , m_view, TQT_SLOT(spellcheckCommon()),actionCollection() + , m_view, TQ_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0 - , m_view, TQT_SLOT(spellcheckAll()),actionCollection() + , m_view, TQ_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 - , m_view, TQT_SLOT(spellcheckFromCursor()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 - , m_view, TQT_SLOT(spellcheckCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0 - , m_view, TQT_SLOT(spellcheckFromCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 - , m_view, TQT_SLOT(spellcheckMarked()),actionCollection() + , m_view, TQ_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); TDEToggleAction *toggleAction; toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0 ,actionCollection(), "diff_toggleDiff"); - connect(toggleAction,TQT_SIGNAL(toggled(bool)), m_view, TQT_SLOT(toggleAutoDiff(bool))); - connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction - , TQT_SLOT(setChecked(bool))); + connect(toggleAction,TQ_SIGNAL(toggled(bool)), m_view, TQ_SLOT(toggleAutoDiff(bool))); + connect(m_view,TQ_SIGNAL(signalDiffEnabled(bool)), toggleAction + , TQ_SLOT(setChecked(bool))); toggleAction->setChecked(m_view->autoDiffEnabled()); action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5 - , m_view, TQT_SLOT(diff()),actionCollection() + , m_view, TQ_SLOT(diff()),actionCollection() ,"diff_diff"); action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6 - , m_view, TQT_SLOT(diffShowOrig()),actionCollection() + , m_view, TQ_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0 - , m_view, TQT_SLOT(openDiffFile()),actionCollection() + , m_view, TQ_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); action = new TDEAction(i18n("&Rough Translation..."), 0 - , m_view, TQT_SLOT(roughTranslation()),actionCollection() + , m_view, TQ_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this, - TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); + TQ_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); + new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQ_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new TDEAction( i18n("&Word Count"), 0, m_view, TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new TDEAction( i18n("&Word Count"), 0, m_view, TQ_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); - KStdAction::configureToolbars(this,TQT_SLOT(optionsEditToolbars()),actionCollection()); + KStdAction::configureToolbars(this,TQ_SLOT(optionsEditToolbars()),actionCollection()); - KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection()); - KStdAction::preferences(this,TQT_SLOT(optionsPreferences()),actionCollection()); + KStdAction::keyBindings(guiFactory(),TQ_SLOT(configureShortcuts()),actionCollection()); + KStdAction::preferences(this,TQ_SLOT(optionsPreferences()),actionCollection()); setStandardToolBarMenuEnabled ( true ); action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, m_view, - TQT_SLOT(stopSearch()),actionCollection(), "stop_search"); + TQ_SLOT(stopSearch()),actionCollection(), "stop_search"); action->setEnabled(false); new TDEAction(i18n("&Gettext Info"), 0, this, - TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); + TQ_SLOT(gettextHelp()), actionCollection(), "help_gettext"); // the bookmarks menu - action = KStdAction::addBookmark(this, TQT_SLOT(slotAddBookmark()), + action = KStdAction::addBookmark(this, TQ_SLOT(slotAddBookmark()), actionCollection(), "add_bookmark"); action->setEnabled(false); // this action is now connected to dummySlot(), and later reconnected // to bmHandler after that object actually is created - new TDEAction(i18n("Clear Bookmarks"), 0, this, TQT_SLOT(dummySlot()), + new TDEAction(i18n("Clear Bookmarks"), 0, this, TQ_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -759,20 +759,20 @@ void KBabelMW::setupDynamicActions() TQValueList tools = ToolAction::validationTools(); TQPtrList actions = ToolAction::dataToolActionList( - tools, m_view, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), + tools, m_view, TQ_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), "validate", false, actionCollection() ); TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view, - TQT_SLOT(checkAll()),actionCollection(), "check_all"); + TQ_SLOT(checkAll()),actionCollection(), "check_all"); ac->setEnabled(false); m_menu->insert(ac); m_menu->insert( new TDEActionSeparator() ); ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view, - TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax"); + TQ_SLOT(checkSyntax()),actionCollection(), "check_syntax"); ac->setEnabled(false); m_menu->insert(ac); @@ -801,7 +801,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -833,7 +833,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -844,7 +844,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, m_view, TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // insert tools @@ -923,7 +923,7 @@ bool KBabelMW::queryClose() { if(m_view->isSearching()) { - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_SLOT(quit())); + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(quit())); m_view->stopSearch(); return false; } @@ -932,7 +932,7 @@ bool KBabelMW::queryClose() { // stop the activity and try again m_view->catalog()->stop(); - TQTimer::singleShot(0, this, TQT_SLOT( close() )); + TQTimer::singleShot(0, this, TQ_SLOT( close() )); return false; } @@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url) void KBabelMW::fileSave() { // do it asynchronously due to tdelibs bug - TQTimer::singleShot( 0, this, TQT_SLOT( fileSave_internal() )); + TQTimer::singleShot( 0, this, TQ_SLOT( fileSave_internal() )); } void KBabelMW::fileSave_internal() @@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), "View" ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -1198,8 +1198,8 @@ void KBabelMW::optionsPreferences() _prefDialog = new KBabelPreferences(m_view->dictionaries()); prefDialogs.append(_prefDialog); - connect(_prefDialog,TQT_SIGNAL(settingsChanged()) - ,m_view,TQT_SLOT(updateSettings())); + connect(_prefDialog,TQ_SIGNAL(settingsChanged()) + ,m_view,TQ_SLOT(updateSettings())); } int prefHeight=_prefDialog->height(); @@ -1651,7 +1651,7 @@ void KBabelMW::spellcheckMoreFiles(TQStringList filelist) { if( filelist.isEmpty() ) return; _toSpellcheck = filelist; - connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), this, TQT_SLOT( spellcheckDone(int))); + connect( m_view, TQ_SIGNAL( signalSpellcheckDone(int) ), this, TQ_SLOT( spellcheckDone(int))); spellcheckDone( KS_IGNORE ); // use something else than KS_STOP } @@ -1659,7 +1659,7 @@ void KBabelMW::spellcheckDone( int result) { if( _toSpellcheck.isEmpty() || result == KS_STOP) { - disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), this, TQT_SLOT(spellcheckDone( int))); + disconnect( m_view, TQ_SIGNAL( signalSpellcheckDone(int)), this, TQ_SLOT(spellcheckDone( int))); KMessageBox::information( this, i18n("MessageBox text", "Spellchecking of multiple files is finished."), i18n("MessageBox caption", "Spellcheck Done")); } @@ -1670,7 +1670,7 @@ void KBabelMW::spellcheckDone( int result) if( m_view->isModified() ) fileSave(); open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; - TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti())); + TQTimer::singleShot( 1, m_view, TQ_SLOT(spellcheckAllMulti())); } } @@ -1792,8 +1792,8 @@ void KBabelMW::projectConfigure() if(!_projectDialog) { _projectDialog = new ProjectDialog(_project); - connect (_projectDialog, TQT_SIGNAL (settingsChanged()) - , m_view, TQT_SLOT (updateProjectSettings())); + connect (_projectDialog, TQ_SIGNAL (settingsChanged()) + , m_view, TQ_SLOT (updateProjectSettings())); } int prefHeight=_projectDialog->height(); diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 11c0b8ee..25cbb77c 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -61,10 +61,10 @@ KBabelPreferences::KBabelPreferences(TQPtrList ml) // this contains a custom widget for tool selection, set it up TQValueList tools = ToolAction::validationTools(); _editorPage->_kcfg_AutoCheckTools->loadTools( "validate", tools ); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( added( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( removed( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( added( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( removed( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); addPage(_searchPage = new SearchPreferences(0, "search") , i18n("title of page in preferences dialog","Search") @@ -78,8 +78,8 @@ KBabelPreferences::KBabelPreferences(TQPtrList ml) _searchPage->_kcfg_DefaultModule->insertItem(info->name); } moduleList = ml; - connect( _searchPage->_kcfg_DefaultModule, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT (updateButtons())); + connect( _searchPage->_kcfg_DefaultModule, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT (updateButtons())); addPage(new EditorDiffPreferences(0, "diff") ,i18n("title of page in preferences dialog","Diff") diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index c630314e..fb38e592 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -201,57 +201,57 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project msgstrEdit->setReadOnly(true); dictBox->setEnabled(false); - connect(this, TQT_SIGNAL(signalNewFileOpened(KURL)), - m_cataloglistview, TQT_SLOT(slotNewFileOpened())); + connect(this, TQ_SIGNAL(signalNewFileOpened(KURL)), + m_cataloglistview, TQ_SLOT(slotNewFileOpened())); - connect(msgstrEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this - ,TQT_SIGNAL(signalMsgstrChanged())); + connect(msgstrEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this + ,TQ_SIGNAL(signalMsgstrChanged())); - connect(msgstrEdit,TQT_SIGNAL(textChanged(const TQString&)),m_cataloglistview - ,TQT_SLOT(msgstrChanged(const TQString&))); + connect(msgstrEdit,TQ_SIGNAL(textChanged(const TQString&)),m_cataloglistview + ,TQ_SLOT(msgstrChanged(const TQString&))); - connect(this,TQT_SIGNAL(signalMsgstrChanged()),this,TQT_SLOT(autoCheck())); - connect(msgstrEdit,TQT_SIGNAL(currentFormChanged(uint)), this - ,TQT_SLOT(msgstrPluralFormChanged(uint))); - - connect(msgidLabel,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - connect(msgstrEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - - connect(dictBox,TQT_SIGNAL(searchStarted()),this - ,TQT_SLOT(forwardSearchStart())); - connect(dictBox, TQT_SIGNAL(progressStarts(const TQString&)), this - ,TQT_SLOT(forwardProgressStart(const TQString&))); - connect(dictBox,TQT_SIGNAL(progressed(int)),this - ,TQT_SIGNAL(signalProgress(int))); - connect(dictBox,TQT_SIGNAL(searchStopped()),this - ,TQT_SLOT(forwardSearchStop())); - connect(dictBox,TQT_SIGNAL(progressEnds()),this - ,TQT_SIGNAL(signalClearProgressBar())); - - connect(dictBox,TQT_SIGNAL(modulesChanged()),this, - TQT_SIGNAL(signalDictionariesChanged())); - connect(dictBox,TQT_SIGNAL(errorInModule(const TQString&)),this - ,TQT_SLOT(showError(const TQString&))); - - connect(_catalog,TQT_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), - this, TQT_SLOT(setNewLanguage())); - - connect(_catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)), - this, TQT_SLOT(checkFuzzies())); - connect(_catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)), - this, TQT_SLOT(checkUntranslated())); + connect(this,TQ_SIGNAL(signalMsgstrChanged()),this,TQ_SLOT(autoCheck())); + connect(msgstrEdit,TQ_SIGNAL(currentFormChanged(uint)), this + ,TQ_SLOT(msgstrPluralFormChanged(uint))); + + connect(msgidLabel,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + connect(msgstrEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + + connect(dictBox,TQ_SIGNAL(searchStarted()),this + ,TQ_SLOT(forwardSearchStart())); + connect(dictBox, TQ_SIGNAL(progressStarts(const TQString&)), this + ,TQ_SLOT(forwardProgressStart(const TQString&))); + connect(dictBox,TQ_SIGNAL(progressed(int)),this + ,TQ_SIGNAL(signalProgress(int))); + connect(dictBox,TQ_SIGNAL(searchStopped()),this + ,TQ_SLOT(forwardSearchStop())); + connect(dictBox,TQ_SIGNAL(progressEnds()),this + ,TQ_SIGNAL(signalClearProgressBar())); + + connect(dictBox,TQ_SIGNAL(modulesChanged()),this, + TQ_SIGNAL(signalDictionariesChanged())); + connect(dictBox,TQ_SIGNAL(errorInModule(const TQString&)),this + ,TQ_SLOT(showError(const TQString&))); + + connect(_catalog,TQ_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), + this, TQ_SLOT(setNewLanguage())); + + connect(_catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)), + this, TQ_SLOT(checkFuzzies())); + connect(_catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)), + this, TQ_SLOT(checkUntranslated())); if(buildLeds) { - connect(this,TQT_SIGNAL(signalFuzzyDisplayed(bool)) - ,this,TQT_SLOT(toggleFuzzyLed(bool))); - connect(this,TQT_SIGNAL(signalUntranslatedDisplayed(bool)) - ,this,TQT_SLOT(toggleUntransLed(bool))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,this,TQT_SLOT(toggleErrorLed(bool))); + connect(this,TQ_SIGNAL(signalFuzzyDisplayed(bool)) + ,this,TQ_SLOT(toggleFuzzyLed(bool))); + connect(this,TQ_SIGNAL(signalUntranslatedDisplayed(bool)) + ,this,TQ_SLOT(toggleUntransLed(bool))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,this,TQ_SLOT(toggleErrorLed(bool))); } _dropMenu = new TQPopupMenu(this); @@ -261,8 +261,8 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project readSettings(_config); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); if(!_catalog->currentURL().isEmpty()) { @@ -356,10 +356,10 @@ of the currently displayed entry.

")); m_mainwindow->setMainDockWidget(mainDock); // master dockwidget mainDock->show (); m_mainwindow->setView (mainDock); - connect (this, TQT_SIGNAL (signalCopy ()), this, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), this, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), this, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), this, TQT_SLOT (selectAll ())); + connect (this, TQ_SIGNAL (signalCopy ()), this, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), this, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), this, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), this, TQ_SLOT (selectAll ())); KDockWidget* comment_dock = m_mainwindow->createDockWidget( "Comment", TQPixmap ()); //i18n: translators: Dock window caption @@ -372,10 +372,10 @@ of the currently displayed entry.

")); KDockWidget::DockRight, // dock site 20 ); // relation target/this (in percent) comment_dock->show (); - connect (this, TQT_SIGNAL (signalCopy ()), m_commentview, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), m_commentview, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), m_commentview, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), m_commentview, TQT_SLOT (textSelectAll ())); + connect (this, TQ_SIGNAL (signalCopy ()), m_commentview, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), m_commentview, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), m_commentview, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), m_commentview, TQ_SLOT (textSelectAll ())); m_commentview->installEventFilter( this ); // build the msgstr widget @@ -550,30 +550,30 @@ of the currently displayed entry.

")); 20 ); dock->show (); - connect(m_cataloglistview,TQT_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) - ,this,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_commentview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_contextview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_taglistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_sourceview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_errorlistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,m_errorlistview,TQT_SLOT(updateView())); - connect(m_charselectorview, TQT_SIGNAL( characterDoubleClicked(TQChar) ) - ,this, TQT_SLOT( insertChar(TQChar) )); - connect(m_taglistview,TQT_SIGNAL(signalTagSelected(const TQString&)) - , this, TQT_SLOT(insertTagFromTool(const TQString&))); - connect(m_taglistview,TQT_SIGNAL(signalHighlightedTagChanged(int)) - , this, TQT_SLOT(skipToTagFromTool(int))); - connect(this, TQT_SIGNAL(signalNextTag(int)) - , m_taglistview, TQT_SLOT(highlightTag(int))); - connect(m_commentview,TQT_SIGNAL(signalCursorPosChanged(int,int)) - , m_mainwindow, TQT_SLOT(updateCursorPosition(int,int))); + connect(m_cataloglistview,TQ_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) + ,this,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_commentview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_contextview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_taglistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_sourceview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_errorlistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,m_errorlistview,TQ_SLOT(updateView())); + connect(m_charselectorview, TQ_SIGNAL( characterDoubleClicked(TQChar) ) + ,this, TQ_SLOT( insertChar(TQChar) )); + connect(m_taglistview,TQ_SIGNAL(signalTagSelected(const TQString&)) + , this, TQ_SLOT(insertTagFromTool(const TQString&))); + connect(m_taglistview,TQ_SIGNAL(signalHighlightedTagChanged(int)) + , this, TQ_SLOT(skipToTagFromTool(int))); + connect(this, TQ_SIGNAL(signalNextTag(int)) + , m_taglistview, TQ_SLOT(highlightTag(int))); + connect(m_commentview,TQ_SIGNAL(signalCursorPosChanged(int,int)) + , m_mainwindow, TQ_SLOT(updateCursorPosition(int,int))); } KBabelView *KBabelView::viewForURL(const KURL& url, const TQString project) @@ -684,8 +684,8 @@ void KBabelView::readSettings(TDEConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } setupAutoCheckTools(); @@ -770,7 +770,7 @@ void KBabelView::readProject(Project::Ptr project) spell2.config->setEncoding(_spellcheckSettings.spellEncoding); spell2.config->setDictionary(_spellcheckSettings.spellDict); - spell2.tdespell= new KSpell(this, "", this, TQT_SLOT(dummy(KSpell *)), + spell2.tdespell= new KSpell(this, "", this, TQ_SLOT(dummy(KSpell *)), spell2.config, false, false); if(spell2.tdespell->status() == KSpell::Error) kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl; @@ -853,13 +853,13 @@ void KBabelView::updateSettings() _errorLed->setColor(KBabelSettings::ledColor()); } - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -1244,7 +1244,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo if ( _autoSaveDelay ) { if ( !autoSaveTimer ) { autoSaveTimer = new TQTimer( this, "AUTOSAVE TIMER" ); - connect( autoSaveTimer, TQT_SIGNAL( timeout( ) ), this, TQT_SLOT( slotAutoSaveTimeout( ) ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout( ) ), this, TQ_SLOT( slotAutoSaveTimeout( ) ) ); } autoSaveTimer->stop( ); autoSaveTimer->start( 1000 * 60 * _autoSaveDelay ); @@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); @@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->blockSignals(false); @@ -1862,7 +1862,7 @@ void KBabelView::updateEditor(int form, bool delay) { if (delay) { - TQTimer::singleShot(0, this, TQT_SLOT (startSearch())); + TQTimer::singleShot(0, this, TQ_SLOT (startSearch())); } else { @@ -2518,9 +2518,9 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(opts.ask) { @@ -2749,9 +2749,9 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(options.ask) { @@ -3335,7 +3335,7 @@ void KBabelView::checkUntranslated() void KBabelView::autoRemoveFuzzyStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); //removeFuzzyStatus(); } @@ -3943,7 +3943,7 @@ void KBabelView::spellcheck() _dontBeep=true; spell.tdespell= new KSpell (this, i18n("Spellcheck"), - this, TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); + this, TQ_SLOT(spellStart(KSpell *)), spell.config, true, true); if( spell.tdespell->status() == KSpell::Error ) { KMessageBox::error( this, i18n("KBabel cannot start spell checker. " @@ -3951,20 +3951,20 @@ void KBabelView::spellcheck() return; } - connect(spell.tdespell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone())); + connect(spell.tdespell, TQ_SIGNAL(death()),this, TQ_SLOT(spellCleanDone())); - connect(spell.tdespell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList & + connect(spell.tdespell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList & , unsigned int)), this - , TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); + , TQ_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); - connect(spell.tdespell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) - , this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); + connect(spell.tdespell, TQ_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) + , this, TQ_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); - connect(spell.tdespell,TQT_SIGNAL(ignoreall(const TQString &)) - , this, TQT_SLOT(spellAddIgnore(const TQString &))); + connect(spell.tdespell,TQ_SIGNAL(ignoreall(const TQString &)) + , this, TQ_SLOT(spellAddIgnore(const TQString &))); - connect(spell.tdespell, TQT_SIGNAL(done(bool)) - , this, TQT_SLOT(spellResult(bool))); + connect(spell.tdespell, TQ_SIGNAL(done(bool)) + , this, TQ_SLOT(spellResult(bool))); spell.tdespell->setAutoDelete(true); // let KSpell handle delete } @@ -4368,7 +4368,7 @@ void KBabelView::spellResult(bool flag) spell.tdespell->cleanUp(); emit signalSpellcheckDone(s); - TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct())); + TQTimer::singleShot(0,this,TQ_SLOT(cleanUpSpellStruct())); } @@ -4458,16 +4458,16 @@ void KBabelView::slotAutoSaveTimeout( ) void KBabelView::useProject (Project::Ptr project) { // FIXME: close the current project first - disconnect (_project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + disconnect (_project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); _project = project; _catalog->useProject(_project); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); } #include "kbabelview.moc" diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 5089f563..cacc1290 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -273,7 +273,7 @@ void KBabelView::setTagsMenu(TQPopupMenu *menu) { _tagsMenu=menu; - connect(_tagsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertTag(int))); + connect(_tagsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertTag(int))); } void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool clearFirst) @@ -407,7 +407,7 @@ void KBabelView::setArgsMenu(TQPopupMenu *menu) { _argsMenu=menu; - connect(_argsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertArg(int))); + connect(_argsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertArg(int))); } @@ -706,7 +706,7 @@ bool KBabelView::openDiffFile(bool autoDiff) Catalog cat; - connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); + connect(&cat,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); ConversionStatus stat = cat.openURL(url); diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 488a4281..2f128fc8 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.cpp @@ -95,7 +95,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), - this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); + this, TQ_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } void KBabelBookmarkHandler::addBookmark(int msgindex, TQString msgtext) diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index 40822862..fea743b7 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -52,7 +52,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe layout->addWidget(m_listview); layout->setStretchFactor(m_listview,1); - connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(m_listview,TQ_SIGNAL(selectionChanged(TQListViewItem *)), this,TQ_SLOT(selectionChanged(TQListViewItem *))); } KBCatalogListView::~KBCatalogListView() diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index 1871b221..990eea93 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -49,8 +49,8 @@ KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr _currentIndex=1; // here we use 1 to accept update at opening a file - connect ( _project, TQT_SIGNAL (signalSettingsChanged()), this, TQT_SLOT (readProjectSettings()) ); - connect ( _catalog, TQT_SIGNAL (signalFileOpened(bool)), this, TQT_SLOT (readFileSettings() ) ); + connect ( _project, TQ_SIGNAL (signalSettingsChanged()), this, TQ_SLOT (readProjectSettings()) ); + connect ( _catalog, TQ_SIGNAL (signalFileOpened(bool)), this, TQ_SLOT (readFileSettings() ) ); readProjectSettings(); readFileSettings(); diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 70977aaa..76a89d3f 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -61,8 +61,8 @@ KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) scroll->addChild(_table); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); } void KBCharSelect::emitChar() diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3f9df538..5be00141 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -74,7 +74,7 @@ KBabelHighlighter::KBabelHighlighter( TQTextEdit * edit, KSpell *spell ) : TQObj readSettings( ); regexps << accelMarker + "[\\w]"; - connect( _edit, TQT_SIGNAL( textChanged( ) ), this, TQT_SLOT( highlight( ) ) ); + connect( _edit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( highlight( ) ) ); setSpellChecker(spell); } @@ -285,8 +285,8 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) { if( mSpell ) { - disconnect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + disconnect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // cleanup the cache dict.clear(); @@ -296,8 +296,8 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) if( mSpell ) { - connect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + connect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // wait for KSpell to startup correctly kapp->processEvents(500); diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 3d614f68..80bc4c90 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -77,7 +77,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) setWordWrap( WidgetWidth ); viewport()->setAcceptDrops( false ); // we need our parent to get drops - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT( onSelectionChanged() ) ); } void MyMultiLineEdit::onSelectionChanged() @@ -641,11 +641,11 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const // this will setup bitBlt pixmaps setFont( font() ); highlighter = new KBabelHighlighter( this, spell ); - connect( this, TQT_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQT_SLOT( setSyntaxHighlighting( bool ) ) ); + connect( this, TQ_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQ_SLOT( setSyntaxHighlighting( bool ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( paintSpacePoints() ) ); - connect( this, TQT_SIGNAL( cursorPositionChanged( int, int ) ), this, TQT_SLOT( paintSpacePoints(int, int) ) ); - connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( emittedTextChanged() ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( paintSpacePoints() ) ); + connect( this, TQ_SIGNAL( cursorPositionChanged( int, int ) ), this, TQ_SLOT( paintSpacePoints(int, int) ) ); + connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( emittedTextChanged() ) ); } MsgMultiLineEdit::~MsgMultiLineEdit () diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 58013eac..6f7de0a1 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -54,7 +54,7 @@ SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project _contextView = new SourceContext (this, project); layout->addWidget (_contextView); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void SourceView::updateView() diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 3233ab57..326a0bc7 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -54,13 +54,13 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje layout->addWidget (_tagBox); - connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) - , this, TQT_SIGNAL(signalTagSelected(const TQString&))); - connect(_tagBox,TQT_SIGNAL(highlighted(int)) - , this, TQT_SIGNAL(signalHighlightedTagChanged(int))); + connect(_tagBox,TQ_SIGNAL(selected(const TQString&)) + , this, TQ_SIGNAL(signalTagSelected(const TQString&))); + connect(_tagBox,TQ_SIGNAL(highlighted(int)) + , this, TQ_SIGNAL(signalHighlightedTagChanged(int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)) - , this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)) + , this, TQ_SLOT(setDisabled(bool))); } void TagListView::updateView() diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index bcd1fcbc..09227802 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -122,17 +122,17 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected } - connect(selectedBox,TQT_SIGNAL(highlighted(int)), this - , TQT_SLOT(selectedMarked(int))); - connect(unselectedBox,TQT_SIGNAL(highlighted(int)), this - , TQT_SLOT(unselectedMarked(int))); - - connect(selectBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(select())); - connect(unselectBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(unselect())); - connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(up())); - connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(down())); - connect(configureBtn,TQT_SIGNAL(clicked()), this - , TQT_SLOT(configureSelected())); + connect(selectedBox,TQ_SIGNAL(highlighted(int)), this + , TQ_SLOT(selectedMarked(int))); + connect(unselectedBox,TQ_SIGNAL(highlighted(int)), this + , TQ_SLOT(unselectedMarked(int))); + + connect(selectBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(select())); + connect(unselectBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(unselect())); + connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(up())); + connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(down())); + connect(configureBtn,TQ_SIGNAL(clicked()), this + , TQ_SLOT(configureSelected())); selectedBox->installEventFilter(this); diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 4b4f1002..ae414c91 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -50,12 +50,12 @@ DictionaryMenu::DictionaryMenu(TDEPopupMenu *popupMenu, TDEActionCollection *col if(popup) { - connect(popup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activated(int))); + connect(popup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activated(int))); } dictionaryMapper = new TQSignalMapper( this ); - connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( activated( int ) ) ); + connect( dictionaryMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( activated( int ) ) ); } @@ -81,15 +81,15 @@ void DictionaryMenu::clear() // create new mapper delete dictionaryMapper; dictionaryMapper = new TQSignalMapper( this ); - connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( activated( int ) ) ); + connect( dictionaryMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( activated( int ) ) ); } void DictionaryMenu::add(const TQString& name, const TQString& moduleId) { if(popup) { - TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQ_SLOT(map()), actionCollection, moduleId.utf8() ); uint id = maxId++; dictionaryAction->plug(popup, id); @@ -116,7 +116,7 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId } TDEShortcut k(keyString); - TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQ_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index 03d08e38..6d8a35ef 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -47,13 +47,13 @@ KBabelDict::KBabelDict() , i18n("About"), i18n("About Module") , i18n("Hide Sett&ings")) { - connect(this, TQT_SIGNAL(closeClicked()),this,TQT_SLOT(saveConfig())); - connect(this, TQT_SIGNAL(closeClicked()),this,TQT_SLOT(quit())); + connect(this, TQ_SIGNAL(closeClicked()),this,TQ_SLOT(saveConfig())); + connect(this, TQ_SIGNAL(closeClicked()),this,TQ_SLOT(quit())); view = new KBabelDictView(this); - connect(this, TQT_SIGNAL(user1Clicked()), view, TQT_SLOT(about())); - connect(this, TQT_SIGNAL(user2Clicked()), view, TQT_SLOT(aboutModule())); - connect(this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(togglePref())); + connect(this, TQ_SIGNAL(user1Clicked()), view, TQ_SLOT(about())); + connect(this, TQ_SIGNAL(user2Clicked()), view, TQ_SLOT(aboutModule())); + connect(this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(togglePref())); // HACK: hide default button, otherwise it would be Help button showButtonOK(false); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index a459332e..f9ea82e7 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -254,12 +254,12 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) listButton = new TQToolButton(TQt::UpArrow,this); listButton->setFixedSize(20,15); listButton->setAutoRepeat(false); - connect(listButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showListOnly())); + connect(listButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showListOnly())); hbox->addWidget(listButton); detailButton = new TQToolButton(TQt::DownArrow,this); detailButton->setFixedSize(20,15); detailButton->setAutoRepeat(false); - connect(detailButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showDetailsOnly())); + connect(detailButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showDetailsOnly())); hbox->addWidget(detailButton); mainLayout->addLayout(hbox); @@ -291,14 +291,14 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) resultListView->installEventFilter(this); connect(resultListView - , TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint&,int)) - , this, TQT_SLOT(editFile())); - connect(resultListView, TQT_SIGNAL(returnPressed(TQListViewItem *)) - , this, TQT_SLOT(editFile())); + , TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint&,int)) + , this, TQ_SLOT(editFile())); + connect(resultListView, TQ_SIGNAL(returnPressed(TQListViewItem *)) + , this, TQ_SLOT(editFile())); connect(resultListView - , TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&)) + , TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&)) , this - , TQT_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&))); + , TQ_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&))); resultSplitter->setResizeMode(viewContainer,TQSplitter::KeepSize); TQValueList sizes; @@ -464,9 +464,9 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) } } - connect(nextButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextResult())); - connect(prevButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevResult())); - connect(moreButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(nextInfo())); + connect(nextButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextResult())); + connect(prevButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPrevResult())); + connect(moreButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(nextInfo())); origView->installEventFilter(this); @@ -475,8 +475,8 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) resultListView->setSorting(0,false); resultListView->setAllColumnsShowFocus(true); - connect(resultListView,TQT_SIGNAL(selectionChanged(TQListViewItem*)) - , this, TQT_SLOT(showResult(TQListViewItem*))); + connect(resultListView,TQ_SIGNAL(selectionChanged(TQListViewItem*)) + , this, TQ_SLOT(showResult(TQListViewItem*))); } /* @@ -490,18 +490,18 @@ void KBabelDictBox::registerModule( SearchEngine* e ) { active = 0; moduleList.append(e); - connect(e, TQT_SIGNAL(started()),this,TQT_SIGNAL(searchStarted())); - connect(e, TQT_SIGNAL(finished()),this,TQT_SIGNAL(searchStopped())); - connect(e, TQT_SIGNAL(finished()),this - ,TQT_SLOT(clearModuleResults())); - connect(e, TQT_SIGNAL(progress(int)),this,TQT_SIGNAL(progressed(int))); - connect(e, TQT_SIGNAL(progressStarts(const TQString&)),this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(e, TQT_SIGNAL(progressEnds()),this,TQT_SIGNAL(progressEnds())); - connect(e, TQT_SIGNAL(resultFound(const SearchResult*)), this - , TQT_SLOT(addResult(const SearchResult*))); - connect(e, TQT_SIGNAL(hasError(const TQString&)), this - , TQT_SIGNAL(errorInModule(const TQString&))); + connect(e, TQ_SIGNAL(started()),this,TQ_SIGNAL(searchStarted())); + connect(e, TQ_SIGNAL(finished()),this,TQ_SIGNAL(searchStopped())); + connect(e, TQ_SIGNAL(finished()),this + ,TQ_SLOT(clearModuleResults())); + connect(e, TQ_SIGNAL(progress(int)),this,TQ_SIGNAL(progressed(int))); + connect(e, TQ_SIGNAL(progressStarts(const TQString&)),this + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(e, TQ_SIGNAL(progressEnds()),this,TQ_SIGNAL(progressEnds())); + connect(e, TQ_SIGNAL(resultFound(const SearchResult*)), this + , TQ_SLOT(addResult(const SearchResult*))); + connect(e, TQ_SIGNAL(hasError(const TQString&)), this + , TQ_SIGNAL(errorInModule(const TQString&))); } void KBabelDictBox::saveSettings(TDEConfigBase *config) @@ -661,8 +661,8 @@ void KBabelDictBox::startSearch(const TQString text) if(engine->isSearching()) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); searchText=text; } @@ -687,8 +687,8 @@ void KBabelDictBox::startTranslationSearch(const TQString text) if(engine->isSearching()) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); searchText=text; } @@ -713,13 +713,13 @@ void KBabelDictBox::startDelayedSearch(const TQString text) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); } else { - TQTimer::singleShot(5,this,TQT_SLOT(startDelayedSearch())); + TQTimer::singleShot(5,this,TQ_SLOT(startDelayedSearch())); } } } @@ -741,13 +741,13 @@ void KBabelDictBox::startDelayedTranslationSearch(const TQString text) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); } else { - TQTimer::singleShot(5,this,TQT_SLOT(startDelayedTranslationSearch())); + TQTimer::singleShot(5,this,TQ_SLOT(startDelayedTranslationSearch())); } } } @@ -824,8 +824,8 @@ void KBabelDictBox::startDelayedSearch() } else { - disconnect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + disconnect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); engine->startSearch(searchText); @@ -844,8 +844,8 @@ void KBabelDictBox::startDelayedTranslationSearch() } else { - disconnect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + disconnect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); engine->startSearchInTranslation(searchText); @@ -1447,7 +1447,7 @@ void KBabelDictBox::setRMBMenu(TQPopupMenu *popup) popup->insertSeparator(); editFileIndex = popup->insertItem(i18n("Edit File") - , this, TQT_SLOT(editFile())); + , this, TQ_SLOT(editFile())); popup->setItemEnabled(editFileIndex,false); KContextMenuManager::insert(origView,popup); @@ -1513,12 +1513,12 @@ void KBabelDictBox::configure(const TQString& id, bool modal) PrefWidget *prefWidget = e->preferencesWidget(dialog); dialog->setMainWidget(prefWidget); - connect(dialog, TQT_SIGNAL(okClicked()),prefWidget,TQT_SLOT(apply())); - connect(dialog, TQT_SIGNAL(applyClicked()),prefWidget,TQT_SLOT(apply())); - connect(dialog, TQT_SIGNAL(defaultClicked()),prefWidget,TQT_SLOT(standard())); - connect(dialog, TQT_SIGNAL(cancelClicked()),prefWidget,TQT_SLOT(cancel())); + connect(dialog, TQ_SIGNAL(okClicked()),prefWidget,TQ_SLOT(apply())); + connect(dialog, TQ_SIGNAL(applyClicked()),prefWidget,TQ_SLOT(apply())); + connect(dialog, TQ_SIGNAL(defaultClicked()),prefWidget,TQ_SLOT(standard())); + connect(dialog, TQ_SIGNAL(cancelClicked()),prefWidget,TQ_SLOT(cancel())); - connect(dialog, TQT_SIGNAL(finished()),this,TQT_SLOT(destroyConfigDialog())); + connect(dialog, TQ_SIGNAL(finished()),this,TQ_SLOT(destroyConfigDialog())); prefDialogs.insert(id,dialog); diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index 7964c65a..0579dee8 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -158,25 +158,25 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) progressLabel = new TQLabel(h); progressBar = new KProgress(h); - connect(textEdit,TQT_SIGNAL(returnPressed()),startButton,TQT_SLOT(animateClick())); - connect(startButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(startSearch())); - connect(stopButton, TQT_SIGNAL(clicked()), dictBox,TQT_SLOT(slotStopSearch())); - connect(editButton, TQT_SIGNAL(clicked()), dictBox, TQT_SLOT(edit())); - connect(dictBox, TQT_SIGNAL(searchStarted()), this, TQT_SLOT(searchStarted())); - connect(dictBox, TQT_SIGNAL(searchStopped()), this, TQT_SLOT(searchStopped())); - connect(dictBox, TQT_SIGNAL(progressed(int)), progressBar, TQT_SLOT(setProgress(int))); - connect(dictBox, TQT_SIGNAL(activeModuleChanged(bool)) - , editButton, TQT_SLOT(setEnabled(bool))); + connect(textEdit,TQ_SIGNAL(returnPressed()),startButton,TQ_SLOT(animateClick())); + connect(startButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(startSearch())); + connect(stopButton, TQ_SIGNAL(clicked()), dictBox,TQ_SLOT(slotStopSearch())); + connect(editButton, TQ_SIGNAL(clicked()), dictBox, TQ_SLOT(edit())); + connect(dictBox, TQ_SIGNAL(searchStarted()), this, TQ_SLOT(searchStarted())); + connect(dictBox, TQ_SIGNAL(searchStopped()), this, TQ_SLOT(searchStopped())); + connect(dictBox, TQ_SIGNAL(progressed(int)), progressBar, TQ_SLOT(setProgress(int))); + connect(dictBox, TQ_SIGNAL(activeModuleChanged(bool)) + , editButton, TQ_SLOT(setEnabled(bool))); - connect(dictBox, TQT_SIGNAL(progressStarts(const TQString&)) - , this, TQT_SLOT(progressStarted(const TQString&))); - connect(dictBox, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(progressStopped())); + connect(dictBox, TQ_SIGNAL(progressStarts(const TQString&)) + , this, TQ_SLOT(progressStarted(const TQString&))); + connect(dictBox, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(progressStopped())); - connect(moduleCombo, TQT_SIGNAL(activated(int)), - dictBox, TQT_SLOT(setActiveModule(int))); - connect(dictBox, TQT_SIGNAL(activeModuleChanged(int)) - , this, TQT_SLOT(switchModule(int))); - connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearSearch())); + connect(moduleCombo, TQ_SIGNAL(activated(int)), + dictBox, TQ_SLOT(setActiveModule(int))); + connect(dictBox, TQ_SIGNAL(activeModuleChanged(int)) + , this, TQ_SLOT(switchModule(int))); + connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearSearch())); } /* diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index 98d00d05..77ad6e48 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -91,8 +91,8 @@ KBabelDictApplication::KBabelDictApplication() TDEApplication::restoreOverrideCursor(); } - TQObject::connect( topLevel, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( quit() ) ); + TQObject::connect( topLevel, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( quit() ) ); } KBabelDictApplication::~KBabelDictApplication() diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 5423bca9..7280bbbd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -82,8 +82,8 @@ SearchEngine (parent, name) dbOpened = false; dbname = ""; lasterror = i18n ("No error"); - connect (this, TQT_SIGNAL (hasError (const TQString &)), - TQT_SLOT (setLastError (const TQString &))); + connect (this, TQ_SIGNAL (hasError (const TQString &)), + TQ_SLOT (setLastError (const TQString &))); IAmReady = true; // I don't know if it is a good idea, no DB loaded!!! @@ -548,9 +548,9 @@ KDBSearchEngine::repeat () new TQProgressDialog (i18n ("Looking for repetitions"), i18n ("Stop"), 100); - connect (this, TQT_SIGNAL (progress (int)), pd, TQT_SLOT (setProgress (int))); - connect (this, TQT_SIGNAL (finished ()), pd, TQT_SLOT (close ())); - connect (pd, TQT_SIGNAL (cancelled ()), this, TQT_SLOT (stopSearch ())); + connect (this, TQ_SIGNAL (progress (int)), pd, TQ_SLOT (setProgress (int))); + connect (this, TQ_SIGNAL (finished ()), pd, TQ_SLOT (close ())); + connect (pd, TQ_SIGNAL (cancelled ()), this, TQ_SLOT (stopSearch ())); TQString txt = "// %1 repetitions, %2 translation(s)\ni18n(\"%3\");\n"; @@ -1208,15 +1208,15 @@ KDBSearchEngine::preferencesWidget (TQWidget * parent) pw = new PreferencesWidget (parent); setSettings (); - connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ())); - connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ())); - connect (pw, TQT_SIGNAL (destroyed ()), this, TQT_SLOT (prefDestr ())); - connect (pw->dbpw->scanPB_2, TQT_SIGNAL (clicked ()), this, TQT_SLOT (scan ())); - connect (pw->dbpw->scanrecPB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanRecur ())); - connect (pw->dbpw->scanFilePB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanFile ())); - connect (pw->dbpw->repeatPB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (repeat ())); + connect (pw, TQ_SIGNAL (restoreNow ()), this, TQ_SLOT (setSettings ())); + connect (pw, TQ_SIGNAL (applyNow ()), this, TQ_SLOT (updateSettings ())); + connect (pw, TQ_SIGNAL (destroyed ()), this, TQ_SLOT (prefDestr ())); + connect (pw->dbpw->scanPB_2, TQ_SIGNAL (clicked ()), this, TQ_SLOT (scan ())); + connect (pw->dbpw->scanrecPB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanRecur ())); + connect (pw->dbpw->scanFilePB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanFile ())); + connect (pw->dbpw->repeatPB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (repeat ())); return pw; @@ -1246,32 +1246,32 @@ KDBSearchEngine::scanRecur () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); //Kbabel progress bar + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); //Kbabel progress bar - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); sca->scanPattern (cvsdir, "*.po", true); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1304,32 +1304,32 @@ KDBSearchEngine::scan () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanPattern (cvsdir, "*.po", false); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1363,31 +1363,31 @@ KDBSearchEngine::scanFile () } if (pw) { - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (fileProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning file %1").arg (directory (cvsdir, 0))); - connect (sca, TQT_SIGNAL (fileFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (fileFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanFile (cvsdir); - sca->disconnect (TQT_SIGNAL (fileProgress (int)), this, - TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - sca->disconnect (TQT_SIGNAL (fileFinished ()), this, - TQT_SIGNAL (progressEnds ())); + sca->disconnect (TQ_SIGNAL (fileProgress (int)), this, + TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + sca->disconnect (TQ_SIGNAL (fileFinished ()), this, + TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 183b1e4d..c8b46db4 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -121,7 +121,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index e87294e4..06f9939b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -27,7 +27,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) layout->addWidget(dbpw); resize(TQSize(200,200).expandedTo(minimumSizeHint())); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 2d564267..25ef4819 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -55,7 +55,7 @@ KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name) di=0; //Database Interface is not yet initialized - connect(this,TQT_SIGNAL(hasError(TQString)),TQT_SLOT(setLastError(TQString))); + connect(this,TQ_SIGNAL(hasError(TQString)),TQ_SLOT(setLastError(TQString))); searching=false; // i'm not searching iAmReady=true; //there are no reason to say I'm not ready. @@ -134,8 +134,8 @@ bool KDBSearchEngine2::startSearch(TQString str) strategy.addAlgorithm(&wbyw); - connect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); - strategy.exec(searchingString); disconnect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); + strategy.exec(searchingString); disconnect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); kdDebug(0) << "End of search for " << searchingString << endl; @@ -230,7 +230,7 @@ bool KDBSearchEngine2::init() else { di = new DataBaseInterface(dbDirectory,&settings); - connect(di,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(di,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); //FIXME: what wbout ready() if(!di->mainOk()) return false; //check if the main DB is OK. @@ -261,16 +261,16 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) pw = new KDB2PreferencesWidget(parent); kdDebug(0) << "new KDB2 preferences widget" << endl; setSettings(); - connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings())); - connect(pw,TQT_SIGNAL(applyNow()),this,TQT_SLOT(updateSettings())); - connect(pw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(prefDestr())); + connect(pw,TQ_SIGNAL(restoreNow()),this,TQ_SLOT(setSettings())); + connect(pw,TQ_SIGNAL(applyNow()),this,TQ_SLOT(updateSettings())); + connect(pw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(prefDestr())); - connect(pw->dbpw->scanAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanAllPressed())); - connect(pw->dbpw->scanSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanNowPressed())); - connect(pw->dbpw->addSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(addSource())); - connect(pw->dbpw->editSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(editSource())); - connect(pw->dbpw->removeSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeSource())); + connect(pw->dbpw->scanAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanAllPressed())); + connect(pw->dbpw->scanSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanNowPressed())); + connect(pw->dbpw->addSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(addSource())); + connect(pw->dbpw->editSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(editSource())); + connect(pw->dbpw->removeSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeSource())); return pw; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index 466b68e5..fc3fd048 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -42,12 +42,12 @@ DataBaseInterface::ResultList GenericSearchAlgorithm::exec(const TQString& query uint countResults=0; for(TQValueList::iterator algoit = algoChain.begin(); algoit!=algoChain.end() && countResults < maxResults; algoit++) { - connect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + connect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); kdDebug(0) << "Algo pointer" << (*algoit) << endl; res+=(*algoit)->exec(query); countResults=res.count(); kdDebug(0) << "Count = " << countResults << endl; - disconnect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + disconnect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); } return res; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 2fe4ae98..db7ac4ee 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -205,7 +205,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index 0b332eef..b413c8b2 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -30,7 +30,7 @@ KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) standard(); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 815e025f..aa85f267 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -64,7 +64,7 @@ PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name) ignoreFuzzy=true; loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(loadAuxiliary())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(loadAuxiliary())); msgidDict.setAutoDelete(true); } @@ -127,9 +127,9 @@ void PoAuxiliary::readSettings(TDEConfigBase *config) PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) { prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -424,8 +424,8 @@ void PoAuxiliary::loadAuxiliary() } emit progressStarts(i18n("Loading PO auxiliary")); - connect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + connect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); ConversionStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) @@ -476,8 +476,8 @@ void PoAuxiliary::loadAuxiliary() auxTranslator = catalog->lastTranslator(); } - disconnect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 378b1830..ddf63616 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -53,8 +53,8 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c layout->addWidget(prefWidget); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); } AuxiliaryPreferencesWidget::~AuxiliaryPreferencesWidget() diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 22598cbf..9c6f96a5 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -77,12 +77,12 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); - connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); + connect(_catalog, TQ_SIGNAL(signalProgress(int)), this, TQ_SIGNAL(progress(int))); ConversionStatus stat=_catalog->openURL(url); - disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(_catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); if( stat!= OK && stat != RECOVERED_PARSE_ERROR) diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 9d1f6440..6045612b 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -88,7 +88,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } PoCompendium::~PoCompendium() @@ -164,9 +164,9 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget"); kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl; - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -828,7 +828,7 @@ void PoCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -847,7 +847,7 @@ void PoCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -1153,14 +1153,14 @@ void PoCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -1171,7 +1171,7 @@ void PoCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -1195,11 +1195,11 @@ void PoCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL( + connect(data, TQ_SIGNAL( progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void PoCompendium::removeData() diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 4ecb2886..d152e3b1 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -53,36 +53,36 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const prefWidget = new CompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->fuzzyBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->fuzzyBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("

Parameters

" diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 9b4cde15..a4ba2cb4 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -55,34 +55,34 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, prefWidget = new TmxCompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("

Parameters

" diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 6ce92e84..2c2f5220 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -82,7 +82,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } TmxCompendium::~TmxCompendium() @@ -155,9 +155,9 @@ void TmxCompendium::readSettings(TDEConfigBase *config) PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -718,7 +718,7 @@ void TmxCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -737,7 +737,7 @@ void TmxCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -915,14 +915,14 @@ void TmxCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -933,7 +933,7 @@ void TmxCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -957,10 +957,10 @@ void TmxCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + connect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void TmxCompendium::removeData() -- cgit v1.2.1