summaryrefslogtreecommitdiffstats
path: root/kbabel
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel')
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp184
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp2
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp2
-rw-r--r--kbabel/commonui/context.cpp6
-rw-r--r--kbabel/commonui/finddialog.cpp2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp230
-rw-r--r--kbabel/kbabel/kbabelview.cpp6
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp6
10 files changed, 221 insertions, 221 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index ceed6ce2..7e19c81e 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() ), TQT_TQOBJECT(this), TQT_SLOT(findNextFile()) );
+ connect(_timerFind, TQT_SIGNAL( timeout() ), this, TQT_SLOT(findNextFile()) );
_searchStopped = false;
_prefDialog=0;
@@ -133,7 +133,7 @@ void CatalogManager::init()
}
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
TQWidget *view = new TQWidget(this);
TQVBoxLayout* layout= new TQVBoxLayout(view);
@@ -145,7 +145,7 @@ void CatalogManager::init()
layout->setStretchFactor(_catalogManager,1);
connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
- ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(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))
@@ -157,7 +157,7 @@ void CatalogManager::init()
connect(_catalogManager,TQT_SIGNAL(gotoFileEntry(TQString,TQString,int))
,this,TQT_SLOT(openFile(TQString,TQString,int)));
connect(_catalogManager, TQT_SIGNAL(selectedChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(selectedChanged(uint)));
+ this, TQT_SLOT(selectedChanged(uint)));
KWin::setIcons(winId(),BarIcon("catalogmanager",32)
,SmallIcon("catalogmanager"));
@@ -173,19 +173,19 @@ void CatalogManager::init()
_progressBar->hide();
connect(_catalogManager,TQT_SIGNAL(prepareProgressBar(TQString,int))
- , TQT_TQOBJECT(this), TQT_SLOT(prepareProgressBar(TQString,int)));
+ , this, TQT_SLOT(prepareProgressBar(TQString,int)));
connect(_catalogManager,TQT_SIGNAL(clearProgressBar())
- , TQT_TQOBJECT(this), TQT_SLOT(clearProgressBar()));
+ , this, TQT_SLOT(clearProgressBar()));
connect(_catalogManager,TQT_SIGNAL(progress(int))
, _progressBar, TQT_SLOT(setProgress(int)));
// connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
-// , TQT_TQOBJECT(this), TQT_SLOT(enableMenuForFiles(bool)));
+// , this, TQT_SLOT(enableMenuForFiles(bool)));
connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
- , TQT_TQOBJECT(this), TQT_SLOT(enableActions(bool)));
+ , this, TQT_SLOT(enableActions(bool)));
connect(this, TQT_SIGNAL(searchStopped())
- , TQT_TQOBJECT(_catalogManager), TQT_SLOT(stopSearch()));
+ , _catalogManager, TQT_SLOT(stopSearch()));
connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int))
- , TQT_TQOBJECT(this), TQT_SLOT(prepareStatusProgressBar(int)));
+ , this, TQT_SLOT(prepareStatusProgressBar(int)));
setCentralWidget(view);
resize( 600,300);
@@ -219,60 +219,60 @@ void CatalogManager::setupActions()
TDEAction *action;
// the file menu
- action = new TDEAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Open"), CTRL+Key_O, _catalogManager,
TQT_SLOT(slotOpenFile()),actionCollection(), "open");
action->setEnabled(false);
- action = new TDEAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("&Open Template"),Key_Space,_catalogManager,
TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
action->setEnabled(false);
- action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager,
TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
action->setEnabled(false);
- action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection());
+ action = KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()), actionCollection());
actionMap["open_template"] = NEEDS_POT;
// the edit menu
- action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this,
TQT_SLOT(find()), actionCollection(), "find_in_files");
action->setEnabled(false);
- action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, this,
TQT_SLOT(replace()), actionCollection(), "replace_in_files");
action->setEnabled(false);
- action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, this,
TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
action->setEnabled(false);
- action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), _catalogManager,
TQT_SLOT(updateCurrent()), actionCollection(), "reload");
action->setEnabled(false);
// the marking menu
- action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager,
TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove Marking"), 0, _catalogManager,
TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Toggle All Markings"), 0, _catalogManager,
TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove All Markings"), 0, _catalogManager,
TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Mark Modified Files"), 0, _catalogManager,
TQT_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, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Load Markings..."), 0, _catalogManager,
TQT_SLOT(loadMarks()), actionCollection(), "load_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Save Markings..."), 0, _catalogManager,
TQT_SLOT(saveMarks()), actionCollection(), "save_marking");
action->setEnabled(false);
- (void)new TDEAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Mark Files..."), 0, _catalogManager,
TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
- (void)new TDEAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Unmark Files..."), 0, _catalogManager,
TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
actionMap["remove_marking"] = NEEDS_MARK;
@@ -282,102 +282,102 @@ void CatalogManager::setupActions()
// go menu
action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
+ _catalogManager, TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action->setEnabled(false);
action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
+ _catalogManager, TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
action->setEnabled(false);
action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
+ _catalogManager, TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
action->setEnabled(false);
action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
+ _catalogManager, TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
action->setEnabled(false);
action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
+ _catalogManager, TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
action->setEnabled(false);
action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
+ _catalogManager, TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
action->setEnabled(false);
action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
+ _catalogManager, TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
action->setEnabled(false);
action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
+ _catalogManager, TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
action->setEnabled(false);
action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
+ _catalogManager, TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
+ _catalogManager, TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
action->setEnabled(false);
action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
+ _catalogManager, TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
+ _catalogManager, TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
+ _catalogManager, TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
action->setEnabled(false);
action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
+ _catalogManager, TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
action->setEnabled(false);
// project menu
// the project menu
action = new TDEAction(i18n("&New..."), "document-new"
- , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
+ , this, TQT_SLOT(projectNew()),actionCollection()
,"project_new");
action = new TDEAction(i18n("&Open..."), "document-open"
- , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
+ , this, TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
action = new TDEAction(i18n("C&lose"), "window-close"
- , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
+ , this, TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
action = new TDEAction(i18n("&Configure..."), "configure"
- , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
+ , this, TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
// tools menu
action = new TDEAction( i18n("&Statistics"), "statistics", CTRL+Key_S,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics");
+ _catalogManager, TQT_SLOT(statistics()), actionCollection(), "statistics");
action->setEnabled(false);
action = new TDEAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
+ _catalogManager, TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
action->setEnabled(false);
action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
+ _catalogManager, TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
action->setEnabled(false);
action = new TDEAction( i18n("S&pell Check"), "tools-check-spelling", CTRL+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
+ this, TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
action->setEnabled(false);
action = new TDEAction( i18n("Spell Check in &Marked"), "tools-check-spelling", CTRL+ALT+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
+ this, TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
action->setEnabled(false);
action = new TDEAction( i18n("&Rough Translation"), CTRL+Key_T,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
+ _catalogManager, TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
action->setEnabled(false);
action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
+ _catalogManager, TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
action->setEnabled(false);
action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
+ _catalogManager, TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
action->setEnabled(false);
action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
+ _catalogManager, TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
action->setEnabled(false);
action = new TDEAction( i18n("&Pack"), "application-x-tar", CTRL+Key_B,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file");
- action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+ _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");
action->setEnabled(false);
actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK;
@@ -393,7 +393,7 @@ void CatalogManager::setupActions()
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
- tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, _catalogManager, TQT_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, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, _catalogManager, TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection(), "marked_" );
m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(),
"dynamic_validation_marked");
@@ -422,19 +422,19 @@ void CatalogManager::setupActions()
// CVS submenu
// Actions for PO files
- (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
- (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
- (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
- (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
- (void)new TDEAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status" ), 0, _catalogManager,
TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
- (void)new TDEAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status for Marked" ), 0, _catalogManager,
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
- (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
// CVS
@@ -448,27 +448,27 @@ void CatalogManager::setupActions()
// SVN submenu
// Actions for PO files
- (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
- (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
- (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
- (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
- (void)new TDEAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local)" ), 0, _catalogManager,
TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
- (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager,
TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
- (void)new TDEAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote)" ), 0, _catalogManager,
TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
- (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager,
TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
- (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
- (void)new TDEAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information" ), 0, _catalogManager,
TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
- (void)new TDEAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information for Marked" ), 0, _catalogManager,
TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" );
// SVN
@@ -485,13 +485,13 @@ void CatalogManager::setupActions()
actionMap["svn_info_marked"] = NEEDS_PO | NEEDS_PO_SVN | NEEDS_MARK;
// CVS Actions for POT files
- (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
- (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
- (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
- (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" );
actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS;
@@ -500,13 +500,13 @@ void CatalogManager::setupActions()
actionMap["cvs_commit_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK;
// SVN Actions for POT files
- (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
- (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
- (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
- (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" );
actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN;
@@ -530,7 +530,7 @@ void CatalogManager::setupActions()
actionCollection(), "file_commands");
_catalogManager->setFileCommandsMenu( actionMenu->popupMenu());
- action = new TDEAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
+ action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
action->setEnabled(false);
#if KDE_IS_VERSION( 3, 2, 90 )
@@ -1189,10 +1189,10 @@ void CatalogManager::projectNew()
if( p )
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = _project->filename();
restoreSettings();
@@ -1218,10 +1218,10 @@ void CatalogManager::projectOpen()
if( p )
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = p->filename();
restoreSettings();
@@ -1239,10 +1239,10 @@ void CatalogManager::projectOpen()
void CatalogManager::projectClose()
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = _project->filename();
restoreSettings();
updateSettings();
@@ -1263,7 +1263,7 @@ void CatalogManager::projectConfigure()
KBabel::ProjectDialog* _projectDialog = new ProjectDialog(_project);
connect (_projectDialog, TQT_SIGNAL (settingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
// settings are updated via signals
_projectDialog->exec();
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index d4ff458d..bcb0c40c 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -127,7 +127,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( )
{
if (!regexpEditDialog)
regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(
- "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this));
+ "KRegExpEditor/KRegExpEditor", TQString(), this);
KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog);
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 841f8bbc..049b47a0 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -52,7 +52,7 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
: RoughTransDlg(dict, new Catalog(), parent, name )
,_fileList(files)
{
- TQWidget* bars = TQT_TQWIDGET(progressbar->parent());
+ TQWidget* bars = static_cast<TQWidget*>(progressbar->parent());
TQLabel* label = new TQLabel( i18n("Files:"), bars );
filesProgressbar = new KProgress(bars,"files progressbar");
filesProgressbar->setTextEnabled(true);
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 02c97738..7cabd133 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -133,7 +133,7 @@ void ValidateProgressDialog::validate_internal()
_mainWidget->_currentFileProgress->setTotalSteps(100);
_mainWidget->_currentFileProgress->setValue(0);
- it->checkErrors(_tool, TQT_TQOBJECT(_mainWidget), _ignoreFuzzy, _setAsFuzzy);
+ it->checkErrors(_tool, _mainWidget, _ignoreFuzzy, _setAsFuzzy);
bool noHeader = true;
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 3d22cb2a..a0a83351 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -278,7 +278,7 @@ bool SourceContext::loadPart()
_view=0;
return false;
}
- _part = static_cast<KTextEditor::Document *>( factory->create( TQT_TQOBJECT(this), 0, "KTextEditor::Document" ) );
+ _part = static_cast<KTextEditor::Document *>( factory->create( this, 0, "KTextEditor::Document" ) );
if( !_part )
{
@@ -289,8 +289,8 @@ bool SourceContext::loadPart()
return false;
}
_view = _part->createView( this, 0 );
- _layout->addWidget(static_cast<TQWidget *>(_view), 1);
- static_cast<TQWidget *>(_view)->show();
+ _layout->addWidget(_view, 1);
+ _view->show();
return true;
}
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 4f695fb4..df1d887b 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -520,7 +520,7 @@ void FindDialog::inButtonsClicked(int id)
void FindDialog::regExpButtonClicked()
{
if ( _regExpEditDialog == 0 )
- _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 203d28c0..29b051ff 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked()
{
if ( _regExpEditDialog==0 )
_regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>
- ("KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ ("KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 2bf4b2a0..3a8da899 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -217,18 +217,18 @@ void KBabelMW::init(KBCatalog* catalog)
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()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
+ connect(catalog,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar()));
connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
- connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableDefaults(bool)));
+ ,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)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool)));
+ connect(catalog,TQT_SIGNAL(signalModified(bool)),this,TQT_SLOT(showModified(bool)));
// allow the view to change the statusbar and caption
connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&)));
+ this, TQT_SLOT(changeStatusbar(const TQString&)));
connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(changeCaption(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
@@ -263,15 +263,15 @@ void KBabelMW::init(KBCatalog* catalog)
,TQT_SLOT(setLedColor(const TQColor&)));
- connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableStop(bool)));
+ 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()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
+ connect(m_view,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar()));
connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
+ ,this,TQT_SLOT(prepareProgressBar(TQString,int)));
connect(m_view,TQT_SIGNAL(signalDictionariesChanged())
- , TQT_TQOBJECT(this), TQT_SLOT(buildDictMenus()));
+ , this, TQT_SLOT(buildDictMenus()));
connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this
, TQT_SLOT(updateCursorPosition(int,int)));
@@ -301,7 +301,7 @@ void KBabelMW::init(KBCatalog* catalog)
bmHandler, TQT_SLOT(slotClearBookmarks()));
}
connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotOpenBookmark(int)));
+ this, TQT_SLOT(slotOpenBookmark(int)));
connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)),
bmHandler, TQT_SLOT(slotClearBookmarks()));
@@ -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,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
+ TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure()));
}
_config->writeEntry("Version",VERSION);
@@ -404,68 +404,68 @@ void KBabelMW::setupActions()
TDEAction* action;
// the file menu
- action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+ action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection());
+ a_recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), actionCollection());
a_recent->setMaxItems(MAX_RECENT);
- action = KStdAction::revert(TQT_TQOBJECT(m_view),TQT_SLOT(revertToSaved()),actionCollection());
- action=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
- action = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
- action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()),
+ 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()),
actionCollection(), "save_special" );
- action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()),
+ action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQT_SLOT(setFilePackage()),
actionCollection(), "set_package" );
- action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection());
+ action = KStdAction::mail(this, TQT_SLOT(fileMail()), actionCollection());
- action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()),
+ action = new TDEAction(i18n("&New View"), 0, this, TQT_SLOT(fileNewView()),
actionCollection(), "file_new_view");
- action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()),
+ action = new TDEAction(i18n("New &Window"), 0, this, TQT_SLOT(fileNewWindow()),
actionCollection(), "file_new_window");
action->setShortcut( TDEStdAccel::openNew() );
- action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
+ action = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
// the edit menu
- action = KStdAction::undo(TQT_TQOBJECT(m_view), TQT_SLOT(undo()), actionCollection());
- action = KStdAction::redo(TQT_TQOBJECT(m_view), TQT_SLOT(redo()), actionCollection());
- action = KStdAction::cut(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCut()), actionCollection());
- action = KStdAction::copy(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCopy()), actionCollection());
- action = KStdAction::paste(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalPaste()), actionCollection());
- action = KStdAction::selectAll(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalSelectAll()), actionCollection());
- action = KStdAction::find(TQT_TQOBJECT(m_view), TQT_SLOT(find()), actionCollection());
- action = KStdAction::findNext(TQT_TQOBJECT(m_view), TQT_SLOT(findNext()), actionCollection());
- action = KStdAction::findPrev(TQT_TQOBJECT(m_view), TQT_SLOT(findPrev()), actionCollection());
- action = KStdAction::replace(TQT_TQOBJECT(m_view), TQT_SLOT(replace()), actionCollection());
-
- action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" );
-
- action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view)
+ 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 = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view
,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr");
action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr",
- CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()),
+ CTRL+ALT+Key_Space, m_view, TQT_SLOT(search2msgstr()),
actionCollection(), "search2msgstr");
- action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view)
+ action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view
,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr");
- action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview)
+ action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
- a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
+ 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, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
+ action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag())
+ , m_view, TQT_SLOT(insertNextTag())
, actionCollection(),"insert_next_tag");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid())
+ , m_view, TQT_SLOT(insertNextTagMsgid())
, actionCollection(),"insert_next_tag_msgid");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
@@ -477,22 +477,22 @@ void KBabelMW::setupActions()
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag()));
action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less
- , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
+ , m_view, TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
action->setEnabled(false);
connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M
- , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag())
+ , m_view, TQT_SLOT(skipToNextTag())
, actionCollection(),"move_to_next_tag");
action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B
- , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag())
+ , m_view, TQT_SLOT(skipToPreviousTag())
, actionCollection(),"move_to_prev_tag");
action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg())
+ , m_view, TQT_SLOT(insertNextArg())
, actionCollection(),"insert_next_arg");
connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
@@ -504,7 +504,7 @@ void KBabelMW::setupActions()
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg()));
action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent
- , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
+ , m_view, TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
action->setEnabled(false);
connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action
@@ -512,181 +512,181 @@ void KBabelMW::setupActions()
// next, the go-menu
action = new TDEAction(i18n("&Previous"), "go-previous",
- TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()),
+ TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQT_SLOT(gotoPrev()),
actionCollection(),"go_prev_entry");
action = new TDEAction(i18n("&Next"), "go-next",
- TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()),
+ TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQT_SLOT(gotoNext()),
actionCollection(),"go_next_entry");
- action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection());
+ action = KStdAction::goTo(m_view, TQT_SLOT(gotoEntry()), actionCollection());
action->setShortcut( TDEStdAccel::gotoLine());
- action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection());
+ action = KStdAction::firstPage(m_view, TQT_SLOT(gotoFirst()),actionCollection());
action->setText(i18n("&First Entry"));
action->setShortcut(CTRL+ALT+Key_Home);
- action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection());
+ action = KStdAction::lastPage(m_view, TQT_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, TQT_TQOBJECT(m_view),
+ CTRL+SHIFT+Key_Prior, m_view,
TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr");
a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans",
- CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view),
+ CTRL+SHIFT+Key_Next, m_view,
TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr");
a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy",
- CTRL+Key_Prior, TQT_TQOBJECT(m_view),
+ CTRL+Key_Prior, m_view,
TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy");
a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy",
- CTRL+Key_Next, TQT_TQOBJECT(m_view),
+ CTRL+Key_Next, m_view,
TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated",
- ALT+Key_Prior, TQT_TQOBJECT(m_view),
+ ALT+Key_Prior, m_view,
TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans");
a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated",
- ALT+Key_Next, TQT_TQOBJECT(m_view),
+ ALT+Key_Next, m_view,
TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action = new TDEAction(i18n("Previo&us Error"), "preverror",
- SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
+ SHIFT+Key_Prior, m_view,
TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error");
action = new TDEAction(i18n("Next Err&or"), "nexterror",
- SHIFT+Key_Next, TQT_TQOBJECT(m_view),
+ SHIFT+Key_Next, m_view,
TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
- action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view,
TQT_SLOT(backHistory()),actionCollection(), "go_back_history");
- action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view,
TQT_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()));
- dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(dictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_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()));
- selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(startSelectionSearch(const TQString)));
actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"),
"transsearch",actionCollection(),"dict_edit");
- editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(editDictionary(const TQString)));
actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"),
"transsearch",actionCollection(),"dict_configure");
- configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(configureDictionary(const TQString)));
actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch",
actionCollection(), "dict_about");
- aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(aboutDictionary(const TQString)));
buildDictMenus();
// the project menu
action = new TDEAction(i18n("&New..."), "document-new"
- , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
+ , this, TQT_SLOT(projectNew()),actionCollection()
,"project_new");
action = new TDEAction(i18n("&Open..."), "document-open"
- , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
+ , this, TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
action = new TDEAction(i18n("C&lose"), "window-close"
- , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
+ , this, TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
action = new TDEAction(i18n("&Configure..."), "configure"
- , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
+ , this, TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
- a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
+ a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
// the tools menu
action = new TDEAction(i18n("&Spell Check..."), "tools-check-spelling", CTRL+Key_I
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckCommon()),actionCollection()
,"spellcheck_common");
action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckAll()),actionCollection()
,"spellcheck_all");
action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckFromCursor()),actionCollection()
,"spellcheck_from_cursor");
action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckCurrent()),actionCollection()
,"spellcheck_current");
action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckFromCurrent()),actionCollection()
,"spellcheck_from_current");
action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckMarked()),actionCollection()
,"spellcheck_marked");
TDEToggleAction *toggleAction;
toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0
,actionCollection(), "diff_toggleDiff");
- connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_view), TQT_SLOT(toggleAutoDiff(bool)));
+ connect(toggleAction,TQT_SIGNAL(toggled(bool)), m_view, TQT_SLOT(toggleAutoDiff(bool)));
connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction
, TQT_SLOT(setChecked(bool)));
toggleAction->setChecked(m_view->autoDiffEnabled());
action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5
- , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection()
+ , m_view, TQT_SLOT(diff()),actionCollection()
,"diff_diff");
action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6
- , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection()
+ , m_view, TQT_SLOT(diffShowOrig()),actionCollection()
,"diff_showOrig");
action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0
- , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection()
+ , m_view, TQT_SLOT(openDiffFile()),actionCollection()
,"diff_openFile");
action = new TDEAction(i18n("&Rough Translation..."), 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection()
+ , m_view, TQT_SLOT(roughTranslation()),actionCollection()
,"rough_translation");
- action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this),
+ action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this,
TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager");
- new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
+ new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
- new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count");
+ new TDEAction( i18n("&Word Count"), 0, m_view, TQT_SLOT(wordCount()), actionCollection(), "word_count");
// next, the settings menu
createStandardStatusBarAction();
- KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection());
+ KStdAction::configureToolbars(this,TQT_SLOT(optionsEditToolbars()),actionCollection());
KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection());
+ KStdAction::preferences(this,TQT_SLOT(optionsPreferences()),actionCollection());
setStandardToolBarMenuEnabled ( true );
- action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, m_view,
TQT_SLOT(stopSearch()),actionCollection(), "stop_search");
action->setEnabled(false);
- new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Gettext Info"), 0, this,
TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext");
// the bookmarks menu
- action = KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()),
+ action = KStdAction::addBookmark(this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()),
+ new TDEAction(i18n("Clear Bookmarks"), 0, this, TQT_SLOT(dummySlot()),
actionCollection(), "clear_bookmarks");
setupDynamicActions();
@@ -759,19 +759,19 @@ void KBabelMW::setupDynamicActions()
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
- tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
+ tools, m_view, TQT_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 , TQT_TQOBJECT(m_view),
+ TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view,
TQT_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 , TQT_TQOBJECT(m_view),
+ ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view,
TQT_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, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_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, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_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, TQT_TQOBJECT(m_view), TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_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)),TQT_TQOBJECT(this),TQT_SLOT(quit()));
+ connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_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, TQT_TQOBJECT(this), TQT_SLOT( close() ));
+ TQTimer::singleShot(0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() ));
+ TQTimer::singleShot( 0, this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()));
+ connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
dlg.exec();
}
@@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p));
+ kb = static_cast<KBabelMW*>(p);
}
return kb;
@@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p));
+ kb = static_cast<KBabelMW*>(p);
}
return kb;
@@ -1651,7 +1651,7 @@ void KBabelMW::spellcheckMoreFiles(TQStringList filelist)
{
if( filelist.isEmpty() ) return;
_toSpellcheck = filelist;
- connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(this), TQT_SLOT( spellcheckDone(int)));
+ connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(spellcheckDone( int)));
+ disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), this, TQT_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, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti()));
+ TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti()));
}
}
@@ -1793,7 +1793,7 @@ void KBabelMW::projectConfigure()
{
_projectDialog = new ProjectDialog(_project);
connect (_projectDialog, TQT_SIGNAL (settingsChanged())
- , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings()));
+ , m_view, TQT_SLOT (updateProjectSettings()));
}
int prefHeight=_projectDialog->height();
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index a96c5a72..c630314e 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -376,7 +376,7 @@ of the currently displayed entry.</p></qt>"));
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 ()));
- m_commentview->installEventFilter( TQT_TQOBJECT(this) );
+ m_commentview->installEventFilter( this );
// build the msgstr widget
tempWidget=new TQWidget(this,"msgstrWidget");
@@ -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, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
+ spell2.tdespell= new KSpell(this, "", this, TQT_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;
@@ -3943,7 +3943,7 @@ void KBabelView::spellcheck()
_dontBeep=true;
spell.tdespell= new KSpell (this, i18n("Spellcheck"),
- TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
+ this, TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
if( spell.tdespell->status() == KSpell::Error )
{
KMessageBox::error( this, i18n("KBabel cannot start spell checker. "
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 1be091ff..a459332e 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -388,7 +388,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{
@@ -419,7 +419,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{
@@ -447,7 +447,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{