summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--kbabel/common/catalog.cpp10
-rw-r--r--kbabel/common/catalogsettings.h2
-rw-r--r--kbabel/common/kbproject.cpp2
-rw-r--r--kbabel/common/libgettext/Makefile.am2
-rw-r--r--kbabel/common/poinfo.cpp6
-rw-r--r--kbabel/commonui/context.cpp2
-rw-r--r--kbabel/commonui/finddialog.cpp2
-rw-r--r--kbabel/commonui/klisteditor.ui14
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp12
-rw-r--r--kbabel/commonui/roughtransdlg.cpp2
-rw-r--r--kbabel/commonui/toolselectionwidget.cpp4
-rw-r--r--kbabel/configure.in.in2
-rw-r--r--kbabel/filters/gettext/gettextexport.cpp4
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp12
-rw-r--r--kbabel/kbabel/commentview.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp230
-rw-r--r--kbabel/kbabel/kbabelview.cpp18
-rw-r--r--kbabel/kbabel/kbabelview2.cpp2
-rw-r--r--kbabel/kbabel/kbhighlighting.cpp2
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp2
-rw-r--r--kbabel/kbabeldict/dictchooser.cpp2
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp14
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp10
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp2
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp6
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pwidget.ui8
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp6
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pwidget.ui28
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp6
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp4
40 files changed, 317 insertions, 315 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>
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 3639748c..6ca18cba 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -1541,7 +1541,7 @@ int Catalog::prevError(uint startIndex, DocPosition& pos) const
void Catalog::registerView(CatalogView* view)
{
- if(d->_views.containsRef(view)==0)
+ if(d->_views.tqcontainsRef(view)==0)
{
d->_views.append(view);
}
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( d->_stop || endReached)
{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( d->_stop || beginReached)
{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
bestId = (*it);
}
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( d->_stop )
{
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
{
oldPercent = percent;
emit signalProgress(percent);
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
}
TQString id = (*it).msgid;
diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h
index 552f88c5..f1426a3c 100644
--- a/kbabel/common/catalogsettings.h
+++ b/kbabel/common/catalogsettings.h
@@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings
int encoding;
bool useOldEncoding;
- TQt::DateFormat dateFormat;
+ Qt::DateFormat dateFormat;
TQString customDateFormat;
TQString projectString;
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 99fece7e..743b26d9 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -250,7 +250,7 @@ SaveSettings Project::saveSettings ()
settings.autoSyntaxCheck = _settings->autoSyntaxCheck();
settings.saveObsolete = _settings->saveObsolete();
settings.customDateFormat = _settings->customDateFormat();
- settings.dateFormat = (TQt::DateFormat)_settings->dateFormat();
+ settings.dateFormat = (Qt::DateFormat)_settings->dateFormat();
settings.updateDescription = _settings->updateDescription();
settings.descriptionString = _settings->descriptionString();
settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright();
diff --git a/kbabel/common/libgettext/Makefile.am b/kbabel/common/libgettext/Makefile.am
index eca54fda..6f5f4fe2 100644
--- a/kbabel/common/libgettext/Makefile.am
+++ b/kbabel/common/libgettext/Makefile.am
@@ -1,3 +1,5 @@
+INCLUDES=$(all_includes)
+
# this might be a naive way of seeing it, but
# automake does not support C++ flex files.
#LEX_OUTPUT_ROOT = lex.GettextBase
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index f7245141..173c369d 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -1,6 +1,6 @@
/*
This file is part of KBabel
- Copyright (C) 2002 Stefan Asserhäll <stefan.asserhall@telia.com>
+ Copyright (C) 2002 Stefan Asserh�ll <stefan.asserhall@telia.com>
2003-2005 Stanislav Visnovsky <visnovsky@kde.org>
This program is free software; you can redistribute it and/or modify
@@ -399,7 +399,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
while( lexer->lastToken != T_EOF && success==OK)
{
- if( interactive ) kapp->processEvents(10);
+ if( interactive ) kapp->tqprocessEvents(10);
if( stopStaticRead )
{
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
case T_MSGID:
case T_MSGIDPLURAL: {
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
// if stopped, return not found
if( stopStaticRead )
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 63e07b28..4c91d1ad 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( this, 0, "KTextEditor::Document" ) );
+ _part = static_cast<KTextEditor::Document *>( factory->create( TQT_TQOBJECT(this), 0, "KTextEditor::Document" ) );
if( !_part )
{
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index a08347fc..18dcd721 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(), this );
+ _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index cb6c43ac..e10be269 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -222,9 +222,9 @@
</connection>
<connection>
<sender>_edit</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>KListEditor</receiver>
- <slot>editChanged(const QString&amp;)</slot>
+ <slot>editChanged(const TQString&amp;)</slot>
</connection>
<connection>
<sender>_list</sender>
@@ -234,9 +234,9 @@
</connection>
<connection>
<sender>_list</sender>
- <signal>highlighted(const QString&amp;)</signal>
+ <signal>highlighted(const TQString&amp;)</signal>
<receiver>_edit</receiver>
- <slot>setText(const QString&amp;)</slot>
+ <slot>setText(const TQString&amp;)</slot>
</connection>
</connections>
<includes>
@@ -252,9 +252,9 @@
<slot>upInList()</slot>
<slot>updateButtons( int newIndex )</slot>
<slot>updateList()</slot>
- <slot>setList( QStringList contents )</slot>
- <slot access="protected">editChanged( const QString &amp; s )</slot>
- <slot>setTitle( const QString &amp; s )</slot>
+ <slot>setList( TQStringList contents )</slot>
+ <slot access="protected">editChanged( const TQString &amp; s )</slot>
+ <slot>setTitle( const TQString &amp; s )</slot>
<slot returnType="TQStringList">list()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 4a363c47..abafec59 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -87,11 +87,11 @@ static TQSize tqsizeHintForWidget(const TQWidget* widget)
TQSize size;
int numChild = 0;
- TQObjectList *l = (TQObjectList*)(widget->tqchildren());
+ TQObjectList l = widget->childrenListObject();
- for( uint i=0; i < l->count(); i++ )
+ for( uint i=0; i < l.count(); i++ )
{
- TQObject *o = l->at(i);
+ TQObject *o = l.at(i);
if( o->isWidgetType() )
{
numChild += 1;
@@ -571,12 +571,12 @@ bool IdentityPreferences::eventFilter(TQObject *o, TQEvent *e)
TQString mail=url.path();
bool handled=false;
- if(o == _mailEdit)
+ if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_mailEdit))
{
handled=true;
_mailEdit->setText(mail);
}
- else if(o == _listEdit)
+ else if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_listEdit))
{
handled=true;
_listEdit->setText(mail);
@@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked()
{
if ( _regExpEditDialog==0 )
_regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>
- ("KRegExpEditor/KRegExpEditor", TQString(), this );
+ ("KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 3928e42c..046ad2de 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
for(int i = 0; i < total; i++)
{
progressbar->setProgress(i+1);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
if(stop || cancel) break;
diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp
index 4fadd865..78a3c0a4 100644
--- a/kbabel/commonui/toolselectionwidget.cpp
+++ b/kbabel/commonui/toolselectionwidget.cpp
@@ -78,7 +78,7 @@ void ToolSelectionWidget::setSelectedTools( const TQStringList& tools )
TQValueList<KDataToolInfo>::ConstIterator entry = _allTools.begin();
for( ; entry != _allTools.end(); ++entry )
{
- TQString uic=*(*entry).userCommands().at((*entry).commands().findIndex("validate"));
+ TQString uic=*(*entry).userCommands().at((*entry).commands().tqfindIndex("validate"));
if( tools.tqcontains((*entry).service()->library()) )
selectedListBox()->insertItem( uic );
else
@@ -96,7 +96,7 @@ TQStringList ToolSelectionWidget::selectedTools()
TQValueList<KDataToolInfo>::ConstIterator entry = _allTools.begin();
for( ; entry != _allTools.end(); ++entry )
{
- if( usedNames.tqcontains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) )
+ if( usedNames.tqcontains(*((*entry).userCommands().at((*entry).commands().tqfindIndex("validate")))) )
result += (*entry).service()->library();
}
return result;
diff --git a/kbabel/configure.in.in b/kbabel/configure.in.in
index 88312d46..03fa27a9 100644
--- a/kbabel/configure.in.in
+++ b/kbabel/configure.in.in
@@ -2,7 +2,7 @@ AM_PROG_LEX
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_CHECK_HEADER(FlexLexer.h,
+KDE_CHECK_HEADER(FlexLexer.h,
[kde_have_flex=yes],
[kde_have_flex=no])
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 21db665e..40911c59 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -164,7 +164,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
stream << "\n";
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( isStopped() )
{
return STOPPED;
@@ -181,7 +181,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
{
stream << (*oit) << "\n\n";
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( isStopped() )
{
return STOPPED;
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index 848cfeb1..ce1680d4 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -106,7 +106,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
//recoveredErrorInHeader = true;
}
- TQIODevice *dev = stream.device();
+ TQIODevice *dev = stream.tqdevice();
int fileSize = dev->size();
// if somethings goes wrong with the parsing, we don't have deleted the old contents
@@ -173,7 +173,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
while( !stream.eof() )
{
- kapp->processEvents(10);
+ kapp->tqprocessEvents(10);
if( isStopped() )
{
return STOPPED;
@@ -363,7 +363,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
{
CatalogItem temp;
- int filePos=stream.device()->at();
+ int filePos=stream.tqdevice()->at();
ConversiontqStatus status=readEntry(stream);
if(status==OK || status==RECOVERED_PARSE_ERROR)
@@ -371,7 +371,7 @@ ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
// test if this is the header
if(!_msgid.first().isEmpty())
{
- stream.device()->at(filePos);
+ stream.tqdevice()->at(filePos);
}
return status;
@@ -402,7 +402,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
while( !stream.eof() )
{
- const int pos=stream.device()->at();
+ const int pos=stream.tqdevice()->at();
line=stream.readLine();
@@ -761,7 +761,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
else if((line.tqfind(TQRegExp("^\\s*msgid")) != -1) || (line.tqfind(TQRegExp("^\\s*#")) != -1))
{
// We have read successfully one entry, so end loop.
- stream.device()->at(pos);// reset position in stream to beginning of this line
+ stream.tqdevice()->at(pos);// reset position in stream to beginning of this line
break;
}
else if(line.startsWith("msgstr"))
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index 7126f422..324c4d32 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -210,7 +210,7 @@ const TQString CommentView::selectedText ()
void CommentView::installEventFilter( const TQObject * filterObj )
{
- commentEdit->installEventFilter( filterObj );
+ commentEdit->installEventFilter( const_cast<TQObject*>(filterObj) );
}
bool CommentView::hasFocus()
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 73f4d365..d3aafed8 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()),this,TQT_SLOT(clearProgressBar()));
+ connect(catalog,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,this,TQT_SLOT(prepareProgressBar(TQString,int)));
- connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(enableDefaults(bool)));
+ ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
+ connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableDefaults(bool)));
connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),m_view,TQT_SLOT(newFileOpened(bool)));
- connect(catalog,TQT_SIGNAL(signalModified(bool)),this,TQT_SLOT(showModified(bool)));
+ connect(catalog,TQT_SIGNAL(signalModified(bool)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool)));
// allow the view to change the statusbar and caption
connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- this, TQT_SLOT(changeStatusbar(const TQString&)));
+ TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&)));
connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
- this, TQT_SLOT(changeCaption(const TQString&)));
+ TQT_TQOBJECT(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)),this,TQT_SLOT(enableStop(bool)));
+ connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableStop(bool)));
connect(m_view,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int)));
- connect(m_view,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar()));
+ connect(m_view,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,this,TQT_SLOT(prepareProgressBar(TQString,int)));
+ ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
connect(m_view,TQT_SIGNAL(signalDictionariesChanged())
- , this, TQT_SLOT(buildDictMenus()));
+ , TQT_TQOBJECT(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)),
- this, TQT_SLOT(slotOpenBookmark(int)));
+ TQT_TQOBJECT(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.").tqarg(encodingStr));
- TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure()));
+ TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
}
_config->writeEntry("Version",VERSION);
@@ -404,68 +404,68 @@ void KBabelMW::setupActions()
KAction* action;
// the file menu
- action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+ action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- a_recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), actionCollection());
+ a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection());
a_recent->setMaxItems(MAX_RECENT);
- action = KStdAction::revert(m_view,TQT_SLOT(revertToSaved()),actionCollection());
- action=KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
- action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
- action = new KAction(i18n("Save Sp&ecial..."), 0, this, TQT_SLOT(fileSaveSpecial()),
+ 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 KAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()),
actionCollection(), "save_special" );
- action = new KAction(i18n("Set &Package..."), 0, m_view, TQT_SLOT(setFilePackage()),
+ action = new KAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()),
actionCollection(), "set_package" );
- action = KStdAction::mail(this, TQT_SLOT(fileMail()), actionCollection());
+ action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection());
- action = new KAction(i18n("&New View"), 0, this, TQT_SLOT(fileNewView()),
+ action = new KAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()),
actionCollection(), "file_new_view");
- action = new KAction(i18n("New &Window"), 0, this, TQT_SLOT(fileNewWindow()),
+ action = new KAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()),
actionCollection(), "file_new_window");
action->setShortcut( KStdAccel::openNew() );
- action = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
+ action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
// the edit menu
- action = KStdAction::undo(m_view, TQT_SLOT(undo()), actionCollection());
- action = KStdAction::redo(m_view, TQT_SLOT(redo()), actionCollection());
- action = KStdAction::cut(m_view, TQT_SIGNAL(signalCut()), actionCollection());
- action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection());
- action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection());
- action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection());
- action = KStdAction::tqfind(m_view, TQT_SLOT(tqfind()), actionCollection());
- action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection());
- action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection());
- action = KStdAction::tqreplace(m_view, TQT_SLOT(tqreplace()), actionCollection());
-
- action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" );
-
- action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view
+ 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(tqfind()), 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(tqreplace()), actionCollection());
+
+ action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" );
+
+ action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view)
,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr");
action = new KAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr",
- CTRL+ALT+Key_Space, m_view, TQT_SLOT(search2msgstr()),
+ CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()),
actionCollection(), "search2msgstr");
- action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view
+ action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view)
,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr");
- action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview
+ action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview)
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
- a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, m_view
+ a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
, TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
- action = new KAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()),
+ action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
action = new KAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N
- , m_view, TQT_SLOT(insertNextTag())
+ , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag())
, actionCollection(),"insert_next_tag");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
action = new KAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M
- , m_view, TQT_SLOT(insertNextTagMsgid())
+ , TQT_TQOBJECT(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 KAction(i18n("Show Tags Menu"),CTRL+Key_Less
- , m_view, TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
+ , TQT_TQOBJECT(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 KAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M
- , m_view, TQT_SLOT(skipToNextTag())
+ , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag())
, actionCollection(),"move_to_next_tag");
action = new KAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B
- , m_view, TQT_SLOT(skipToPreviousTag())
+ , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag())
, actionCollection(),"move_to_prev_tag");
action = new KAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G
- , m_view, TQT_SLOT(insertNextArg())
+ , TQT_TQOBJECT(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 KAction(i18n("Show Arguments Menu"),CTRL+Key_Percent
- , m_view, TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
+ , TQT_TQOBJECT(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 KAction(i18n("&Previous"), "previous",
- KStdAccel::shortcut(KStdAccel::Prior), m_view , TQT_SLOT(gotoPrev()),
+ KStdAccel::shortcut(KStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()),
actionCollection(),"go_prev_entry");
action = new KAction(i18n("&Next"), "next",
- KStdAccel::shortcut(KStdAccel::Next), m_view , TQT_SLOT(gotoNext()),
+ KStdAccel::shortcut(KStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()),
actionCollection(),"go_next_entry");
- action = KStdAction::goTo(m_view, TQT_SLOT(gotoEntry()), actionCollection());
+ action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection());
action->setShortcut( KStdAccel::gotoLine());
- action = KStdAction::firstPage(m_view, TQT_SLOT(gotoFirst()),actionCollection());
+ action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection());
action->setText(i18n("&First Entry"));
action->setShortcut(CTRL+ALT+Key_Home);
- action = KStdAction::lastPage(m_view, TQT_SLOT(gotoLast()),actionCollection());
+ action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection());
action->setText(i18n("&Last Entry"));
action->setShortcut(CTRL+ALT+Key_End);
a_prevFoU = new KAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans",
- CTRL+SHIFT+Key_Prior, m_view,
+ CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr");
a_nextFoU = new KAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans",
- CTRL+SHIFT+Key_Next, m_view,
+ CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr");
a_prevFuzzy = new KAction(i18n("Pre&vious Fuzzy"),"prevfuzzy",
- CTRL+Key_Prior, m_view,
+ CTRL+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy");
a_nextFuzzy = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy",
- CTRL+Key_Next, m_view,
+ CTRL+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
a_prevUntrans = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated",
- ALT+Key_Prior, m_view,
+ ALT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans");
a_nextUntrans = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated",
- ALT+Key_Next, m_view,
+ ALT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action = new KAction(i18n("Previo&us Error"), "preverror",
- SHIFT+Key_Prior, m_view,
+ SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error");
action = new KAction(i18n("Next Err&or"), "nexterror",
- SHIFT+Key_Next, m_view,
+ SHIFT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
- action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view,
+ action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view),
TQT_SLOT(backHistory()),actionCollection(), "go_back_history");
- action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view,
+ action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view),
TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history");
// the search menu
actionMenu=new KActionMenu(i18n("&Find Text"),
"transsearch",actionCollection(),"dict_search_all");
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch()));
- dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
- connect(dictMenu,TQT_SIGNAL(activated(const TQString)), m_view
+ dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
+ connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(startSearch(const TQString)));
actionMenu=new KActionMenu(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(),this);
- connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
+ selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
+ connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(startSelectionSearch(const TQString)));
actionMenu=new KActionMenu(i18n("&Edit Dictionary"),
"transsearch",actionCollection(),"dict_edit");
- editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
- connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
+ editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
+ connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(editDictionary(const TQString)));
actionMenu=new KActionMenu(i18n("Con&figure Dictionary"),
"transsearch",actionCollection(),"dict_configure");
- configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
- connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
+ configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
+ connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(configureDictionary(const TQString)));
actionMenu=new KActionMenu(i18n("About Dictionary"), "transsearch",
actionCollection(), "dict_about");
- aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
- connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
+ aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
+ connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(aboutDictionary(const TQString)));
buildDictMenus();
// 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");
- a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, this, TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
+ a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
// the tools menu
action = new KAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I
- , m_view, TQT_SLOT(spellcheckCommon()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection()
,"spellcheck_common");
action = new KAction(i18n("&Check All..."), "spellcheck_all", 0
- , m_view, TQT_SLOT(spellcheckAll()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection()
,"spellcheck_all");
action = new KAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0
- , m_view, TQT_SLOT(spellcheckFromCursor()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection()
,"spellcheck_from_cursor");
action = new KAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0
- , m_view, TQT_SLOT(spellcheckCurrent()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection()
,"spellcheck_current");
action = new KAction(i18n("Check Fro&m Current to End of File..."), 0
- , m_view, TQT_SLOT(spellcheckFromCurrent()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection()
,"spellcheck_from_current");
action = new KAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0
- , m_view, TQT_SLOT(spellcheckMarked()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection()
,"spellcheck_marked");
KToggleAction *toggleAction;
toggleAction = new KToggleAction(i18n("&Diffmode"), "autodiff", 0
,actionCollection(), "diff_toggleDiff");
- connect(toggleAction,TQT_SIGNAL(toggled(bool)), m_view, TQT_SLOT(toggleAutoDiff(bool)));
+ connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(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 KAction(i18n("&Show Diff"), "diff", Key_F5
- , m_view, TQT_SLOT(diff()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection()
,"diff_diff");
action = new KAction(i18n("S&how Original Text"), "contents", Key_F6
- , m_view, TQT_SLOT(diffShowOrig()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection()
,"diff_showOrig");
action = new KAction(i18n("&Open File for Diff"), "fileopen" ,0
- , m_view, TQT_SLOT(openDiffFile()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection()
,"diff_openFile");
action = new KAction(i18n("&Rough Translation..."), 0
- , m_view, TQT_SLOT(roughTranslation()),actionCollection()
+ , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection()
,"rough_translation");
- action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this,
+ action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this),
TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager");
- new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
+ new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
- new KAction( i18n("&Word Count"), 0, m_view, TQT_SLOT(wordCount()), actionCollection(), "word_count");
+ new KAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count");
// next, the settings menu
createStandardStatusBarAction();
- KStdAction::configureToolbars(this,TQT_SLOT(optionsEditToolbars()),actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection());
KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection());
- KStdAction::preferences(this,TQT_SLOT(optionsPreferences()),actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection());
setStandardToolBarMenuEnabled ( true );
- action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, m_view,
+ action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view),
TQT_SLOT(stopSearch()),actionCollection(), "stop_search");
action->setEnabled(false);
- new KAction(i18n("&Gettext Info"), 0, this,
+ new KAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this),
TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext");
// the bookmarks menu
- action = KStdAction::addBookmark(this, TQT_SLOT(slotAddBookmark()),
+ action = KStdAction::addBookmark(TQT_TQOBJECT(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 KAction(i18n("Clear Bookmarks"), 0, this, TQT_SLOT(dummySlot()),
+ new KAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()),
actionCollection(), "clear_bookmarks");
setupDynamicActions();
@@ -759,19 +759,19 @@ void KBabelMW::setupDynamicActions()
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
TQPtrList<KAction> actions = ToolAction::dataToolActionList(
- tools, m_view, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
+ tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
"validate", false, actionCollection() );
KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools");
- KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view,
+ KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view),
TQT_SLOT(checkAll()),actionCollection(), "check_all");
ac->setEnabled(false);
m_menu->insert(ac);
m_menu->insert( new KActionSeparator() );
- ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view,
+ ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(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, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, TQT_TQOBJECT(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, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, TQT_TQOBJECT(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, m_view, TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, TQT_TQOBJECT(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)),this,TQT_SLOT(quit()));
+ connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(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, this, TQT_SLOT( close() ));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT( close() ));
return false;
}
@@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url)
void KBabelMW::fileSave()
{
// do it asynchronously due to kdelibs bug
- TQTimer::singleShot( 0, this, TQT_SLOT( fileSave_internal() ));
+ TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() ));
}
void KBabelMW::fileSave_internal()
@@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars()
{
saveMainWindowSettings( KGlobal::config(), "View" );
KEditToolbar dlg(actionCollection());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+ connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()));
dlg.exec();
}
@@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(p);
+ kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p));
}
return kb;
@@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(p);
+ kb = static_cast<KBabelMW*>(TQT_TQWIDGET(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) ), this, TQT_SLOT( spellcheckDone(int)));
+ connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(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)), this, TQT_SLOT(spellcheckDone( int)));
+ disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), TQT_TQOBJECT(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, m_view, TQT_SLOT(spellcheckAllMulti()));
+ TQTimer::singleShot( 1, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti()));
}
}
@@ -1793,7 +1793,7 @@ void KBabelMW::projectConfigure()
{
_projectDialog = new ProjectDialog(_project);
connect (_projectDialog, TQT_SIGNAL (settingsChanged())
- , m_view, TQT_SLOT (updateProjectSettings()));
+ , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings()));
}
int prefHeight=_projectDialog->height();
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 0e685f0c..9d7f4df2 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( this );
+ m_commentview->installEventFilter( TQT_TQOBJECT(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.kspell= new KSpell(this, "", this, TQT_SLOT(dummy(KSpell *)),
+ spell2.kspell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
spell2.config, false, false);
if(spell2.kspell->status() == KSpell::Error)
kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl;
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
while(success)
{
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
_replacesTotal++;
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
if(emitProgress)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
lastPercent++;
emit signalProgress(lastPercent);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
TQStringList msgs=_catalog->msgstr(i);
@@ -3943,7 +3943,7 @@ void KBabelView::spellcheck()
_dontBeep=true;
spell.kspell= new KSpell (this, i18n("Spellcheck"),
- this, TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
+ TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
if( spell.kspell->status() == KSpell::Error )
{
KMessageBox::error( this, i18n("KBabel cannot start spell checker. "
@@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *)
if(spell.ignoreList.count() > 0)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
uint total = spell.ignoreList.count();
uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
{
oldPercent++;
emit signalProgress(oldPercent);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
spell.kspell->ignore(*it);
@@ -4379,7 +4379,7 @@ void KBabelView::spellCleanDone()
// if the pointer is cleared, you have finished correcly
if( !spell.kspell ) return;
- KSpell::spelltqStatus status = spell.kspell->status();
+ KSpell::spellStatus status = spell.kspell->status();
if(status == KSpell::Error || status == KSpell::Crashed)
{
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 7b700390..daf0819e 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -940,7 +940,7 @@ bool KBabelView::validateUsingTool( const KDataToolInfo & info, const TQString &
bool result=_catalog->checkUsingTool(tool);
emitEntryState();
- TQString checkName = *(info.userCommands().at( info.commands().findIndex(command) ));
+ TQString checkName = *(info.userCommands().at( info.commands().tqfindIndex(command) ));
if(result)
{
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index f4109a34..05aada8f 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
// wait for KSpell to startup correctly
- kapp->processEvents(500);
+ kapp->tqprocessEvents(500);
}
highlight();
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 29a8da78..af58cd0a 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
int i = s.tqfind( " " );
while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
{
- TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+ TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
TQRect r = mapToView( curpara, i );
r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index d60b1de6..ec7ba712 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -261,7 +261,7 @@ bool DictChooser::eventFilter(TQObject *object, TQEvent *event)
{
if(event->type() == TQEvent::FocusIn)
{
- if(object==selectedBox)
+ if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(selectedBox))
{
int i = selectedBox->currentItem();
selectedBox->setSelected(i,true);
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 4f1a4f7f..bd2fbbcd 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -388,7 +388,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(this
+ SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
, "searchengine", "SearchEngine");
if(!e)
{
@@ -419,7 +419,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(this
+ SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
, "searchengine", "SearchEngine");
if(!e)
{
@@ -447,7 +447,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(this
+ SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
, "searchengine", "SearchEngine");
if(!e)
{
@@ -1534,7 +1534,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal)
void KBabelDictBox::destroyConfigDialog()
{
- const TQObject *obj = sender();
+ const TQObject *obj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
if(obj && obj->inherits("KDialogBase"))
{
KDialogBase *dialog = (KDialogBase*)obj;
@@ -1609,14 +1609,14 @@ bool KBabelDictBox::eventFilter(TQObject *o, TQEvent *e)
{
if(e->type() == TQEvent::Wheel)
{
- TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
+ TQWheelEvent *we = TQT_TQWHEELEVENT(e);
if(we)
{
wheelEvent(we);
return true;
}
}
- else if(e->type() == TQEvent::Resize && o == resultListView)
+ else if(e->type() == TQEvent::Resize && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(resultListView))
{
if(resultListView->height() < 2)
{
@@ -1679,7 +1679,7 @@ void KBabelDictBox::editFile()
DCOPClient *dcop = kapp->dcopClient();
QCStringList list = dcop->registeredApplications();
- int index = list.findIndex("kbabel");
+ int index = list.tqfindIndex("kbabel");
if(index < 0)
// if(!dcop->isApplicationRegistered("kbabel"));
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 3e658255..3292ccc9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->processEvents (100);
+ kapp->tqprocessEvents (100);
}
if (stopNow)
{
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->processEvents (100);
+ kapp->tqprocessEvents (100);
}
if (stopNow)
{
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
step = 100;
emit progress (0);
- kapp->processEvents (100);
+ kapp->tqprocessEvents (100);
if (stopNow)
{
stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
{
emit progress (100 * count / /*TQMAX( */
totalprogress /*,1) */ );
- kapp->processEvents (100);
+ kapp->tqprocessEvents (100);
if (stopNow)
{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
{
emit
progress (100 * count / totalprogress);
- kapp->processEvents (100);
+ kapp->tqprocessEvents (100);
}
if (stopNow)
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index cb5ebae1..1d1cb9ae 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags)
else
{
kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1").
- arg (ret) << endl;
+ tqarg (ret) << endl;
return DataBaseItem ();
}
@@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory,
loadInfo ();
else
kdDebug (KBABEL_SEARCH) << TQString ("I am NOT ok : %1").
- arg (ret) << endl;
+ tqarg (ret) << endl;
//THIS IS WRONG, rewrite the error handling.
return iAmOk;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index fd3ed7f1..3d86ebb1 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ????
{
emit fileProgress(100*i/tot);
emit added(count);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index cc726ad8..fae9fb0e 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
clearResults();
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
text.tqreplace("\n","");
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
clearResults();
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
Entry *entry = msgstrDict[text];
if(entry)
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index aa9e6710..b91f98e5 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI>
<class>PWidget</class>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>PWidget</cstring>
@@ -29,7 +29,7 @@
<number>6</number>
</property>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
@@ -51,7 +51,7 @@
</property>
</widget>
<widget>
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>fuzzyBtn</cstring>
@@ -62,7 +62,7 @@
</property>
</widget>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_2</cstring>
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index f5c37dd5..edc38dc0 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
// FIXME: shoudl care about plural forms
@@ -221,7 +221,7 @@ const TQValueList<int>* CompendiumData::textonlyDict(const TQString text) const
void CompendiumData::registerObject(TQObject *obj)
{
- if(!_registered.containsRef(obj))
+ if(!_registered.tqcontainsRef(obj))
_registered.append(obj);
}
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 1911be72..dab127bf 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
emit progress( (50*checkCounter+1)/catalogInfo.total);
}
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
TQString origStr = data->catalog()->msgid(*it).first();
origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
continue;
}
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
TQString origStr = data->catalog()->msgid(i).first();
origStr = CompendiumData::simplify(origStr);
@@ -1204,7 +1204,7 @@ void PoCompendium::registerData()
void PoCompendium::removeData()
{
- const TQObject *s=sender();
+ const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
if(s && s->inherits("CompendiumData"))
{
const CompendiumData *d=static_cast<const CompendiumData*>(s);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index f1883a88..f9558dc3 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -2,7 +2,7 @@
<class>CompendiumPWidget</class>
<include location="global">kseparator.h</include>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>PWidget</cstring>
@@ -30,7 +30,7 @@
<number>6</number>
</property>
<widget>
- <class>QGroupBox</class>
+ <class>TQGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBox1</cstring>
@@ -58,7 +58,7 @@
</vbox>
</widget>
<widget>
- <class>QButtonGroup</class>
+ <class>TQButtonGroup</class>
<property stdset="1">
<name>name</name>
<cstring>ButtonGroup1</cstring>
@@ -77,7 +77,7 @@
<number>6</number>
</property>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout4</cstring>
@@ -92,7 +92,7 @@
<number>6</number>
</property>
<widget row="1" column="0" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>fuzzyBtn</cstring>
@@ -103,7 +103,7 @@
</property>
</widget>
<widget row="0" column="1" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>wholeBtn</cstring>
@@ -114,7 +114,7 @@
</property>
</widget>
<widget row="0" column="0" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>caseBtn</cstring>
@@ -138,7 +138,7 @@
</property>
</widget>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel3</cstring>
@@ -149,7 +149,7 @@
</property>
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout3</cstring>
@@ -164,7 +164,7 @@
<number>6</number>
</property>
<widget row="0" column="0" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>equalBtn</cstring>
@@ -175,7 +175,7 @@
</property>
</widget>
<widget row="2" column="1" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>hasWordBtn</cstring>
@@ -186,7 +186,7 @@
</property>
</widget>
<widget row="1" column="1" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>isContainedBtn</cstring>
@@ -197,7 +197,7 @@
</property>
</widget>
<widget row="1" column="0" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>ngramBtn</cstring>
@@ -208,7 +208,7 @@
</property>
</widget>
<widget row="0" column="1" >
- <class>QCheckBox</class>
+ <class>TQCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>containsBtn</cstring>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index fd5fcd29..f375574c 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
emit progress( (100*(checkCounter+1))/data->numberOfEntries());
}
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
TQString origStr = data->msgid(*it);
origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
continue;
}
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
if(i >= data->numberOfEntries())
{
@@ -965,7 +965,7 @@ void TmxCompendium::registerData()
void TmxCompendium::removeData()
{
- const TQObject *s=sender();
+ const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
if(s && s->inherits("TmxCompendiumData"))
{
const TmxCompendiumData *d=static_cast<const TmxCompendiumData*>(s);
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 739379e1..1cd033bc 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");
@@ -268,7 +268,7 @@ const TQString TmxCompendiumData::msgstr(const int index) const
void TmxCompendiumData::registerObject(TQObject *obj)
{
- if(!_registered.containsRef(obj))
+ if(!_registered.tqcontainsRef(obj))
_registered.append(obj);
}