summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/catalogmanager')
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp184
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp10
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp2
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp2
-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/catalogmanager/validateprogresswidget.ui2
8 files changed, 103 insertions, 103 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index a659505e..d8b5168c 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, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT(findNextFile()) );
_searchStopped = false;
_prefDialog=0;
@@ -133,7 +133,7 @@ void CatalogManager::init()
}
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
TQWidget *view = new TQWidget(this);
TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
@@ -145,7 +145,7 @@ void CatalogManager::init()
tqlayout->setStretchFactor(_catalogManager,1);
connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
- ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings)));
+ ,TQT_TQOBJECT(_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)),
- this, TQT_SLOT(selectedChanged(uint)));
+ TQT_TQOBJECT(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))
- , this, TQT_SLOT(prepareProgressBar(TQString,int)));
+ , TQT_TQOBJECT(this), TQT_SLOT(prepareProgressBar(TQString,int)));
connect(_catalogManager,TQT_SIGNAL(clearProgressBar())
- , this, TQT_SLOT(clearProgressBar()));
+ , TQT_TQOBJECT(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)));
+// , TQT_TQOBJECT(this), TQT_SLOT(enableMenuForFiles(bool)));
connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
- , this, TQT_SLOT(enableActions(bool)));
+ , TQT_TQOBJECT(this), TQT_SLOT(enableActions(bool)));
connect(this, TQT_SIGNAL(searchStopped())
- , _catalogManager, TQT_SLOT(stopSearch()));
+ , TQT_TQOBJECT(_catalogManager), TQT_SLOT(stopSearch()));
connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int))
- , this, TQT_SLOT(prepareStatusProgressBar(int)));
+ , TQT_TQOBJECT(this), TQT_SLOT(prepareStatusProgressBar(int)));
setCentralWidget(view);
resize( 600,300);
@@ -219,60 +219,60 @@ void CatalogManager::setupActions()
KAction *action;
// the file menu
- action = new KAction( i18n("&Open"), CTRL+Key_O, _catalogManager,
+ action = new KAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenFile()),actionCollection(), "open");
action->setEnabled(false);
- action = new KAction(i18n("&Open Template"),Key_Space,_catalogManager,
+ action = new KAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
action->setEnabled(false);
- action = new KAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager,
+ action = new KAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
action->setEnabled(false);
- action = KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()), actionCollection());
+ action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection());
actionMap["open_template"] = NEEDS_POT;
// the edit menu
- action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this,
+ action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
TQT_SLOT(tqfind()), actionCollection(), "find_in_files");
action->setEnabled(false);
- action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, this,
+ action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
TQT_SLOT(tqreplace()), actionCollection(), "replace_in_files");
action->setEnabled(false);
- action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, this,
+ action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this),
TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
action->setEnabled(false);
- action = new KAction( i18n("&Reload"), "reload", KStdAccel::reload(), _catalogManager,
+ action = new KAction( i18n("&Reload"), "reload", KStdAccel::reload(), TQT_TQOBJECT(_catalogManager),
TQT_SLOT(updateCurrent()), actionCollection(), "reload");
action->setEnabled(false);
// the marking menu
- action = new KAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager,
+ action = new KAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking");
action->setEnabled(false);
- action = new KAction( i18n("Remove Marking"), 0, _catalogManager,
+ action = new KAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
action->setEnabled(false);
- action = new KAction( i18n("Toggle All Markings"), 0, _catalogManager,
+ action = new KAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
action->setEnabled(false);
- action = new KAction( i18n("Remove All Markings"), 0, _catalogManager,
+ action = new KAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
action->setEnabled(false);
- action = new KAction( i18n("Mark Modified Files"), 0, _catalogManager,
+ action = new KAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files");
// fixme to enabling this when loading is done using updateFinished() signal
action->setEnabled(true);
- action = new KAction( i18n("&Load Markings..."), 0, _catalogManager,
+ action = new KAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(loadMarks()), actionCollection(), "load_marking");
action->setEnabled(false);
- action = new KAction( i18n("&Save Markings..."), 0, _catalogManager,
+ action = new KAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(saveMarks()), actionCollection(), "save_marking");
action->setEnabled(false);
- (void)new KAction(i18n("&Mark Files..."), 0, _catalogManager,
+ (void)new KAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
- (void)new KAction(i18n("&Unmark Files..."), 0, _catalogManager,
+ (void)new KAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
actionMap["remove_marking"] = NEEDS_MARK;
@@ -282,102 +282,102 @@ void CatalogManager::setupActions()
// go menu
action = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
- _catalogManager, TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action->setEnabled(false);
action = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
- _catalogManager, TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
action->setEnabled(false);
action = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
- _catalogManager, TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
action->setEnabled(false);
action = new KAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
- _catalogManager, TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
action->setEnabled(false);
action = new KAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
- _catalogManager, TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
action->setEnabled(false);
action = new KAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
- _catalogManager, TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
action->setEnabled(false);
action = new KAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
- _catalogManager, TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
action->setEnabled(false);
action = new KAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
- _catalogManager, TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
action->setEnabled(false);
action = new KAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
- _catalogManager, TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
action->setEnabled(false);
action = new KAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
- _catalogManager, TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
action->setEnabled(false);
action = new KAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
- _catalogManager, TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
action->setEnabled(false);
action = new KAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
- _catalogManager, TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
action->setEnabled(false);
action = new KAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
- _catalogManager, TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
action->setEnabled(false);
action = new KAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
- _catalogManager, TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
action->setEnabled(false);
// project menu
// the project menu
action = new KAction(i18n("&New..."), "filenew"
- , this, TQT_SLOT(projectNew()),actionCollection()
+ , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
,"project_new");
action = new KAction(i18n("&Open..."), "fileopen"
- , this, TQT_SLOT(projectOpen()),actionCollection()
+ , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
action = new KAction(i18n("C&lose"), "fileclose"
- , this, TQT_SLOT(projectClose()),actionCollection()
+ , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
action = new KAction(i18n("&Configure..."), "configure"
- , this, TQT_SLOT(projectConfigure()),actionCollection()
+ , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
// tools menu
action = new KAction( i18n("&Statistics"), "statistics", CTRL+Key_S,
- _catalogManager, TQT_SLOT(statistics()), actionCollection(), "statistics");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics");
action->setEnabled(false);
action = new KAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S,
- _catalogManager, TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
action->setEnabled(false);
action = new KAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
- _catalogManager, TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
action->setEnabled(false);
action = new KAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I,
- this, TQT_SLOT(spellcheck()), actionCollection(), "spellcheck");
+ TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "spellcheck");
action->setEnabled(false);
action = new KAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I,
- this, TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
+ TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
action->setEnabled(false);
action = new KAction( i18n("&Rough Translation"), CTRL+Key_T,
- _catalogManager, TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
action->setEnabled(false);
action = new KAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
- _catalogManager, TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
action->setEnabled(false);
action = new KAction( i18n("Mai&l"), "mail_send", CTRL+Key_A,
- _catalogManager, TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
action->setEnabled(false);
action = new KAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A,
- _catalogManager, TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
action->setEnabled(false);
action = new KAction( i18n("&Pack"), "tar", CTRL+Key_B,
- _catalogManager, TQT_SLOT(packageFiles()), actionCollection(), "package_file");
- action = new KAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, _catalogManager, TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+ TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file");
+ action = new KAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_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<KAction> actions = ToolAction::dataToolActionList(
- tools, _catalogManager, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection() );
KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(),
@@ -407,7 +407,7 @@ void CatalogManager::setupActions()
}
actions = ToolAction::dataToolActionList(
- tools, _catalogManager, TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection(), "marked_" );
m_menu = new KActionMenu(i18n("V&alidation Marked"), actionCollection(),
"dynamic_validation_marked");
@@ -422,19 +422,19 @@ void CatalogManager::setupActions()
// CVS submenu
// Actions for PO files
- (void)new KAction( i18n( "Update" ), "down", 0, _catalogManager,
+ (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
- (void)new KAction( i18n( "Update Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
- (void)new KAction( i18n( "Commit" ), "up", 0, _catalogManager,
+ (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
- (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
- (void)new KAction( i18n( "tqStatus" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
- (void)new KAction( i18n( "tqStatus for Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
- (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
// CVS
@@ -448,27 +448,27 @@ void CatalogManager::setupActions()
// SVN submenu
// Actions for PO files
- (void)new KAction( i18n( "Update" ), "down", 0, _catalogManager,
+ (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
- (void)new KAction( i18n( "Update Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
- (void)new KAction( i18n( "Commit" ), "up", 0, _catalogManager,
+ (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
- (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
- (void)new KAction( i18n( "tqStatus (Local)" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
- (void)new KAction( i18n( "tqStatus (Local) for Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
- (void)new KAction( i18n( "tqStatus (Remote)" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
- (void)new KAction( i18n( "tqStatus (Remote) for Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "tqStatus (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
- (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
- (void)new KAction( i18n( "Show Information" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
- (void)new KAction( i18n( "Show Information for Marked" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_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 KAction( i18n( "Update Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
- (void)new KAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
- (void)new KAction( i18n( "Commit Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
- (void)new KAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_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 KAction( i18n( "Update Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
- (void)new KAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
- (void)new KAction( i18n( "Commit Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
- (void)new KAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
+ (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_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 KAction(i18n("&Delete"),Key_Delete,_catalogManager,TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
+ action = new KAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_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())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
_configFile = _project->filename();
restoreSettings();
@@ -1218,10 +1218,10 @@ void CatalogManager::projectOpen()
if( p )
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
_configFile = p->filename();
restoreSettings();
@@ -1239,10 +1239,10 @@ void CatalogManager::projectOpen()
void CatalogManager::projectClose()
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(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())
- , this, TQT_SLOT (updateSettings()));
+ , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
// settings are updated via signals
_projectDialog->exec();
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 49e10c05..54d177b4 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -1953,7 +1953,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir
}
TQString subDir=relDir+(*it)+"/";
- if(!_dirWatch->tqcontains(baseDir+subDir))
+ if(!_dirWatch->contains(baseDir+subDir))
{
_dirWatch->addDir(baseDir+subDir);
}
@@ -2056,7 +2056,7 @@ void CatalogManagerView::updateDir(TQString relDir)
bool newDirAdded=false;
TQString subDir=relDir+(*it)+"/";
- if(!_dirWatch->tqcontains(potBaseDir+subDir))
+ if(!_dirWatch->contains(potBaseDir+subDir))
{
_dirWatch->addDir(potBaseDir+subDir);
@@ -2138,7 +2138,7 @@ void CatalogManagerView::updateDir(TQString relDir)
bool newDirAdded=false;
TQString subDir=relDir+(*it)+"/";
- if(!_dirWatch->tqcontains(poBaseDir+subDir))
+ if(!_dirWatch->contains(poBaseDir+subDir))
{
_dirWatch->addDir(poBaseDir+subDir);
newDirAdded=true;
@@ -2507,7 +2507,7 @@ void CatalogManagerView::showEvent(TQShowEvent*)
void CatalogManagerView::contentsMousePressEvent(TQMouseEvent* event)
{
- if(event->button() == LeftButton)
+ if(event->button() == Qt::LeftButton)
_pressPos=event->pos();
TQListView::contentsMousePressEvent( event );
@@ -2515,7 +2515,7 @@ void CatalogManagerView::contentsMousePressEvent(TQMouseEvent* event)
void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
{
- if(event->state() & LeftButton)
+ if(event->state() & Qt::LeftButton)
{
const int delay = KGlobalSettings::dndEventDelay();
if(TQABS( event->pos().x() - _pressPos.x() ) >= delay ||
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 73d149d3..af58ead9 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -314,7 +314,7 @@ void CVSHandler::checkToAdd( const TQStringList& files )
temp = TQFileInfo( *it ).dirPath( true );
}
// check recursivlely if tqparent dirs have to be added as well
- while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) {
+ while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.tqfindIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
}
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index c648c2bb..6bd00ad3 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -416,7 +416,7 @@ void SVNHandler::checkToAdd( const TQStringList& files )
// ### TODO: does SVN really needs this or does it do it automatically?
// check recursivlely if tqparent dirs have to be added as well
- while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) {
+ while ( ! isInSvn( temp ) && toBeAdded.tqfindIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
}
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index ecb88bb8..063069e6 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(), this);
+ "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this));
KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog);
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 70cc32fc..e5b272f1 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(), tqparent, name )
,_fileList(files)
{
- TQWidget* bars = static_cast<TQWidget*>(progressbar->tqparent());
+ TQWidget* bars = TQT_TQWIDGET(progressbar->tqparent());
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 8c957ca9..acfc36da 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,_mainWidget, _ignoreFuzzy, _setAsFuzzy);
+ it->checkErrors(_tool, TQT_TQOBJECT(_mainWidget), _ignoreFuzzy, _setAsFuzzy);
bool noHeader = true;
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index ccef3b74..b13a5fbc 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -117,7 +117,7 @@
<signal>setValidationProgressBar(int)</signal>
</Q_SIGNALS>
<Q_SLOTS>
- <slot>setupFileProgressBar( QString text, int maxvalue )</slot>
+ <slot>setupFileProgressBar( TQString text, int maxvalue )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>