diff options
Diffstat (limited to 'kbabel/catalogmanager')
26 files changed, 1146 insertions, 1146 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 6cbe964d..1292c0cf 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -45,8 +45,8 @@ #include "msgfmt.h" #include "toolaction.h" -#include <qlabel.h> -#include <qpainter.h> +#include <tqlabel.h> +#include <tqpainter.h> #include <dcopclient.h> #include <kapplication.h> @@ -72,24 +72,24 @@ #include <ktoolbar.h> #include <kwin.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qtimer.h> -#include <qbitmap.h> -#include <qwhatsthis.h> -#include <qheader.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qhbox.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqtimer.h> +#include <tqbitmap.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqhbox.h> using namespace KBabel; WId CatalogManagerApp::_preferredWindow = 0; -QStringList CatalogManager::_foundFilesList; -QStringList CatalogManager::_toBeSearched; +TQStringList CatalogManager::_foundFilesList; +TQStringList CatalogManager::_toBeSearched; -CatalogManager::CatalogManager(QString configFile ) +CatalogManager::CatalogManager(TQString configFile ) :KMainWindow(0,0) { if ( configFile.isEmpty() ) @@ -114,8 +114,8 @@ void CatalogManager::init() _totalFound = 0; _foundFilesList.clear(); _toBeSearched.clear(); - _timerFind = new QTimer( this ); - connect(_timerFind, SIGNAL( timeout() ), this, SLOT(findNextFile()) ); + _timerFind = new TQTimer( this ); + connect(_timerFind, TQT_SIGNAL( timeout() ), this, TQT_SLOT(findNextFile()) ); _searchStopped = false; _prefDialog=0; @@ -132,11 +132,11 @@ void CatalogManager::init() _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } - connect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); - QWidget *view = new QWidget(this); - QVBoxLayout* layout= new QVBoxLayout(view); + TQWidget *view = new TQWidget(this); + TQVBoxLayout* layout= new TQVBoxLayout(view); layout->setMargin(0); layout->setSpacing(KDialog::spacingHint()); @@ -144,26 +144,26 @@ void CatalogManager::init() layout->addWidget(_catalogManager); layout->setStretchFactor(_catalogManager,1); - connect(this,SIGNAL(settingsChanged(KBabel::CatManSettings)) - ,_catalogManager,SLOT(setSettings(KBabel::CatManSettings))); - connect(_catalogManager,SIGNAL(openFile(QString,QString)) - ,this,SLOT(openFile(QString,QString))); - connect(_catalogManager,SIGNAL(openFileInNewWindow(QString,QString)) - ,this,SLOT(openFileInNewWindow(QString,QString))); - connect(_catalogManager,SIGNAL(openTemplate(QString,QString,QString)) - ,this,SLOT(openTemplate(QString,QString,QString))); - connect(_catalogManager,SIGNAL(openTemplateInNewWindow(QString,QString,QString)) - ,this,SLOT(openTemplateInNewWindow(QString,QString,QString))); - connect(_catalogManager,SIGNAL(gotoFileEntry(QString,QString,int)) - ,this,SLOT(openFile(QString,QString,int))); - connect(_catalogManager, SIGNAL(selectedChanged(uint)), - this, SLOT(selectedChanged(uint))); + connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings)) + ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings))); + connect(_catalogManager,TQT_SIGNAL(openFile(TQString,TQString)) + ,this,TQT_SLOT(openFile(TQString,TQString))); + connect(_catalogManager,TQT_SIGNAL(openFileInNewWindow(TQString,TQString)) + ,this,TQT_SLOT(openFileInNewWindow(TQString,TQString))); + connect(_catalogManager,TQT_SIGNAL(openTemplate(TQString,TQString,TQString)) + ,this,TQT_SLOT(openTemplate(TQString,TQString,TQString))); + connect(_catalogManager,TQT_SIGNAL(openTemplateInNewWindow(TQString,TQString,TQString)) + ,this,TQT_SLOT(openTemplateInNewWindow(TQString,TQString,TQString))); + connect(_catalogManager,TQT_SIGNAL(gotoFileEntry(TQString,TQString,int)) + ,this,TQT_SLOT(openFile(TQString,TQString,int))); + connect(_catalogManager, TQT_SIGNAL(selectedChanged(uint)), + this, TQT_SLOT(selectedChanged(uint))); KWin::setIcons(winId(),BarIcon("catalogmanager",32) ,SmallIcon("catalogmanager")); - QHBoxLayout* hBoxL = new QHBoxLayout(layout); - _progressLabel = new QLabel(view); + TQHBoxLayout* hBoxL = new TQHBoxLayout(layout); + _progressLabel = new TQLabel(view); hBoxL->addWidget(_progressLabel); _progressBar=new KProgress(view); hBoxL->addWidget(_progressBar); @@ -172,20 +172,20 @@ void CatalogManager::init() _progressLabel->hide(); _progressBar->hide(); - connect(_catalogManager,SIGNAL(prepareProgressBar(QString,int)) - , this, SLOT(prepareProgressBar(QString,int))); - connect(_catalogManager,SIGNAL(clearProgressBar()) - , this, SLOT(clearProgressBar())); - connect(_catalogManager,SIGNAL(progress(int)) - , _progressBar, SLOT(setProgress(int))); -// connect(_catalogManager, SIGNAL(signalBuildTree(bool)) -// , this, SLOT(enableMenuForFiles(bool))); - connect(_catalogManager, SIGNAL(signalBuildTree(bool)) - , this, SLOT(enableActions(bool))); - connect(this, SIGNAL(searchStopped()) - , _catalogManager, SLOT(stopSearch())); - connect(_catalogManager, SIGNAL(prepareFindProgressBar(int)) - , this, SLOT(prepareStatusProgressBar(int))); + connect(_catalogManager,TQT_SIGNAL(prepareProgressBar(TQString,int)) + , this, TQT_SLOT(prepareProgressBar(TQString,int))); + connect(_catalogManager,TQT_SIGNAL(clearProgressBar()) + , this, TQT_SLOT(clearProgressBar())); + connect(_catalogManager,TQT_SIGNAL(progress(int)) + , _progressBar, TQT_SLOT(setProgress(int))); +// connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool)) +// , this, TQT_SLOT(enableMenuForFiles(bool))); + connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool)) + , this, TQT_SLOT(enableActions(bool))); + connect(this, TQT_SIGNAL(searchStopped()) + , _catalogManager, TQT_SLOT(stopSearch())); + connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int)) + , this, TQT_SLOT(prepareStatusProgressBar(int))); setCentralWidget(view); resize( 600,300); @@ -194,20 +194,20 @@ void CatalogManager::init() setupActions(); - QPopupMenu* popup; - popup = (QPopupMenu*)(factory()->container("rmb_file", this)); + TQPopupMenu* popup; + popup = (TQPopupMenu*)(factory()->container("rmb_file", this)); if(popup) { _catalogManager->setRMBMenuFile(popup); } - popup = (QPopupMenu*)(factory()->container("rmb_dir", this)); + popup = (TQPopupMenu*)(factory()->container("rmb_dir", this)); if(popup) { _catalogManager->setRMBMenuDir(popup); } - connect(_catalogManager, SIGNAL(signalSearchedFile(int)) - , _statusProgressBar, SLOT(advance(int))); + connect(_catalogManager, TQT_SIGNAL(signalSearchedFile(int)) + , _statusProgressBar, TQT_SLOT(advance(int))); restoreView(); } @@ -220,60 +220,60 @@ void CatalogManager::setupActions() // the file menu action = new KAction( i18n("&Open"), CTRL+Key_O, _catalogManager, - SLOT(slotOpenFile()),actionCollection(), "open"); + TQT_SLOT(slotOpenFile()),actionCollection(), "open"); action->setEnabled(false); action = new KAction(i18n("&Open Template"),Key_Space,_catalogManager, - SLOT(slotOpenTemplate()),actionCollection(), "open_template"); + TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template"); action->setEnabled(false); action = new KAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager, - SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); + TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); action->setEnabled(false); - action = KStdAction::quit(kapp, SLOT (closeAllWindows()), actionCollection()); + action = KStdAction::quit(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, - SLOT(find()), actionCollection(), "find_in_files"); + TQT_SLOT(find()), actionCollection(), "find_in_files"); action->setEnabled(false); action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, this, - SLOT(replace()), actionCollection(), "replace_in_files"); + TQT_SLOT(replace()), actionCollection(), "replace_in_files"); action->setEnabled(false); action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, this, - SLOT(stopSearching()), actionCollection(), "stop_search"); + TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); action->setEnabled(false); action = new KAction( i18n("&Reload"), "reload", KStdAccel::reload(), _catalogManager, - SLOT(updateCurrent()), actionCollection(), "reload"); + TQT_SLOT(updateCurrent()), actionCollection(), "reload"); action->setEnabled(false); // the marking menu action = new KAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager, - SLOT(toggleMark()), actionCollection(), "toggle_marking"); + TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking"); action->setEnabled(false); action = new KAction( i18n("Remove Marking"), 0, _catalogManager, - SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking"); + TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking"); action->setEnabled(false); action = new KAction( i18n("Toggle All Markings"), 0, _catalogManager, - SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking"); + TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking"); action->setEnabled(false); action = new KAction( i18n("Remove All Markings"), 0, _catalogManager, - SLOT(clearAllMarks()), actionCollection(), "remove_all_marking"); + TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking"); action->setEnabled(false); action = new KAction( i18n("Mark Modified Files"), 0, _catalogManager, - SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files"); + 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, - SLOT(loadMarks()), actionCollection(), "load_marking"); + TQT_SLOT(loadMarks()), actionCollection(), "load_marking"); action->setEnabled(false); action = new KAction( i18n("&Save Markings..."), 0, _catalogManager, - SLOT(saveMarks()), actionCollection(), "save_marking"); + TQT_SLOT(saveMarks()), actionCollection(), "save_marking"); action->setEnabled(false); (void)new KAction(i18n("&Mark Files..."), 0, _catalogManager, - SLOT(slotMarkPattern()), actionCollection(), "mark_pattern"); + TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern"); (void)new KAction(i18n("&Unmark Files..."), 0, _catalogManager, - SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern"); + TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern"); actionMap["remove_marking"] = NEEDS_MARK; actionMap["remove_all_marking"] = NEEDS_MARK; @@ -282,102 +282,102 @@ void CatalogManager::setupActions() // go menu action = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, - _catalogManager, SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); + _catalogManager, TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action->setEnabled(false); action = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, - _catalogManager, SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans"); + _catalogManager, TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans"); action->setEnabled(false); action = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, - _catalogManager, SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); + _catalogManager, TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); action->setEnabled(false); action = new KAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior, - _catalogManager, SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy"); + _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, SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr"); + _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, SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr"); + _catalogManager, TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr"); action->setEnabled(false); action = new KAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next, - _catalogManager, SLOT(gotoNextError()),actionCollection(), "go_next_error"); + _catalogManager, TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); action->setEnabled(false); action = new KAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior, - _catalogManager, SLOT(gotoPreviousError()),actionCollection(), "go_prev_error"); + _catalogManager, TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error"); action->setEnabled(false); action = new KAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down, - _catalogManager, SLOT(gotoNextTemplate()),actionCollection(), "go_next_template"); + _catalogManager, TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template"); action->setEnabled(false); action = new KAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up, - _catalogManager, SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template"); + _catalogManager, TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template"); action->setEnabled(false); action = new KAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down, - _catalogManager, SLOT(gotoNextPo()),actionCollection(), "go_next_po"); + _catalogManager, TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po"); action->setEnabled(false); action = new KAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up, - _catalogManager, SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po"); + _catalogManager, TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po"); action->setEnabled(false); action = new KAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up, - _catalogManager, SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked"); + _catalogManager, TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked"); action->setEnabled(false); action = new KAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down, - _catalogManager, SLOT(gotoNextMarked()),actionCollection(), "go_next_marked"); + _catalogManager, TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked"); action->setEnabled(false); // project menu // the project menu action = new KAction(i18n("&New..."), "filenew" - , this, SLOT(projectNew()),actionCollection() + , this, TQT_SLOT(projectNew()),actionCollection() ,"project_new"); action = new KAction(i18n("&Open..."), "fileopen" - , this, SLOT(projectOpen()),actionCollection() + , this, TQT_SLOT(projectOpen()),actionCollection() ,"project_open"); action = new KAction(i18n("C&lose"), "fileclose" - , this, SLOT(projectClose()),actionCollection() + , this, TQT_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); action = new KAction(i18n("&Configure..."), "configure" - , this, SLOT(projectConfigure()),actionCollection() + , this, TQT_SLOT(projectConfigure()),actionCollection() ,"project_settings"); // tools menu action = new KAction( i18n("&Statistics"), "statistics", CTRL+Key_S, - _catalogManager, SLOT(statistics()), actionCollection(), "statistics"); + _catalogManager, TQT_SLOT(statistics()), actionCollection(), "statistics"); action->setEnabled(false); action = new KAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S, - _catalogManager, SLOT(markedStatistics()), actionCollection(), "statistics_marked"); + _catalogManager, TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked"); action->setEnabled(false); action = new KAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y, - _catalogManager, SLOT(checkSyntax()), actionCollection(), "syntax"); + _catalogManager, TQT_SLOT(checkSyntax()), actionCollection(), "syntax"); action->setEnabled(false); action = new KAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I, - this, SLOT(spellcheck()), actionCollection(), "spellcheck"); + this, TQT_SLOT(spellcheck()), actionCollection(), "spellcheck"); action->setEnabled(false); action = new KAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I, - this, SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked"); + this, TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked"); action->setEnabled(false); action = new KAction( i18n("&Rough Translation"), CTRL+Key_T, - _catalogManager, SLOT(roughTranslation()), actionCollection(), "rough_translation"); + _catalogManager, TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation"); action->setEnabled(false); action = new KAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T, - _catalogManager, SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked"); + _catalogManager, TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked"); action->setEnabled(false); action = new KAction( i18n("Mai&l"), "mail_send", CTRL+Key_A, - _catalogManager, SLOT(mailFiles()), actionCollection(), "mail_file"); + _catalogManager, TQT_SLOT(mailFiles()), actionCollection(), "mail_file"); action->setEnabled(false); action = new KAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A, - _catalogManager, SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked"); + _catalogManager, TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked"); action->setEnabled(false); action = new KAction( i18n("&Pack"), "tar", CTRL+Key_B, - _catalogManager, SLOT(packageFiles()), actionCollection(), "package_file"); - action = new KAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, _catalogManager, SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked"); + _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"); action->setEnabled(false); actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK; @@ -390,10 +390,10 @@ void CatalogManager::setupActions() actionMap["package_file_marked"] = NEEDS_PO | NEEDS_MARK; // dynamic tools - QValueList<KDataToolInfo> tools = ToolAction::validationTools(); + TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); - QPtrList<KAction> actions = ToolAction::dataToolActionList( - tools, _catalogManager, SLOT(validateUsingTool( const KDataToolInfo &, const QString& )) + TQPtrList<KAction> actions = ToolAction::dataToolActionList( + tools, _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, SLOT(validateMarkedUsingTool( const KDataToolInfo &, const QString& )) + tools, _catalogManager, TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& )) ,"validate", false, actionCollection(), "marked_" ); m_menu = new KActionMenu(i18n("V&alidation Marked"), actionCollection(), "dynamic_validation_marked"); @@ -423,19 +423,19 @@ void CatalogManager::setupActions() // CVS submenu // Actions for PO files (void)new KAction( i18n( "Update" ), "down", 0, _catalogManager, - SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" ); + TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" ); (void)new KAction( i18n( "Update Marked" ), 0, _catalogManager, - SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" ); + TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" ); (void)new KAction( i18n( "Commit" ), "up", 0, _catalogManager, - SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); + TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, - SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); + TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); (void)new KAction( i18n( "Status" ), 0, _catalogManager, - SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); + TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); (void)new KAction( i18n( "Status for Marked" ), 0, _catalogManager, - SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); + TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, - SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); + TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); // CVS actionMap["cvs_update"] = NEEDS_PO | NEEDS_PO_CVS; @@ -449,27 +449,27 @@ void CatalogManager::setupActions() // SVN submenu // Actions for PO files (void)new KAction( i18n( "Update" ), "down", 0, _catalogManager, - SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" ); + TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" ); (void)new KAction( i18n( "Update Marked" ), 0, _catalogManager, - SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" ); + TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" ); (void)new KAction( i18n( "Commit" ), "up", 0, _catalogManager, - SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); + TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, - SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); + TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); (void)new KAction( i18n( "Status (Local)" ), 0, _catalogManager, - SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); + TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); (void)new KAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager, - SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); + TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); (void)new KAction( i18n( "Status (Remote)" ), 0, _catalogManager, - SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); + TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager, - SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); + TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, - SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); + TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); (void)new KAction( i18n( "Show Information" ), 0, _catalogManager, - SLOT( svnInfo() ), actionCollection( ), "svn_info" ); + TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" ); (void)new KAction( i18n( "Show Information for Marked" ), 0, _catalogManager, - SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" ); + TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" ); // SVN actionMap["svn_update"] = NEEDS_PO | NEEDS_PO_SVN; @@ -486,13 +486,13 @@ void CatalogManager::setupActions() // CVS Actions for POT files (void)new KAction( i18n( "Update Templates" ), 0, _catalogManager, - SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" ); + TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" ); (void)new KAction( i18n( "Update Marked Templates" ), 0, _catalogManager, - SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" ); + TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" ); (void)new KAction( i18n( "Commit Templates" ), 0, _catalogManager, - SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" ); + TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" ); (void)new KAction( i18n( "Commit Marked Templates" ), 0, _catalogManager, - SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" ); + TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" ); actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS; actionMap["cvs_update_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK; @@ -501,13 +501,13 @@ void CatalogManager::setupActions() // SVN Actions for POT files (void)new KAction( i18n( "Update Templates" ), 0, _catalogManager, - SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" ); + TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" ); (void)new KAction( i18n( "Update Marked Templates" ), 0, _catalogManager, - SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" ); + TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" ); (void)new KAction( i18n( "Commit Templates" ), 0, _catalogManager, - SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" ); + TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" ); (void)new KAction( i18n( "Commit Marked Templates" ), 0, _catalogManager, - SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" ); + TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" ); actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN; actionMap["svn_update_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK; @@ -515,7 +515,7 @@ void CatalogManager::setupActions() actionMap["svn_commit_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK; // settings menu - // FIXME: KStdAction::preferences(this, SLOT( optionsPreferences()), actionCollection()); + // FIXME: KStdAction::preferences(this, TQT_SLOT( optionsPreferences()), actionCollection()); createStandardStatusBarAction(); @@ -530,7 +530,7 @@ void CatalogManager::setupActions() actionCollection(), "file_commands"); _catalogManager->setFileCommandsMenu( actionMenu->popupMenu()); - action = new KAction(i18n("&Delete"),Key_Delete,_catalogManager,SLOT(slotDeleteFile()),actionCollection(), "delete"); + action = new KAction(i18n("&Delete"),Key_Delete,_catalogManager,TQT_SLOT(slotDeleteFile()),actionCollection(), "delete"); action->setEnabled(false); #if KDE_IS_VERSION( 3, 2, 90 ) @@ -542,19 +542,19 @@ void CatalogManager::setupActions() void CatalogManager::setupStatusBar() { - _foundLabel = new QLabel( " ", statusBar()); + _foundLabel = new TQLabel( " ", statusBar()); statusBar()->addWidget(_foundLabel,0); - QHBox* progressBox = new QHBox(statusBar(), "progressBox" ); + TQHBox* progressBox = new TQHBox(statusBar(), "progressBox" ); progressBox->setSpacing(2); - _statusProgressLabel = new QLabel( "", progressBox ); + _statusProgressLabel = new TQLabel( "", progressBox ); _statusProgressBar = new KProgress( progressBox, "progressBar"); _statusProgressBar->hide(); statusBar()->addWidget(progressBox,1); statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height()); - QWhatsThis::add(statusBar(), + TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n" "<p>The statusbar displays information about progress of" " the current find or replace operation. The first number in <b>Found:</b>" @@ -570,7 +570,7 @@ void CatalogManager::enableMenuForFiles(bool enable) void CatalogManager::selectedChanged(uint actionValue) { - QMap<QString,uint>::Iterator it; + TQMap<TQString,uint>::Iterator it; for (it = actionMap.begin( ); it != actionMap.end( ); ++it) { KAction * action = actionCollection()->action(it.key( ).latin1( )); if (action) action->setEnabled((actionValue & it.data( )) == it.data( )); @@ -589,7 +589,7 @@ void CatalogManager::updateSettings() _openNewWindow=_settings.openWindow; } -void CatalogManager::saveSettings( QString configFile ) +void CatalogManager::saveSettings( TQString configFile ) { _settings = _catalogManager->settings(); // restore settings from the view @@ -615,12 +615,12 @@ void CatalogManager::setPreferredWindow(WId window) kdDebug(KBABEL_CATMAN) << "setPrefereedWindow set to :" << _preferredWindow << endl; } -void CatalogManager::updateFile(QString fileWithPath) +void CatalogManager::updateFile(TQString fileWithPath) { _catalogManager->updateFile(fileWithPath,true); //force update } -void CatalogManager::updateAfterSave(QString fileWithPath, PoInfo &info) +void CatalogManager::updateAfterSave(TQString fileWithPath, PoInfo &info) { _catalogManager->updateAfterSave(fileWithPath, info); } @@ -630,16 +630,16 @@ CatalogManagerView *CatalogManager::view() return _catalogManager; } -void CatalogManager::openFile(QString filename, QString package) +void CatalogManager::openFile(TQString filename, TQString package) { DCOPClient * client = kapp->dcopClient(); if( startKBabel() ) { - QByteArray data; - QCString url = filename.local8Bit(); - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQCString url = filename.local8Bit(); + TQDataStream arg(data, IO_WriteOnly); arg << url; arg << package.utf8(); arg << CatalogManagerApp::_preferredWindow; @@ -647,11 +647,11 @@ void CatalogManager::openFile(QString filename, QString package) kdDebug(KBABEL_CATMAN) << "Open file with project " << _configFile << endl; - QCString callfunc="openURL(QCString, QCString, WId,int)"; + TQCString callfunc="openURL(TQCString, TQCString, WId,int)"; if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - callfunc="openURL(QCString, QCString, WId,int,QCString)"; + callfunc="openURL(TQCString, TQCString, WId,int,TQCString)"; } kdDebug(KBABEL_CATMAN) << callfunc << endl; @@ -665,26 +665,26 @@ void CatalogManager::openFile(QString filename, QString package) } } -void CatalogManager::openFile(QString filename, QString package, int msgid) +void CatalogManager::openFile(TQString filename, TQString package, int msgid) { DCOPClient * client = kapp->dcopClient(); if( startKBabel() ) { - QByteArray data; - QCString url = filename.local8Bit(); - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQCString url = filename.local8Bit(); + TQDataStream arg(data, IO_WriteOnly); arg << url; arg << package.utf8(); arg << msgid; kdDebug(KBABEL_CATMAN) << "Open file with project " << _configFile << endl; - QCString callfunc="gotoFileEntry(QCString, QCString, int)"; + TQCString callfunc="gotoFileEntry(TQCString, TQCString, int)"; if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - callfunc="gotoFileEntry(QCString, QCString,int,QCString)"; + callfunc="gotoFileEntry(TQCString, TQCString,int,TQCString)"; } kdDebug(KBABEL_CATMAN) << callfunc << endl; @@ -698,26 +698,26 @@ void CatalogManager::openFile(QString filename, QString package, int msgid) } } -void CatalogManager::openFileInNewWindow(QString filename, QString package) +void CatalogManager::openFileInNewWindow(TQString filename, TQString package) { DCOPClient * client = kapp->dcopClient(); if( startKBabel() ) { - QByteArray data; - QCString url = filename.local8Bit(); - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQCString url = filename.local8Bit(); + TQDataStream arg(data, IO_WriteOnly); arg << url; arg << package.utf8(); arg << CatalogManagerApp::_preferredWindow; arg << ((int)1); - QCString callfunc="openURL(QCString, QCString, WId,int)"; + TQCString callfunc="openURL(TQCString, TQCString, WId,int)"; if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - callfunc="openURL(QCString, QCString, WId,int,QCString)"; + callfunc="openURL(TQCString, TQCString, WId,int,TQCString)"; } // update the user timestamp for KBabel to get it a focus @@ -729,25 +729,25 @@ void CatalogManager::openFileInNewWindow(QString filename, QString package) } } -void CatalogManager::openTemplate(QString openFilename,QString saveFilename,QString package) +void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQString package) { DCOPClient * client = kapp->dcopClient(); if( startKBabel() ) { - QByteArray data; - QCString url = openFilename.local8Bit(); - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQCString url = openFilename.local8Bit(); + TQDataStream arg(data, IO_WriteOnly); arg << url; url = saveFilename.utf8(); arg << url; arg << package.utf8(); arg << (_openNewWindow ? 1 : 0 ); - QCString callfunc="openTemplate(QCString,QCString,QCString,int)"; + TQCString callfunc="openTemplate(TQCString,TQCString,TQCString,int)"; if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - callfunc="openTemplate(QCString,QCString,QCString,int,QCString)"; + callfunc="openTemplate(TQCString,TQCString,TQCString,int,TQCString)"; } // update the user timestamp for KBabel to get it a focus @@ -759,25 +759,25 @@ void CatalogManager::openTemplate(QString openFilename,QString saveFilename,QStr } } -void CatalogManager::openTemplateInNewWindow(QString openFilename,QString saveFilename,QString package) +void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString saveFilename,TQString package) { DCOPClient * client = kapp->dcopClient(); if( startKBabel() ) { - QByteArray data; - QCString url = openFilename.local8Bit(); - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQCString url = openFilename.local8Bit(); + TQDataStream arg(data, IO_WriteOnly); arg << url; url = saveFilename.utf8(); arg << url; arg << package.utf8(); arg << ((int)1); - QCString callfunc="openTemplate(QCString,QCString,QCString,int)"; + TQCString callfunc="openTemplate(TQCString,TQCString,TQCString,int)"; if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - callfunc="openTemplate(QCString,QCString,QCString,int,QCString)"; + callfunc="openTemplate(TQCString,TQCString,TQCString,int,TQCString)"; } // update the user timestamp for KBabel to get it a focus @@ -793,17 +793,17 @@ void CatalogManager::spellcheck() { DCOPClient * client = kapp->dcopClient(); - QStringList fileList = _catalogManager->current(); + TQStringList fileList = _catalogManager->current(); if( startKBabel() ) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << fileList; // update the user timestamp for KBabel to get it a focus kapp->updateRemoteUserTimestamp ("kbabel"); - if( !client->send("kbabel","KBabelIFace", "spellcheck(QStringList)", data) ) + if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" "Please check your installation of KDE.")); } @@ -813,17 +813,17 @@ void CatalogManager::markedSpellcheck() { DCOPClient * client = kapp->dcopClient(); - QStringList fileList = _catalogManager->marked(); + TQStringList fileList = _catalogManager->marked(); if( startKBabel() ) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << fileList; // update the user timestamp for KBabel to get it a focus kapp->updateRemoteUserTimestamp ("kbabel"); - if( !client->send("kbabel","KBabelIFace", "spellcheck(QStringList)", data) ) + if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" "Please check your installation of KDE.")); } @@ -831,8 +831,8 @@ void CatalogManager::markedSpellcheck() bool CatalogManager::startKBabel() { - QCString service; - QString result; + TQCString service; + TQString result; DCOPClient * client = kapp->dcopClient(); @@ -840,7 +840,7 @@ bool CatalogManager::startKBabel() QCStringList apps = client->registeredApplications(); for( QCStringList::Iterator it = apps.begin() ; it != apps.end() ; ++it ) { - QString clientID = *it; + TQString clientID = *it; if( clientID=="kbabel" ) { service = *it; @@ -851,8 +851,8 @@ bool CatalogManager::startKBabel() // if there is no running kbabel, start one if( service.isEmpty() ) { - QString app = "kbabel"; - QString url = ""; + TQString app = "kbabel"; + TQString url = ""; if( kapp->startServiceByDesktopName(app,url, &result, &service)) { KMessageBox::error( this, i18n("Unable to use KLauncher to start KBabel.\n" @@ -866,7 +866,7 @@ bool CatalogManager::startKBabel() } -void CatalogManager::prepareProgressBar(QString msg, int max) +void CatalogManager::prepareProgressBar(TQString msg, int max) { _progressBar->setTotalSteps(max); _progressBar->setProgress(0); @@ -884,7 +884,7 @@ void CatalogManager::clearProgressBar() _progressLabel->hide(); } -void CatalogManager::prepareStatusProgressBar(QString msg, int max) +void CatalogManager::prepareStatusProgressBar(TQString msg, int max) { _totalFound = 0; _foundToBeSent = 0; @@ -932,7 +932,7 @@ void CatalogManager::find() { if( !_findDialog ) _findDialog = new FindInFilesDialog(false,this); - if( _findDialog->exec("") == QDialog::Accepted ) + if( _findDialog->exec("") == TQDialog::Accepted ) { _timerFind->stop(); _searchStopped = false; @@ -946,22 +946,22 @@ void CatalogManager::find() _findOptions = _findDialog->findOpts(); // get from options the information for ignoring text parts - _findOptions.contextInfo = QRegExp( _project->miscSettings().contextInfo ); + _findOptions.contextInfo = TQRegExp( _project->miscSettings().contextInfo ); _findOptions.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::find" << endl; - QString url = _catalogManager->find(_findOptions, _toBeSearched ); + TQString url = _catalogManager->find(_findOptions, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) { if( startKBabel() ) { - QCString funcCall("findInFile(QCString,QCString,QString,int,int,int,int,int,int,int,int,int,int)"); + TQCString funcCall("findInFile(TQCString,TQCString,TQString,int,int,int,int,int,int,int,int,int,int)"); DCOPClient *client = kapp->dcopClient(); - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << client->appId(); arg << url.utf8(); arg << _findOptions.findStr; @@ -977,9 +977,9 @@ void CatalogManager::find() arg << (_findOptions.askForSave ? 1 : 0); if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - funcCall="findInFile(QCString,QCString,QString,int,int,int,int,int,int,int,int,int,int,QCString)"; + funcCall="findInFile(TQCString,TQCString,TQString,int,int,int,int,int,int,int,int,int,int,TQCString)"; } - kdDebug(KBABEL) << "DCOP: " << QString(data.data()) << endl; + kdDebug(KBABEL) << "DCOP: " << TQString(data.data()) << endl; if( !client->send("kbabel","KBabelIFace", funcCall, data) ) { @@ -1016,7 +1016,7 @@ void CatalogManager::replace() if( !_replaceDialog ) _replaceDialog = new FindInFilesDialog(true,this); - if( _replaceDialog->exec("") == QDialog::Accepted ) + if( _replaceDialog->exec("") == TQDialog::Accepted ) { _timerFind->stop(); _searchStopped = false; @@ -1032,21 +1032,21 @@ void CatalogManager::replace() _findOptions = options; // get from options the information for ignoring text parts - options.contextInfo = QRegExp( _project->miscSettings().contextInfo ); + options.contextInfo = TQRegExp( _project->miscSettings().contextInfo ); options.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - QString url = _catalogManager->find(options, _toBeSearched ); + TQString url = _catalogManager->find(options, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) { if( startKBabel() ) { - QCString funcCall("replaceInFile(QCString,QCString,QString,QString,int,int,int,int,int,int,int,int,int,int,int)"); + TQCString funcCall("replaceInFile(TQCString,TQCString,TQString,TQString,int,int,int,int,int,int,int,int,int,int,int)"); DCOPClient *client = kapp->dcopClient(); - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << client->appId(); arg << url.utf8(); @@ -1065,7 +1065,7 @@ void CatalogManager::replace() arg << (options.askForSave ? 1 : 0); if(_configFile != "kbabelrc" ) { arg << _configFile.utf8(); - funcCall="replaceInFile(QCString,QCString,QString,QString,int,int,int,int,int,int,int,int,int,int,int,QCString)"; + funcCall="replaceInFile(TQCString,TQCString,TQString,TQString,int,int,int,int,int,int,int,int,int,int,int,TQCString)"; } if( !client->send("kbabel","KBabelIFace", funcCall, data) @@ -1105,7 +1105,7 @@ void CatalogManager::findNextFile() stopSearching(); return; } - QString file = _toBeSearched.first(); + TQString file = _toBeSearched.first(); _toBeSearched.pop_front(); if( PoInfo::findInFile( file, _findOptions ) ) { @@ -1188,11 +1188,11 @@ void CatalogManager::projectNew() KBabel::Project::Ptr p = KBabel::ProjectWizard::newProject(); if( p ) { - disconnect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _project = p; - connect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _configFile = _project->filename(); restoreSettings(); @@ -1204,12 +1204,12 @@ void CatalogManager::projectNew() void CatalogManager::projectOpen() { - QString oldproject = _project->filename(); + TQString oldproject = _project->filename(); if( oldproject == KBabel::ProjectManager::defaultProjectName() ) { - oldproject = QString(); + oldproject = TQString(); } - const QString file = KFileDialog::getOpenFileName(oldproject, QString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); if (file.isEmpty()) { return; @@ -1217,11 +1217,11 @@ void CatalogManager::projectOpen() KBabel::Project::Ptr p = KBabel::ProjectManager::open(file); if( p ) { - disconnect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _project = p; - connect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _configFile = p->filename(); restoreSettings(); @@ -1238,11 +1238,11 @@ void CatalogManager::projectOpen() void CatalogManager::projectClose() { - disconnect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); - connect( _project, SIGNAL (signalCatManSettingsChanged()) - , this, SLOT (updateSettings())); + connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) + , this, TQT_SLOT (updateSettings())); _configFile = _project->filename(); restoreSettings(); updateSettings(); @@ -1250,7 +1250,7 @@ void CatalogManager::projectClose() emit settingsChanged(_settings); } -void CatalogManager::changeProjectActions(const QString& project) +void CatalogManager::changeProjectActions(const TQString& project) { bool def = ( project == KBabel::ProjectManager::defaultProjectName() ) ; @@ -1262,8 +1262,8 @@ void CatalogManager::projectConfigure() { KBabel::ProjectDialog* _projectDialog = new ProjectDialog(_project); - connect (_projectDialog, SIGNAL (settingsChanged()) - , this, SLOT (updateSettings())); + connect (_projectDialog, TQT_SIGNAL (settingsChanged()) + , this, TQT_SLOT (updateSettings())); // settings are updated via signals _projectDialog->exec(); diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index 67f871fa..11927bd7 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -34,18 +34,18 @@ #ifndef CATALOGMANAGER_H #define CATALOGMANAGER_H -#include <qdict.h> -#include <qlistview.h> -#include <qdatetime.h> -#include <qfileinfo.h> -#include <qguardedptr.h> -#include <qmap.h> +#include <tqdict.h> +#include <tqlistview.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> +#include <tqguardedptr.h> +#include <tqmap.h> #include <kdeversion.h> #include <kmainwindow.h> #include <kdirwatch.h> #include <kprocess.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "projectsettings.h" #include "kbproject.h" @@ -71,7 +71,7 @@ class CatalogManager : public KMainWindow { Q_OBJECT public: - CatalogManager(QString configfile = QString() ); + CatalogManager(TQString configfile = TQString() ); ~CatalogManager(); KBabel::CatManSettings settings() const; @@ -82,15 +82,15 @@ public: void setPreferredWindow(WId id); /** updates the file fileWithPath in the @ref CatalogManagerView */ - void updateFile(QString fileWithPath); - void updateAfterSave(QString fileWithPath, KBabel::PoInfo &info); + void updateFile(TQString fileWithPath); + void updateAfterSave(TQString fileWithPath, KBabel::PoInfo &info); CatalogManagerView *view(); void pause(bool flag) { if( _catalogManager ) _catalogManager->pause (flag); } - static QStringList _foundFilesList; - static QStringList _toBeSearched; + static TQStringList _foundFilesList; + static TQStringList _toBeSearched; public slots: /** updates the settings from the project */ @@ -110,13 +110,13 @@ public slots: void projectOpen(); void projectClose(); void projectConfigure(); - void changeProjectActions(const QString& project); + void changeProjectActions(const TQString& project); virtual void clearProgressBar(); - virtual void prepareProgressBar(QString msg, int max); + virtual void prepareProgressBar(TQString msg, int max); virtual void clearStatusProgressBar(); - virtual void prepareStatusProgressBar(QString msg, int max); + virtual void prepareStatusProgressBar(TQString msg, int max); virtual void prepareStatusProgressBar(int max); virtual void setNumberOfFound( int toBeSent, int total ); @@ -137,7 +137,7 @@ private: void restoreView(); void saveView(); - void saveSettings( QString configFile = QString::null ); + void saveSettings( TQString configFile = TQString::null ); void setupActions(); void setupStatusBar(); @@ -150,16 +150,16 @@ private slots: * is used. If this is deleted meanwhile, the first window in * @ref KMainWindow::memberList is used. */ - void openFile(QString filename,QString package); - void openFile(QString filename,QString package, int msgid); - void openFileInNewWindow(QString filename,QString package); + void openFile(TQString filename,TQString package); + void openFile(TQString filename,TQString package, int msgid); + void openFileInNewWindow(TQString filename,TQString package); /** * calls @ref KBabel::openTemplate where as preferred windos _preferredWindow * is used. If this is deleted meanwhile, the first window in * @ref KMainWindow::memberList is used. */ - void openTemplate(QString openFilename,QString saveFileName,QString package); - void openTemplateInNewWindow(QString openFilename,QString saveFileName,QString package); + void openTemplate(TQString openFilename,TQString saveFileName,TQString package); + void openTemplateInNewWindow(TQString openFilename,TQString saveFileName,TQString package); void markedSpellcheck(); void spellcheck(); @@ -187,16 +187,16 @@ private: /// update progress bar KProgress* _progressBar; - QLabel* _progressLabel; + TQLabel* _progressLabel; /// statusbar progress bar KProgress* _statusProgressBar; - QLabel* _statusProgressLabel; - QLabel* _foundLabel; + TQLabel* _statusProgressLabel; + TQLabel* _foundLabel; int _foundToBeSent; int _totalFound; - QTimer* _timerFind; + TQTimer* _timerFind; bool _searchStopped; KBabel::CatManSettings _settings; @@ -207,12 +207,12 @@ private: /// project configuration file - QString _configFile; + TQString _configFile; KBabel::Project::Ptr _project; KConfig* config; - QMap<QString,uint> actionMap; + TQMap<TQString,uint> actionMap; }; #endif // CATALOGMANAGER_H diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index e0762e5b..3534a516 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -49,8 +49,8 @@ public: CatalogManagerInterface(); virtual void setPreferredWindow( WId id ); - virtual QCString findNextFile(); - virtual void updatedFile( QCString url ); + virtual TQCString findNextFile(); + virtual void updatedFile( TQCString url ); }; class CatalogManagerApp : public KApplication @@ -62,8 +62,8 @@ public: virtual int newInstance(); static void setPreferredWindow( WId id ); - static QCString findNextFile(); - static void updatedFile( QCString url ); + static TQCString findNextFile(); + static void updatedFile( TQCString url ); static WId _preferredWindow; private: CatalogManagerInterface *kbInterface; diff --git a/kbabel/catalogmanager/catalogmanageriface.h b/kbabel/catalogmanager/catalogmanageriface.h index 232a694c..037aa7c0 100644 --- a/kbabel/catalogmanager/catalogmanageriface.h +++ b/kbabel/catalogmanager/catalogmanageriface.h @@ -52,16 +52,16 @@ k_dcop: * Returns a next file containing the searched string. Invoked from * KBabel in case the FindNext() finishes a file and wants to continue in * the next one. - * @returns a URL to the next file, QString:null if there is no more + * @returns a URL to the next file, TQString:null if there is no more * files to be searched or empty string if the search string * is not found yet, but there is more files to be searched in. */ - virtual QCString findNextFile() = 0; + virtual TQCString findNextFile() = 0; /** * If you care about this file, you should update information shown. */ - virtual void updatedFile( QCString url) = 0; + virtual void updatedFile( TQCString url) = 0; }; #endif // CATALOGMANAGERIFACE_H diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 6bb4c88f..991e1899 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -50,10 +50,10 @@ #include "markpatterndialog.h" #include "validationoptions.h" -#include <qcheckbox.h> -#include <qpopupmenu.h> -#include <qlabel.h> -#include <qpainter.h> +#include <tqcheckbox.h> +#include <tqpopupmenu.h> +#include <tqlabel.h> +#include <tqpainter.h> #include <kcmenumngr.h> #include <kcursor.h> @@ -73,15 +73,15 @@ #include <kdeversion.h> #include <ktempfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qtimer.h> -#include <qbitmap.h> -#include <qwhatsthis.h> -#include <qheader.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qtextedit.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqtimer.h> +#include <tqbitmap.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqtextedit.h> using namespace KBabel; @@ -98,8 +98,8 @@ const char* columnNames[] = { #define COLTEXT(a) (i18n(columnNames[a])) -CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* parent,const char* name) - : QListView(parent,name) +CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name) + : TQListView(parent,name) , _dirWatch(0) , _readInfoCount(0) , _active(false) @@ -131,8 +131,8 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* pa _dictBox = new KBabelDictBox(this, "dictbox"); _dictBox->hide(); - _updateTimer = new QTimer(this); - connect(_updateTimer,SIGNAL(timeout()),this,SLOT(checkUpdate())); + _updateTimer = new TQTimer(this); + connect(_updateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdate())); addColumn(COLTEXT(COL_NAME)); addColumn(COLTEXT(COL_MARKER),25); @@ -143,7 +143,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* pa setColumnAlignment(2,AlignCenter); addColumn(COLTEXT(COL_TOTAL)); setColumnAlignment(3,AlignCenter); - addColumn(QString::null); // CVS/SVN column, header is set later + addColumn(TQString::null); // CVS/SVN column, header is set later addColumn(COLTEXT(COL_REVISION)); addColumn(COLTEXT(COL_TRANSLATOR)); @@ -154,21 +154,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* pa if(KContextMenuManager::showOnButtonPress()) { - connect(this,SIGNAL(rightButtonPressed(QListViewItem*,const QPoint &, int)) - ,this, SLOT(showContentsMenu(QListViewItem*,const QPoint &, int))); + connect(this,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &, int)) + ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); } else { - connect(this,SIGNAL(rightButtonClicked(QListViewItem*,const QPoint &, int)) - ,this, SLOT(showContentsMenu(QListViewItem*,const QPoint &, int))); + connect(this,TQT_SIGNAL(rightButtonClicked(TQListViewItem*,const TQPoint &, int)) + ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); } - connect(this, SIGNAL(returnPressed(QListViewItem*)) - ,this, SLOT(activateItem(QListViewItem*))); - connect(this, SIGNAL(doubleClicked(QListViewItem*)) - ,this, SLOT(activateItem(QListViewItem*))); - connect(this,SIGNAL(selectionChanged()),this,SLOT(checkSelected())); - connect( this, SIGNAL( clicked(QListViewItem *, const QPoint &, int)), - this, SLOT( columnClicked(QListViewItem *, const QPoint &, int))); + connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)) + ,this, TQT_SLOT(activateItem(TQListViewItem*))); + connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)) + ,this, TQT_SLOT(activateItem(TQListViewItem*))); + connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkSelected())); + connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint &, int)), + this, TQT_SLOT( columnClicked(TQListViewItem *, const TQPoint &, int))); _dirCommandsMenu = 0; _fileCommandsMenu = 0; @@ -178,20 +178,20 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* pa _logWindow = new KDialogBase(0,"log window",false,i18n("Log Window") ,KDialogBase::Close | KDialogBase::User1,KDialogBase::Close); _logWindow->setButtonText(KDialogBase::User1,i18n("C&lear")); - _logWindow->setInitialSize(QSize(300,200)); + _logWindow->setInitialSize(TQSize(300,200)); - QWhatsThis::add(_logWindow,i18n("<qt><p><b>Log window</b></p>\n" + TQWhatsThis::add(_logWindow,i18n("<qt><p><b>Log window</b></p>\n" "<p>In this window the output of " "the executed commands are shown.</p></qt>")); - _logView = new QTextEdit(_logWindow); + _logView = new TQTextEdit(_logWindow); _logView->setReadOnly(true); _logWindow->setMainWidget(_logView); - connect(_logWindow,SIGNAL(user1Clicked()),_logView,SLOT(clear())); + connect(_logWindow,TQT_SIGNAL(user1Clicked()),_logView,TQT_SLOT(clear())); - QWhatsThis::add(this,i18n("<qt><p><b>Catalog Manager</b></p>\n" + TQWhatsThis::add(this,i18n("<qt><p><b>Catalog Manager</b></p>\n" "<p>The Catalog Manager merges two folders into one tree and displays all\n" "PO and POT files in these folders. This way you can easily see if a\n" "template has been added or removed. Also some information about the files\n" @@ -205,21 +205,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, QWidget* pa // CVS cvshandler = new CVSHandler( ); - connect( cvshandler, SIGNAL( signalIsPORepository( bool ) ), - this, SLOT( slotValidPOCVSRepository( bool ) ) ); - connect( cvshandler, SIGNAL( signalIsPOTRepository( bool ) ), - this, SLOT( slotValidPOTCVSRepository( bool ) ) ); - connect( cvshandler, SIGNAL( signalFilesCommitted( const QStringList& ) ), - this, SLOT( updateFiles( const QStringList& ) ) ); + connect( cvshandler, TQT_SIGNAL( signalIsPORepository( bool ) ), + this, TQT_SLOT( slotValidPOCVSRepository( bool ) ) ); + connect( cvshandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ), + this, TQT_SLOT( slotValidPOTCVSRepository( bool ) ) ); + connect( cvshandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ), + this, TQT_SLOT( updateFiles( const TQStringList& ) ) ); // SVN svnhandler = new SVNHandler( ); - connect( svnhandler, SIGNAL( signalIsPORepository( bool ) ), - this, SLOT( slotValidPOSVNRepository( bool ) ) ); - connect( svnhandler, SIGNAL( signalIsPOTRepository( bool ) ), - this, SLOT( slotValidPOTSVNRepository( bool ) ) ); - connect( svnhandler, SIGNAL( signalFilesCommitted( const QStringList& ) ), - this, SLOT( updateFiles( const QStringList& ) ) ); + connect( svnhandler, TQT_SIGNAL( signalIsPORepository( bool ) ), + this, TQT_SLOT( slotValidPOSVNRepository( bool ) ) ); + connect( svnhandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ), + this, TQT_SLOT( slotValidPOTSVNRepository( bool ) ) ); + connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ), + this, TQT_SLOT( updateFiles( const TQStringList& ) ) ); KConfig *config = KGlobal::config(); restoreView(config); @@ -271,26 +271,26 @@ void CatalogManagerView::restoreView( KConfig *config) _ignoreFuzzy = config->readBoolEntry( "ValidateIgnoreFuzzy", false ); } -void CatalogManagerView::setRMBMenuFile( QPopupMenu *m ) +void CatalogManagerView::setRMBMenuFile( TQPopupMenu *m ) { _fileContentsMenu = m; } -void CatalogManagerView::setRMBMenuDir( QPopupMenu *m ) +void CatalogManagerView::setRMBMenuDir( TQPopupMenu *m ) { _dirContentsMenu = m; } -void CatalogManagerView::setDirCommandsMenu( QPopupMenu *m ) +void CatalogManagerView::setDirCommandsMenu( TQPopupMenu *m ) { _dirCommandsMenu = m; - connect(_dirCommandsMenu,SIGNAL(activated(int)),this,SLOT(slotDirCommand(int))); + connect(_dirCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotDirCommand(int))); } -void CatalogManagerView::setFileCommandsMenu( QPopupMenu *m ) +void CatalogManagerView::setFileCommandsMenu( TQPopupMenu *m ) { _fileCommandsMenu = m; - connect(_fileCommandsMenu,SIGNAL(activated(int)),this,SLOT(slotFileCommand(int))); + connect(_fileCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotFileCommand(int))); } void CatalogManagerView::checkUpdate() @@ -298,7 +298,7 @@ void CatalogManagerView::checkUpdate() _updateNesting++; pause(true); - QDictIterator<CatManListItem> it( _fileList ); // iterator for dict + TQDictIterator<CatManListItem> it( _fileList ); // iterator for dict while ( it.current() && !_stop) { @@ -353,24 +353,24 @@ void CatalogManagerView::clear() delete _dirWatch; _dirWatch= new KDirWatch(); - connect(_dirWatch,SIGNAL(deleted(const QString&)),this - ,SLOT(directoryDeleted(const QString&))); - connect(_dirWatch,SIGNAL(dirty(const QString&)),this - ,SLOT(directoryChanged(const QString&))); - connect(_dirWatch,SIGNAL(created(const QString&)),this - ,SLOT(directoryChanged(const QString&))); + connect(_dirWatch,TQT_SIGNAL(deleted(const TQString&)),this + ,TQT_SLOT(directoryDeleted(const TQString&))); + connect(_dirWatch,TQT_SIGNAL(dirty(const TQString&)),this + ,TQT_SLOT(directoryChanged(const TQString&))); + connect(_dirWatch,TQT_SIGNAL(created(const TQString&)),this + ,TQT_SLOT(directoryChanged(const TQString&))); _dirList.clear(); _fileList.clear(); - QListView::clear(); + TQListView::clear(); } void CatalogManagerView::toggleAllMarks() { _markerList.clear(); - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); CatManListItem* item; for ( ; it.current(); ++it ) @@ -397,7 +397,7 @@ void CatalogManagerView::toggleAllMarks() void CatalogManagerView::clearAllMarks() { _markerList.clear(); - QDictIterator<CatManListItem> it( _fileList ); // iterator for dict + TQDictIterator<CatManListItem> it( _fileList ); // iterator for dict while ( it.current() ) { @@ -415,7 +415,7 @@ void CatalogManagerView::clearAllMarks() void CatalogManagerView::markModifiedFiles() { - QDictIterator<CatManListItem> it( _fileList ); + TQDictIterator<CatManListItem> it( _fileList ); while ( it.current() ) { CatManListItem* item=it.current(); @@ -434,10 +434,10 @@ void CatalogManagerView::markModifiedFiles() void CatalogManagerView::loadMarks() { - const KURL url = KFileDialog::getOpenURL( QString(),"*.marklist", this ); + const KURL url = KFileDialog::getOpenURL( TQString(),"*.marklist", this ); if( url.isEmpty() ) return; - QString filename; + TQString filename; #if KDE_IS_VERSION( 3, 2, 90 ) if (!KIO::NetAccess::download( url, filename, this ) ) #else @@ -450,13 +450,13 @@ void CatalogManagerView::loadMarks() } // now load from file - QStringList newMarkerList; // better create new list in case of problems - QFile f( filename ); + TQStringList newMarkerList; // better create new list in case of problems + TQFile f( filename ); if( f.open( IO_ReadOnly) ) { - QTextStream s(&f); + TQTextStream s(&f); - QString input; + TQString input; s >> input ; if( input == "[Markers]" ) @@ -486,8 +486,8 @@ void CatalogManagerView::loadMarks() KIO::NetAccess::removeTempFile( filename ); // test validity of list items - QStringList testedList; - QStringList::const_iterator it; + TQStringList testedList; + TQStringList::const_iterator it; for( it=newMarkerList.constBegin() ; it!=newMarkerList.constEnd() ; ++it ) if( _fileList[(*it)] != 0 ) testedList.append( (*it) ); @@ -510,13 +510,13 @@ void CatalogManagerView::loadMarks() void CatalogManagerView::saveMarks() { - const KURL url2 = KFileDialog::getSaveURL( QString(), "*.marklist", this ); + const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.marklist", this ); if( url2.isEmpty() ) return; // ### FIXME: why is the file dialog not doing this? if ( KIO::NetAccess::exists( url2, false, this ) ) { - if(KMessageBox::warningContinueCancel(this,QString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " + if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; @@ -531,19 +531,19 @@ void CatalogManagerView::saveMarks() #endif kdDebug() << "Saving marks: " << url2.prettyURL() << " most-local: " << url.prettyURL() << endl; - QFile* file = 0; + TQFile* file = 0; KTempFile* tempFile = 0; - QTextStream* stream = 0; + TQTextStream* stream = 0; bool error = false; const bool localFile = url.isLocalFile(); if ( localFile ) { // We have a local file - file = new QFile( url.path() ); + file = new TQFile( url.path() ); if ( file->open (IO_WriteOnly) ) { - stream = new QTextStream( file ); + stream = new TQTextStream( file ); } else { @@ -561,7 +561,7 @@ void CatalogManagerView::saveMarks() { // ### TODO: try to get a better file format for KDE4 (XML?), one working with real relative paths (no / at start) and working with UTF-8 *stream << "[Markers]" << endl; - for( QStringList::const_iterator it = _markerList.constBegin(); it!=_markerList.constEnd() ; ++it ) + for( TQStringList::const_iterator it = _markerList.constBegin(); it!=_markerList.constEnd() ; ++it ) *stream << (*it) << endl; } if ( error ) @@ -622,20 +622,20 @@ void CatalogManagerView::setPatternMarks(bool mark) if (markPatternDialog->exec( ) != KDialog::Accepted) return; - QRegExp rx(markPatternDialog->pattern( )); + TQRegExp rx(markPatternDialog->pattern( )); rx.setWildcard(!markPatternDialog->useRegExp( )); rx.setCaseSensitive(markPatternDialog->isCaseSensitive( )); - QStringList fileList = item->allChildrenList(true); - for (QStringList::const_iterator it = fileList.constBegin( ); it != fileList.constEnd( ); ++it) { + TQStringList fileList = item->allChildrenList(true); + for (TQStringList::const_iterator it = fileList.constBegin( ); it != fileList.constEnd( ); ++it) { CatManListItem * i = _fileList[*it]; - QString matchName; + TQString matchName; if (i->hasPo( )) matchName = i->poFile( ); else if (i->hasPot( ) && markPatternDialog->includeTemplates( )) matchName = i->potFile( ); - matchName = QFileInfo(matchName).baseName( ); + matchName = TQFileInfo(matchName).baseName( ); if (mark) { if (!matchName.isEmpty( ) && rx.exactMatch(matchName) && !i->marked( )) { @@ -670,7 +670,7 @@ void CatalogManagerView::statistics() } } - QStringList doList; + TQStringList doList; if( i->isFile() ) doList.append(i->package()); else doList = i->allChildrenList(true); @@ -697,13 +697,13 @@ void CatalogManagerView::markedStatistics() } } - QStringList doList; + TQStringList doList; if( i->isFile() ) doList.append(i->package()); else doList = i->allChildrenList(true); - QStringList markedDoList; - QStringList::const_iterator it; + TQStringList markedDoList; + TQStringList::const_iterator it; for( it = doList.constBegin(); it != doList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -713,11 +713,11 @@ void CatalogManagerView::markedStatistics() showStatistics( i, markedDoList ); } -void CatalogManagerView::showStatistics( CatManListItem *i, QStringList &childrenList ) +void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList ) { KLocale *locale = KGlobal::locale(); - QString msg; + TQString msg; int totalPackages=0; int totalPo=0; int totalNoPot=0; @@ -726,7 +726,7 @@ void CatalogManagerView::showStatistics( CatManListItem *i, QStringList &childr int totalFuzzy=0; int totalUntranslated=0; - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -764,7 +764,7 @@ void CatalogManagerView::showStatistics( CatManListItem *i, QStringList &childr double percent; - const QString name=i->package(false); + const TQString name=i->package(false); if(name.isEmpty()) msg = i18n("Statistics for all:\n"); else @@ -808,7 +808,7 @@ void CatalogManagerView::checkSyntax() return; Msgfmt::Status status; - QString output; + TQString output; Msgfmt msgfmt; status=msgfmt.checkSyntax(item->poFile(),output); @@ -851,18 +851,18 @@ void CatalogManagerView::checkSyntax() else { Msgfmt::Status status; - QString output; + TQString output; Msgfmt msgfmt; status=msgfmt.checkSyntaxInDir(item->poFile(), "*.po", output); - QString name=item->package(false); + TQString name=item->package(false); switch(status) { case Msgfmt::Ok: { - QString msg; + TQString msg; if(!name.isEmpty()) { msg=i18n("All files in folder %1 are syntactically correct.\n" @@ -878,7 +878,7 @@ void CatalogManagerView::checkSyntax() } case Msgfmt::SyntaxError: { - QString msg; + TQString msg; if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has syntax errors.\n" @@ -894,7 +894,7 @@ void CatalogManagerView::checkSyntax() } case Msgfmt::HeaderError: { - QString msg; + TQString msg; if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has header syntax errors.\n" @@ -910,7 +910,7 @@ void CatalogManagerView::checkSyntax() } case Msgfmt::Error: { - QString msg; + TQString msg; if(!name.isEmpty()) { msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" " @@ -940,12 +940,12 @@ void CatalogManagerView::checkSyntax() void CatalogManagerView::roughTranslation() { - QPtrList<CatManListItem> result; + TQPtrList<CatManListItem> result; CatManListItem *current = static_cast<CatManListItem *>(currentItem()); if( current->isDir() ) { - QStringList s = current->allChildrenList(true); - QStringList::const_iterator it; + TQStringList s = current->allChildrenList(true); + TQStringList::const_iterator it; for( it = s.constBegin() ; it != s.constEnd(); ++it ) { CatManListItem *item = _fileList[(*it)]; @@ -966,9 +966,9 @@ void CatalogManagerView::markedRoughTranslation() { if( _markerList.count() == 0 ) return; - QPtrList<CatManListItem> result; + TQPtrList<CatManListItem> result; - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = _markerList.constBegin() ; it != _markerList.constEnd(); ++it ) { CatManListItem *item = _fileList[(*it)]; @@ -984,10 +984,10 @@ void CatalogManagerView::mailFiles() { CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { - QStringList filesToSend; - QStringList childrenList = item->allChildrenList(true); + TQStringList filesToSend; + TQStringList childrenList = item->allChildrenList(true); - QStringList::const_iterator it; + TQStringList::const_iterator it; for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { @@ -1007,8 +1007,8 @@ void CatalogManagerView::mailMarkedFiles() if (_markerList.count() == 0) return; - QStringList filesToSend; - QStringList::const_iterator it; + TQStringList filesToSend; + TQStringList::const_iterator it; for (it = _markerList.constBegin(); it != _markerList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { @@ -1022,24 +1022,24 @@ void CatalogManagerView::packageFiles( ) { CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { - QStringList filesToPackage; - QStringList childrenList = item->allChildrenList(true); + TQStringList filesToPackage; + TQStringList childrenList = item->allChildrenList(true); - QStringList::const_iterator it; + TQStringList::const_iterator it; for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { filesToPackage << i->poFile(); } } - QString packageFileName = KFileDialog::getSaveFileName(QString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, QString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); } else { if (item->hasPo()) { - QStringList fileToPackage(item->poFile()); - QString packageFileName = KFileDialog::getSaveFileName(QString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( fileToPackage, packageFileName, QString::null, false ); + TQStringList fileToPackage(item->poFile()); + TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( fileToPackage, packageFileName, TQString::null, false ); } } } @@ -1048,8 +1048,8 @@ void CatalogManagerView::packageMarkedFiles( ) if (_markerList.count() == 0) return; - QStringList filesToPackage; - QStringList::const_iterator it; + TQStringList filesToPackage; + TQStringList::const_iterator it; for (it = _markerList.constBegin(); it != _markerList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { @@ -1057,8 +1057,8 @@ void CatalogManagerView::packageMarkedFiles( ) } } - QString packageFileName = KFileDialog::getSaveFileName(QString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, QString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); } // CVS @@ -1122,8 +1122,8 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ KSharedConfig* config = _project->sharedConfig(); if ( marked ) { if ( _markerList.isEmpty() ) return; - QStringList fileList; - QStringList::const_iterator it; + TQStringList fileList; + TQStringList::const_iterator it; for ( it = _markerList.constBegin( ); it != _markerList.constEnd( ); ++it ) { CatManListItem * i = _fileList[(*it)]; if ( templates && i->hasPot( ) ) @@ -1133,12 +1133,12 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ } cvshandler->execCVSCommand( this, cmd, fileList, templates, config ); } else { - const QString basedir = ( templates ? _settings.potBaseDir : _settings.poBaseDir ); - QString cvsItem; + const TQString basedir = ( templates ? _settings.potBaseDir : _settings.poBaseDir ); + TQString cvsItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) { // all children including directories - QStringList cvsItems = item->allChildrenFileList (true, false, true); + TQStringList cvsItems = item->allChildrenFileList (true, false, true); if ( !cvsItems.isEmpty( ) ) cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config ); } else { @@ -1234,8 +1234,8 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ KSharedConfig* config = _project->sharedConfig(); if ( marked ) { if ( _markerList.isEmpty() ) return; - QStringList fileList; - QStringList::const_iterator it; + TQStringList fileList; + TQStringList::const_iterator it; for ( it = _markerList.constBegin( ); it != _markerList.constEnd( ); ++it ) { CatManListItem * i = _fileList[(*it)]; if ( templates && i->hasPot( ) ) @@ -1245,12 +1245,12 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ } svnhandler->execSVNCommand( this, cmd, fileList, templates, config ); } else { - const QString basedir = ( templates ? _settings.potBaseDir : _settings.poBaseDir ); - QString svnItem; + const TQString basedir = ( templates ? _settings.potBaseDir : _settings.poBaseDir ); + TQString svnItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) { // all children including directories - QStringList svnItems = item->allChildrenFileList (true, false, true); + TQStringList svnItems = item->allChildrenFileList (true, false, true); if ( !svnItems.isEmpty( ) ) svnhandler->execSVNCommand( this, cmd, svnItems, templates, config ); } else { @@ -1270,26 +1270,26 @@ void CatalogManagerView::showLog() _logWindow->show(); } -QString CatalogManagerView::find( FindOptions &options, QStringList &rest ) +TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) { CatManListItem* i=(CatManListItem*) currentItem(); if(!i || options.inAllFiles) i=(CatManListItem*)_dirList["/"]; - QValueList<QString> foundFiles; + TQValueList<TQString> foundFiles; _stopSearch = false; - const QString search = options.findStr.lower().simplifyWhiteSpace(); - QStringList searchWords = QStringList::split(' ', search); + const TQString search = options.findStr.lower().simplifyWhiteSpace(); + TQStringList searchWords = TQStringList::split(' ', search); - QStringList childrenList; + TQStringList childrenList; if( i->isFile() ) childrenList.append(i->name()); else childrenList =i->allChildrenList(true); emit prepareFindProgressBar(childrenList.size()); - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -1314,7 +1314,7 @@ QString CatalogManagerView::find( FindOptions &options, QStringList &rest ) else doSearch = true; // we do not have index, we need to search if( doSearch ) { - QString itemFile; + TQString itemFile; if( options.inTemplates ) { if( item->hasPot() ) itemFile=item->potFile(); @@ -1338,14 +1338,14 @@ QString CatalogManagerView::find( FindOptions &options, QStringList &rest ) _stopSearch = false; return itemFile; } - const QString foundItemFile = itemFile; + const TQString foundItemFile = itemFile; it++; while( it != childrenList.constEnd() ) { CatManListItem *item = _fileList[(*it)]; - itemFile = QString::null; + itemFile = TQString::null; if( options.inTemplates ) { if( item->hasPot() ) itemFile=item->potFile(); @@ -1353,7 +1353,7 @@ QString CatalogManagerView::find( FindOptions &options, QStringList &rest ) if( item->hasPo() )itemFile=item->poFile(); } if( options.inMarkedFiles && !item->marked() ) - itemFile=QString::null; + itemFile=TQString::null; if( !itemFile.isNull()) { @@ -1380,23 +1380,23 @@ QString CatalogManagerView::find( FindOptions &options, QStringList &rest ) _stopSearch = false; rest.clear(); if( _updateNesting == 0 && !_stop ) emit updateFinished(); - return QString::null; + return TQString::null; } } - return QString::null; + return TQString::null; } -bool CatalogManagerView::hasMatchingWords( QStringList &itemWords, QStringList &searchWords) +bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList &searchWords) { - for( QStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 ) - for( QStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 ) + for( TQStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 ) + for( TQStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 ) if( *it1 == *it2 || (*it1).contains(*it2) || (*it2).contains(*it1) ) return true; return false; } -void CatalogManagerView::showContentsMenu(QListViewItem *i, const QPoint &point, int) +void CatalogManagerView::showContentsMenu(TQListViewItem *i, const TQPoint &point, int) { CatManListItem* item = (CatManListItem*) i; @@ -1427,7 +1427,7 @@ void CatalogManagerView::checkSelected() emit selectedChanged(actionValue); } -void CatalogManagerView::activateItem(QListViewItem *) +void CatalogManagerView::activateItem(TQListViewItem *) { CatManListItem* item=(CatManListItem*) currentItem(); @@ -1471,7 +1471,7 @@ void CatalogManagerView::slotOpenFileInNewWindow() if(item && item->isFile()) { - QString filename; + TQString filename; if(item->hasPo()) { emit openFileInNewWindow(item->poFile(),item->package()); @@ -1499,10 +1499,10 @@ void CatalogManagerView::slotDeleteFile() if(item && item->isFile() && item->hasPo() && !item->hasPot()) { - const QString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile()); + const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile()); if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue) { - if(!QFile::remove(item->poFile())) + if(!TQFile::remove(item->poFile())) { KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile())); } @@ -1545,9 +1545,9 @@ void CatalogManagerView::slotToggleMarksInDir() if(i && i->isDir()) { - const QStringList contentList = i->allChildrenList(true); + const TQStringList contentList = i->allChildrenList(true); - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = contentList.constBegin(); it != contentList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -1579,9 +1579,9 @@ void CatalogManagerView::slotClearMarksInDir() if(i && i->isDir()) { - const QStringList contentList=i->contentsList(true); + const TQStringList contentList=i->contentsList(true); - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = contentList.constBegin(); it != contentList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -1608,7 +1608,7 @@ void CatalogManagerView::slotDirCommand(int index) if(index>=0 && item && item->isDir()) { - QString cmd=*(_settings.dirCommands).at(index); + TQString cmd=*(_settings.dirCommands).at(index); cmd.replace("@PACKAGE@",item->name()); cmd.replace("@PODIR@",item->poFile()); cmd.replace("@POTDIR@",item->potFile()); @@ -1620,12 +1620,12 @@ void CatalogManagerView::slotDirCommand(int index) KProcess* proc = new KShellProcess(); _pendingProcesses.append(proc); - connect( proc,SIGNAL( processExited(KProcess *) ), this - ,SLOT( processEnded(KProcess*) ) ); - connect( proc,SIGNAL( receivedStdout(KProcess*,char*,int) ), this - ,SLOT( showOutput(KProcess*,char*,int) ) ); - connect( proc,SIGNAL( receivedStderr(KProcess*,char*,int) ), this - ,SLOT( showOutput(KProcess*,char*,int) ) ); + connect( proc,TQT_SIGNAL( processExited(KProcess *) ), this + ,TQT_SLOT( processEnded(KProcess*) ) ); + connect( proc,TQT_SIGNAL( receivedStdout(KProcess*,char*,int) ), this + ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); + connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this + ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); *proc << "cd" << item->poFile() << ";" << cmd; proc->start(KProcess::NotifyOnExit,KProcess::AllOutput); @@ -1640,7 +1640,7 @@ void CatalogManagerView::slotFileCommand(int index) { CatManListItem* parent = (CatManListItem*)item->parent(); - QString cmd=*(_settings.fileCommands).at(index); + TQString cmd=*(_settings.fileCommands).at(index); cmd.replace("@PACKAGE@",item->name()); cmd.replace("@POFILE@",item->poFile()); cmd.replace("@POTFILE@",item->potFile()); @@ -1653,12 +1653,12 @@ void CatalogManagerView::slotFileCommand(int index) KProcess* proc = new KShellProcess(); _pendingProcesses.append(proc); - connect( proc,SIGNAL( processExited(KProcess *) ), this - ,SLOT( processEnded(KProcess*) ) ); - connect( proc,SIGNAL( receivedStdout(KProcess*,char*,int) ), this - ,SLOT( showOutput(KProcess*,char*,int) ) ); - connect( proc,SIGNAL( receivedStderr(KProcess*,char*,int) ), this - ,SLOT( showOutput(KProcess*,char*,int) ) ); + connect( proc,TQT_SIGNAL( processExited(KProcess *) ), this + ,TQT_SLOT( processEnded(KProcess*) ) ); + connect( proc,TQT_SIGNAL( receivedStdout(KProcess*,char*,int) ), this + ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); + connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this + ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); *proc << "cd" << parent->poFile() << ";" << cmd; proc->start(KProcess::NotifyOnExit,KProcess::AllOutput); @@ -1667,9 +1667,9 @@ void CatalogManagerView::slotFileCommand(int index) } -void CatalogManagerView::updateFile(QString fileWithPath, bool force) +void CatalogManagerView::updateFile(TQString fileWithPath, bool force) { - QString relFile; + TQString relFile; if(fileWithPath.startsWith(_settings.poBaseDir)) { relFile=fileWithPath.mid(_settings.poBaseDir.length()); @@ -1704,9 +1704,9 @@ void CatalogManagerView::updateFile(QString fileWithPath, bool force) } -void CatalogManagerView::updateAfterSave(QString fileWithPath, PoInfo &newInfo) +void CatalogManagerView::updateAfterSave(TQString fileWithPath, PoInfo &newInfo) { - QString relFile; + TQString relFile; if(fileWithPath.startsWith(_settings.poBaseDir)) { relFile=fileWithPath.mid(_settings.poBaseDir.length()); @@ -1741,7 +1741,7 @@ void CatalogManagerView::updateAfterSave(QString fileWithPath, PoInfo &newInfo) void CatalogManagerView::buildTree() { // in case we were called after settings update - disconnect( this, SIGNAL( updateFinished() ), this, SLOT(buildTree() ) ); + disconnect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) ); emit signalBuildTree(false); // announce start of building @@ -1760,7 +1760,7 @@ void CatalogManagerView::buildTree() _dirList.insert("/",root); //root->setSelectable(false); - QFileInfo fileInfo(_settings.poBaseDir); + TQFileInfo fileInfo(_settings.poBaseDir); if(!fileInfo.isDir()) { KMessageBox::error(this,i18n("You have not specified a valid folder " @@ -1833,7 +1833,7 @@ void CatalogManagerView::buildTree() } // first read information about the files... - QDictIterator<CatManListItem> it( _fileList ); // iterator for dict + TQDictIterator<CatManListItem> it( _fileList ); // iterator for dict int i=0; while ( it.current() && !_stop) @@ -1844,7 +1844,7 @@ void CatalogManagerView::buildTree() } // ...then update directories - QDictIterator<CatManListItem> dit( _dirList ); // iterator for dict + TQDictIterator<CatManListItem> dit( _dirList ); // iterator for dict while ( dit.current() && !_stop) { @@ -1868,12 +1868,12 @@ void CatalogManagerView::buildTree() } } -bool CatalogManagerView::buildDir(QString relDir,bool fast) +bool CatalogManagerView::buildDir(TQString relDir,bool fast) { if( _stop ) return false; bool haveTemplateDir=true; - QFileInfo fileInfo; + TQFileInfo fileInfo; fileInfo.setFile(_settings.potBaseDir); if(!fileInfo.isDir()) @@ -1891,8 +1891,8 @@ bool CatalogManagerView::buildDir(QString relDir,bool fast) } -bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir - , const QString extension , bool fast) +bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir + , const TQString extension , bool fast) { if( _stop ) return false; @@ -1905,14 +1905,14 @@ bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir return false; } - const QString poBaseDir=_settings.poBaseDir; - const QString potBaseDir=_settings.potBaseDir; + const TQString poBaseDir=_settings.poBaseDir; + const TQString potBaseDir=_settings.potBaseDir; // traverse directory in poBaseDir - QDir dir(baseDir+relDir); - QStringList entryList=dir.entryList("*"+extension,QDir::Files,QDir::Name); + TQDir dir(baseDir+relDir); + TQStringList entryList=dir.entryList("*"+extension,TQDir::Files,TQDir::Name); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = entryList.constBegin(); it != entryList.constEnd() && !_stop ; ++it ) { @@ -1920,8 +1920,8 @@ bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir havePoFiles=true; - QString file=relDir+(*it); - file.remove(QRegExp(extension+"$")); + TQString file=relDir+(*it); + file.remove(TQRegExp(extension+"$")); CatManListItem* item = _fileList[file]; if(!item) { @@ -1941,7 +1941,7 @@ bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir } } - entryList=dir.entryList(QDir::Dirs,QDir::Name); + entryList=dir.entryList(TQDir::Dirs,TQDir::Name); for ( it = entryList.constBegin(); it != entryList.constEnd() && !_stop ; ++it ) { @@ -1952,7 +1952,7 @@ bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir continue; } - QString subDir=relDir+(*it)+"/"; + TQString subDir=relDir+(*it)+"/"; if(!_dirWatch->contains(baseDir+subDir)) { _dirWatch->addDir(baseDir+subDir); @@ -1987,7 +1987,7 @@ bool CatalogManagerView::buildDir(const QString& baseDir,const QString& relDir } -void CatalogManagerView::updateDir(QString relDir) +void CatalogManagerView::updateDir(TQString relDir) { if( _stop ) return; @@ -2002,16 +2002,16 @@ void CatalogManagerView::updateDir(QString relDir) return; } - QStringList contentList = thisItem->contentsList(true); + TQStringList contentList = thisItem->contentsList(true); - const QString poBaseDir=_settings.poBaseDir; - const QString potBaseDir=_settings.potBaseDir; + const TQString poBaseDir=_settings.poBaseDir; + const TQString potBaseDir=_settings.potBaseDir; // first lookup template directory - QDir dir(potBaseDir+relDir); - QStringList entryList=dir.entryList("*.pot",QDir::Files,QDir::Name); + TQDir dir(potBaseDir+relDir); + TQStringList entryList=dir.entryList("*.pot",TQDir::Files,TQDir::Name); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) { @@ -2019,8 +2019,8 @@ void CatalogManagerView::updateDir(QString relDir) havePoFiles=true; - QString file=relDir+(*it); - file.remove(QRegExp(".pot$")); + TQString file=relDir+(*it); + file.remove(TQRegExp(".pot$")); CatManListItem* item = _fileList[file]; if(!item) { @@ -2042,7 +2042,7 @@ void CatalogManagerView::updateDir(QString relDir) contentList.remove(file); } - entryList=dir.entryList(QDir::Dirs,QDir::Name); + entryList=dir.entryList(TQDir::Dirs,TQDir::Name); for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) { @@ -2055,7 +2055,7 @@ void CatalogManagerView::updateDir(QString relDir) bool newDirAdded=false; - QString subDir=relDir+(*it)+"/"; + TQString subDir=relDir+(*it)+"/"; if(!_dirWatch->contains(potBaseDir+subDir)) { _dirWatch->addDir(potBaseDir+subDir); @@ -2093,7 +2093,7 @@ void CatalogManagerView::updateDir(QString relDir) // now traverse directory in poBaseDir dir.setPath(poBaseDir+relDir); - entryList=dir.entryList("*.po",QDir::Files,QDir::Name); + entryList=dir.entryList("*.po",TQDir::Files,TQDir::Name); for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) { @@ -2101,8 +2101,8 @@ void CatalogManagerView::updateDir(QString relDir) if( _stop ) return; - QString file=relDir+(*it); - file.remove(QRegExp(".po$")); + TQString file=relDir+(*it); + file.remove(TQRegExp(".po$")); CatManListItem* item = _fileList[file]; if(!item) { @@ -2124,7 +2124,7 @@ void CatalogManagerView::updateDir(QString relDir) contentList.remove(file); } - entryList=dir.entryList(QDir::Dirs,QDir::Name); + entryList=dir.entryList(TQDir::Dirs,TQDir::Name); for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) { @@ -2137,7 +2137,7 @@ void CatalogManagerView::updateDir(QString relDir) bool newDirAdded=false; - QString subDir=relDir+(*it)+"/"; + TQString subDir=relDir+(*it)+"/"; if(!_dirWatch->contains(poBaseDir+subDir)) { _dirWatch->addDir(poBaseDir+subDir); @@ -2180,11 +2180,11 @@ void CatalogManagerView::updateDir(QString relDir) // but only if we traversed also the template directory if(contentList.count()>0) { - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = contentList.constBegin(); it != contentList.constEnd(); ++it ) { - QFileInfo po(poBaseDir+(*it)); - QFileInfo pot(potBaseDir+(*it)); + TQFileInfo po(poBaseDir+(*it)); + TQFileInfo pot(potBaseDir+(*it)); if(!po.exists() && !pot.exists()) { @@ -2217,11 +2217,11 @@ void CatalogManagerView::updateDir(QString relDir) } } -void CatalogManagerView::directoryChanged(const QString& dir) +void CatalogManagerView::directoryChanged(const TQString& dir) { pause(true); - QString relDir, relDirPo, relDirPot; + TQString relDir, relDirPo, relDirPot; if(dir.startsWith(_settings.poBaseDir)) { relDirPo=dir.mid(_settings.poBaseDir.length()); @@ -2261,13 +2261,13 @@ void CatalogManagerView::directoryChanged(const QString& dir) kdDebug(KBABEL_CATMAN) << "directory changed: " << relDir << endl; - QFileInfo fileInfo(_settings.potBaseDir); + TQFileInfo fileInfo(_settings.potBaseDir); CatManListItem* thisItem=_dirList[relDir]; if(!thisItem) { // if this item is not in the list search for next existing parent item - QString prevRelDir; + TQString prevRelDir; do { prevRelDir=relDir; @@ -2312,11 +2312,11 @@ void CatalogManagerView::directoryChanged(const QString& dir) } -void CatalogManagerView::directoryDeleted(const QString& dir) +void CatalogManagerView::directoryDeleted(const TQString& dir) { pause(true); - QString relDir, relDirPo, relDirPot; + TQString relDir, relDirPo, relDirPot; if(dir.startsWith(_settings.poBaseDir)) { relDirPo=dir.mid(_settings.poBaseDir.length()); @@ -2371,10 +2371,10 @@ void CatalogManagerView::directoryDeleted(const QString& dir) } else { - QStringList childList = thisItem->contentsList(); + TQStringList childList = thisItem->contentsList(); CatManListItem* item; - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = childList.constBegin();it != childList.constEnd(); ++it ) { item=_fileList[(*it)]; @@ -2415,7 +2415,7 @@ void CatalogManagerView::directoryDeleted(const QString& dir) pause(false); } -void CatalogManagerView::fileInfoRead( QString filename ) +void CatalogManagerView::fileInfoRead( TQString filename ) { if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) { emit progress( ++_readInfoCount); @@ -2437,25 +2437,25 @@ void CatalogManagerView::setSettings(CatManSettings newSettings) _dirCommandsMenu->clear(); int counter=0; - for ( QStringList::const_iterator it = _settings.dirCommandNames.constBegin() + for ( TQStringList::const_iterator it = _settings.dirCommandNames.constBegin() ; it != _settings.dirCommandNames.constEnd(); ++it ) { _dirCommandsMenu->insertItem((*it),counter); counter++; } _dirCommandsMenu->insertSeparator(); - _dirCommandsMenu->insertItem(i18n("Log Window"),this,SLOT(showLog())); + _dirCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog())); _fileCommandsMenu->clear(); counter=0; - for ( QStringList::const_iterator it = _settings.fileCommandNames.constBegin() + for ( TQStringList::const_iterator it = _settings.fileCommandNames.constBegin() ; it != _settings.fileCommandNames.constEnd(); ++it ) { _fileCommandsMenu->insertItem((*it),counter); counter++; } _fileCommandsMenu->insertSeparator(); - _fileCommandsMenu->insertItem(i18n("Log Window"),this,SLOT(showLog())); + _fileCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog())); const bool pathChanged = (oldSettings.poBaseDir!=_settings.poBaseDir) || (oldSettings.potBaseDir!=_settings.potBaseDir); @@ -2463,10 +2463,10 @@ void CatalogManagerView::setSettings(CatManSettings newSettings) if(pathChanged) { if( !isActive() ) { - QTimer::singleShot(100,this,SLOT(buildTree())); + TQTimer::singleShot(100,this,TQT_SLOT(buildTree())); } else { stop(); - connect( this, SIGNAL( updateFinished() ), this, SLOT(buildTree() ) ); + connect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) ); } } @@ -2487,7 +2487,7 @@ CatManSettings CatalogManagerView::settings() const } -void CatalogManagerView::hideEvent(QHideEvent*) +void CatalogManagerView::hideEvent(TQHideEvent*) { pause(true); @@ -2495,9 +2495,9 @@ void CatalogManagerView::hideEvent(QHideEvent*) _dirWatch->stopScan(); } -void CatalogManagerView::showEvent(QShowEvent*) +void CatalogManagerView::showEvent(TQShowEvent*) { - QTimer::singleShot(1,this,SLOT(checkUpdate())); + TQTimer::singleShot(1,this,TQT_SLOT(checkUpdate())); pause(false); @@ -2505,15 +2505,15 @@ void CatalogManagerView::showEvent(QShowEvent*) _dirWatch->startScan(true); } -void CatalogManagerView::contentsMousePressEvent(QMouseEvent* event) +void CatalogManagerView::contentsMousePressEvent(TQMouseEvent* event) { if(event->button() == LeftButton) _pressPos=event->pos(); - QListView::contentsMousePressEvent( event ); + TQListView::contentsMousePressEvent( event ); } -void CatalogManagerView::contentsMouseMoveEvent(QMouseEvent* event) +void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event) { if(event->state() & LeftButton) { @@ -2526,29 +2526,29 @@ void CatalogManagerView::contentsMouseMoveEvent(QMouseEvent* event) { // always add the po-file and if existing the pot-file to the drag and // let the user decide what to do, when dropping into kbabel - QStrList uri; - uri.append(QUriDrag::localFileToUri(item->poFile())); + TQStrList uri; + uri.append(TQUriDrag::localFileToUri(item->poFile())); if(item->hasPot()) - uri.append(QUriDrag::localFileToUri(item->potFile())); + uri.append(TQUriDrag::localFileToUri(item->potFile())); - QUriDrag* drag = new QUriDrag(uri,this); - QPixmap icon=KGlobal::iconLoader()->loadIcon("txt",KIcon::Desktop); - drag->setPixmap(icon,QPoint(icon.width()/2,icon.height()/2)); + TQUriDrag* drag = new TQUriDrag(uri,this); + TQPixmap icon=KGlobal::iconLoader()->loadIcon("txt",KIcon::Desktop); + drag->setPixmap(icon,TQPoint(icon.width()/2,icon.height()/2)); drag->drag(); } else { - QListView::contentsMouseMoveEvent(event); + TQListView::contentsMouseMoveEvent(event); } } else { - QListView::contentsMouseMoveEvent(event); + TQListView::contentsMouseMoveEvent(event); } } else { - QListView::contentsMouseMoveEvent(event); + TQListView::contentsMouseMoveEvent(event); } } @@ -2568,7 +2568,7 @@ void CatalogManagerView::saveMarker( KConfig* config) const } -void CatalogManagerView::deleteDirItem(QString relDir) +void CatalogManagerView::deleteDirItem(TQString relDir) { CatManListItem* thisItem=_dirList[relDir]; @@ -2577,9 +2577,9 @@ void CatalogManagerView::deleteDirItem(QString relDir) _dirList.remove(relDir); - QStringList childList = thisItem->allChildrenList(); + TQStringList childList = thisItem->allChildrenList(); - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = childList.constBegin();it != childList.constEnd(); ++it ) { if(!_fileList.remove((*it))) @@ -2601,12 +2601,12 @@ void CatalogManagerView::processEnded(KProcess* proc) void CatalogManagerView::showOutput(KProcess*, char *buffer, int buflen) { - const QCString output(buffer,buflen+1); + const TQCString output(buffer,buflen+1); _logView->insert(output); } -void CatalogManagerView::columnClicked(QListViewItem * item, const QPoint &, int c) +void CatalogManagerView::columnClicked(TQListViewItem * item, const TQPoint &, int c) { if( item && c == COL_MARKER ) { @@ -2878,14 +2878,14 @@ void CatalogManagerView::gotoPreviousMarked() } } -QStringList CatalogManagerView::current() +TQStringList CatalogManagerView::current() { - QStringList result; + TQStringList result; CatManListItem *current = static_cast<CatManListItem *>(currentItem()); if( current->isDir() ) { - QStringList s = current->allChildrenList(true); - QStringList::const_iterator it; + TQStringList s = current->allChildrenList(true); + TQStringList::const_iterator it; for( it = s.constBegin() ; it != s.constEnd(); ++it ) { CatManListItem *item = _fileList[(*it)]; @@ -2899,11 +2899,11 @@ QStringList CatalogManagerView::current() return result; } -QStringList CatalogManagerView::marked() +TQStringList CatalogManagerView::marked() { - QStringList result; + TQStringList result; - QStringList::const_iterator it; + TQStringList::const_iterator it; for( it = _markerList.constBegin() ; it != _markerList.constEnd(); ++it ) { CatManListItem *item = _fileList[(*it)]; @@ -2943,9 +2943,9 @@ void CatalogManagerView::updateCurrent() } } -void CatalogManagerView::updateFiles( const QStringList& files ) +void CatalogManagerView::updateFiles( const TQStringList& files ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = files.constBegin( ); it != files.constEnd( ); ++it ) { updateFile( *it, true ); } @@ -2961,14 +2961,14 @@ SVNHandler * CatalogManagerView::svnHandler( ) return svnhandler; } -void CatalogManagerView::validateUsingTool( const KDataToolInfo &tool, const QString& command ) +void CatalogManagerView::validateUsingTool( const KDataToolInfo &tool, const TQString& command ) { - QStringList result; + TQStringList result; CatManListItem *current = static_cast<CatManListItem *>(currentItem()); if( current->isDir() ) { - const QStringList s = current->allChildrenList(true); - QStringList::const_iterator it; + const TQStringList s = current->allChildrenList(true); + TQStringList::const_iterator it; for( it = s.constBegin() ; it != s.constEnd(); ++it ) { CatManListItem *item = _fileList[(*it)]; @@ -2983,12 +2983,12 @@ void CatalogManagerView::validateUsingTool( const KDataToolInfo &tool, const QSt validate_internal( result, tool, command ); } -void CatalogManagerView::validateMarkedUsingTool( const KDataToolInfo &tool, const QString& command ) +void CatalogManagerView::validateMarkedUsingTool( const KDataToolInfo &tool, const TQString& command ) { validate_internal( _markerList, tool, command ); } -void CatalogManagerView::validate_internal( const QStringList& files, const KDataToolInfo &tool, const QString& ) +void CatalogManagerView::validate_internal( const TQStringList& files, const KDataToolInfo &tool, const TQString& ) { if( files.isEmpty() ) return; @@ -3015,7 +3015,7 @@ void CatalogManagerView::validate_internal( const QStringList& files, const KDat _validateOptions->ignoreFuzzy->setChecked( _ignoreFuzzy ); } - if( _validateOptionsDlg->exec() != QDialog::Accepted ) + if( _validateOptionsDlg->exec() != TQDialog::Accepted ) { delete t; @@ -3025,8 +3025,8 @@ void CatalogManagerView::validate_internal( const QStringList& files, const KDat if( !_validateDialog ) { _validateDialog = new ValidateProgressDialog(_settings.ignoreURL, this); - connect( _validateDialog, SIGNAL( errorDoubleClicked(const QString,const int)), - this, SLOT(showError( const QString, const int ))); + connect( _validateDialog, TQT_SIGNAL( errorDoubleClicked(const TQString,const int)), + this, TQT_SLOT(showError( const TQString, const int ))); } _markAsFuzzy = _validateOptions->markAsFuzzy->isChecked(); @@ -3035,9 +3035,9 @@ void CatalogManagerView::validate_internal( const QStringList& files, const KDat _validateDialog->setMarkAsFuzzy(_markAsFuzzy); _validateDialog->setIgnoreFuzzy(_ignoreFuzzy); - QPtrList<CatManListItem> fileitems; + TQPtrList<CatManListItem> fileitems; - for( QValueListConstIterator<QString> it=files.begin() ; it!=files.end() ; ++it ) + for( TQValueListConstIterator<TQString> it=files.begin() ; it!=files.end() ; ++it ) { CatManListItem* item=_fileList[ (*it) ]; if( item ) { @@ -3050,7 +3050,7 @@ void CatalogManagerView::validate_internal( const QStringList& files, const KDat delete t; } -void CatalogManagerView::showError( const QString package, const int num ) +void CatalogManagerView::showError( const TQString package, const int num ) { CatManListItem* item = _fileList[ package]; if( !item ) @@ -3064,9 +3064,9 @@ void CatalogManagerView::showError( const QString package, const int num ) void CatalogManagerView::updateMarkerList() { - QStringList newMarkers; + TQStringList newMarkers; - for( QStringList::const_iterator it = _markerList.constBegin(); it != _markerList.constEnd(); ++it ) { + for( TQStringList::const_iterator it = _markerList.constBegin(); it != _markerList.constEnd(); ++it ) { if( _fileList[ (*it) ] ) newMarkers.append( (*it) ); } diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h index e4421973..9c93d195 100644 --- a/kbabel/catalogmanager/catalogmanagerview.h +++ b/kbabel/catalogmanager/catalogmanagerview.h @@ -35,17 +35,17 @@ #ifndef CATALOGMANAGERVIEW_H #define CATALOGMANAGERVIEW_H -#include <qdict.h> -#include <qlistview.h> -#include <qdatetime.h> -#include <qtimer.h> -#include <qfileinfo.h> -#include <qguardedptr.h> +#include <tqdict.h> +#include <tqlistview.h> +#include <tqdatetime.h> +#include <tqtimer.h> +#include <tqfileinfo.h> +#include <tqguardedptr.h> #include <kdialogbase.h> #include <kdirwatch.h> #include <kprocess.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "kbproject.h" #include "projectsettings.h" @@ -78,7 +78,7 @@ class CatalogManagerView : public QListView { Q_OBJECT public: - CatalogManagerView(KBabel::Project::Ptr project, QWidget* parent=0, const char* name=0); + CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent=0, const char* name=0); virtual ~CatalogManagerView(); KBabel::CatManSettings settings() const; @@ -89,9 +89,9 @@ public: void pause(bool); /** if file fileWithPath exists in the treeview, this is updated */ - void updateFile(QString fileWithPath, bool force = false); + void updateFile(TQString fileWithPath, bool force = false); - void updateAfterSave(QString fileWithPath, KBabel::PoInfo &info); + void updateAfterSave(TQString fileWithPath, KBabel::PoInfo &info); bool isActive() const {return _active;} bool isStopped() const {return _stop;} @@ -99,10 +99,10 @@ public: void restoreView(KConfig *config); void saveView(KConfig *config) const; - void setRMBMenuFile( QPopupMenu *m); - void setRMBMenuDir( QPopupMenu *m); - void setDirCommandsMenu( QPopupMenu *m); - void setFileCommandsMenu( QPopupMenu *m); + void setRMBMenuFile( TQPopupMenu *m); + void setRMBMenuDir( TQPopupMenu *m); + void setDirCommandsMenu( TQPopupMenu *m); + void setFileCommandsMenu( TQPopupMenu *m); CVSHandler * cvsHandler(); SVNHandler * svnHandler(); @@ -184,7 +184,7 @@ public slots: void svnInfo(); void svnInfoMarked(); - QString find(KBabel::FindOptions &options, QStringList &rest); + TQString find(KBabel::FindOptions &options, TQStringList &rest); void showLog(); @@ -193,7 +193,7 @@ public slots: /** * Stop searching, do not try to proceed to the next file * @ref @find will return clear list of rest to be searched - * and @ref QString::null, if search string was not is the last searched file + * and @ref TQString::null, if search string was not is the last searched file */ void stopSearch(); @@ -201,7 +201,7 @@ public slots: * Information for this file has been read. If the file is in * @ref @_readInfoFileList, it will update progress bar by emitting @ref @progress */ - void fileInfoRead( QString file ); + void fileInfoRead( TQString file ); void gotoNextUntranslated(); void gotoPreviousUntranslated(); @@ -218,10 +218,10 @@ public slots: void gotoNextMarked(); void gotoPreviousMarked(); - void validateUsingTool( const KDataToolInfo &, const QString& ); - void validateMarkedUsingTool( const KDataToolInfo &, const QString& ); + void validateUsingTool( const KDataToolInfo &, const TQString& ); + void validateMarkedUsingTool( const KDataToolInfo &, const TQString& ); - void showError( const QString package, const int num); + void showError( const TQString package, const int num); void updateCurrent(); @@ -230,33 +230,33 @@ public slots: * after 'cvs commit' or 'svn commit' the file contents have not changed * but the CVS/SVN file status could have changed. */ - void updateFiles( const QStringList& files ); + void updateFiles( const TQStringList& files ); /** * Returns the list of all currently selected files. If current selection is dir, * it returns list of all its children. */ - QStringList current(); + TQStringList current(); /** * Returns the list of all currently marked files. */ - QStringList marked(); + TQStringList marked(); signals: - void openFile(QString filename,QString package); - void openFileInNewWindow(QString filename,QString package); - void openTemplate(QString openFilename,QString saveFileName,QString package); - void openTemplateInNewWindow(QString openFilename,QString saveFileName,QString package); - void gotoFileEntry(QString filename,QString package,int msgid); - void prepareProgressBar(QString msg,int max); + void openFile(TQString filename,TQString package); + void openFileInNewWindow(TQString filename,TQString package); + void openTemplate(TQString openFilename,TQString saveFileName,TQString package); + void openTemplateInNewWindow(TQString openFilename,TQString saveFileName,TQString package); + void gotoFileEntry(TQString filename,TQString package,int msgid); + void prepareProgressBar(TQString msg,int max); void progress(int); void clearProgressBar(); void prepareFindProgressBar(int max); void signalBuildTree(bool done); void signalSearchedFile(int count); - void newValidationFile(QString); - void newValidationTool(QString); + void newValidationFile(TQString); + void newValidationTool(TQString); void setValidationProgressBar(int); void advanceValidationFileProgressBar(int); void setMaxValidationProgressBar(int); @@ -284,7 +284,7 @@ protected: * @see CatalogManagerView::buildDir * @see CatalogManagerView::updateDir */ - bool buildDir(QString relDir,bool fast=true); + bool buildDir(TQString relDir,bool fast=true); /** * This function is traversing the real directory on the @@ -297,7 +297,7 @@ protected: * @see CatalogManagerView::buildDir * @see CatalogManagerView::updateDir */ - bool buildDir(const QString& baseDir,const QString& relDir, const QString extension,bool fast=true); + bool buildDir(const TQString& baseDir,const TQString& relDir, const TQString extension,bool fast=true); /** * updates dir relDir and if any new subdir is added @@ -306,27 +306,27 @@ protected: * This function doesn't enters subdirs except when a new subdir is added. * @see CatalogManagerView::buildDir */ - void updateDir(QString relDir); + void updateDir(TQString relDir); /** * stops the update timer and the dirwatch * @see KDirWatch::stop - * @see QTimer::stop + * @see TQTimer::stop */ - virtual void hideEvent(QHideEvent*); + virtual void hideEvent(TQHideEvent*); /** * restarts the update timer and the dirwatch * @see KDirWatch::start - * @see QTimer::start + * @see TQTimer::start */ - virtual void showEvent(QShowEvent*); + virtual void showEvent(TQShowEvent*); /** used for dragging */ - virtual void contentsMousePressEvent(QMouseEvent* e); + virtual void contentsMousePressEvent(TQMouseEvent* e); /** used for dragging */ - virtual void contentsMouseMoveEvent(QMouseEvent* e); + virtual void contentsMouseMoveEvent(TQMouseEvent* e); - void showStatistics( CatManListItem *i, QStringList &packages); + void showStatistics( CatManListItem *i, TQStringList &packages); protected slots: /** rebuilds the tree*/ @@ -338,13 +338,13 @@ protected slots: void checkUpdate(); /** this is called from KDirWatch when a directory has changed */ - void directoryChanged(const QString& dir); + void directoryChanged(const TQString& dir); /** this is called from KDirWatch when a directory has been deleted */ - void directoryDeleted(const QString& dir); + void directoryDeleted(const TQString& dir); - void showContentsMenu(QListViewItem *, const QPoint &, int col); + void showContentsMenu(TQListViewItem *, const TQPoint &, int col); /** does the default action on the currently selected item*/ - void activateItem(QListViewItem *); + void activateItem(TQListViewItem *); /** emits the state of the selected item using selectedChanged*/ void checkSelected(); /** calls @ref activateItem with the selected item as argument*/ @@ -366,7 +366,7 @@ protected slots: private slots: void showOutput(KProcess *proc, char *buffer, int buflen); void processEnded(KProcess *proc); - void columnClicked(QListViewItem * item, const QPoint & pnt, int c); + void columnClicked(TQListViewItem * item, const TQPoint & pnt, int c); void slotToggleCVSOrSVNColumn( bool ); @@ -396,33 +396,33 @@ private: * deletes item with package name (relative directory) relDir * and makes sure, that all subitems are removed from the lists */ - void deleteDirItem(QString relDir); + void deleteDirItem(TQString relDir); - bool hasMatchingWords( QStringList &itemWords, QStringList &searchWords); + bool hasMatchingWords( TQStringList &itemWords, TQStringList &searchWords); CatManListItem *itemBelow( CatManListItem *item ); CatManListItem *itemAbove( CatManListItem *item ); - void validate_internal( const QStringList&, const KDataToolInfo &, const QString& ); + void validate_internal( const TQStringList&, const KDataToolInfo &, const TQString& ); void doCVSCommand( CVS::Command cmd, bool marked = false, bool templates = false ); void doSVNCommand( SVN::Command cmd, bool marked = false, bool templates = false ); private: - QDict<CatManListItem> _dirList; - QDict<CatManListItem> _fileList; + TQDict<CatManListItem> _dirList; + TQDict<CatManListItem> _fileList; KDirWatch *_dirWatch; - QTimer *_updateTimer; + TQTimer *_updateTimer; // list of files for which was calculated the progress bar for reading file info - QStringList _readInfoFileList; + TQStringList _readInfoFileList; // current count of already read files in @ref @_readInfoFileList. int _readInfoCount; KBabel::CatManSettings _settings; - QStringList _markerList; + TQStringList _markerList; bool _active; // stopping, application quit @@ -431,17 +431,17 @@ private: bool _stopSearch; int _updateNesting; - QPtrList<KProcess> _pendingProcesses; + TQPtrList<KProcess> _pendingProcesses; - QTextEdit* _logView; + TQTextEdit* _logView; KDialogBase* _logWindow; - QPopupMenu* _fileContentsMenu; - QPopupMenu* _dirContentsMenu; - QPopupMenu* _dirCommandsMenu; - QPopupMenu* _fileCommandsMenu; + TQPopupMenu* _fileContentsMenu; + TQPopupMenu* _dirContentsMenu; + TQPopupMenu* _dirCommandsMenu; + TQPopupMenu* _fileCommandsMenu; /** used for starting a drag */ - QPoint _pressPos; + TQPoint _pressPos; KBabelDictBox* _dictBox; diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 249cb053..5613a0bd 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -42,29 +42,29 @@ #include <klocale.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qbitmap.h> -#include <qlabel.h> -#include <qpainter.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqbitmap.h> +#include <tqlabel.h> +#include <tqpainter.h> #include <cvshandler.h> #include <svnhandler.h> using namespace KBabel; -CatManListItem::CatManListItem(CatalogManagerView *view, QListViewItem* parent,QString fullPath,QString fullPotPath,QString package) - : QListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath,TQString fullPotPath,TQString package) + : TQListViewItem(parent) { _view = view; init(fullPath,fullPotPath,package); } -CatManListItem::CatManListItem(CatalogManagerView *view, QListView* parent,QString fullPath,QString fullPotPath) - : QListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath,TQString fullPotPath) + : TQListViewItem(parent) { - _primary=QFileInfo(fullPath); - _template=QFileInfo(fullPotPath); + _primary=TQFileInfo(fullPath); + _template=TQFileInfo(fullPotPath); _package="/"; _type=Dir; _marked=false; @@ -82,10 +82,10 @@ CatManListItem::CatManListItem(CatalogManagerView *view, QListView* parent,QStri } -void CatManListItem::init(const QString& fullPath, const QString& fullPotPath, const QString& package) +void CatManListItem::init(const TQString& fullPath, const TQString& fullPotPath, const TQString& package) { - _primary=QFileInfo(fullPath); - _template=QFileInfo(fullPotPath); + _primary=TQFileInfo(fullPath); + _template=TQFileInfo(fullPotPath); _package=package; _marked=false; @@ -97,7 +97,7 @@ void CatManListItem::init(const QString& fullPath, const QString& fullPotPath, c _template.setCaching(false); // set - _lastUpdated=QDate(1900,1,1); + _lastUpdated=TQDate(1900,1,1); _wordList.clear(); _wordListUpdated = false; @@ -141,11 +141,11 @@ bool CatManListItem::marked() const void CatManListItem::setOpen(bool open) { bool needWork = needsWork(); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if(open && _type==Dir) { - QPixmap icon; + TQPixmap icon; icon = needWork ? ICON_FOLDER_OPEN_WORK : ICON_FOLDER_OPEN_OK; if(!_template.exists()) @@ -164,7 +164,7 @@ void CatManListItem::setOpen(bool open) } else { - QPixmap icon; + TQPixmap icon; if(needsWork()) icon = ICON_FOLDER_CLOSED_WORK; @@ -181,14 +181,14 @@ void CatManListItem::setOpen(bool open) } -QStringList CatManListItem::allChildrenList(bool onlyFiles) const +TQStringList CatManListItem::allChildrenList(bool onlyFiles) const { - QStringList childrenList; + TQStringList childrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) { - QString name=myChild->package(); + TQString name=myChild->package(); if(myChild->isFile()) { @@ -209,9 +209,9 @@ QStringList CatManListItem::allChildrenList(bool onlyFiles) const } -QStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const +TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const { - QStringList childrenList; + TQStringList childrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -238,14 +238,14 @@ QStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, } -QStringList CatManListItem::contentsList(bool onlyFiles) const +TQStringList CatManListItem::contentsList(bool onlyFiles) const { - QStringList childList; + TQStringList childList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) { - QString name=myChild->package(); + TQString name=myChild->package(); if(onlyFiles) { @@ -292,10 +292,10 @@ void CatManListItem::checkUpdate(bool noParents) } } -QString CatManListItem::key(int col, bool) const +TQString CatManListItem::key(int col, bool) const { // show directories first - QString key=text(col); + TQString key=text(col); if(col==COL_NAME) { @@ -356,7 +356,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren { if(_primary.isDir()) { - QDir dir=_primary.dir(); + TQDir dir=_primary.dir(); setText(COL_NAME,dir.dirName()); // count the childen numbers @@ -374,15 +374,15 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren ch = static_cast<CatManListItem*>(ch->nextSibling()); } - setText(COL_FUZZY,QString::number(fuzzy)); - setText(COL_UNTRANS,QString::number(untrans)); - setText(COL_TOTAL,QString::number(total)); + setText(COL_FUZZY,TQString::number(fuzzy)); + setText(COL_UNTRANS,TQString::number(untrans)); + setText(COL_TOTAL,TQString::number(total)); //setSelectable(false); _type=Dir; bool needWork = needsWork(); - QPixmap icon; + TQPixmap icon; if(!isOpen()) { if( needWork ) @@ -403,7 +403,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren } else { - QPixmap folder = icon; + TQPixmap folder = icon; icon=paintExclamation(&folder); setPixmap(COL_NAME,folder); @@ -412,18 +412,18 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren else // primary is file { _type=File; - QString name=_primary.fileName(); + TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); if(showPoInfo) { - _lastUpdated=QDateTime::currentDateTime(); + _lastUpdated=TQDateTime::currentDateTime(); bool neededWork=needsWork(); bool needWork=false; PoInfo poInfo; - QPixmap icon = ICON_UPDATING; + TQPixmap icon = ICON_UPDATING; setPixmap(COL_NAME,icon); if ( PoInfo::info( _primary.absFilePath(), poInfo, _wordList, updateWordList, true, true ) == OK ) { @@ -441,7 +441,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren _isModified = cvsHandler->isConsideredModified( cvsFileStatus ) || svnHandler->isConsideredModified( svnFileStatus ); - QString versionControl; + TQString versionControl; if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) versionControl = cvsHandler->fileStatus( cvsFileStatus ); else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) @@ -449,9 +449,9 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren else versionControl = i18n("No version control"); - setText(COL_FUZZY,QString::number(poInfo.fuzzy)); - setText(COL_UNTRANS,QString::number(poInfo.untranslated)); - setText(COL_TOTAL,QString::number(poInfo.total)); + setText(COL_FUZZY,TQString::number(poInfo.fuzzy)); + setText(COL_UNTRANS,TQString::number(poInfo.untranslated)); + setText(COL_TOTAL,TQString::number(poInfo.total)); setText( COL_CVS_OR_SVN, versionControl ); setText(COL_REVISION,poInfo.revision); setText(COL_TRANSLATOR,poInfo.lastTranslator); @@ -492,7 +492,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren { if(_template.isDir()) { - QDir dir=_template.dir(); + TQDir dir=_template.dir(); setText(COL_NAME,dir.dirName()); //setSelectable(false); _type=Dir; @@ -508,10 +508,10 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren ch = static_cast<CatManListItem*>(ch->nextSibling()); } - setText(COL_TOTAL,QString::number(total)); + setText(COL_TOTAL,TQString::number(total)); - QPixmap icon; + TQPixmap icon; if(!isOpen()) { icon = ICON_FOLDER_CLOSED_WORK; @@ -527,20 +527,20 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren else { _type=File; - QString name=_primary.fileName(); + TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); if(showPoInfo) { - _lastUpdated=QDateTime::currentDateTime(); + _lastUpdated=TQDateTime::currentDateTime(); // clean previous state information - setText(COL_FUZZY,QString::null); - setText(COL_UNTRANS,QString::null); - setText(COL_TOTAL,QString::null); - setText(COL_CVS_OR_SVN, QString::null); - setText(COL_REVISION, QString::null); - setText(COL_TRANSLATOR, QString::null); + setText(COL_FUZZY,TQString::null); + setText(COL_UNTRANS,TQString::null); + setText(COL_TOTAL,TQString::null); + setText(COL_CVS_OR_SVN, TQString::null); + setText(COL_REVISION, TQString::null); + setText(COL_TRANSLATOR, TQString::null); setPixmap(COL_NAME,ICON_UPDATING); @@ -548,7 +548,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if ( PoInfo::info( _template.absFilePath(), poInfo, _wordList, false, true, true ) == OK ) { if( _view->isStopped() ) return; - setText(COL_TOTAL,QString::number(poInfo.total)); + setText(COL_TOTAL,TQString::number(poInfo.total)); } if( _view->isStopped() ) return; } @@ -614,21 +614,21 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) // primary is existent file _type=File; - QString name=_primary.fileName(); + TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); - _lastUpdated=QDateTime::currentDateTime(); + _lastUpdated=TQDateTime::currentDateTime(); bool neededWork=needsWork(); bool needWork=false; - QPixmap icon; + TQPixmap icon; _hasErrors=false; const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile()); const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile()); - QString versionControl; + TQString versionControl; if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus ); else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) @@ -636,9 +636,9 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) else versionControl = i18n("No version control"); - setText(COL_FUZZY,QString::number(poInfo.fuzzy)); - setText(COL_UNTRANS,QString::number(poInfo.untranslated)); - setText(COL_TOTAL,QString::number(poInfo.total)); + setText(COL_FUZZY,TQString::number(poInfo.fuzzy)); + setText(COL_UNTRANS,TQString::number(poInfo.untranslated)); + setText(COL_TOTAL,TQString::number(poInfo.total)); setText( COL_CVS_OR_SVN, versionControl ); setText(COL_REVISION,poInfo.revision); setText(COL_TRANSLATOR,poInfo.lastTranslator); @@ -777,17 +777,17 @@ bool CatManListItem::isFile() const return type()==File; } -QString CatManListItem::poFile() const +TQString CatManListItem::poFile() const { return _primary.absFilePath(); } -QString CatManListItem::potFile() const +TQString CatManListItem::potFile() const { return _template.absFilePath(); } -QString CatManListItem::package(bool rootSlash) const +TQString CatManListItem::package(bool rootSlash) const { if(rootSlash) return _package; @@ -797,21 +797,21 @@ QString CatManListItem::package(bool rootSlash) const } } -QString CatManListItem::packageDir( ) const +TQString CatManListItem::packageDir( ) const { - return ( _type == Dir ? _package : QString::null ); + return ( _type == Dir ? _package : TQString::null ); } -QString CatManListItem::name() const +TQString CatManListItem::name() const { int index = _package.findRev("/"); return _package.right(_package.length()-index-1); } -QPixmap CatManListItem::paintExclamation(QPixmap* pixmap) +TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap) { if(!pixmap || pixmap->isNull()) - return QPixmap(0,0); + return TQPixmap(0,0); if(_package=="/" && _template.filePath().isEmpty()) return *pixmap; @@ -827,17 +827,17 @@ QPixmap CatManListItem::paintExclamation(QPixmap* pixmap) int diameter=QMIN(width,height); - QBitmap mask=pixmap->createHeuristicMask(); + TQBitmap mask=pixmap->createHeuristicMask(); - QPainter mp(&mask); - mp.setPen(QPen(Qt::color1,1)); + TQPainter mp(&mask); + mp.setPen(TQPen(Qt::color1,1)); mp.drawEllipse(width-diameter,height-diameter,diameter,diameter); - QPixmap result(width,height); + TQPixmap result(width,height); - QPainter p(&result); + TQPainter p(&result); p.drawPixmap(0,0,*pixmap); - p.setPen( QPen(red,1) ); + p.setPen( TQPen(red,1) ); p.drawEllipse(width-diameter,height-diameter,diameter,diameter); result.setMask(mask); @@ -845,9 +845,9 @@ QPixmap CatManListItem::paintExclamation(QPixmap* pixmap) return result; } -QListViewItem *CatManListItem::previousSibling() +TQListViewItem *CatManListItem::previousSibling() { - QListViewItem * i = parent(); + TQListViewItem * i = parent(); if( !i ) return i; i = i->firstChild(); if( !i ) return i; @@ -856,22 +856,22 @@ QListViewItem *CatManListItem::previousSibling() return i; } -QListViewItem *CatManListItem::lastChild() +TQListViewItem *CatManListItem::lastChild() { - QListViewItem * i = firstChild(); + TQListViewItem * i = firstChild(); if( !i ) return i; while( i->nextSibling() ) i = i->nextSibling(); return i; } -void CatManListItem::checkErrors(KDataTool* tool, QObject* progressSignalHandler, bool ignoreFuzzy, bool markAsFuzzy) +void CatManListItem::checkErrors(KDataTool* tool, TQObject* progressSignalHandler, bool ignoreFuzzy, bool markAsFuzzy) { bool hasError=false; _errors.clear(); Catalog* cat = new Catalog(); - QObject::connect( cat, SIGNAL( signalProgress(int) ), progressSignalHandler, SIGNAL( setValidationProgressBar(int))); - QObject::connect( cat, SIGNAL( signalResetProgressBar(QString, int) ), progressSignalHandler, SLOT( setupFileProgressBar(QString, int))); + TQObject::connect( cat, TQT_SIGNAL( signalProgress(int) ), progressSignalHandler, TQT_SIGNAL( setValidationProgressBar(int))); + TQObject::connect( cat, TQT_SIGNAL( signalResetProgressBar(TQString, int) ), progressSignalHandler, TQT_SLOT( setupFileProgressBar(TQString, int))); if( cat->openURL(KURL( poFile() )) == OK ) { @@ -887,7 +887,7 @@ void CatManListItem::checkErrors(KDataTool* tool, QObject* progressSignalHandler if( hasError ) { - QString errortext; + TQString errortext; _hasErrors = true; DocPosition dummy; diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h index a5f41e2f..00fc3842 100644 --- a/kbabel/catalogmanager/catmanlistitem.h +++ b/kbabel/catalogmanager/catmanlistitem.h @@ -38,10 +38,10 @@ #include <config.h> #endif -#include <qstringlist.h> -#include <qlistview.h> -#include <qdatetime.h> -#include <qfileinfo.h> +#include <tqstringlist.h> +#include <tqlistview.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> #include "validateprogress.h" @@ -60,24 +60,24 @@ public: /** the type of this item */ enum Type{File,Dir}; - CatManListItem(CatalogManagerView *view, QListViewItem* parent,QString fullPath - ,QString fullPotPath,QString package); + CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath + ,TQString fullPotPath,TQString package); /** creates the toplevel root item with package name "/" */ - CatManListItem(CatalogManagerView *view, QListView* parent,QString fullPath, QString fullPotPath); + CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath, TQString fullPotPath); /** * returns the package names (including relative path) of the * children of this item */ - QStringList contentsList(bool onlyFiles=false) const; + TQStringList contentsList(bool onlyFiles=false) const; /** * returns the package names of all children of this item * (including all subdirectries) * @param onlyFiles flag, if only the names of files should be returned * @see CatManListItem::contentsList */ - QStringList allChildrenList(bool onlyFiles=false) const; + TQStringList allChildrenList(bool onlyFiles=false) const; /** * returns the relative file names of all children of this item @@ -87,7 +87,7 @@ public: * @param onlyModified, if only modified files should be returned * @see CatManListItem::contentsList */ - QStringList allChildrenFileList(bool onlyFiles=false, bool emptyDirs=false, bool onlyModified=false) const; + TQStringList allChildrenFileList(bool onlyFiles=false, bool emptyDirs=false, bool onlyModified=false) const; void setMarked(bool on); bool marked() const; @@ -110,20 +110,20 @@ public: * @param ignoreFuzzy flag, whether fuzzy messages in the file should be not checked * @param markAsFuzzy flag, whether the error messages should be marked as fuzzy (this alters the PO file) */ - void checkErrors(KDataTool* validator, QObject* progressSignalHandler, bool ignoreFuzzy, bool markAsFuzzy); + void checkErrors(KDataTool* validator, TQObject* progressSignalHandler, bool ignoreFuzzy, bool markAsFuzzy); /** return the absolute filename of the po-File */ - QString poFile() const; + TQString poFile() const; /** return the absolute filename of the pot-File */ - QString potFile() const; + TQString potFile() const; /** returns the package name (inlcuding relative path to base-directory) */ - QString package(bool rootSlash=true) const; + TQString package(bool rootSlash=true) const; - /** returns the relative path of a dir or QString::null if not a dir. */ - QString packageDir( ) const; + /** returns the relative path of a dir or TQString::null if not a dir. */ + TQString packageDir( ) const; /** returns the package name (without path) */ - QString name() const; + TQString name() const; /** * returns the type of this item @@ -159,25 +159,25 @@ public: * @return true, if there were errors while parsing the file */ bool hasErrors() const {return _hasErrors;} - QValueList<IgnoreItem> errors() const {return _errors;} + TQValueList<IgnoreItem> errors() const {return _errors;} - virtual QString key(int col,bool) const; + virtual TQString key(int col,bool) const; virtual void setOpen(bool); /** paints the marking, if this package has no template */ - QPixmap paintExclamation(QPixmap*); + TQPixmap paintExclamation(TQPixmap*); void updateAfterSave( KBabel::PoInfo &po); - QStringList &wordList() { return _wordList; } + TQStringList &wordList() { return _wordList; } bool wordsUpdated() { return _wordListUpdated; } /** These are not in Qt, so we need to implement it ourselves*/ - QListViewItem *previousSibling(); - QListViewItem *lastChild(); + TQListViewItem *previousSibling(); + TQListViewItem *lastChild(); private: - void init(const QString& fullPath, const QString& fullPotPath,const QString& package); + void init(const TQString& fullPath, const TQString& fullPotPath,const TQString& package); /** * updates the item * @param showPoInfo if true, reads information about the @@ -197,12 +197,12 @@ private: * last updated. This is used to check, if the file * on the disc has changed since last update. */ - QDateTime _lastUpdated; + TQDateTime _lastUpdated; /** the po-file */ - QFileInfo _primary; + TQFileInfo _primary; /** the pot-file */ - QFileInfo _template; + TQFileInfo _template; /** * The package name, includes the relative path beginning * at the base directory. @@ -210,7 +210,7 @@ private: * The root item has the package name "/" * @see CatManListItem::CatManListItem */ - QString _package; + TQString _package; Type _type; bool _marked; @@ -225,13 +225,13 @@ private: /** flag, if the PO-file has a syntax error */ bool _hasErrors; /** a list of errors found by validation tool*/ - QValueList<IgnoreItem> _errors; + TQValueList<IgnoreItem> _errors; /** parent view for this item, used for stopping the activity */ CatalogManagerView *_view; /** index of words, but it does not contain any useful information as values */ - QStringList _wordList; + TQStringList _wordList; bool _wordListUpdated; }; diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index b11a20d8..becffa51 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -32,10 +32,10 @@ **************************************************************************** */ #include "findinfilesdialog.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kdebug.h> @@ -44,19 +44,19 @@ using namespace KBabel; -FindInFilesDialog::FindInFilesDialog(bool forReplace, QWidget* parent) +FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent) :FindDialog(forReplace, parent) { - QGroupBox* box = new QGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget()); + TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget()); mainWidget()->layout()->add(box); - _inAllFiles = new QCheckBox(i18n("&In all files"),box); - _inMarked = new QCheckBox(i18n("&Marked files"),box); - _inTemplates = new QCheckBox(i18n("In &templates"),box); - _askForNextFile = new QCheckBox(i18n("Ask before ne&xt file"),box); - _askForSave = new QCheckBox(i18n("Save &without asking"),box); + _inAllFiles = new TQCheckBox(i18n("&In all files"),box); + _inMarked = new TQCheckBox(i18n("&Marked files"),box); + _inTemplates = new TQCheckBox(i18n("In &templates"),box); + _askForNextFile = new TQCheckBox(i18n("Ask before ne&xt file"),box); + _askForSave = new TQCheckBox(i18n("Save &without asking"),box); - QWhatsThis::add(box,i18n("<qt><p><b>File Options</b></p>" + TQWhatsThis::add(box,i18n("<qt><p><b>File Options</b></p>" "<p>Here you can finetune where to find:" "<ul><li><b>In all files</b>: search in all files, otherwise searched " "is the selected file or files in the selected folder</li>" @@ -71,14 +71,14 @@ FindInFilesDialog::~FindInFilesDialog() saveSettings(); } -int FindInFilesDialog::show(QString initialStr) +int FindInFilesDialog::show(TQString initialStr) { FindDialog::show(initialStr); int r = result(); - if( r == QDialog::Accepted ) { + if( r == TQDialog::Accepted ) { if( isReplaceDialog() ) { ReplaceOptions options = replaceOpts(); options.inAllFiles = _inAllFiles->isChecked(); @@ -102,13 +102,13 @@ int FindInFilesDialog::show(QString initialStr) return r; } -int FindInFilesDialog::exec(QString initialStr) +int FindInFilesDialog::exec(TQString initialStr) { FindDialog::exec(initialStr); int r = result(); - if( r == QDialog::Accepted ) { + if( r == TQDialog::Accepted ) { if(isReplaceDialog()) { ReplaceOptions options = replaceOpts(); options.inAllFiles = _inAllFiles->isChecked(); diff --git a/kbabel/catalogmanager/findinfilesdialog.h b/kbabel/catalogmanager/findinfilesdialog.h index fd25f845..608e78e0 100644 --- a/kbabel/catalogmanager/findinfilesdialog.h +++ b/kbabel/catalogmanager/findinfilesdialog.h @@ -46,7 +46,7 @@ public: * Constructor * @param replaceDlg flag, if this is a replace dialog */ - FindInFilesDialog(bool replaceDlg, QWidget* parent); + FindInFilesDialog(bool replaceDlg, TQWidget* parent); ~FindInFilesDialog(); /** @@ -56,7 +56,7 @@ public: * * @return the result code of the dialog */ - int show(QString initialStr); + int show(TQString initialStr); /** * executes the dialog as modal @@ -65,7 +65,7 @@ public: * * @return the result code of the dialog */ - int exec(QString initialStr); + int exec(TQString initialStr); void setFindOpts(KBabel::FindOptions options); void setReplaceOpts(KBabel::ReplaceOptions options); @@ -75,11 +75,11 @@ protected: void saveSettings(); private: - QCheckBox *_inAllFiles; - QCheckBox *_inTemplates; - QCheckBox *_inMarked; - QCheckBox *_askForNextFile; - QCheckBox *_askForSave; + TQCheckBox *_inAllFiles; + TQCheckBox *_inTemplates; + TQCheckBox *_inMarked; + TQCheckBox *_askForNextFile; + TQCheckBox *_askForSave; }; #endif // FINDDIALOG_H diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index af76d9d0..090b3de3 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -33,18 +33,18 @@ // Qt include files -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qfileinfo.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtextedit.h> -#include <qtextcodec.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqfileinfo.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtextedit.h> +#include <tqtextcodec.h> // KDE include files #include <kconfig.h> #include <kdebug.h> @@ -60,16 +60,16 @@ #include "cvsdialog.h" -CVSDialog::CVSDialog( CVS::Command cmd, QWidget * parent, KSharedConfig* config ) +CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ) : KDialog( parent, "CVSDIALOG", true ), m_config( config ) { _cmd = cmd; p=0L; setCaption( i18n( "CVS Dialog" ) ); - QString temp; + TQString temp; - QVBoxLayout * layout = new QVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the CVS command. switch ( cmd ) { @@ -86,54 +86,54 @@ CVSDialog::CVSDialog( CVS::Command cmd, QWidget * parent, KSharedConfig* config temp = i18n( "Get diff for the following files:" ); break; } - layout->addWidget( new QLabel( temp, this ) ); + layout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. - filebox = new QListBox( this ); + filebox = new TQListBox( this ); layout->addWidget( filebox ); // Add special widgets for 'cvs commit'. if ( cmd == CVS::Commit ) { - QLabel * label; + TQLabel * label; // Combobox for displaying old log messages. - label = new QLabel( i18n( "&Old messages:" ), this ); - oldMessages = new QComboBox( this ); + label = new TQLabel( i18n( "&Old messages:" ), this ); + oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); layout->addWidget( label ); layout->addWidget( oldMessages ); // Textfield for entering a log message. - label = new QLabel( i18n( "&Log message:" ), this ); - logedit = new QTextEdit( this ); + label = new TQLabel( i18n( "&Log message:" ), this ); + logedit = new TQTextEdit( this ); label->setBuddy( logedit ); layout->addWidget( label ); layout->addWidget( logedit ); - label = new QLabel( i18n( "E&ncoding:" ), this ); + label = new TQLabel( i18n( "E&ncoding:" ), this ); m_encodingComboBox = new KComboBox( this ); label->setBuddy( m_encodingComboBox ); layout->addWidget( label ); layout->addWidget( m_encodingComboBox ); - QStringList encodingList; + TQStringList encodingList; // The last encoding will be added at the top of the list, when the seetings will be read. encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); - encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( QTextCodec::codecForLocale()->mimeName() ); + encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_encodingComboBox->insertStringList( encodingList ); - connect( oldMessages, SIGNAL( activated( int ) ), - this, SLOT( slotComboActivated( int ) ) ); + connect( oldMessages, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotComboActivated( int ) ) ); } - QHBoxLayout * buttons = new QHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); + TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); // Add special buttons for 'cvs commit'. if ( cmd == CVS::Commit ) { - autoAddBox = new QCheckBox( i18n( "Auto&matically add files if necessary" ), this ); + autoAddBox = new TQCheckBox( i18n( "Auto&matically add files if necessary" ), this ); buttons->addWidget( autoAddBox ); } - buttons->addItem( new QSpacerItem( 1, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + buttons->addItem( new TQSpacerItem( 1, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); // Set the main button's text depending on the CVS comand. switch ( cmd ) { @@ -150,33 +150,33 @@ CVSDialog::CVSDialog( CVS::Command cmd, QWidget * parent, KSharedConfig* config temp = i18n( "&Get Diff" ); break; } - mainBtn = new QPushButton( temp, this ); + mainBtn = new TQPushButton( temp, this ); mainBtn->setDefault( true ); buttons->addWidget( mainBtn ); - cancelBtn = new QPushButton( i18n( "C&ancel" ), this ); + cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); layout->addLayout( buttons ); - QFrame * line = new QFrame( this ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame * line = new TQFrame( this ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); layout->addWidget( line ); - layout->addWidget( new QLabel( i18n( "Command output:" ), this ) ); + layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); - output = new QTextEdit( this ); + output = new TQTextEdit( this ); output->setReadOnly( true ); layout->addWidget( output ); - resize( QSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); if ( cmd == CVS::Commit ) logedit->setFocus( ); readSettings( ); - connect( mainBtn, SIGNAL( clicked( ) ), this, SLOT( slotExecuteCommand( ) ) ); - connect( cancelBtn, SIGNAL( clicked( ) ), this, SLOT( reject( ) ) ); + connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) ); + connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) ); } void CVSDialog::slotComboActivated( int index ) @@ -197,17 +197,17 @@ void CVSDialog::accept( ) KDialog::accept( ); } -void CVSDialog::setFiles( const QStringList& files ) +void CVSDialog::setFiles( const TQStringList& files ) { filebox->insertStringList( files ); } -void CVSDialog::setCommandLine( const QString& command ) +void CVSDialog::setCommandLine( const TQString& command ) { _commandLine = command; } -void CVSDialog::setAddCommand( const QString& command ) +void CVSDialog::setAddCommand( const TQString& command ) { _addCommand = command; } @@ -228,7 +228,7 @@ void CVSDialog::slotExecuteCommand( ) if ( autoAddBox->isChecked( ) && !_addCommand.isEmpty( ) ) _commandLine.prepend( _addCommand ); - const QString msg( logedit->text() ); + const TQString msg( logedit->text() ); if ( msg.isEmpty() ) { @@ -240,7 +240,7 @@ void CVSDialog::slotExecuteCommand( ) } m_encoding = KGlobal::charsets()->encodingForName( m_encodingComboBox->currentText() ); - QTextCodec* codec = QTextCodec::codecForName( m_encoding.utf8() ); + TQTextCodec* codec = TQTextCodec::codecForName( m_encoding.utf8() ); if ( !codec ) { @@ -259,10 +259,10 @@ void CVSDialog::slotExecuteCommand( ) // Write the commit log message from the input field to a temporary file m_tempFile = new KTempFile; m_tempFile->setAutoDelete( true ); - QTextStream* stream = m_tempFile->textStream(); + TQTextStream* stream = m_tempFile->textStream(); if ( !stream ) { - kdError() << "Could not create QTextStream for file " << m_tempFile->name(); + kdError() << "Could not create TQTextStream for file " << m_tempFile->name(); delete m_tempFile; m_tempFile = 0; KMessageBox::error( this, i18n( "Cannot open temporary file for writing. Aborting.") ); @@ -286,7 +286,7 @@ void CVSDialog::slotExecuteCommand( ) // Update the list of log messages if ( !msg.isEmpty() ) { - const QString shortLog = KStringHandler::csqueeze( msg, 80 ); + const TQString shortLog = KStringHandler::csqueeze( msg, 80 ); // Remove the message from the list if it already exists @@ -301,12 +301,12 @@ void CVSDialog::slotExecuteCommand( ) // Set the KProcess' command line. *p << _commandLine; - connect( p, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT ( slotProcessStdout( KProcess*, char*, int ) ) ); - connect( p, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT ( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( p, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotProcessExited( KProcess* ) ) ); + connect( p, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT ( slotProcessStdout( KProcess*, char*, int ) ) ); + connect( p, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT ( slotProcessStderr( KProcess*, char*, int ) ) ); + connect( p, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); output->append( i18n( "[ Starting command ]" ) ); @@ -325,22 +325,22 @@ void CVSDialog::slotExecuteCommand( ) void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len ) { - output->append( QString::fromLocal8Bit( buffer, len ) ); + output->append( TQString::fromLocal8Bit( buffer, len ) ); // Set the cursor's position at the end of the output. output->setCursorPosition( output->lines( ), 0 ); // If the command is 'cvs status' or 'cvs diff' collect the output of stdout. if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) ) - _statusOutput += QString::fromLocal8Bit( buffer, len ); + _statusOutput += TQString::fromLocal8Bit( buffer, len ); } void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len ) { // If an error occurs while executing the command display stderr in // another color. - QColor oldColor( output->color( ) ); + TQColor oldColor( output->color( ) ); output->setColor( Qt::red ); - output->append( QString::fromLocal8Bit( buffer, len ) ); + output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); } @@ -358,7 +358,7 @@ void CVSDialog::slotProcessExited( KProcess * p ) mainBtn->setText( i18n( "&Show Diff" ) ); else mainBtn->setText( i18n( "&Close" ) ); - connect( mainBtn, SIGNAL( clicked( ) ), this, SLOT( accept( ) ) ); + connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) ); // Reenable the button and the log edit now that the process is finished. mainBtn->setEnabled( true ); @@ -366,7 +366,7 @@ void CVSDialog::slotProcessExited( KProcess * p ) logedit->setEnabled( true ); } -QString CVSDialog::statusOutput( ) +TQString CVSDialog::statusOutput( ) { return _statusOutput; } @@ -383,14 +383,14 @@ void CVSDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( QString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) { - const QString logMessage = config->readEntry( QString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) // ### FIXME: if the string matches the squeezed 80 chars, it might overwrite another entry - const QString shortLog = KStringHandler::csqueeze( logMessage ); + const TQString shortLog = KStringHandler::csqueeze( logMessage ); m_logMessages.append( logMessage ); m_squeezedLogMessages.append( shortLog ); oldMessages->insertItem( shortLog ); @@ -411,9 +411,9 @@ void CVSDialog::saveSettings( ) // Write the log messages to the config file. int cnt = 0; - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( QString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); config->writeEntry( "CVSEncoding", m_encoding ); } diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h index 658e9883..1ed312fe 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.h +++ b/kbabel/catalogmanager/libcvs/cvsdialog.h @@ -72,30 +72,30 @@ class CVSDialog : public KDialog * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - CVSDialog( CVS::Command cmd, QWidget * parent, KSharedConfig* config ); + CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ); ~CVSDialog(); /** * Set the list of files which will be used for the CVS command. * @param files The list of files. */ - void setFiles( const QStringList& files ); + void setFiles( const TQStringList& files ); /** * Set the command line for the execution of the CVS command. * @param command The command line. */ - void setCommandLine( const QString& command ); + void setCommandLine( const TQString& command ); /** * Set the command line for adding files to the CVS repository. * This method is only used together with a 'cvs commit' for automatically * adding files which are not yet in the repository. * @param command The command line. */ - void setAddCommand( const QString& command ); + void setAddCommand( const TQString& command ); /** * Return the output of a 'cvs status' command. * @returns The complete output. */ - QString statusOutput( ); + TQString statusOutput( ); protected: /** @@ -123,30 +123,30 @@ class CVSDialog : public KDialog private: CVS::Command _cmd; - QPushButton * mainBtn; - QPushButton * cancelBtn; - QListBox * filebox; - QComboBox * oldMessages; - QTextEdit * logedit; - QTextEdit * output; - QCheckBox * autoAddBox; + TQPushButton * mainBtn; + TQPushButton * cancelBtn; + TQListBox * filebox; + TQComboBox * oldMessages; + TQTextEdit * logedit; + TQTextEdit * output; + TQCheckBox * autoAddBox; KProcess * p; - QString _commandLine; - QString _addCommand; - QString _statusOutput; + TQString _commandLine; + TQString _addCommand; + TQString _statusOutput; /// Log messages (long version) - QStringList m_logMessages; + TQStringList m_logMessages; /// Log messages (short version) - QStringList m_squeezedLogMessages; + TQStringList m_squeezedLogMessages; /// Temporary file (for commits) KTempFile* m_tempFile; /// Encoding for the commit log message - QString m_encoding; + TQString m_encoding; /// Combo box for the encoding KComboBox* m_encodingComboBox; diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index d3f2ae18..66eeac0a 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -37,12 +37,12 @@ #include <time.h> #include <unistd.h> // Qt include files -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> // KDE include files #include <kapplication.h> #include <klocale.h> @@ -52,17 +52,17 @@ #include "cvshandler.h" -CVSHandler::CVSHandler( const QString& poBaseDir, const QString& potBaseDir ) +CVSHandler::CVSHandler( const TQString& poBaseDir, const TQString& potBaseDir ) { setPOBaseDir( poBaseDir ); setPOTBaseDir( potBaseDir ); _autoUpdateTemplates = false; } -void CVSHandler::setPOBaseDir( const QString& dir ) +void CVSHandler::setPOBaseDir( const TQString& dir ) { // check if 'CVS/Entries' exists in the PO base directory - if ( QFileInfo( dir + "/CVS/Entries" ).exists( ) ) { + if ( TQFileInfo( dir + "/CVS/Entries" ).exists( ) ) { _isPORepository = true; _poBaseDir = dir; } else @@ -70,10 +70,10 @@ void CVSHandler::setPOBaseDir( const QString& dir ) emit signalIsPORepository( _isPORepository ); } -void CVSHandler::setPOTBaseDir( const QString& dir ) +void CVSHandler::setPOTBaseDir( const TQString& dir ) { // check if 'CVS/Entries' exists in the POT base directory - if ( QFileInfo( dir + "/CVS/Entries" ).exists( ) ) { + if ( TQFileInfo( dir + "/CVS/Entries" ).exists( ) ) { _isPOTRepository = true; _potBaseDir = dir; } else @@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const QString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -QString CVSHandler::fileStatus( const FileStatus status ) const +TQString CVSHandler::fileStatus( const FileStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -111,29 +111,29 @@ QString CVSHandler::fileStatus( const FileStatus status ) const } } -CVSHandler::FileStatus CVSHandler::fstatus( const QString& filename ) const +CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) return NO_REPOSITORY; - QString fn( filename ); - fn = fn.remove( QRegExp( "/$" ) ); + TQString fn( filename ); + fn = fn.remove( TQRegExp( "/$" ) ); - QFileInfo info( fn ); + TQFileInfo info( fn ); // check if 'CVS/Entries' exists and can be read - QFile entries( info.dir( true ).path( ) + "/CVS/Entries" ); + TQFile entries( info.dir( true ).path( ) + "/CVS/Entries" ); if ( !entries.open( IO_ReadOnly ) ) return NOT_IN_CVS; // we already know that it's a repository // ### FIXME: it does not take care of CVS/Entries.Log // a line in CVS/Entries has the following format: // [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE - QRegExp rx( QString( "^D?/%1/" ).arg( info.fileName( ) ) ); + TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) ); - QString temp; - QTextStream stream( &entries ); + TQString temp; + TQTextStream stream( &entries ); bool isInRepository = false; while ( !stream.atEnd() ) { @@ -149,11 +149,11 @@ CVSHandler::FileStatus CVSHandler::fstatus( const QString& filename ) const if ( !isInRepository ) return NOT_IN_CVS; - const QStringList fields = QStringList::split( '/', temp, true ); + const TQStringList fields = TQStringList::split( '/', temp, true ); // bool isDir = ( fields[0] == "D" ); - const QString cvsname( fields[1] ); - const QString revision( fields[2] ); - const QString timestamp( fields[3] ); + const TQString cvsname( fields[1] ); + const TQString revision( fields[2] ); + const TQString timestamp( fields[3] ); // ignore the other fields for now if ( revision == "0" && timestamp == "dummy timestamp" ) @@ -167,9 +167,9 @@ CVSHandler::FileStatus CVSHandler::fstatus( const QString& filename ) const // calculate the UTC time from the file's last modified date struct stat st; - lstat( QFile::encodeName(fn), &st ); + lstat( TQFile::encodeName(fn), &st ); struct tm * tm_p = gmtime( &st.st_mtime ); - QString ftime = QString( asctime( tm_p ) ); + TQString ftime = TQString( asctime( tm_p ) ); ftime.truncate( ftime.length( ) - 1 ); if ( ftime != timestamp ) return LOCALLY_MODIFIED; @@ -177,12 +177,12 @@ CVSHandler::FileStatus CVSHandler::fstatus( const QString& filename ) const return UP_TO_DATE; } -QString CVSHandler::cvsStatus( const QString& filename ) const +TQString CVSHandler::cvsStatus( const TQString& filename ) const { return map[filename]; } -void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QString& filename, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) @@ -191,16 +191,16 @@ void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStrin return; } - QFileInfo info( filename ); + TQFileInfo info( filename ); if ( !info.isDir( ) ) { - execCVSCommand( parent, cmd, QStringList( filename ), templates, config ); + execCVSCommand( parent, cmd, TQStringList( filename ), templates, config ); return; } - // ### FIXME: instead of making a QString, use KProcess directly, so that it cares about quoting. + // ### FIXME: instead of making a TQString, use KProcess directly, so that it cares about quoting. // ### FIXME: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.) // it's a dir - QString command( "cd " + filename + " && cvs " ); + TQString command( "cd " + filename + " && cvs " ); switch ( cmd ) { case CVS::Update: command += "update -dP"; @@ -208,7 +208,7 @@ void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStrin case CVS::Commit: // The cvs client does not care about the encoding, so we cannot set anything here command += "commit -F @LOG@FILE@"; - checkToAdd( QStringList( filename ) ); + checkToAdd( TQStringList( filename ) ); break; case CVS::Status: command += "status"; @@ -218,10 +218,10 @@ void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStrin break; } - showDialog( parent, cmd, QStringList( filename ), command, config ); + showDialog( parent, cmd, TQStringList( filename ), command, config ); } -void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStringList& files, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) @@ -230,9 +230,9 @@ void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStrin return; } - // ### FIXME: instead of making a QString, use KProcess directly, so that it cares about quoting. + // ### FIXME: instead of making a TQString, use KProcess directly, so that it cares about quoting. // ### FIXME: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.) - QString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && cvs "); + TQString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && cvs "); switch ( cmd ) { case CVS::Update: command += "update -dP"; @@ -249,15 +249,15 @@ void CVSHandler::execCVSCommand( QWidget* parent, CVS::Command cmd, const QStrin break; } - QRegExp rx; + TQRegExp rx; if (templates) rx.setPattern(_potBaseDir + "/?"); else rx.setPattern(_poBaseDir + "/?"); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = files.begin( ); it != files.end( ); ++it ) { - QString temp = *it; + TQString temp = *it; temp.remove(rx); command += " \'" + temp + "\'"; } @@ -270,7 +270,7 @@ void CVSHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void CVSHandler::showDialog( QWidget* parent, CVS::Command cmd, const QStringList& files, const QString& commandLine, KSharedConfig* config ) +void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { CVSDialog * dia = new CVSDialog( cmd, parent, config ); dia->setFiles( files ); @@ -293,30 +293,30 @@ void CVSHandler::showDialog( QWidget* parent, CVS::Command cmd, const QStringLis emit signalFilesCommitted( files ); } -void CVSHandler::checkToAdd( const QStringList& files ) +void CVSHandler::checkToAdd( const TQStringList& files ) { if ( files.isEmpty( ) ) return; - QStringList toBeAdded; + TQStringList toBeAdded; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = files.begin( ); it != files.end( ); ++it ) { // check for every entry if it needs to be added if ( fstatus( *it ) == NOT_IN_CVS ) { - QFileInfo info( *it ); - QString temp; // will hold the dir path + TQFileInfo info( *it ); + TQString temp; // will hold the dir path if ( info.isDir( ) ) { toBeAdded << *it; temp = *it; } else { toBeAdded << *it; - temp = QFileInfo( *it ).dirPath( true ); + temp = TQFileInfo( *it ).dirPath( true ); } // check recursivlely if parent dirs have to be added as well while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; - temp = QFileInfo( temp ).dirPath( true ); + temp = TQFileInfo( temp ).dirPath( true ); } } } @@ -329,36 +329,36 @@ void CVSHandler::checkToAdd( const QStringList& files ) // create a command line for adding the files and dirs for ( it = toBeAdded.begin( ); it != toBeAdded.end( ); ++it ) { - QFileInfo info( *it ); + TQFileInfo info( *it ); _addCommand += "cd " + info.dirPath( true ) + " && cvs add " + info.fileName( ) + "; "; } } -void CVSHandler::processStatusOutput( const QString& status ) +void CVSHandler::processStatusOutput( const TQString& status ) { if ( !_isPORepository ) return; // at first we need to extract the name of the base directory on the server - QFile f( _poBaseDir + "/CVS/Root" ); + TQFile f( _poBaseDir + "/CVS/Root" ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream stream( &f ); + TQTextStream stream( &f ); // extract the string after the last colon in the first line - QString basedir = stream.readLine( ).section( ':', -1 ); + TQString basedir = stream.readLine( ).section( ':', -1 ); f.close( ); // divide the complete status output in little chunks for every file - QStringList entries = QStringList::split( QRegExp( "={67,67}" ), status ); - QStringList::Iterator it; + TQStringList entries = TQStringList::split( TQRegExp( "={67,67}" ), status ); + TQStringList::Iterator it; for ( it = entries.begin( ); it != entries.end( ); ++it ) { - QString entr = *it; + TQString entr = *it; // translate the filename from repository to local - QRegExp rx( basedir + ".*,v" ); + TQRegExp rx( basedir + ".*,v" ); int pos = entr.find( rx ); - QString file = _poBaseDir + entr.mid( pos + basedir.length( ), + TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); entr = "<qt>" + entr + "</qt>"; @@ -369,16 +369,16 @@ void CVSHandler::processStatusOutput( const QString& status ) } } -void CVSHandler::processDiff( QString output ) +void CVSHandler::processDiff( TQString output ) { - output.remove( QRegExp( "\\[ .* \\]$" )); - output.remove( QRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "\\[ .* \\]$" )); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; tmpFile.close(); - QString error; + TQString error; if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h index 44777aa3..8157a895 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.h +++ b/kbabel/catalogmanager/libcvs/cvshandler.h @@ -36,8 +36,8 @@ #define CVSHANDLER_H // Qt include files -#include <qmap.h> -#include <qobject.h> +#include <tqmap.h> +#include <tqobject.h> // Project specific include files #include "cvsdialog.h" #include "cvsresources.h" @@ -69,17 +69,17 @@ class CVSHandler : public QObject UP_TO_DATE }; - CVSHandler( const QString& poBaseDir = QString::null, const QString& potBaseDir = QString::null ); + CVSHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); - void setPOBaseDir( const QString& dir ); - void setPOTBaseDir( const QString& dir ); + void setPOBaseDir( const TQString& dir ); + void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const QString& filename ) const; - QString fileStatus( const FileStatus status ) const; - QString cvsStatus( const QString& filename ) const; + FileStatus fstatus( const TQString& filename ) const; + TQString fileStatus( const FileStatus status ) const; + TQString cvsStatus( const TQString& filename ) const; - void execCVSCommand( QWidget* parent, CVS::Command cmd, const QString& filename, bool templates, KSharedConfig* config ); - void execCVSCommand( QWidget* parent, CVS::Command cmd, const QStringList& files, bool templates, KSharedConfig* config ); + void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); @@ -91,24 +91,24 @@ class CVSHandler : public QObject signals: void signalIsPORepository( bool ); void signalIsPOTRepository( bool ); - void signalFilesCommitted( const QStringList& ); + void signalFilesCommitted( const TQStringList& ); private: - void showDialog( QWidget* parent, CVS::Command cmd, const QStringList& files, const QString& commandLine, KSharedConfig* config ); - void checkToAdd( const QStringList& files ); - void processStatusOutput( const QString& status ); - void processDiff( QString output ); + void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); + void checkToAdd( const TQStringList& files ); + void processStatusOutput( const TQString& status ); + void processDiff( TQString output ); private: - QString _poBaseDir; - QString _potBaseDir; + TQString _poBaseDir; + TQString _potBaseDir; bool _isPORepository; bool _isPOTRepository; bool _autoUpdateTemplates; - QString _addCommand; + TQString _addCommand; /** Mapping the output of 'cvs status' against the filename. */ - QMap<QString,QString> map; + TQMap<TQString,TQString> map; }; #endif // CVSHANDLER_H diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index 69653591..a6f7d229 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -33,17 +33,17 @@ // Qt include files -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qfileinfo.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtextedit.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqfileinfo.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtextedit.h> // KDE include files #include <kconfig.h> #include <kdebug.h> @@ -57,16 +57,16 @@ #include "svndialog.h" -SVNDialog::SVNDialog( SVN::Command cmd, QWidget * parent, KSharedConfig* config ) +SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ) : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) { _cmd = cmd; p=0L; setCaption( i18n( "SVN Dialog" ) ); - QString temp; + TQString temp; - QVBoxLayout * layout = new QVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the SVN command. switch ( cmd ) { @@ -89,42 +89,42 @@ SVNDialog::SVNDialog( SVN::Command cmd, QWidget * parent, KSharedConfig* config temp = i18n( "Get information for the following files:" ); break; } - layout->addWidget( new QLabel( temp, this ) ); + layout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. - filebox = new QListBox( this ); + filebox = new TQListBox( this ); layout->addWidget( filebox ); // Add special widgets for 'svn commit'. if ( cmd == SVN::Commit ) { - QLabel * label; + TQLabel * label; // Combobox for displaying old log messages. - label = new QLabel( i18n( "&Old messages:" ), this ); - oldMessages = new QComboBox( this ); + label = new TQLabel( i18n( "&Old messages:" ), this ); + oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); layout->addWidget( label ); layout->addWidget( oldMessages ); // Textfield for entering a log message. - label = new QLabel( i18n( "&Log message:" ), this ); - logedit = new QTextEdit( this ); + label = new TQLabel( i18n( "&Log message:" ), this ); + logedit = new TQTextEdit( this ); label->setBuddy( logedit ); layout->addWidget( label ); layout->addWidget( logedit ); - connect( oldMessages, SIGNAL( activated( int ) ), - this, SLOT( slotComboActivated( int ) ) ); + connect( oldMessages, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotComboActivated( int ) ) ); } - QHBoxLayout * buttons = new QHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); + TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); // Add special buttons for 'svn commit'. if ( cmd == SVN::Commit ) { - autoAddBox = new QCheckBox( i18n( "Auto&matically add files if necessary" ), this ); + autoAddBox = new TQCheckBox( i18n( "Auto&matically add files if necessary" ), this ); buttons->addWidget( autoAddBox ); } - buttons->addItem( new QSpacerItem( 1, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + buttons->addItem( new TQSpacerItem( 1, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); // Set the main button's text depending on the SVN comand. switch ( cmd ) { @@ -145,33 +145,33 @@ SVNDialog::SVNDialog( SVN::Command cmd, QWidget * parent, KSharedConfig* config temp = i18n( "&Get Information" ); break; } - mainBtn = new QPushButton( temp, this ); + mainBtn = new TQPushButton( temp, this ); mainBtn->setDefault( true ); buttons->addWidget( mainBtn ); - cancelBtn = new QPushButton( i18n( "C&ancel" ), this ); + cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); layout->addLayout( buttons ); - QFrame * line = new QFrame( this ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame * line = new TQFrame( this ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); layout->addWidget( line ); - layout->addWidget( new QLabel( i18n( "Command output:" ), this ) ); + layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); - output = new QTextEdit( this ); + output = new TQTextEdit( this ); output->setReadOnly( true ); layout->addWidget( output ); - resize( QSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); if ( cmd == SVN::Commit ) logedit->setFocus( ); readSettings( ); - connect( mainBtn, SIGNAL( clicked( ) ), this, SLOT( slotExecuteCommand( ) ) ); - connect( cancelBtn, SIGNAL( clicked( ) ), this, SLOT( reject( ) ) ); + connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) ); + connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) ); } void SVNDialog::slotComboActivated( int index ) @@ -193,17 +193,17 @@ void SVNDialog::accept( ) KDialog::accept( ); } -void SVNDialog::setFiles( const QStringList& files ) +void SVNDialog::setFiles( const TQStringList& files ) { filebox->insertStringList( files ); } -void SVNDialog::setCommandLine( const QString& command ) +void SVNDialog::setCommandLine( const TQString& command ) { _commandLine = command; } -void SVNDialog::setAddCommand( const QString& command ) +void SVNDialog::setAddCommand( const TQString& command ) { _addCommand = command; } @@ -224,7 +224,7 @@ void SVNDialog::slotExecuteCommand( ) if ( autoAddBox->isChecked( ) && !_addCommand.isEmpty( ) ) _commandLine.prepend( _addCommand ); - const QString msg( logedit->text() ); + const TQString msg( logedit->text() ); if ( msg.isEmpty() ) { @@ -238,16 +238,16 @@ void SVNDialog::slotExecuteCommand( ) // Write the commit log message from the input field to a temporary file m_tempFile = new KTempFile; m_tempFile->setAutoDelete( true ); - QTextStream* stream = m_tempFile->textStream(); + TQTextStream* stream = m_tempFile->textStream(); if ( !stream ) { - kdError() << "Could not create QTextStream for file " << m_tempFile->name(); + kdError() << "Could not create TQTextStream for file " << m_tempFile->name(); delete m_tempFile; m_tempFile = 0; KMessageBox::error( this, i18n( "Cannot open temporary file for writing. Aborting.") ); return; } - stream->setEncoding( QTextStream::UnicodeUTF8 ); + stream->setEncoding( TQTextStream::UnicodeUTF8 ); *stream << msg; m_tempFile->close(); @@ -265,7 +265,7 @@ void SVNDialog::slotExecuteCommand( ) // Update the list of log messages if ( !msg.isEmpty() ) { - const QString shortLog = KStringHandler::csqueeze( msg, 80 ); + const TQString shortLog = KStringHandler::csqueeze( msg, 80 ); // Remove the message from the list if it already exists @@ -280,12 +280,12 @@ void SVNDialog::slotExecuteCommand( ) // Set the KProcess' command line. *p << _commandLine; - connect( p, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT ( slotProcessStdout( KProcess*, char*, int ) ) ); - connect( p, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT ( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( p, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotProcessExited( KProcess* ) ) ); + connect( p, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT ( slotProcessStdout( KProcess*, char*, int ) ) ); + connect( p, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT ( slotProcessStderr( KProcess*, char*, int ) ) ); + connect( p, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); output->append( i18n( "[ Starting command ]" ) ); @@ -304,22 +304,22 @@ void SVNDialog::slotExecuteCommand( ) void SVNDialog::slotProcessStdout( KProcess*, char * buffer, int len ) { - output->append( QString::fromLocal8Bit( buffer, len ) ); + output->append( TQString::fromLocal8Bit( buffer, len ) ); // Set the cursor's position at the end of the output. output->setCursorPosition( output->lines( ), 0 ); // If the command is 'svn status' or 'svn diff' collect the output of stdout. if ( ( _cmd == SVN::StatusLocal ) || ( _cmd == SVN::StatusRemote ) || ( _cmd == SVN::Diff ) ) - _statusOutput += QString::fromLocal8Bit( buffer, len ); + _statusOutput += TQString::fromLocal8Bit( buffer, len ); } void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len ) { // If an error occurs while executing the command display stderr in // another color. - QColor oldColor( output->color( ) ); + TQColor oldColor( output->color( ) ); output->setColor( Qt::red ); - output->append( QString::fromLocal8Bit( buffer, len ) ); + output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); } @@ -337,7 +337,7 @@ void SVNDialog::slotProcessExited( KProcess * p ) mainBtn->setText( i18n( "&Show Diff" ) ); else mainBtn->setText( i18n( "&Close" ) ); - connect( mainBtn, SIGNAL( clicked( ) ), this, SLOT( accept( ) ) ); + connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) ); // Reenable the button and the log edit now that the process is finished. mainBtn->setEnabled( true ); @@ -345,7 +345,7 @@ void SVNDialog::slotProcessExited( KProcess * p ) logedit->setEnabled( true ); } -QString SVNDialog::statusOutput( ) +TQString SVNDialog::statusOutput( ) { return _statusOutput; } @@ -362,14 +362,14 @@ void SVNDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( QString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) { - const QString logMessage = config->readEntry( QString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) // ### FIXME: if the string matches the squeezed 80 chars, it might overwrite another entry - const QString shortLog = KStringHandler::csqueeze( logMessage ); + const TQString shortLog = KStringHandler::csqueeze( logMessage ); m_logMessages.append( logMessage ); m_squeezedLogMessages.append( shortLog ); oldMessages->insertItem( shortLog ); @@ -388,9 +388,9 @@ void SVNDialog::saveSettings( ) // Write the log messages to the config file. int cnt = 0; - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( QString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); } m_config->sync(); } diff --git a/kbabel/catalogmanager/libsvn/svndialog.h b/kbabel/catalogmanager/libsvn/svndialog.h index 0c824fa8..23ec6a7e 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.h +++ b/kbabel/catalogmanager/libsvn/svndialog.h @@ -71,30 +71,30 @@ class SVNDialog : public KDialog * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - SVNDialog( SVN::Command cmd, QWidget * parent, KSharedConfig* config ); + SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ); ~SVNDialog(); /** * Set the list of files which will be used for the SVN command. * @param files The list of files. */ - void setFiles( const QStringList& files ); + void setFiles( const TQStringList& files ); /** * Set the command line for the execution of the SVN command. * @param command The command line. */ - void setCommandLine( const QString& command ); + void setCommandLine( const TQString& command ); /** * Set the command line for adding files to the SVN repository. * This method is only used together with a 'svn commit' for automatically * adding files which are not yet in the repository. * @param command The command line. */ - void setAddCommand( const QString& command ); + void setAddCommand( const TQString& command ); /** * Return the output of a 'svn status' command. * @returns The complete output. */ - QString statusOutput( ); + TQString statusOutput( ); protected: /** @@ -122,24 +122,24 @@ class SVNDialog : public KDialog private: SVN::Command _cmd; - QPushButton * mainBtn; - QPushButton * cancelBtn; - QListBox * filebox; - QComboBox * oldMessages; - QTextEdit * logedit; - QTextEdit * output; - QCheckBox * autoAddBox; + TQPushButton * mainBtn; + TQPushButton * cancelBtn; + TQListBox * filebox; + TQComboBox * oldMessages; + TQTextEdit * logedit; + TQTextEdit * output; + TQCheckBox * autoAddBox; KProcess * p; - QString _commandLine; - QString _addCommand; - QString _statusOutput; + TQString _commandLine; + TQString _addCommand; + TQString _statusOutput; /// Log messages (long version) - QStringList m_logMessages; + TQStringList m_logMessages; /// Log messages (short version) - QStringList m_squeezedLogMessages; + TQStringList m_squeezedLogMessages; /// Temporary file (for commits) KTempFile* m_tempFile; diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 8117fe62..1ac98f66 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -37,13 +37,13 @@ #include <sys/stat.h> #include <time.h> // Qt include files -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qdom.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdom.h> // KDE include files #include <kapplication.h> #include <klocale.h> @@ -54,17 +54,17 @@ // project specific include files #include "svnhandler.h" -SVNHandler::SVNHandler( const QString& poBaseDir, const QString& potBaseDir ) +SVNHandler::SVNHandler( const TQString& poBaseDir, const TQString& potBaseDir ) { setPOBaseDir( poBaseDir ); setPOTBaseDir( potBaseDir ); _autoUpdateTemplates = false; } -void SVNHandler::setPOBaseDir( const QString& dir ) +void SVNHandler::setPOBaseDir( const TQString& dir ) { // check if '.svn/entries' exists in the PO base directory - if ( QFileInfo( dir + "/.svn/entries" ).exists( ) ) { + if ( TQFileInfo( dir + "/.svn/entries" ).exists( ) ) { _isPORepository = true; _poBaseDir = dir; } else @@ -72,10 +72,10 @@ void SVNHandler::setPOBaseDir( const QString& dir ) emit signalIsPORepository( _isPORepository ); } -void SVNHandler::setPOTBaseDir( const QString& dir ) +void SVNHandler::setPOTBaseDir( const TQString& dir ) { // check if '.svn/entries' exists in the POT base directory - if ( QFileInfo( dir + "/.svn/entries" ).exists( ) ) { + if ( TQFileInfo( dir + "/.svn/entries" ).exists( ) ) { _isPOTRepository = true; _potBaseDir = dir; } else @@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const QString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -QString SVNHandler::fileStatus( const FileStatus status ) const +TQString SVNHandler::fileStatus( const FileStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -115,19 +115,19 @@ QString SVNHandler::fileStatus( const FileStatus status ) const } } -SVNHandler::FileStatus SVNHandler::fstatus( const QString& filename ) const +SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) return NO_REPOSITORY; - QString fn( filename ); - fn = fn.remove( QRegExp( "/$" ) ); + TQString fn( filename ); + fn = fn.remove( TQRegExp( "/$" ) ); - QFileInfo info( fn ); + TQFileInfo info( fn ); // check if '.svn/entries' exists. - QFile entries( info.dir( true ).path( ) + "/.svn/entries" ); + TQFile entries( info.dir( true ).path( ) + "/.svn/entries" ); if ( !entries.exists() ) return NOT_IN_SVN; @@ -140,12 +140,12 @@ SVNHandler::FileStatus SVNHandler::fstatus( const QString& filename ) const if( !proc.start( KProcess::Block, KProcess::Stdout ) ) return ERROR_IN_WC; - QDomDocument doc; - QString errorMsg; + TQDomDocument doc; + TQString errorMsg; int errorLine, errorCol; - QDomNodeList nodelist; - QDomNode node; - QDomElement entry, wcStatus; + TQDomNodeList nodelist; + TQDomNode node; + TQDomElement entry, wcStatus; // Parse the output. if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) { @@ -211,11 +211,11 @@ no_status_xml: } entries.close(); - QDomElement element; + TQDomElement element; // File name that we are searching - const QString findName = info.fileName(); + const TQString findName = info.fileName(); // The entries are <entry> elements, so we have to check them - QDomNode child = doc.documentElement().firstChild(); + TQDomNode child = doc.documentElement().firstChild(); for ( ; !child.isNull() ; child = child.nextSibling() ) { if ( !child.isElement() ) @@ -226,7 +226,7 @@ no_status_xml: // Should not happend with svn 1.1.x continue; } - const QString name = element.attribute("name"); + const TQString name = element.attribute("name"); if ( name == findName ) break; } @@ -239,7 +239,7 @@ no_status_xml: // ### TODO: should we check the attribute kind to be file and not dir? // ### TODO: what do copy and move add here? - const QString onSchedule = element.attribute( "schedule" ); + const TQString onSchedule = element.attribute( "schedule" ); if ( onSchedule == "delete" ) return LOCALLY_REMOVED; else if ( onSchedule == "added" ) @@ -250,15 +250,15 @@ no_status_xml: } // Note: we do not check the property time stamp - const QString textTimeStamp( element.attribute( "text-time" ) ); + const TQString textTimeStamp( element.attribute( "text-time" ) ); // calculate the UTC time from the file's last modified date struct stat st; - lstat( QFile::encodeName(fn), &st ); + lstat( TQFile::encodeName(fn), &st ); struct tm * tm_p = gmtime( &st.st_mtime ); const int year = tm_p->tm_year + 1900; const int month = tm_p->tm_mon + 1; - QString fileTime; + TQString fileTime; fileTime.sprintf( "%04i-%02i-%02iT%02i:%02i:%02i.000000Z", year, month, tm_p->tm_mday, tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec ); //kdDebug() << "File: " << filename << " SVN time: " << textTimeStamp << " File time: " << fileTime << endl; @@ -269,19 +269,19 @@ no_status_xml: } -QString SVNHandler::svnStatus( const QString& filename ) const +TQString SVNHandler::svnStatus( const TQString& filename ) const { return map[filename]; } -void SVNHandler::execSVNCommand( QWidget* parent, SVN::Command cmd, const QString& filename, bool templates, KSharedConfig* config) +void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config) { // Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!) // ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one - execSVNCommand( parent, cmd, QStringList( filename ), templates, config ); + execSVNCommand( parent, cmd, TQStringList( filename ), templates, config ); } -void SVNHandler::execSVNCommand( QWidget* parent, SVN::Command cmd, const QStringList& files, bool templates, KSharedConfig* config ) +void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) @@ -290,9 +290,9 @@ void SVNHandler::execSVNCommand( QWidget* parent, SVN::Command cmd, const QStrin return; } - // ### TODO: instead of making a QString, use KProcess directly, so that it cares about quoting. + // ### TODO: instead of making a TQString, use KProcess directly, so that it cares about quoting. // ### TODO: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.) - QString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && svn "); + TQString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && svn "); switch ( cmd ) { case SVN::Update: command += "update --non-interactive"; @@ -315,15 +315,15 @@ void SVNHandler::execSVNCommand( QWidget* parent, SVN::Command cmd, const QStrin command += "info"; // Does not allow --non-interactive (at least svn 1.1.4). } - QRegExp rx; + TQRegExp rx; if (templates) rx.setPattern(_potBaseDir + "/?"); else rx.setPattern(_poBaseDir + "/?"); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = files.begin( ); it != files.end( ); ++it ) { - QString temp = *it; + TQString temp = *it; temp.remove(rx); command += " \'" + temp + "\'"; } @@ -336,7 +336,7 @@ void SVNHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void SVNHandler::showDialog( QWidget* parent, SVN::Command cmd, const QStringList& files, const QString& commandLine, KSharedConfig* config ) +void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { SVNDialog * dia = new SVNDialog( cmd, parent, config ); dia->setFiles( files ); @@ -359,7 +359,7 @@ void SVNHandler::showDialog( QWidget* parent, SVN::Command cmd, const QStringLis emit signalFilesCommitted( files ); } -bool SVNHandler::isInSvn( const QString& path ) +bool SVNHandler::isInSvn( const TQString& path ) { if ( path.isEmpty() ) return false; @@ -375,57 +375,57 @@ bool SVNHandler::isInSvn( const QString& path ) * - for a file: check if there is a corresponding file in .svn/text-base/ */ - const QFileInfo info( path ); + const TQFileInfo info( path ); if ( info.isDir() ) { // It is a directory, so find a .svn/entries file - QDir dir( path ); + TQDir dir( path ); return dir.exists( ".svn/entries", true ); } else { // It is a file, so find the corresponding file in .svn/text-base - QDir dir( info.dirPath() ); + TQDir dir( info.dirPath() ); if ( ! dir.cd( ".svn/text-base" ) ) { // There is not even a .svn/text-base directory, so the file is not under control return false; } - const QString textBaseFilename( info.fileName() + ".svn-base" ); + const TQString textBaseFilename( info.fileName() + ".svn-base" ); return dir.exists( textBaseFilename, true ); } } -void SVNHandler::checkToAdd( const QStringList& files ) +void SVNHandler::checkToAdd( const TQStringList& files ) { if ( files.isEmpty( ) ) return; - QStringList toBeAdded; + TQStringList toBeAdded; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = files.begin( ); it != files.end( ); ++it ) { // check for every entry if it needs to be added if ( ! isInSvn( *it ) ) { - QFileInfo info( *it ); - QString temp; // will hold the dir path + TQFileInfo info( *it ); + TQString temp; // will hold the dir path if ( info.isDir( ) ) { toBeAdded << *it; temp = *it; } else { toBeAdded << *it; - temp = QFileInfo( *it ).dirPath( true ); + temp = TQFileInfo( *it ).dirPath( true ); } // ### TODO: does SVN really needs this or does it do it automatically? // check recursivlely if parent dirs have to be added as well while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; - temp = QFileInfo( temp ).dirPath( true ); + temp = TQFileInfo( temp ).dirPath( true ); } } } // remove an old command - _addCommand = QString(); + _addCommand = TQString(); // ### TODO: does SVN really need this? // make sure the directories are added before the files @@ -434,38 +434,38 @@ void SVNHandler::checkToAdd( const QStringList& files ) // ### TODO: try to make this better // create a command line for adding the files and dirs for ( it = toBeAdded.begin( ); it != toBeAdded.end( ); ++it ) { - QFileInfo info( *it ); + TQFileInfo info( *it ); _addCommand += "cd " + info.dirPath( true ) + " && svn add " + info.fileName( ) + "; "; } } // ### TODO: convert to SVN -void SVNHandler::processStatusOutput( const QString& status ) +void SVNHandler::processStatusOutput( const TQString& status ) { if ( !_isPORepository ) return; #if 0 // at first we need to extract the name of the base directory on the server - QFile f( _poBaseDir + "/SVN/Root" ); // ### FIXME + TQFile f( _poBaseDir + "/SVN/Root" ); // ### FIXME if ( !f.open( IO_ReadOnly ) ) return; - QTextStream stream( &f ); + TQTextStream stream( &f ); // extract the string after the last colon in the first line - QString basedir = stream.readLine( ).section( ':', -1 ); + TQString basedir = stream.readLine( ).section( ':', -1 ); f.close( ); // divide the complete status output in little chunks for every file - QStringList entries = QStringList::split( QRegExp( "={67,67}" ), status ); - QStringList::Iterator it; + TQStringList entries = TQStringList::split( TQRegExp( "={67,67}" ), status ); + TQStringList::Iterator it; for ( it = entries.begin( ); it != entries.end( ); ++it ) { - QString entr = *it; + TQString entr = *it; // translate the filename from repository to local - QRegExp rx( basedir + ".*,v" ); + TQRegExp rx( basedir + ".*,v" ); int pos = entr.find( rx ); - QString file = _poBaseDir + entr.mid( pos + basedir.length( ), + TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); entr = "<qt>" + entr + "</qt>"; @@ -477,16 +477,16 @@ void SVNHandler::processStatusOutput( const QString& status ) #endif } -void SVNHandler::processDiff( QString output ) +void SVNHandler::processDiff( TQString output ) { - output.remove( QRegExp( "\\[ .* \\]$" )); - output.remove( QRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "\\[ .* \\]$" )); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; tmpFile.close(); - QString error; + TQString error; if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } @@ -516,10 +516,10 @@ void SVNOutputCollector::setProcess( KProcess* p ) m_process = p; if( p ) { - connect( p, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotGatherStdout(KProcess*, char*, int)) ); - connect( p, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotGatherStderr(KProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) ); } m_gatheredOutput.truncate( 0 ); @@ -529,14 +529,14 @@ void SVNOutputCollector::setProcess( KProcess* p ) void SVNOutputCollector::slotGatherStderr( KProcess*, char* data, int len ) { - m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) ); - m_stderrOutput.append( QString::fromLocal8Bit( data, len ) ); + m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); + m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) ); } void SVNOutputCollector::slotGatherStdout( KProcess*, char* data, int len ) { - m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) ); - m_stdoutOutput.append( QString::fromLocal8Bit( data, len ) ); + m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); + m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) ); } #include "svnhandler.moc" diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h index 67c86d73..4933cb92 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.h +++ b/kbabel/catalogmanager/libsvn/svnhandler.h @@ -36,8 +36,8 @@ #define SVNHANDLER_H // Qt include files -#include <qmap.h> -#include <qobject.h> +#include <tqmap.h> +#include <tqobject.h> // Project specific include files #include "svndialog.h" #include "svnresources.h" @@ -68,17 +68,17 @@ class SVNHandler : public QObject ERROR_IN_WC ///< The working copy has data that cannot be handled }; - SVNHandler( const QString& poBaseDir = QString::null, const QString& potBaseDir = QString::null ); + SVNHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); - void setPOBaseDir( const QString& dir ); - void setPOTBaseDir( const QString& dir ); + void setPOBaseDir( const TQString& dir ); + void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const QString& filename ) const; - QString fileStatus( const FileStatus status ) const; - QString svnStatus( const QString& filename ) const; + FileStatus fstatus( const TQString& filename ) const; + TQString fileStatus( const FileStatus status ) const; + TQString svnStatus( const TQString& filename ) const; - void execSVNCommand( QWidget* parent, SVN::Command cmd, const QString& filename, bool templates, KSharedConfig* config ); - void execSVNCommand( QWidget* parent, SVN::Command cmd, const QStringList& files, bool templates, KSharedConfig* config ); + void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); @@ -90,26 +90,26 @@ class SVNHandler : public QObject signals: void signalIsPORepository( bool ); void signalIsPOTRepository( bool ); - void signalFilesCommitted( const QStringList& ); + void signalFilesCommitted( const TQStringList& ); private: - void showDialog( QWidget* parent, SVN::Command cmd, const QStringList& files, const QString& commandLine, KSharedConfig* config ); + void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); /// Check quickly if the file is part of a SVN repository - bool isInSvn( const QString& path ); - void checkToAdd( const QStringList& files ); - void processStatusOutput( const QString& status ); - void processDiff( QString output ); + bool isInSvn( const TQString& path ); + void checkToAdd( const TQStringList& files ); + void processStatusOutput( const TQString& status ); + void processDiff( TQString output ); private: - QString _poBaseDir; - QString _potBaseDir; + TQString _poBaseDir; + TQString _potBaseDir; bool _isPORepository; bool _isPOTRepository; bool _autoUpdateTemplates; - QString _addCommand; + TQString _addCommand; /** Mapping the output of 'svn status' against the filename. */ - QMap<QString,QString> map; + TQMap<TQString,TQString> map; }; class SVNOutputCollector: public QObject @@ -120,18 +120,18 @@ class SVNOutputCollector: public QObject SVNOutputCollector( KProcess* ); void setProcess( KProcess* ); - const QString& getOutput() const { return m_gatheredOutput; } - const QString& getStderr() const { return m_stderrOutput; } - const QString& getStdout() const { return m_stdoutOutput; } + const TQString& getOutput() const { return m_gatheredOutput; } + const TQString& getStderr() const { return m_stderrOutput; } + const TQString& getStdout() const { return m_stdoutOutput; } private slots: void slotGatherStderr( KProcess*, char*, int ); void slotGatherStdout( KProcess*, char*, int ); private: - QString m_gatheredOutput; - QString m_stderrOutput; - QString m_stdoutOutput; + TQString m_gatheredOutput; + TQString m_stderrOutput; + TQString m_stdoutOutput; KProcess* m_process; }; diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index 868df92a..706ad67f 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -53,10 +53,10 @@ #include <kwin.h> #include <kmainwindow.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqtimer.h> CatalogManager *CatalogManagerApp::_view = 0; @@ -84,15 +84,15 @@ void CatalogManagerApp::setPreferredWindow(WId id) } } -void CatalogManagerApp::updatedFile(QCString url) +void CatalogManagerApp::updatedFile(TQCString url) { if( _view ) _view->updateFile(url); } -QCString CatalogManagerApp::findNextFile() +TQCString CatalogManagerApp::findNextFile() { - QString reply = ""; + TQString reply = ""; if( !CatalogManager::_foundFilesList.isEmpty() ) { reply = CatalogManager::_foundFilesList.first(); @@ -101,9 +101,9 @@ QCString CatalogManagerApp::findNextFile() } else { if( !CatalogManager::_toBeSearched.isEmpty() ) - reply = QString(""); // nothing found yet + reply = TQString(""); // nothing found yet else - return QCString(); // not found definitely + return TQCString(); // not found definitely } return reply.utf8(); @@ -128,11 +128,11 @@ int CatalogManagerApp::newInstance() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - QString configfile = args->getOption("project"); + TQString configfile = args->getOption("project"); if( !configfile.isEmpty() ) { - QFileInfo fi( configfile ); + TQFileInfo fi( configfile ); configfile = fi.absFilePath(); } else @@ -163,12 +163,12 @@ void CatalogManagerInterface::setPreferredWindow( WId id ) CatalogManagerApp::setPreferredWindow(id); } -QCString CatalogManagerInterface::findNextFile() +TQCString CatalogManagerInterface::findNextFile() { return CatalogManagerApp::findNextFile(); } -void CatalogManagerInterface::updatedFile( QCString url ) +void CatalogManagerInterface::updatedFile( TQCString url ) { CatalogManagerApp::updatedFile(url); } diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index efe893a2..f56a735b 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -31,10 +31,10 @@ **************************************************************************** */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> #include <kcombobox.h> #include <kcompletion.h> @@ -47,21 +47,21 @@ #include "markpatterndialog.h" #include "markpatternwidget.h" -MarkPatternDialog::MarkPatternDialog(QWidget * parent, const char * name) +MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name) : KDialogBase(parent, name, true, 0, Ok|Cancel, Ok) { actionButton(Ok)->setEnabled(false); mainWidget = new MarkPatternWidget(this); - connect (mainWidget->combo, SIGNAL(textChanged(const QString&)), - this, SLOT(slotComboTextChanged(const QString&))); + connect (mainWidget->combo, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotComboTextChanged(const TQString&))); comboCompletion = mainWidget->combo->completionObject( ); regexpEditDialog = 0; if (!KTrader::self( )->query("KRegExpEditor/KRegExpEditor").isEmpty( )) { - connect(mainWidget->regexpButton, SIGNAL(clicked( )), this, SLOT(slotRegexpButtonClicked( ))); + connect(mainWidget->regexpButton, TQT_SIGNAL(clicked( )), this, TQT_SLOT(slotRegexpButtonClicked( ))); } else { disconnect(mainWidget->useRegExp, 0, mainWidget->regexpButton, 0); delete mainWidget->regexpButton; @@ -87,7 +87,7 @@ void MarkPatternDialog::accept( ) KDialogBase::accept( ); } -QString MarkPatternDialog::pattern( ) +TQString MarkPatternDialog::pattern( ) { return mainWidget->combo->currentText( ); } @@ -118,7 +118,7 @@ void MarkPatternDialog::setMode(bool markMode) } } -void MarkPatternDialog::slotComboTextChanged(const QString& text) +void MarkPatternDialog::slotComboTextChanged(const TQString& text) { actionButton(Ok)->setEnabled(!text.isEmpty( )); } @@ -126,14 +126,14 @@ void MarkPatternDialog::slotComboTextChanged(const QString& text) void MarkPatternDialog::slotRegexpButtonClicked( ) { if (!regexpEditDialog) - regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( - "KRegExpEditor/KRegExpEditor", QString::null, this); + regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( + "KRegExpEditor/KRegExpEditor", TQString::null, this); KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog); if (iface) { iface->setRegExp(mainWidget->combo->currentText( )); - if (regexpEditDialog->exec( ) == QDialog::Accepted) + if (regexpEditDialog->exec( ) == TQDialog::Accepted) mainWidget->combo->setCurrentText(iface->regExp( )); } } diff --git a/kbabel/catalogmanager/markpatterndialog.h b/kbabel/catalogmanager/markpatterndialog.h index c8ec1218..de919130 100644 --- a/kbabel/catalogmanager/markpatterndialog.h +++ b/kbabel/catalogmanager/markpatterndialog.h @@ -45,9 +45,9 @@ class MarkPatternDialog : public KDialogBase Q_OBJECT public: - MarkPatternDialog(QWidget * parent, const char * name = 0); + MarkPatternDialog(TQWidget * parent, const char * name = 0); - QString pattern( ); + TQString pattern( ); bool isCaseSensitive( ); bool useRegExp( ); bool includeTemplates( ); @@ -60,14 +60,14 @@ class MarkPatternDialog : public KDialogBase void saveSettings( ); protected slots: - void slotComboTextChanged(const QString& text); + void slotComboTextChanged(const TQString& text); void slotRegexpButtonClicked( ); private: MarkPatternWidget * mainWidget; - QDialog * regexpEditDialog; + TQDialog * regexpEditDialog; - QStringList patternList; + TQStringList patternList; KCompletion * comboCompletion; }; diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index 874b9c3e..248ac55a 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -35,8 +35,8 @@ #include "catmanlistitem.h" #include "multiroughtransdlg.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kdebug.h> #include <kglobal.h> @@ -47,18 +47,18 @@ using namespace KBabel; -MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, QPtrList<CatManListItem> files - , QWidget *parent,const char *name) +MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManListItem> files + , TQWidget *parent,const char *name) : RoughTransDlg(dict, new Catalog(), parent, name ) ,_fileList(files) { - QWidget* bars = static_cast<QWidget*>(progressbar->parent()); - QLabel* label = new QLabel( i18n("Files:"), bars ); + TQWidget* bars = static_cast<TQWidget*>(progressbar->parent()); + TQLabel* label = new TQLabel( i18n("Files:"), bars ); filesProgressbar = new KProgress(bars,"files progressbar"); filesProgressbar->setTextEnabled(true); filesProgressbar->setFormat("%v/%m (%p%)"); filesProgressbar->setTotalSteps(files.count()); - QHBoxLayout* mylayout= new QHBoxLayout(bars->layout()); + TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout()); mylayout->add(label); mylayout->add(filesProgressbar); @@ -126,7 +126,7 @@ void MultiRoughTransDlg::showAllStatistics() int nothing=tt-ptc-etc; KLocale *locale = KGlobal::locale(); - QString statMsg = i18n("Result of the translation:\n" + TQString statMsg = i18n("Result of the translation:\n" "Edited entries: %1\n" "Exact translations: %2 (%3%)\n" "Approximate translations: %4 (%5%)\n" diff --git a/kbabel/catalogmanager/multiroughtransdlg.h b/kbabel/catalogmanager/multiroughtransdlg.h index 8bda58e2..cdc4d1ed 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.h +++ b/kbabel/catalogmanager/multiroughtransdlg.h @@ -42,7 +42,7 @@ class MultiRoughTransDlg : public RoughTransDlg Q_OBJECT public: - MultiRoughTransDlg(KBabelDictBox* dictBox, QPtrList<CatManListItem> list, QWidget *parent + MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *parent , const char *name=0); protected slots: @@ -56,7 +56,7 @@ protected slots: private: - QPtrList<CatManListItem> _fileList; + TQPtrList<CatManListItem> _fileList; KProgress *filesProgressbar; }; diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index 9075f24e..b8c563a8 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -43,8 +43,8 @@ #include <kprogress.h> #include <ksqueezedtextlabel.h> -#include <qlistbox.h> -#include <qtimer.h> +#include <tqlistbox.h> +#include <tqtimer.h> #define ID_ERROR_OPEN 1 #define ID_ERROR_IGNORE 2 @@ -52,7 +52,7 @@ // version identification for validation ignores #define IGNOREFILE_VERSION 0x00 -ValidateProgressDialog::ValidateProgressDialog(const QString& ignoreURL, QWidget *parent,const char *name) +ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *parent,const char *name) : KDialogBase(parent,name,true,i18n("Caption of dialog","Validation") , Close, Close) , _ignoreURL(ignoreURL), _tool(0), _stopped(false) @@ -61,7 +61,7 @@ ValidateProgressDialog::ValidateProgressDialog(const QString& ignoreURL, QWidget { _mainWidget = new ValidateProgressWidget(this); setMainWidget(_mainWidget); - setInitialSize( QSize(400, 300) ); + setInitialSize( TQSize(400, 300) ); _errors.clear(); _ignores.clear(); @@ -72,12 +72,12 @@ ValidateProgressDialog::ValidateProgressDialog(const QString& ignoreURL, QWidget _errorMenu->insertItem(i18n("&Open"),ID_ERROR_OPEN); _errorMenu->insertItem(i18n("&Ignore"),ID_ERROR_IGNORE); - connect( this, SIGNAL(closeClicked()), this, SLOT(stop())); - connect( _mainWidget->_errorList, SIGNAL( doubleClicked(QListBoxItem *)), - this, SLOT( errorItemDoubleClicked(QListBoxItem *))); + connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(stop())); + connect( _mainWidget->_errorList, TQT_SIGNAL( doubleClicked(TQListBoxItem *)), + this, TQT_SLOT( errorItemDoubleClicked(TQListBoxItem *))); - connect( _mainWidget->_errorList, SIGNAL( contextMenuRequested(QListBoxItem *, const QPoint &)), - this, SLOT( showContextMenu(QListBoxItem *, const QPoint &))); + connect( _mainWidget->_errorList, TQT_SIGNAL( contextMenuRequested(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT( showContextMenu(TQListBoxItem *, const TQPoint &))); } ValidateProgressDialog::~ValidateProgressDialog() @@ -85,7 +85,7 @@ ValidateProgressDialog::~ValidateProgressDialog() writeIgnores(); } -void ValidateProgressDialog::validate( const KDataToolInfo &tool, const QPtrList<CatManListItem> files ) +void ValidateProgressDialog::validate( const KDataToolInfo &tool, const TQPtrList<CatManListItem> files ) { if( files.isEmpty() ) return; @@ -111,7 +111,7 @@ void ValidateProgressDialog::validate( const KDataToolInfo &tool, const QPtrList _stopped = false; - QTimer::singleShot( 0, this, SLOT(validate_internal()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(validate_internal()) ); exec(); @@ -139,13 +139,13 @@ void ValidateProgressDialog::validate_internal() if( it->hasErrors() ) { - QValueList<IgnoreItem> err = it->errors(); + TQValueList<IgnoreItem> err = it->errors(); - for( QValueList<IgnoreItem>::Iterator errit = err.begin(); errit!=err.end() ; ++errit ) + for( TQValueList<IgnoreItem>::Iterator errit = err.begin(); errit!=err.end() ; ++errit ) { IgnoreItem item = (*errit); - QValueList<IgnoreItem>::Iterator ig; + TQValueList<IgnoreItem>::Iterator ig; for( ig = _ignores.begin() ; ig != _ignores.end() ; ++ig ) { if( (*ig).validationTool == _toolID && @@ -167,7 +167,7 @@ void ValidateProgressDialog::validate_internal() noHeader = false; } - QString errortext=QString::number(item.index+1)+": " + item.msgid.first().left(50); + TQString errortext=TQString::number(item.index+1)+": " + item.msgid.first().left(50); errortext.replace("\n"," "); if( item.msgid.first().length() > 50 ) errortext+="..."; _mainWidget->_errorList->insertItem( errortext); @@ -200,9 +200,9 @@ void ValidateProgressDialog::stop() _stopped = true; } -void ValidateProgressDialog::errorItemDoubleClicked(QListBoxItem * item) +void ValidateProgressDialog::errorItemDoubleClicked(TQListBoxItem * item) { - QString it = item->text(); + TQString it = item->text(); bool ok =false; int offset = it.find(":"); @@ -215,7 +215,7 @@ void ValidateProgressDialog::errorItemDoubleClicked(QListBoxItem * item) if( !ok ) num = 0; } - QListBoxItem* package=item; + TQListBoxItem* package=item; while( package && !package->text().startsWith("/") ) package=package->prev(); @@ -228,7 +228,7 @@ void ValidateProgressDialog::errorItemDoubleClicked(QListBoxItem * item) emit errorDoubleClicked(package->text(), num-1 ); } -void ValidateProgressDialog::showContextMenu(QListBoxItem * item, const QPoint & pos) +void ValidateProgressDialog::showContextMenu(TQListBoxItem * item, const TQPoint & pos) { // disable ignore for whole package _errorMenu->setItemEnabled(ID_ERROR_IGNORE, item->pixmap()==0 ); @@ -255,10 +255,10 @@ void ValidateProgressDialog::readIgnores() { IgnoreItem item; - QFile ignoreFile( _ignoreURL ); + TQFile ignoreFile( _ignoreURL ); if( ignoreFile.open( IO_ReadOnly ) ) { - QDataStream s( &ignoreFile ); - QString url; + TQDataStream s( &ignoreFile ); + TQString url; int version; s >> version; @@ -277,15 +277,15 @@ void ValidateProgressDialog::readIgnores() void ValidateProgressDialog::writeIgnores() { - QFile ignoreFile( _ignoreURL ); + TQFile ignoreFile( _ignoreURL ); if( ignoreFile.open( IO_WriteOnly ) ) { - QDataStream s( &ignoreFile ); - QString url; + TQDataStream s( &ignoreFile ); + TQString url; int version = IGNOREFILE_VERSION; s << version; - for( QValueList<IgnoreItem>::Iterator it = _ignores.begin(); it!=_ignores.end(); ++it) + for( TQValueList<IgnoreItem>::Iterator it = _ignores.begin(); it!=_ignores.end(); ++it) { s << (*it); } @@ -293,7 +293,7 @@ void ValidateProgressDialog::writeIgnores() } } -QDataStream & operator<<( QDataStream & stream, const IgnoreItem & i ) +TQDataStream & operator<<( TQDataStream & stream, const IgnoreItem & i ) { return stream << i.fileURL << i.msgid @@ -302,7 +302,7 @@ QDataStream & operator<<( QDataStream & stream, const IgnoreItem & i ) << i.validationTool; } -QDataStream & operator>>( QDataStream & stream, IgnoreItem & i ) { +TQDataStream & operator>>( TQDataStream & stream, IgnoreItem & i ) { return stream >> i.fileURL >> i.msgid >> i.msgstr diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h index 05133889..15c7c238 100644 --- a/kbabel/catalogmanager/validateprogress.h +++ b/kbabel/catalogmanager/validateprogress.h @@ -33,7 +33,7 @@ #ifndef VALIDATEDLG_H #define VALIDATEDLG_H -#include <qmap.h> +#include <tqmap.h> #include <kdialogbase.h> #include <kurl.h> @@ -47,31 +47,31 @@ class KPopupMenu; struct IgnoreItem { KURL fileURL; - QStringList msgid; - QStringList msgstr; + TQStringList msgid; + TQStringList msgstr; uint index; - QString validationTool; + TQString validationTool; }; -QDataStream & operator<<( QDataStream & stream, const IgnoreItem &ident ); -QDataStream & operator>>( QDataStream & stream, IgnoreItem & ident); +TQDataStream & operator<<( TQDataStream & stream, const IgnoreItem &ident ); +TQDataStream & operator>>( TQDataStream & stream, IgnoreItem & ident); class ValidateProgressDialog : public KDialogBase { Q_OBJECT public: - ValidateProgressDialog(const QString& ignoreURL, QWidget* parent, const char *name=0); + ValidateProgressDialog(const TQString& ignoreURL, TQWidget* parent, const char *name=0); virtual ~ValidateProgressDialog(); void setIgnoreFuzzy(bool enable) { _ignoreFuzzy = enable; } void setMarkAsFuzzy(bool enable) { _setAsFuzzy = enable; } public slots: - void validate(const KDataToolInfo &tool, const QPtrList<CatManListItem> files); + void validate(const KDataToolInfo &tool, const TQPtrList<CatManListItem> files); signals: - void errorDoubleClicked(const QString file, const int messageNumber); + void errorDoubleClicked(const TQString file, const int messageNumber); private slots: /** implementation of the validation itself */ @@ -82,28 +82,28 @@ private slots: /** If user doubleclicked an item, this slot will be invoked. * It emits errorDoubleClicked signal for corresponding error*/ - void errorItemDoubleClicked(QListBoxItem * item); + void errorItemDoubleClicked(TQListBoxItem * item); /** show our context menu */ - void showContextMenu(QListBoxItem * item, const QPoint & pos); + void showContextMenu(TQListBoxItem * item, const TQPoint & pos); private: void readIgnores(); void writeIgnores(); ValidateProgressWidget *_mainWidget; - QString _ignoreURL; + TQString _ignoreURL; KDataTool* _tool; - QString _toolID; - QPtrList<CatManListItem> _files; + TQString _toolID; + TQPtrList<CatManListItem> _files; bool _stopped; KPopupMenu* _errorMenu; bool _ignoreFuzzy; bool _setAsFuzzy; - QValueList<IgnoreItem> _ignores; - QMap<QString,IgnoreItem> _errors; + TQValueList<IgnoreItem> _ignores; + TQMap<TQString,IgnoreItem> _errors; }; #endif // VALIDATEDLG_H diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h index 88f36d60..f3723e02 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui.h +++ b/kbabel/catalogmanager/validateprogresswidget.ui.h @@ -37,11 +37,11 @@ ** place of a destructor. *****************************************************************************/ -void ValidateProgressWidget::setupFileProgressBar( QString text, int maxvalue ) +void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue ) { _currentFileProgress->setTotalSteps(maxvalue); - QString t = text[0].upper()+text.mid(1)+":"; + TQString t = text[0].upper()+text.mid(1)+":"; _currentAction->setText(t); _currentAction->repaint(); |