diff options
Diffstat (limited to 'kbabel/catalogmanager')
33 files changed, 495 insertions, 484 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 1292c0cf..a659505e 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -126,7 +126,7 @@ void CatalogManager::init() if ( _project == NULL ) { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile) , i18n("Project File Error")); _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); @@ -136,13 +136,13 @@ void CatalogManager::init() , this, TQT_SLOT (updateSettings())); TQWidget *view = new TQWidget(this); - TQVBoxLayout* layout= new TQVBoxLayout(view); - layout->setMargin(0); - layout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout* tqlayout= new TQVBoxLayout(view); + tqlayout->setMargin(0); + tqlayout->setSpacing(KDialog::spacingHint()); _catalogManager=new CatalogManagerView(_project, view,"catalog manager"); - layout->addWidget(_catalogManager); - layout->setStretchFactor(_catalogManager,1); + tqlayout->addWidget(_catalogManager); + tqlayout->setStretchFactor(_catalogManager,1); connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings)) ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings))); @@ -162,7 +162,7 @@ void CatalogManager::init() KWin::setIcons(winId(),BarIcon("catalogmanager",32) ,SmallIcon("catalogmanager")); - TQHBoxLayout* hBoxL = new TQHBoxLayout(layout); + TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout); _progressLabel = new TQLabel(view); hBoxL->addWidget(_progressLabel); _progressBar=new KProgress(view); @@ -235,10 +235,10 @@ void CatalogManager::setupActions() // the edit menu action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this, - TQT_SLOT(find()), actionCollection(), "find_in_files"); + TQT_SLOT(tqfind()), actionCollection(), "find_in_files"); action->setEnabled(false); action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, this, - TQT_SLOT(replace()), actionCollection(), "replace_in_files"); + TQT_SLOT(tqreplace()), actionCollection(), "replace_in_files"); action->setEnabled(false); action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, this, TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); @@ -430,9 +430,9 @@ void CatalogManager::setupActions() TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); - (void)new KAction( i18n( "Status" ), 0, _catalogManager, - TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); - (void)new KAction( i18n( "Status for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus" ), 0, _catalogManager, + TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" ); + (void)new KAction( i18n( "tqStatus for Marked" ), 0, _catalogManager, TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); @@ -456,13 +456,13 @@ void CatalogManager::setupActions() TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); - (void)new KAction( i18n( "Status (Local)" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Local)" ), 0, _catalogManager, TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); - (void)new KAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Local) for Marked" ), 0, _catalogManager, TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); - (void)new KAction( i18n( "Status (Remote)" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Remote)" ), 0, _catalogManager, TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); - (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Remote) for Marked" ), 0, _catalogManager, TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); @@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar() _statusProgressBar->hide(); statusBar()->addWidget(progressBox,1); - statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height()); + statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height()); TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n" @@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar() void CatalogManager::setNumberOfFound(int toBeSent, int total) { - _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total)); + _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total)); } void CatalogManager::decreaseNumberOfFound() @@ -928,7 +928,7 @@ void CatalogManager::slotHelp() kapp->invokeHelp("CATALOGMANAGER","kbabel"); } -void CatalogManager::find() +void CatalogManager::tqfind() { if( !_findDialog ) _findDialog = new FindInFilesDialog(false,this); @@ -950,8 +950,8 @@ void CatalogManager::find() _findOptions.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::find" << endl; - TQString url = _catalogManager->find(_findOptions, _toBeSearched ); + kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::tqfind" << endl; + TQString url = _catalogManager->tqfind(_findOptions, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) @@ -1011,7 +1011,7 @@ void CatalogManager::find() } } -void CatalogManager::replace() +void CatalogManager::tqreplace() { if( !_replaceDialog ) _replaceDialog = new FindInFilesDialog(true,this); @@ -1036,7 +1036,7 @@ void CatalogManager::replace() options.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - TQString url = _catalogManager->find(options, _toBeSearched ); + TQString url = _catalogManager->tqfind(options, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) @@ -1209,7 +1209,7 @@ void CatalogManager::projectOpen() { oldproject = TQString(); } - const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString(), this); if (file.isEmpty()) { return; @@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen() } else { - KMessageBox::error (this, i18n("Cannot open project file %1").arg(file)); + KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file)); } } diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index 17235d8e..89fdef13 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -70,6 +70,7 @@ namespace KBabel class CatalogManager : public KMainWindow { Q_OBJECT + TQ_OBJECT public: CatalogManager(TQString configfile = TQString() ); ~CatalogManager(); @@ -99,8 +100,8 @@ public slots: void selectedChanged(uint actionValue); virtual void slotHelp(); - virtual void find(); - virtual void replace(); + virtual void tqfind(); + virtual void tqreplace(); virtual void stopSearching(); virtual void optionsPreferences(); virtual void optionsShowStatusbar(bool on); @@ -137,7 +138,7 @@ private: void restoreView(); void saveView(); - void saveSettings( TQString configFile = TQString::null ); + void saveSettings( TQString configFile = TQString() ); void setupActions(); void setupStatusBar(); diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index 3534a516..8e5bee23 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/catalogmanageriface.h b/kbabel/catalogmanager/catalogmanageriface.h index 037aa7c0..35345e9c 100644 --- a/kbabel/catalogmanager/catalogmanageriface.h +++ b/kbabel/catalogmanager/catalogmanageriface.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 991e1899..49e10c05 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -23,11 +23,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -91,15 +91,15 @@ const char* columnNames[] = { I18N_NOOP("Fuzzy"), I18N_NOOP("Untranslated"), I18N_NOOP("Total"), - I18N_NOOP("CVS/SVN Status"), + I18N_NOOP("CVS/SVN tqStatus"), I18N_NOOP("Last Revision"), I18N_NOOP("Last Translator") }; #define COLTEXT(a) (i18n(columnNames[a])) -CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name) - : TQListView(parent,name) +CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent,const char* name) + : TQListView(tqparent,name) , _dirWatch(0) , _readInfoCount(0) , _active(false) @@ -143,7 +143,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p setColumnAlignment(2,AlignCenter); addColumn(COLTEXT(COL_TOTAL)); setColumnAlignment(3,AlignCenter); - addColumn(TQString::null); // CVS/SVN column, header is set later + addColumn(TQString()); // CVS/SVN column, header is set later addColumn(COLTEXT(COL_REVISION)); addColumn(COLTEXT(COL_TRANSLATOR)); @@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks() #endif { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); return; } @@ -471,7 +471,7 @@ void CatalogManagerView::loadMarks() { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid file with list of markings.").arg(url.prettyURL())); + "Maybe it is not a valid file with list of markings.").tqarg(url.prettyURL())); f.close(); return; } @@ -480,7 +480,7 @@ void CatalogManagerView::loadMarks() else { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); } KIO::NetAccess::removeTempFile( filename ); @@ -516,8 +516,8 @@ void CatalogManagerView::saveMarks() // ### FIXME: why is the file dialog not doing this? if ( KIO::NetAccess::exists( url2, false, this ) ) { - 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) + if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; } @@ -568,7 +568,7 @@ void CatalogManagerView::saveMarks() { // ### KDE4 FIXME: strip the final \n of the message KMessageBox::error( this, - i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( url.prettyURL()) ); + i18n( "An error occurred while trying to write to file:\n%1\n" ).tqarg( url.prettyURL()) ); } else if ( !localFile ) { @@ -577,7 +577,7 @@ void CatalogManagerView::saveMarks() { // ### KDE4 FIXME: strip the final \n of the message KMessageBox::error(this, - i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL())); + i18n("An error occurred while trying to upload the file:\n%1\n").tqarg(url.prettyURL())); } } @@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics() showStatistics( i, markedDoList ); } -void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList ) +void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &tqchildrenList ) { KLocale *locale = KGlobal::locale(); @@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &child int totalUntranslated=0; TQStringList::const_iterator it; - for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) + for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &child if(name.isEmpty()) msg = i18n("Statistics for all:\n"); else - msg = i18n("Statistics for %1:\n").arg(name); + msg = i18n("Statistics for %1:\n").tqarg(name); - msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0)); + msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0)); percent=100.0-((double)needworkPo*100.0)/totalPackages; - msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0)); + msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0)); percent=100.0-((double)totalPo*100.0)/totalPackages; - msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0)); + msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0)); percent=((double)totalNoPot*100.0)/totalPackages; - msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0)); + msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0)); - msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0)); + msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0)); long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated; percent=((double)totalTranslated*100.0)/totalMsgid; - msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0)); + msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0)); percent=((double)totalFuzzy*100.0)/totalMsgid; - msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0)); + msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0)); percent=((double)totalUntranslated*100.0)/totalMsgid; - msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0)); + msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0)); KMessageBox::information(this,msg,i18n("Statistics")); } @@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax() if(!item->hasPo()) return; - Msgfmt::Status status; + Msgfmt::tqStatus status; TQString output; Msgfmt msgfmt; @@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax() } else { - Msgfmt::Status status; + Msgfmt::tqStatus status; TQString output; Msgfmt msgfmt; @@ -866,7 +866,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("All files in folder %1 are syntactically correct.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -882,7 +882,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has syntax errors.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -898,7 +898,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has header syntax errors.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -914,7 +914,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" " -"in folder %1").arg(name); +"in folder %1").tqarg(name); } else { @@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles() CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { TQStringList filesToSend; - TQStringList childrenList = item->allChildrenList(true); + TQStringList tqchildrenList = item->allChildrenList(true); TQStringList::const_iterator it; - for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { + for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { filesToSend << i->poFile(); @@ -1023,23 +1023,23 @@ void CatalogManagerView::packageFiles( ) CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { TQStringList filesToPackage; - TQStringList childrenList = item->allChildrenList(true); + TQStringList tqchildrenList = item->allChildrenList(true); TQStringList::const_iterator it; - for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { + for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { filesToPackage << i->poFile(); } } - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString(), false ); } else { if (item->hasPo()) { TQStringList fileToPackage(item->poFile()); - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( fileToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( fileToPackage, packageFileName, TQString(), false ); } } } @@ -1057,8 +1057,8 @@ void CatalogManagerView::packageMarkedFiles( ) } } - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString(), false ); } // CVS @@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( ) doCVSCommand( CVS::Commit, true ); } -void CatalogManagerView::cvsStatus( ) +void CatalogManagerView::cvstqStatus( ) { - doCVSCommand( CVS::Status ); + doCVSCommand( CVS::tqStatus ); } void CatalogManagerView::cvsStatusMarked( ) { - doCVSCommand( CVS::Status, true ); + doCVSCommand( CVS::tqStatus, true ); } void CatalogManagerView::cvsUpdateTemplate( ) @@ -1137,7 +1137,7 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ TQString cvsItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) { - // all children including directories + // all tqchildren including directories TQStringList cvsItems = item->allChildrenFileList (true, false, true); if ( !cvsItems.isEmpty( ) ) cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config ); @@ -1249,7 +1249,7 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ TQString svnItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) { - // all children including directories + // all tqchildren including directories TQStringList svnItems = item->allChildrenFileList (true, false, true); if ( !svnItems.isEmpty( ) ) svnhandler->execSVNCommand( this, cmd, svnItems, templates, config ); @@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog() _logWindow->show(); } -TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) +TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest ) { CatManListItem* i=(CatManListItem*) currentItem(); @@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) const TQString search = options.findStr.lower().simplifyWhiteSpace(); TQStringList searchWords = TQStringList::split(' ', search); - TQStringList childrenList; - if( i->isFile() ) childrenList.append(i->name()); - else childrenList =i->allChildrenList(true); + TQStringList tqchildrenList; + if( i->isFile() ) tqchildrenList.append(i->name()); + else tqchildrenList =i->allChildrenList(true); - emit prepareFindProgressBar(childrenList.size()); + emit prepareFindProgressBar(tqchildrenList.size()); TQStringList::const_iterator it; - for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) + for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -1341,11 +1341,11 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) const TQString foundItemFile = itemFile; it++; - while( it != childrenList.constEnd() ) + while( it != tqchildrenList.constEnd() ) { CatManListItem *item = _fileList[(*it)]; - itemFile = TQString::null; + itemFile = TQString(); if( options.inTemplates ) { if( item->hasPot() ) itemFile=item->potFile(); @@ -1353,7 +1353,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) if( item->hasPo() )itemFile=item->poFile(); } if( options.inMarkedFiles && !item->marked() ) - itemFile=TQString::null; + itemFile=TQString(); if( !itemFile.isNull()) { @@ -1380,10 +1380,10 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) _stopSearch = false; rest.clear(); if( _updateNesting == 0 && !_stop ) emit updateFinished(); - return TQString::null; + return TQString(); } } - return TQString::null; + return TQString(); } bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList &searchWords) @@ -1391,8 +1391,8 @@ bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList 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; + || (*it1).tqcontains(*it2) + || (*it2).tqcontains(*it1) ) return true; return false; } @@ -1499,12 +1499,12 @@ void CatalogManagerView::slotDeleteFile() if(item && item->isFile() && item->hasPo() && !item->hasPot()) { - const TQString 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?").tqarg(item->poFile()); if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue) { if(!TQFile::remove(item->poFile())) { - KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile())); + KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").tqarg(item->poFile())); } } } @@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index) if(index>=0 && item && item->isDir()) { TQString cmd=*(_settings.dirCommands).at(index); - cmd.replace("@PACKAGE@",item->name()); - cmd.replace("@PODIR@",item->poFile()); - cmd.replace("@POTDIR@",item->potFile()); - cmd.replace("@POFILES@",current().join(" ")); - cmd.replace("@MARKEDPOFILES@",marked().join(" ")); + cmd.tqreplace("@PACKAGE@",item->name()); + cmd.tqreplace("@PODIR@",item->poFile()); + cmd.tqreplace("@POTDIR@",item->potFile()); + cmd.tqreplace("@POFILES@",current().join(" ")); + cmd.tqreplace("@MARKEDPOFILES@",marked().join(" ")); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1638,15 +1638,15 @@ void CatalogManagerView::slotFileCommand(int index) if(index>=0 && item && item->isFile()) { - CatManListItem* parent = (CatManListItem*)item->parent(); + CatManListItem* tqparent = (CatManListItem*)item->tqparent(); TQString cmd=*(_settings.fileCommands).at(index); - cmd.replace("@PACKAGE@",item->name()); - cmd.replace("@POFILE@",item->poFile()); - cmd.replace("@POTFILE@",item->potFile()); - cmd.replace("@PODIR@",parent->poFile()); - cmd.replace("@POTDIR@",parent->potFile()); - cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR)); + cmd.tqreplace("@PACKAGE@",item->name()); + cmd.tqreplace("@POFILE@",item->poFile()); + cmd.tqreplace("@POTFILE@",item->potFile()); + cmd.tqreplace("@PODIR@",tqparent->poFile()); + cmd.tqreplace("@POTDIR@",tqparent->potFile()); + cmd.tqreplace("@POEMAIL@",item->text(COL_TRANSLATOR)); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1660,7 +1660,7 @@ void CatalogManagerView::slotFileCommand(int index) connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); - *proc << "cd" << parent->poFile() << ";" << cmd; + *proc << "cd" << tqparent->poFile() << ";" << cmd; proc->start(KProcess::NotifyOnExit,KProcess::AllOutput); } @@ -1765,7 +1765,7 @@ void CatalogManagerView::buildTree() { KMessageBox::error(this,i18n("You have not specified a valid folder " "for the base folder of the PO files:\n%1\n" -"Please check your settings in the project settings dialog.").arg(_settings.poBaseDir)); +"Please check your settings in the project settings dialog.").tqarg(_settings.poBaseDir)); _active=false; _updateNesting--; @@ -1782,7 +1782,7 @@ void CatalogManagerView::buildTree() { KMessageBox::error(this,i18n("You have not specified a valid folder " "for the base folder of the PO template files:\n%1\n" -"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir)); +"Please check your settings in the project settings dialog.").tqarg(_settings.potBaseDir)); } cvshandler->setPOTBaseDir( _settings.potBaseDir ); @@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir _fileList.insert(file,item); _readInfoFileList.prepend(file); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -1953,7 +1953,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir } TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(baseDir+subDir)) + if(!_dirWatch->tqcontains(baseDir+subDir)) { _dirWatch->addDir(baseDir+subDir); } @@ -2027,7 +2027,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -2056,7 +2056,7 @@ void CatalogManagerView::updateDir(TQString relDir) bool newDirAdded=false; TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(potBaseDir+subDir)) + if(!_dirWatch->tqcontains(potBaseDir+subDir)) { _dirWatch->addDir(potBaseDir+subDir); @@ -2109,7 +2109,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -2138,7 +2138,7 @@ void CatalogManagerView::updateDir(TQString relDir) bool newDirAdded=false; TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(poBaseDir+subDir)) + if(!_dirWatch->tqcontains(poBaseDir+subDir)) { _dirWatch->addDir(poBaseDir+subDir); newDirAdded=true; @@ -2206,8 +2206,8 @@ void CatalogManagerView::updateDir(TQString relDir) deleteDirItem(relDir); // if this directory has to be removed, check, if - // the parent directory has to be removed too - const int index=relDir.findRev("/",relDir.length()-2); + // the tqparent directory has to be removed too + const int index=relDir.tqfindRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2266,12 +2266,12 @@ void CatalogManagerView::directoryChanged(const TQString& dir) CatManListItem* thisItem=_dirList[relDir]; if(!thisItem) { - // if this item is not in the list search for next existing parent item + // if this item is not in the list search for next existing tqparent item TQString prevRelDir; do { prevRelDir=relDir; - const int index=relDir.findRev("/",relDir.length()-2); + const int index=relDir.tqfindRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2289,7 +2289,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir) } else { - // if a parent item dir is found, create the needed item in this dir + // if a tqparent item dir is found, create the needed item in this dir // and build the tree from this item on kdDebug(KBABEL_CATMAN) << "building dir: " << prevRelDir << endl; CatManListItem* item = new CatManListItem(this, thisItem,_settings.poBaseDir+prevRelDir @@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir) void CatalogManagerView::fileInfoRead( TQString filename ) { - if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) { + if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) { emit progress( ++_readInfoCount); _readInfoFileList.remove( filename ); } @@ -2518,8 +2518,8 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event) if(event->state() & LeftButton) { const int delay = KGlobalSettings::dndEventDelay(); - if(QABS( event->pos().x() - _pressPos.x() ) >= delay || - QABS( event->pos().y() - _pressPos.y() ) >= delay) + if(TQABS( event->pos().x() - _pressPos.x() ) >= delay || + TQABS( event->pos().y() - _pressPos.y() ) >= delay) { CatManListItem* item = (CatManListItem*)itemAt(contentsToViewport(_pressPos)); if(item && item->isFile()) @@ -2624,7 +2624,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->nextSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent() ); + item = static_cast<CatManListItem *>( item->tqparent() ); if( !item ) return item; } return static_cast<CatManListItem *>( item->nextSibling() ); @@ -2634,7 +2634,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->nextSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent()); + item = static_cast<CatManListItem *>( item->tqparent()); if( !item ) return item; } return static_cast<CatManListItem *>( item->nextSibling() ); @@ -2651,7 +2651,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->previousSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent() ); + item = static_cast<CatManListItem *>( item->tqparent() ); if( !item ) return item; } return static_cast<CatManListItem *>( item->previousSibling() ); @@ -2661,7 +2661,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->previousSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent()); + item = static_cast<CatManListItem *>( item->tqparent()); if( !item ) return item; } return static_cast<CatManListItem *>( item->previousSibling() ); @@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel); _validateOptions = new ValidationOptions(_validateOptionsDlg); _validateOptionsDlg->setMainWidget( _validateOptions ); - _validateOptions->resize( _validateOptions->sizeHint() ); + _validateOptions->resize( _validateOptions->tqsizeHint() ); // setup stored values _validateOptions->markAsFuzzy->setChecked( _markAsFuzzy ); @@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show ) } #include "catalogmanagerview.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h index a1a23729..26a05d9f 100644 --- a/kbabel/catalogmanager/catalogmanagerview.h +++ b/kbabel/catalogmanager/catalogmanagerview.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -74,11 +74,12 @@ namespace KBabel class PoInfo; } -class CatalogManagerView : public QListView +class CatalogManagerView : public TQListView { Q_OBJECT + TQ_OBJECT public: - CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent=0, const char* name=0); + CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent=0, const char* name=0); virtual ~CatalogManagerView(); KBabel::CatManSettings settings() const; @@ -125,14 +126,14 @@ public slots: * traverses all childs in the directory of the current item * (including all subdirectories) and displays some statistics * about the translations. If the item is a file, its - * parent directory is used instead. + * tqparent directory is used instead. */ void statistics(); /** * traverses all marked childs in the directory of the current item * (including all subdirectories) and displays some statistics * about the translations. If the item is a file, its - * parent directory is used instead. + * tqparent directory is used instead. */ void markedStatistics(); /** @@ -160,7 +161,7 @@ public slots: void cvsUpdateMarked( ); void cvsCommit( ); void cvsCommitMarked( ); - void cvsStatus( ); + void cvstqStatus( ); void cvsStatusMarked( ); void cvsUpdateTemplate( ); void cvsUpdateMarkedTemplate( ); @@ -184,7 +185,7 @@ public slots: void svnInfo(); void svnInfoMarked(); - TQString find(KBabel::FindOptions &options, TQStringList &rest); + TQString tqfind(KBabel::FindOptions &options, TQStringList &rest); void showLog(); @@ -193,7 +194,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 TQString::null, if search string was not is the last searched file + * and @ref TQString(), if search string was not is the last searched file */ void stopSearch(); @@ -234,7 +235,7 @@ public slots: /** * Returns the list of all currently selected files. If current selection is dir, - * it returns list of all its children. + * it returns list of all its tqchildren. */ TQStringList current(); /** diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 5613a0bd..8d1496d4 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,15 +53,15 @@ using namespace KBabel; -CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath,TQString fullPotPath,TQString package) - : TQListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath,TQString fullPotPath,TQString package) + : TQListViewItem(tqparent) { _view = view; init(fullPath,fullPotPath,package); } -CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath,TQString fullPotPath) - : TQListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath,TQString fullPotPath) + : TQListViewItem(tqparent) { _primary=TQFileInfo(fullPath); _template=TQFileInfo(fullPotPath); @@ -102,7 +102,7 @@ void CatManListItem::init(const TQString& fullPath, const TQString& fullPotPath, _wordList.clear(); _wordListUpdated = false; - update(parent()->isOpen(),false,true); + update(tqparent()->isOpen(),false,true); if( !isDir() ) setPixmap(COL_MARKER,ICON_NOFLAG); } @@ -183,7 +183,7 @@ void CatManListItem::setOpen(bool open) TQStringList CatManListItem::allChildrenList(bool onlyFiles) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const if(myChild->isFile()) { - childrenList.append(name); + tqchildrenList.append(name); } else if(myChild->isDir()) { if(!onlyFiles) - childrenList.append(name); + tqchildrenList.append(name); - childrenList+=myChild->allChildrenList(onlyFiles); + tqchildrenList+=myChild->allChildrenList(onlyFiles); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -219,22 +219,22 @@ TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, if(myChild->isFile() && myChild->hasPo() && !(!myChild->isModified() && onlyModified)) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } else if(myChild->isDir()) { if(!onlyFiles && (emptyDirs || myChild->_primary.exists() )) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } - childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); + tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } @@ -332,11 +332,11 @@ TQString CatManListItem::key(int col, bool) const void CatManListItem::update(bool showPoInfo,bool includeChildren , bool noParents) { - if( _view->isStopped() ) return; // if parent view is stopped, we should stop as well + if( _view->isStopped() ) return; // if tqparent view is stopped, we should stop as well bool updateWordList = _view->settings().indexWords; - // flag, if something has changed and parent has to be updated + // flag, if something has changed and tqparent has to be updated bool updateParent=false; // update flags for files... @@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren const CVSHandler* cvsHandler = _view->cvsHandler(); const SVNHandler* svnHandler = _view->svnHandler(); - const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() ); - const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() ); + const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() ); + const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() ); - _isModified = cvsHandler->isConsideredModified( cvsFileStatus ) - || svnHandler->isConsideredModified( svnFileStatus ); + _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus ) + || svnHandler->isConsideredModified( svnFiletqStatus ); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = cvsHandler->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = svnHandler->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = cvsHandler->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = svnHandler->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); @@ -532,15 +532,15 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); // clean previous state information - 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); + setText(COL_FUZZY,TQString()); + setText(COL_UNTRANS,TQString()); + setText(COL_TOTAL,TQString()); + setText(COL_CVS_OR_SVN, TQString()); + setText(COL_REVISION, TQString()); + setText(COL_TRANSLATOR, TQString()); setPixmap(COL_NAME,ICON_UPDATING); @@ -596,7 +596,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren // however, is can be saved template or translation!!! - only translation is handled??? void CatManListItem::updateAfterSave( PoInfo &poInfo ) { - // flag, if something has changed and parent has to be updated + // flag, if something has changed and tqparent has to be updated bool updateParent=false; // update flags for files... @@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQPixmap icon; _hasErrors=false; - const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile()); - const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile()); + const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile()); + const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile()); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = _view->svnHandler()->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); @@ -661,7 +661,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) setPixmap(COL_NAME,icon); - // if the status changed, update the parent item + // if the status changed, update the tqparent item if(needWork != neededWork) { updateParent=true; @@ -677,11 +677,11 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) void CatManListItem::updateParents() { - CatManListItem *item = (CatManListItem*)parent(); + CatManListItem *item = (CatManListItem*)tqparent(); while( item && !_view->isStopped()) { item->update(false,false); - item = (CatManListItem*)item->parent(); + item = (CatManListItem*)item->tqparent(); } } @@ -799,12 +799,12 @@ TQString CatManListItem::package(bool rootSlash) const TQString CatManListItem::packageDir( ) const { - return ( _type == Dir ? _package : TQString::null ); + return ( _type == Dir ? _package : TQString() ); } TQString CatManListItem::name() const { - int index = _package.findRev("/"); + int index = _package.tqfindRev("/"); return _package.right(_package.length()-index-1); } @@ -825,12 +825,12 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap) int width=pixmap->width(); int height=pixmap->height(); - int diameter=QMIN(width,height); + int diameter=TQMIN(width,height); - TQBitmap mask=pixmap->createHeuristicMask(); + TQBitmap tqmask=pixmap->createHeuristicMask(); - TQPainter mp(&mask); - mp.setPen(TQPen(Qt::color1,1)); + TQPainter mp(&tqmask); + mp.setPen(TQPen(TQt::color1,1)); mp.drawEllipse(width-diameter,height-diameter,diameter,diameter); TQPixmap result(width,height); @@ -840,14 +840,14 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap) p.setPen( TQPen(red,1) ); p.drawEllipse(width-diameter,height-diameter,diameter,diameter); - result.setMask(mask); + result.setMask(tqmask); return result; } TQListViewItem *CatManListItem::previousSibling() { - TQListViewItem * i = parent(); + TQListViewItem * i = tqparent(); if( !i ) return i; i = i->firstChild(); if( !i ) return i; diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h index b156c034..a21db4f0 100644 --- a/kbabel/catalogmanager/catmanlistitem.h +++ b/kbabel/catalogmanager/catmanlistitem.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,25 +54,25 @@ namespace KBabel class PoInfo; } -class CatManListItem : public QListViewItem +class CatManListItem : public TQListViewItem { public: /** the type of this item */ enum Type{File,Dir}; - CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath + CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath ,TQString fullPotPath,TQString package); /** creates the toplevel root item with package name "/" */ - CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath, TQString fullPotPath); + CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath, TQString fullPotPath); /** * returns the package names (including relative path) of the - * children of this item + * tqchildren of this item */ TQStringList contentsList(bool onlyFiles=false) const; /** - * returns the package names of all children of this item + * returns the package names of all tqchildren of this item * (including all subdirectries) * @param onlyFiles flag, if only the names of files should be returned * @see CatManListItem::contentsList @@ -80,7 +80,7 @@ public: TQStringList allChildrenList(bool onlyFiles=false) const; /** - * returns the relative file names of all children of this item + * returns the relative file names of all tqchildren of this item * (including all subdirectries) * @param onlyFiles flag, if only the names of files should be returned * @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should be returned @@ -94,7 +94,7 @@ public: /** * checks if the file on the disc has changed, * reads information about the file and displays it - * @param noParents flag, if the update has to include the parent + * @param noParents flag, if the update has to include the tqparent * of the item, if the status has changed. Since at the first build of * the tree, the status of every item changes, this is not useful then. */ @@ -119,7 +119,7 @@ public: /** returns the package name (inlcuding relative path to base-directory) */ TQString package(bool rootSlash=true) const; - /** returns the relative path of a dir or TQString::null if not a dir. */ + /** returns the relative path of a dir or TQString() if not a dir. */ TQString packageDir( ) const; /** returns the package name (without path) */ @@ -172,7 +172,7 @@ public: TQStringList &wordList() { return _wordList; } bool wordsUpdated() { return _wordListUpdated; } - /** These are not in Qt, so we need to implement it ourselves*/ + /** These are not in TQt, so we need to implement it ourselves*/ TQListViewItem *previousSibling(); TQListViewItem *lastChild(); @@ -183,8 +183,8 @@ private: * @param showPoInfo if true, reads information about the * file using @ref Catalog::info * ( slow for big files ) - * @param includeChildren flag, if possible children should be updated,too - * @param noParents flag, if parents should be updated, when state + * @param includeChildren flag, if possible tqchildren should be updated,too + * @param noParents flag, if tqparents should be updated, when state * of the item has changed */ void update(bool showPoInfo=true,bool includeChildren=false @@ -227,7 +227,7 @@ private: /** a list of errors found by validation tool*/ TQValueList<IgnoreItem> _errors; - /** parent view for this item, used for stopping the activity */ + /** tqparent view for this item, used for stopping the activity */ CatalogManagerView *_view; /** index of words, but it does not contain any useful information as values */ diff --git a/kbabel/catalogmanager/catmanresource.h b/kbabel/catalogmanager/catmanresource.h index 06b3ac33..0c8a694a 100644 --- a/kbabel/catalogmanager/catmanresource.h +++ b/kbabel/catalogmanager/catmanresource.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index becffa51..587d7f75 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,11 +44,11 @@ using namespace KBabel; -FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent) - :FindDialog(forReplace, parent) +FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent) + :FindDialog(forReplace, tqparent) { TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget()); - mainWidget()->layout()->add(box); + mainWidget()->tqlayout()->add(box); _inAllFiles = new TQCheckBox(i18n("&In all files"),box); _inMarked = new TQCheckBox(i18n("&Marked files"),box); @@ -57,7 +57,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent) _askForSave = new TQCheckBox(i18n("Save &without asking"),box); TQWhatsThis::add(box,i18n("<qt><p><b>File Options</b></p>" - "<p>Here you can finetune where to find:" + "<p>Here you can finetune where to tqfind:" "<ul><li><b>In all files</b>: search in all files, otherwise searched " "is the selected file or files in the selected folder</li>" "<li><b>Ask before next file</b>: show a dialog asking to proceed to the next file</li>" diff --git a/kbabel/catalogmanager/findinfilesdialog.h b/kbabel/catalogmanager/findinfilesdialog.h index 4ddbbb7d..afabcb58 100644 --- a/kbabel/catalogmanager/findinfilesdialog.h +++ b/kbabel/catalogmanager/findinfilesdialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,12 +41,13 @@ class TQCheckBox; class FindInFilesDialog : public FindDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param replaceDlg flag, if this is a replace dialog */ - FindInFilesDialog(bool replaceDlg, TQWidget* parent); + FindInFilesDialog(bool replaceDlg, TQWidget* tqparent); ~FindInFilesDialog(); /** diff --git a/kbabel/catalogmanager/future.cpp b/kbabel/catalogmanager/future.cpp index 4c9c8a90..a1da0036 100644 --- a/kbabel/catalogmanager/future.cpp +++ b/kbabel/catalogmanager/future.cpp @@ -2,7 +2,7 @@ // Misc. messages already existing in the kbabel-svn branch i18n("SVN"); -i18n( "CVS/SVN Status" ); +i18n( "CVS/SVN tqStatus" ); // Messages for further SVN functions i18n( "Resolved" ); diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 090b3de3..1a71cf94 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ **************************************************************************** */ -// Qt include files +// TQt include files #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqfileinfo.h> @@ -60,8 +60,8 @@ #include "cvsdialog.h" -CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ) - : KDialog( parent, "CVSDIALOG", true ), m_config( config ) +CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config ) + : KDialog( tqparent, "CVSDIALOG", true ), m_config( config ) { _cmd = cmd; p=0L; @@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config TQString temp; - TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the CVS command. switch ( cmd ) { @@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config case CVS::Commit: temp = i18n( "Commit the following files:" ); break; - case CVS::Status: + case CVS::tqStatus: temp = i18n( "Get status for the following files:" ); break; case CVS::Diff: temp = i18n( "Get diff for the following files:" ); break; } - layout->addWidget( new TQLabel( temp, this ) ); + tqlayout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. filebox = new TQListBox( this ); - layout->addWidget( filebox ); + tqlayout->addWidget( filebox ); // Add special widgets for 'cvs commit'. if ( cmd == CVS::Commit ) { @@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); - layout->addWidget( label ); - layout->addWidget( oldMessages ); + tqlayout->addWidget( label ); + tqlayout->addWidget( oldMessages ); // Textfield for entering a log message. label = new TQLabel( i18n( "&Log message:" ), this ); logedit = new TQTextEdit( this ); label->setBuddy( logedit ); - layout->addWidget( label ); - layout->addWidget( logedit ); + tqlayout->addWidget( label ); + tqlayout->addWidget( logedit ); label = new TQLabel( i18n( "E&ncoding:" ), this ); m_encodingComboBox = new KComboBox( this ); label->setBuddy( m_encodingComboBox ); - layout->addWidget( label ); - layout->addWidget( m_encodingComboBox ); + tqlayout->addWidget( label ); + tqlayout->addWidget( m_encodingComboBox ); 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( TQTextCodec::codecForLocale()->mimeName() ); + encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); + encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_encodingComboBox->insertStringList( encodingList ); @@ -143,8 +143,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config case CVS::Commit: temp = i18n( "&Commit" ); break; - case CVS::Status: - temp = i18n( "&Get Status" ); + case CVS::tqStatus: + temp = i18n( "&Get tqStatus" ); break; case CVS::Diff: temp = i18n( "&Get Diff" ); @@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); - layout->addLayout( buttons ); + tqlayout->addLayout( buttons ); TQFrame * line = new TQFrame( this ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - layout->addWidget( line ); + tqlayout->addWidget( line ); - layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); + tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); output = new TQTextEdit( this ); output->setReadOnly( true ); - layout->addWidget( output ); + tqlayout->addWidget( output ); - resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) ); if ( cmd == CVS::Commit ) logedit->setFocus( ); @@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( ) if ( !codec ) { - KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) ); + KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) ); return; } else if ( !codec->canEncode( msg ) ) { const int res = KMessageBox::warningContinueCancel( this, i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n" - "Do you want to continue?" ).arg( m_encoding ) ); + "Do you want to continue?" ).tqarg( m_encoding ) ); if ( res != KMessageBox::Continue ) return; } @@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( ) } // Change the command line to have the real name of the temporary file - _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); + _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); // Update the list of log messages if ( !msg.isEmpty() ) { @@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len ) 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) ) + if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) ) _statusOutput += TQString::fromLocal8Bit( buffer, len ); } @@ -339,7 +339,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len ) // If an error occurs while executing the command display stderr in // another color. TQColor oldColor( output->color( ) ); - output->setColor( Qt::red ); + output->setColor( TQt::red ); output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); @@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len ) void CVSDialog::slotProcessExited( KProcess * p ) { if ( p->exitStatus( ) ) - output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) ); + output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) ); else output->append( i18n( "[ Finished ]" ) ); @@ -383,9 +383,9 @@ void CVSDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) ) { - const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) @@ -398,7 +398,7 @@ void CVSDialog::readSettings( ) } m_encoding = config->readEntry( "CVSEncoding", "UTF-8" ); - m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0); + m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0); } } @@ -413,7 +413,7 @@ void CVSDialog::saveSettings( ) int cnt = 0; TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it ); config->writeEntry( "CVSEncoding", m_encoding ); } diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h index 0eccf24c..3c492704 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.h +++ b/kbabel/catalogmanager/libcvs/cvsdialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,7 +39,7 @@ #include <kdialog.h> // Project specific include files #include "cvsresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQCheckBox; class TQComboBox; class TQListBox; @@ -66,13 +66,14 @@ class KComboBox; class CVSDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ); + CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config ); ~CVSDialog(); /** * Set the list of files which will be used for the CVS command. diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index 66eeac0a..73d149d3 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,7 +36,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> -// Qt include files +// TQt include files #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -TQString CVSHandler::fileStatus( const FileStatus status ) const +TQString CVSHandler::filetqStatus( const FiletqStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -111,7 +111,7 @@ TQString CVSHandler::fileStatus( const FileStatus status ) const } } -CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const +CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) @@ -130,7 +130,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const // ### 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 - TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) ); + TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) ); TQString temp; TQTextStream stream( &entries ); @@ -138,7 +138,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const bool isInRepository = false; while ( !stream.atEnd() ) { temp = stream.readLine( ); - if ( temp.find( rx ) == 0 ) { + if ( temp.tqfind( rx ) == 0 ) { isInRepository = true; break; } @@ -162,7 +162,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const return LOCALLY_REMOVED; // check for conflicts - if ( timestamp.find( '+' ) >= 0 ) + if ( timestamp.tqfind( '+' ) >= 0 ) return CONFLICT; // calculate the UTC time from the file's last modified date @@ -177,23 +177,23 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const return UP_TO_DATE; } -TQString CVSHandler::cvsStatus( const TQString& filename ) const +TQString CVSHandler::cvstqStatus( const TQString& filename ) const { return map[filename]; } -void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. " "The CVS commands cannot be executed." ) ); return; } TQFileInfo info( filename ); if ( !info.isDir( ) ) { - execCVSCommand( parent, cmd, TQStringList( filename ), templates, config ); + execCVSCommand( tqparent, cmd, TQStringList( filename ), templates, config ); return; } @@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += "commit -F @LOG@FILE@"; checkToAdd( TQStringList( filename ) ); break; - case CVS::Status: + case CVS::tqStatus: command += "status"; break; case CVS::Diff: @@ -218,14 +218,14 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr break; } - showDialog( parent, cmd, TQStringList( filename ), command, config ); + showDialog( tqparent, cmd, TQStringList( filename ), command, config ); } -void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. " "The CVS commands cannot be executed." ) ); return; } @@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += "commit -F @LOG@FILE@"; checkToAdd( files ); break; - case CVS::Status: + case CVS::tqStatus: command += "status"; break; case CVS::Diff: @@ -262,7 +262,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += " \'" + temp + "\'"; } - showDialog( parent, cmd, files, command, config ); + showDialog( tqparent, cmd, files, command, config ); } void CVSHandler::setAutoUpdateTemplates( bool update ) @@ -270,9 +270,9 @@ void CVSHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) +void CVSHandler::showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { - CVSDialog * dia = new CVSDialog( cmd, parent, config ); + CVSDialog * dia = new CVSDialog( cmd, tqparent, config ); dia->setFiles( files ); dia->setCommandLine( commandLine ); if ( cmd == CVS::Commit ) { @@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL } if ( dia->exec( ) == KDialog::Accepted ) { - if ( cmd == CVS::Status ) + if ( cmd == CVS::tqStatus ) processStatusOutput( dia->statusOutput( ) ); if ( cmd == CVS::Diff ) processDiff( dia->statusOutput( ) ); @@ -313,7 +313,7 @@ void CVSHandler::checkToAdd( const TQStringList& files ) toBeAdded << *it; temp = TQFileInfo( *it ).dirPath( true ); } - // check recursivlely if parent dirs have to be added as well + // check recursivlely if tqparent dirs have to be added as well while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; temp = TQFileInfo( temp ).dirPath( true ); @@ -357,7 +357,7 @@ void CVSHandler::processStatusOutput( const TQString& status ) TQString entr = *it; // translate the filename from repository to local TQRegExp rx( basedir + ".*,v" ); - int pos = entr.find( rx ); + int pos = entr.tqfind( rx ); TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); @@ -365,14 +365,14 @@ void CVSHandler::processStatusOutput( const TQString& status ) // TODO: do some markup - map.replace( file, entr ); + map.tqreplace( file, entr ); } } void CVSHandler::processDiff( TQString output ) { output.remove( TQRegExp( "\\[ .* \\]$" )); - output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; @@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output ) KMessageBox::error( 0, error ); } -bool CVSHandler::isConsideredModified( const FileStatus status ) const +bool CVSHandler::isConsideredModified( const FiletqStatus status ) const { /* * A file is modified if it is either: diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h index 961c41fd..78e248da 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.h +++ b/kbabel/catalogmanager/libcvs/cvshandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,13 +35,13 @@ #ifndef CVSHANDLER_H #define CVSHANDLER_H -// Qt include files +// TQt include files #include <tqmap.h> #include <tqobject.h> // Project specific include files #include "cvsdialog.h" #include "cvsresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQString; class TQStringList; class TQWidget; @@ -54,12 +54,13 @@ class KSharedConfig; * @short Backend for CVS support in Catalog Manager * @author Marco Wegner <mail@marcowegner.de> */ -class CVSHandler : public QObject +class CVSHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum FileStatus { + enum FiletqStatus { NO_REPOSITORY, NOT_IN_CVS, LOCALLY_ADDED, @@ -69,24 +70,24 @@ class CVSHandler : public QObject UP_TO_DATE }; - CVSHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); + CVSHandler( const TQString& poBaseDir = TQString(), const TQString& potBaseDir = TQString() ); void setPOBaseDir( const TQString& dir ); void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const TQString& filename ) const; - TQString fileStatus( const FileStatus status ) const; - TQString cvsStatus( const TQString& filename ) const; + FiletqStatus fstatus( const TQString& filename ) const; + TQString filetqStatus( const FiletqStatus status ) const; + TQString cvstqStatus( const TQString& filename ) const; - 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 execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); /** * True if the file was modified or has another status considered as a modification */ - bool isConsideredModified( const FileStatus status ) const; + bool isConsideredModified( const FiletqStatus status ) const; signals: void signalIsPORepository( bool ); @@ -94,7 +95,7 @@ class CVSHandler : public QObject void signalFilesCommitted( const TQStringList& ); private: - void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); + void showDialog( TQWidget* tqparent, 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 ); diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h index 627802f7..4c2bc144 100644 --- a/kbabel/catalogmanager/libcvs/cvsresources.h +++ b/kbabel/catalogmanager/libcvs/cvsresources.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,7 +35,7 @@ #define CVSRESOURCES_H namespace CVS { - enum Command { Update, Commit, Status, Diff }; + enum Command { Update, Commit, tqStatus, Diff }; } #endif // CVSRESOURCES_H diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index a6f7d229..e6cb76e5 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ **************************************************************************** */ -// Qt include files +// TQt include files #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqfileinfo.h> @@ -57,8 +57,8 @@ #include "svndialog.h" -SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ) - : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) +SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config ) + : KDialog( tqparent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) { _cmd = cmd; p=0L; @@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config TQString temp; - TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the SVN command. switch ( cmd ) { @@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config temp = i18n( "Get information for the following files:" ); break; } - layout->addWidget( new TQLabel( temp, this ) ); + tqlayout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. filebox = new TQListBox( this ); - layout->addWidget( filebox ); + tqlayout->addWidget( filebox ); // Add special widgets for 'svn commit'. if ( cmd == SVN::Commit ) { @@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); - layout->addWidget( label ); - layout->addWidget( oldMessages ); + tqlayout->addWidget( label ); + tqlayout->addWidget( oldMessages ); // Textfield for entering a log message. label = new TQLabel( i18n( "&Log message:" ), this ); logedit = new TQTextEdit( this ); label->setBuddy( logedit ); - layout->addWidget( label ); - layout->addWidget( logedit ); + tqlayout->addWidget( label ); + tqlayout->addWidget( logedit ); connect( oldMessages, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotComboActivated( int ) ) ); @@ -136,7 +136,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config break; case SVN::StatusRemote: case SVN::StatusLocal: - temp = i18n( "&Get Status" ); + temp = i18n( "&Get tqStatus" ); break; case SVN::Diff: temp = i18n( "&Get Diff" ); @@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); - layout->addLayout( buttons ); + tqlayout->addLayout( buttons ); TQFrame * line = new TQFrame( this ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - layout->addWidget( line ); + tqlayout->addWidget( line ); - layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); + tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); output = new TQTextEdit( this ); output->setReadOnly( true ); - layout->addWidget( output ); + tqlayout->addWidget( output ); - resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) ); if ( cmd == SVN::Commit ) logedit->setFocus( ); @@ -261,7 +261,7 @@ void SVNDialog::slotExecuteCommand( ) } // Change the command line to have the real name of the temporary file - _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); + _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); // Update the list of log messages if ( !msg.isEmpty() ) { @@ -318,7 +318,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len ) // If an error occurs while executing the command display stderr in // another color. TQColor oldColor( output->color( ) ); - output->setColor( Qt::red ); + output->setColor( TQt::red ); output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); @@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len ) void SVNDialog::slotProcessExited( KProcess * p ) { if ( p->exitStatus( ) ) - output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) ); + output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) ); else output->append( i18n( "[ Finished ]" ) ); @@ -362,9 +362,9 @@ void SVNDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) ) { - const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) @@ -390,11 +390,11 @@ void SVNDialog::saveSettings( ) int cnt = 0; TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it ); } m_config->sync(); } #include "svndialog.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/libsvn/svndialog.h b/kbabel/catalogmanager/libsvn/svndialog.h index d1ca2d16..55c57f27 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.h +++ b/kbabel/catalogmanager/libsvn/svndialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,7 +39,7 @@ #include <kdialog.h> // Project specific include files #include "svnresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQCheckBox; class TQComboBox; class TQListBox; @@ -65,13 +65,14 @@ class KSharedConfig; class SVNDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ); + SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config ); ~SVNDialog(); /** * Set the list of files which will be used for the SVN command. diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 1ac98f66..c648c2bb 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,7 +36,7 @@ #include <unistd.h> #include <sys/stat.h> #include <time.h> -// Qt include files +// TQt include files #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -TQString SVNHandler::fileStatus( const FileStatus status ) const +TQString SVNHandler::filetqStatus( const FiletqStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -115,7 +115,7 @@ TQString SVNHandler::fileStatus( const FileStatus status ) const } } -SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const +SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) @@ -145,7 +145,7 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const int errorLine, errorCol; TQDomNodeList nodelist; TQDomNode node; - TQDomElement entry, wcStatus; + TQDomElement entry, wctqStatus; // Parse the output. if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) { @@ -177,22 +177,22 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const if ( node.isNull() ) return ERROR_IN_WC; - wcStatus = node.toElement(); + wctqStatus = node.toElement(); - if ( wcStatus.attributeNode("item").value() == "normal" ) + if ( wctqStatus.attributeNode("item").value() == "normal" ) return UP_TO_DATE; - if ( wcStatus.attributeNode("item").value() == "modified" ) + if ( wctqStatus.attributeNode("item").value() == "modified" ) return LOCALLY_MODIFIED; - if ( wcStatus.attributeNode("item").value() == "conflicted" ) + if ( wctqStatus.attributeNode("item").value() == "conflicted" ) return CONFLICT; - if ( wcStatus.attributeNode("item").value() == "unversioned" ) + if ( wctqStatus.attributeNode("item").value() == "unversioned" ) return NOT_IN_SVN; // TODO Ignored entry should have separate return value probably. - if ( wcStatus.attributeNode("item").value() == "ignored" ) + if ( wctqStatus.attributeNode("item").value() == "ignored" ) return NOT_IN_SVN; - if ( wcStatus.attributeNode("item").value() == "added" ) + if ( wctqStatus.attributeNode("item").value() == "added" ) return LOCALLY_ADDED; - if ( wcStatus.attributeNode("item").value() == "deleted" ) + if ( wctqStatus.attributeNode("item").value() == "deleted" ) return LOCALLY_REMOVED; // TODO What to do with "missing", "incomplete", "replaced", "merged", // "obstructed", "external"? Can these appear at all in our case? @@ -269,23 +269,23 @@ no_status_xml: } -TQString SVNHandler::svnStatus( const TQString& filename ) const +TQString SVNHandler::svntqStatus( const TQString& filename ) const { return map[filename]; } -void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config) +void SVNHandler::execSVNCommand( TQWidget* tqparent, 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, TQStringList( filename ), templates, config ); + execSVNCommand( tqparent, cmd, TQStringList( filename ), templates, config ); } -void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) +void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid SVN repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid SVN repository. " "The SVN commands cannot be executed." ) ); return; } @@ -328,7 +328,7 @@ void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStr command += " \'" + temp + "\'"; } - showDialog( parent, cmd, files, command, config ); + showDialog( tqparent, cmd, files, command, config ); } void SVNHandler::setAutoUpdateTemplates( bool update ) @@ -336,9 +336,9 @@ void SVNHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) +void SVNHandler::showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { - SVNDialog * dia = new SVNDialog( cmd, parent, config ); + SVNDialog * dia = new SVNDialog( cmd, tqparent, config ); dia->setFiles( files ); dia->setCommandLine( commandLine ); if ( cmd == SVN::Commit ) { @@ -415,7 +415,7 @@ void SVNHandler::checkToAdd( const TQStringList& files ) } // ### TODO: does SVN really needs this or does it do it automatically? - // check recursivlely if parent dirs have to be added as well + // check recursivlely if tqparent dirs have to be added as well while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; temp = TQFileInfo( temp ).dirPath( true ); @@ -464,7 +464,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) TQString entr = *it; // translate the filename from repository to local TQRegExp rx( basedir + ".*,v" ); - int pos = entr.find( rx ); + int pos = entr.tqfind( rx ); TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); @@ -472,7 +472,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) // TODO: do some markup - map.replace( file, entr ); + map.tqreplace( file, entr ); } #endif } @@ -480,7 +480,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) void SVNHandler::processDiff( TQString output ) { output.remove( TQRegExp( "\\[ .* \\]$" )); - output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; @@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output ) KMessageBox::error( 0, error ); } -bool SVNHandler::isConsideredModified( const FileStatus status ) const +bool SVNHandler::isConsideredModified( const FiletqStatus status ) const { /* * A file is modified if it is either: @@ -541,4 +541,4 @@ void SVNOutputCollector::slotGatherStdout( KProcess*, char* data, int len ) #include "svnhandler.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h index 82039421..cad3e93f 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.h +++ b/kbabel/catalogmanager/libsvn/svnhandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,13 +35,13 @@ #ifndef SVNHANDLER_H #define SVNHANDLER_H -// Qt include files +// TQt include files #include <tqmap.h> #include <tqobject.h> // Project specific include files #include "svndialog.h" #include "svnresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQString; class TQStringList; @@ -52,12 +52,13 @@ class KSharedConfig; * * @short Backend for SVN support in Catalog Manager */ -class SVNHandler : public QObject +class SVNHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum FileStatus { + enum FiletqStatus { NO_REPOSITORY, NOT_IN_SVN, LOCALLY_ADDED, @@ -68,24 +69,24 @@ class SVNHandler : public QObject ERROR_IN_WC ///< The working copy has data that cannot be handled }; - SVNHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); + SVNHandler( const TQString& poBaseDir = TQString(), const TQString& potBaseDir = TQString() ); void setPOBaseDir( const TQString& dir ); void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const TQString& filename ) const; - TQString fileStatus( const FileStatus status ) const; - TQString svnStatus( const TQString& filename ) const; + FiletqStatus fstatus( const TQString& filename ) const; + TQString filetqStatus( const FiletqStatus status ) const; + TQString svntqStatus( const TQString& filename ) const; - 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 execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); /** * True if the file was modified or has another status considered as a modification */ - bool isConsideredModified( const FileStatus status ) const; + bool isConsideredModified( const FiletqStatus status ) const; signals: void signalIsPORepository( bool ); @@ -93,7 +94,7 @@ class SVNHandler : public QObject void signalFilesCommitted( const TQStringList& ); private: - void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); + void showDialog( TQWidget* tqparent, 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 TQString& path ); void checkToAdd( const TQStringList& files ); @@ -112,9 +113,10 @@ class SVNHandler : public QObject TQMap<TQString,TQString> map; }; -class SVNOutputCollector: public QObject +class SVNOutputCollector: public TQObject { Q_OBJECT + TQ_OBJECT public: SVNOutputCollector( KProcess* ); diff --git a/kbabel/catalogmanager/libsvn/svnresources.h b/kbabel/catalogmanager/libsvn/svnresources.h index d9032a4f..1d68aa16 100644 --- a/kbabel/catalogmanager/libsvn/svnresources.h +++ b/kbabel/catalogmanager/libsvn/svnresources.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index 706ad67f..31030dd5 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -188,7 +188,7 @@ int main(int argc, char **argv) I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); - about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/Qt3.") + about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/TQt3.") ,"visnovsky@kde.org"); about.addAuthor("Nicolas Goutte", I18N_NOOP("Current maintainer"), "goutte@kde.org"); @@ -211,7 +211,7 @@ int main(int argc, char **argv) about.addCredit("Bram Schoenmakers",I18N_NOOP("Support for making diffs and some minor " "improvements."),"bramschoenmakers@kde.nl"); - about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from Qt"), 0, "http://www.trolltech.com"); + about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from TQt"), 0, "http://www.trolltech.com"); about.addCredit("GNU gettext", I18N_NOOP("KBabel contains code from GNU gettext"), 0, "http://www.gnu.org/software/gettext/"); diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index f56a735b..ecb88bb8 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ #include "markpatterndialog.h" #include "markpatternwidget.h" -MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name) - : KDialogBase(parent, name, true, 0, Ok|Cancel, Ok) +MarkPatternDialog::MarkPatternDialog(TQWidget * tqparent, const char * name) + : KDialogBase(tqparent, name, true, 0, Ok|Cancel, Ok) { actionButton(Ok)->setEnabled(false); @@ -127,7 +127,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( ) { if (!regexpEditDialog) regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( - "KRegExpEditor/KRegExpEditor", TQString::null, this); + "KRegExpEditor/KRegExpEditor", TQString(), this); KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog); diff --git a/kbabel/catalogmanager/markpatterndialog.h b/kbabel/catalogmanager/markpatterndialog.h index de919130..46a39c32 100644 --- a/kbabel/catalogmanager/markpatterndialog.h +++ b/kbabel/catalogmanager/markpatterndialog.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,9 +43,10 @@ class MarkPatternWidget; class MarkPatternDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MarkPatternDialog(TQWidget * parent, const char * name = 0); + MarkPatternDialog(TQWidget * tqparent, const char * name = 0); TQString pattern( ); bool isCaseSensitive( ); diff --git a/kbabel/catalogmanager/markpatternwidget.ui b/kbabel/catalogmanager/markpatternwidget.ui index b4b8745e..2a4c88af 100644 --- a/kbabel/catalogmanager/markpatternwidget.ui +++ b/kbabel/catalogmanager/markpatternwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MarkPatternWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MarkPatternWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mainLabel</cstring> </property> @@ -35,7 +35,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>caseSensitive</cstring> </property> @@ -54,7 +54,7 @@ <string>C&ase sensitive</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>inclTemplates</cstring> </property> @@ -62,7 +62,7 @@ <string>&Include templates</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>useWildcards</cstring> </property> @@ -70,7 +70,7 @@ <string>Use &wildcards</string> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>regexpButton</cstring> </property> @@ -78,7 +78,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>useRegExp</cstring> </property> @@ -120,7 +120,7 @@ <forwards> <forward>class KComboBox;</forward> </forwards> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index 248ac55a..70cc32fc 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,19 +48,19 @@ using namespace KBabel; MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManListItem> files - , TQWidget *parent,const char *name) - : RoughTransDlg(dict, new Catalog(), parent, name ) + , TQWidget *tqparent,const char *name) + : RoughTransDlg(dict, new Catalog(), tqparent, name ) ,_fileList(files) { - TQWidget* bars = static_cast<TQWidget*>(progressbar->parent()); + TQWidget* bars = static_cast<TQWidget*>(progressbar->tqparent()); 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()); - TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout()); - mylayout->add(label); - mylayout->add(filesProgressbar); + TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout()); + mytqlayout->add(label); + mytqlayout->add(filesProgressbar); msgButtonClicked(0); } @@ -82,7 +82,7 @@ void MultiRoughTransDlg::translate() if( catalog->openURL( url ) != OK ) { KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); filesProgressbar->advance(1); continue; } @@ -94,7 +94,7 @@ void MultiRoughTransDlg::translate() if( catalog->openURL( poturl, url ) != OK ) { KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(poturl.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(poturl.prettyURL())); filesProgressbar->advance(1); continue; } @@ -131,13 +131,13 @@ void MultiRoughTransDlg::showAllStatistics() "Exact translations: %2 (%3%)\n" "Approximate translations: %4 (%5%)\n" "Nothing found: %6 (%7%)") - .arg( locale->formatNumber(tt,0) ) - .arg( locale->formatNumber(etc,0) ) - .arg( locale->formatNumber( ((double)(10000*etc/tt))/100) ) - .arg( locale->formatNumber(ptc,0) ) - .arg( locale->formatNumber(((double)(10000*ptc/tt))/100) ) - .arg( locale->formatNumber(nothing,0) ) - .arg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) ); + .tqarg( locale->formatNumber(tt,0) ) + .tqarg( locale->formatNumber(etc,0) ) + .tqarg( locale->formatNumber( ((double)(10000*etc/tt))/100) ) + .tqarg( locale->formatNumber(ptc,0) ) + .tqarg( locale->formatNumber(((double)(10000*ptc/tt))/100) ) + .tqarg( locale->formatNumber(nothing,0) ) + .tqarg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) ); KMessageBox::information(this, statMsg , i18n("Rough Translation Statistics")); diff --git a/kbabel/catalogmanager/multiroughtransdlg.h b/kbabel/catalogmanager/multiroughtransdlg.h index cdc4d1ed..560ae1d8 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.h +++ b/kbabel/catalogmanager/multiroughtransdlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,10 @@ class CatManListItem; class MultiRoughTransDlg : public RoughTransDlg { Q_OBJECT + TQ_OBJECT public: - MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *parent + MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *tqparent , const char *name=0); protected slots: diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index b8c563a8..8c957ca9 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,8 +52,8 @@ // version identification for validation ignores #define IGNOREFILE_VERSION 0x00 -ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *parent,const char *name) - : KDialogBase(parent,name,true,i18n("Caption of dialog","Validation") +ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Validation") , Close, Close) , _ignoreURL(ignoreURL), _tool(0), _stopped(false) , _ignoreFuzzy(false), _setAsFuzzy(false) @@ -168,7 +168,7 @@ void ValidateProgressDialog::validate_internal() } TQString errortext=TQString::number(item.index+1)+": " + item.msgid.first().left(50); - errortext.replace("\n"," "); + errortext.tqreplace("\n"," "); if( item.msgid.first().length() > 50 ) errortext+="..."; _mainWidget->_errorList->insertItem( errortext); @@ -187,7 +187,7 @@ void ValidateProgressDialog::validate_internal() "\n" "Checked files: %1\n" "Number of errors: %2\n" - "Number of ignored errors: %3").arg(checked).arg(errors).arg(ignorederrors),i18n("Validation Done")); + "Number of ignored errors: %3").tqarg(checked).tqarg(errors).tqarg(ignorederrors),i18n("Validation Done")); } delete _tool; @@ -205,7 +205,7 @@ void ValidateProgressDialog::errorItemDoubleClicked(TQListBoxItem * item) TQString it = item->text(); bool ok =false; - int offset = it.find(":"); + int offset = it.tqfind(":"); int num; if( offset < -1 ) num = 0; @@ -239,7 +239,7 @@ void ValidateProgressDialog::showContextMenu(TQListBoxItem * item, const TQPoint errorItemDoubleClicked( item ); break; case ID_ERROR_IGNORE: - IgnoreItem it = _errors.find(item->text()).data(); + IgnoreItem it = _errors.tqfind(item->text()).data(); // if there is no pixmap, it's the whole file if( !item->pixmap() ) diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h index 15c7c238..f0ae950f 100644 --- a/kbabel/catalogmanager/validateprogress.h +++ b/kbabel/catalogmanager/validateprogress.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -59,9 +59,10 @@ TQDataStream & operator>>( TQDataStream & stream, IgnoreItem & ident); class ValidateProgressDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ValidateProgressDialog(const TQString& ignoreURL, TQWidget* parent, const char *name=0); + ValidateProgressDialog(const TQString& ignoreURL, TQWidget* tqparent, const char *name=0); virtual ~ValidateProgressDialog(); void setIgnoreFuzzy(bool enable) { _ignoreFuzzy = enable; } diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index a181806b..ccef3b74 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ValidateProgressWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ValidateProgressWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,19 +16,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>_currentAction</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>92</width> <height>0</height> @@ -51,7 +51,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -72,7 +72,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_currentLabel</cstring> </property> @@ -80,7 +80,7 @@ <string>Current file:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -90,7 +90,7 @@ </widget> </grid> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -113,13 +113,13 @@ <includes> <include location="local" impldecl="in implementation">validateprogresswidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>setValidationProgressBar(int)</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>setupFileProgressBar( QString text, int maxvalue )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h index f3723e02..70655c72 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui.h +++ b/kbabel/catalogmanager/validateprogresswidget.ui.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -44,5 +44,5 @@ void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue ) TQString t = text[0].upper()+text.mid(1)+":"; _currentAction->setText(t); - _currentAction->repaint(); + _currentAction->tqrepaint(); } diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui index 61079ff3..23e560c4 100644 --- a/kbabel/catalogmanager/validationoptions.ui +++ b/kbabel/catalogmanager/validationoptions.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ValidationOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ValidationOptions</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>markAsFuzzy</cstring> </property> @@ -39,7 +39,7 @@ marked as fuzzy and the resulting file will be saved.</p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreFuzzy</cstring> </property> @@ -56,5 +56,5 @@ marked as fuzzy will not be validated at all.</p></qt></string> </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |