diff options
Diffstat (limited to 'kbabel')
271 files changed, 3100 insertions, 2993 deletions
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp index 457e4bd9..5ad0ebaa 100644 --- a/kbabel/addons/kfile-plugins/kfile_po.cpp +++ b/kbabel/addons/kfile-plugins/kfile_po.cpp @@ -17,11 +17,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,9 @@ using namespace KBabel; typedef KGenericFactory<KPoPlugin> POFactory; K_EXPORT_COMPONENT_FACTORY(kfile_po, POFactory("kfile_po")) -KPoPlugin::KPoPlugin(TQObject *parent, const char *name, +KPoPlugin::KPoPlugin(TQObject *tqparent, const char *name, const TQStringList& args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo("application/x-gettext"); @@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint) { PoInfo poInfo; TQStringList wordList; - ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false); + ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false); if (status == OK) { KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo"); diff --git a/kbabel/addons/kfile-plugins/kfile_po.h b/kbabel/addons/kfile-plugins/kfile_po.h index 091bd5f3..d5e46c34 100644 --- a/kbabel/addons/kfile-plugins/kfile_po.h +++ b/kbabel/addons/kfile-plugins/kfile_po.h @@ -17,11 +17,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 TQStringList; class KPoPlugin : public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KPoPlugin(TQObject *parent, const char *name, const TQStringList& args); + KPoPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint); }; diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 0883025c..87eb5dbf 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.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. @@ -110,7 +110,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage int w = pix.width()-2*xBorder; int h = pix.height()*2/3-2*yBorder; - int d = QMIN(w,h); + int d = TQMIN(w,h); xBorder = (pix.width()-d)/2; yBorder = (pix.height()*2/3-d)/2; @@ -118,7 +118,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(fuzzyAngle>0) { - p.setBrush(Qt::blue); + p.setBrush(TQt::blue); if(poInfo.total == poInfo.fuzzy) { @@ -132,7 +132,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(untransAngle>0) { - p.setBrush(Qt::red); + p.setBrush(TQt::red); if(poInfo.untranslated == poInfo.total) { @@ -146,7 +146,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(circle - fuzzyAngle - untransAngle>0) { - p.setBrush(Qt::darkGreen); + p.setBrush(TQt::darkGreen); if(poInfo.fuzzy==0 && poInfo.untranslated==0) { @@ -180,9 +180,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage int numLines = (int) (canvasHeight / chSize.height()); int rest = pix.width() - (numCharsPerLine * chSize.width()); - xBorder = QMAX( xBorder, rest/2); // center horizontally + xBorder = TQMAX( xBorder, rest/2); // center horizontally rest = pix.height()/3 - (numLines * chSize.height()); - yBorder = QMAX( yBorder, rest/2); // center vertically + yBorder = TQMAX( yBorder, rest/2); // center vertically // end centering @@ -207,7 +207,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(!poInfo.encoding.isEmpty()) text += poInfo.encoding+'\n'; - int lines = text.contains('\n')+1; + int lines = text.tqcontains('\n')+1; if(lines < numLines) { text = poInfo.headerComment+'\n'+text; @@ -259,9 +259,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage max = (*it).length(); } rest = pix.width() - (max * chSize.width()); - xBorder = QMAX( xBorder, rest/2); // center horizontally + xBorder = TQMAX( xBorder, rest/2); // center horizontally rest = pix.height()/3 - (lineList.count() * chSize.height()); - yBorder = QMAX( yBorder, rest/2); // center vertically + yBorder = TQMAX( yBorder, rest/2); // center vertically // where to paint the characters int x = xBorder, y = pix.height()*2/3; @@ -286,7 +286,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage // physical newline in the file if we don't come from one if ( !newLine ) { - int pos = text.find( '\n', i ); + int pos = text.tqfind( '\n', i ); if ( pos > (int) i ) i = pos +1; } @@ -311,7 +311,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage rect = m_splitter->coordinates( ch ); if ( !rect.isEmpty() ) { - bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP ); + bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP ); } x += xOffset; // next character @@ -339,11 +339,11 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage } int x = pix.width()-kbabelPix.width()-4; - x = QMAX(x,0); + x = TQMAX(x,0); if(!kbabelPix.isNull()) { bitBlt(&pix, TQPoint(x,4), &kbabelPix, kbabelPix.rect() - , Qt::CopyROP); + , TQt::CopyROP); } } diff --git a/kbabel/addons/preview/pothumbcreator.h b/kbabel/addons/preview/pothumbcreator.h index 25a1f7ab..f975b554 100644 --- a/kbabel/addons/preview/pothumbcreator.h +++ b/kbabel/addons/preview/pothumbcreator.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/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> diff --git a/kbabel/common/argextractor.cpp b/kbabel/common/argextractor.cpp index ec5d659f..5666acdc 100644 --- a/kbabel/common/argextractor.cpp +++ b/kbabel/common/argextractor.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. diff --git a/kbabel/common/argextractor.h b/kbabel/common/argextractor.h index dd84f1c2..83545520 100644 --- a/kbabel/common/argextractor.h +++ b/kbabel/common/argextractor.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. @@ -58,7 +58,7 @@ public: /** * Create an argument extractor for "string" */ - ArgExtractor(TQString string=TQString::null); + ArgExtractor(TQString string=TQString()); /** * Set a new list of tag regular expressions. It also diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index d6501c3e..3639748c 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.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. @@ -70,8 +70,8 @@ #include <kmessagebox.h> using namespace KBabel; -Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile) - : TQObject(parent,name) +Catalog::Catalog(TQObject* tqparent, const char* name, TQString projectFile) + : TQObject(tqparent,name) { if ( projectFile.isEmpty() ) projectFile = KBabel::ProjectManager::defaultProjectName(); @@ -79,7 +79,7 @@ Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile) readPreferences(); } -Catalog::Catalog(const Catalog& c): TQObject(c.parent(),c.name() +Catalog::Catalog(const Catalog& c): TQObject(c.tqparent(),c.name() ) { kdFatal() << "Copy constructor of Catalog, please report how to reproduce to the authors" << endl; @@ -93,7 +93,7 @@ Catalog::~Catalog() TQString Catalog::msgctxt(uint index) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -103,7 +103,7 @@ TQString Catalog::msgctxt(uint index) const TQStringList Catalog::msgid(uint index, const bool noNewlines) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -114,7 +114,7 @@ TQStringList Catalog::msgid(uint index, const bool noNewlines) const TQStringList Catalog::msgstr(uint index, const bool noNewlines) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) @@ -126,7 +126,7 @@ TQStringList Catalog::msgstr(uint index, const bool noNewlines) const TQString Catalog::comment(uint index) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -165,7 +165,7 @@ int Catalog::indexForMsgid(const TQString& id) const int i=0; TQValueVector<CatalogItem>::ConstIterator it = d->_entries.begin(); - while(it != d->_entries.end() && !((*it).msgid(true).contains(id))) + while(it != d->_entries.end() && !((*it).msgid(true).tqcontains(id))) { ++it; i++; @@ -290,8 +290,8 @@ bool Catalog::setHeader(CatalogItem newHeader) { // normalize the values - ensure every key:value pair is only on a single line TQString values = newHeader.msgstr().first(); - values.replace ("\n", ""); - values.replace ("\\n", "\\n\n"); + values.tqreplace ("\n", ""); + values.tqreplace ("\\n", "\\n\n"); kdDebug () << "Normalized header: " << values << endl; @@ -343,7 +343,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp+="\\n"; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Last-Translator:.*"))) + if((*it).tqcontains(TQRegExp("^ *Last-Translator:.*"))) { (*it) = temp; found=true; @@ -363,7 +363,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *PO-Revision-Date:.*"))) + if((*it).tqcontains(TQRegExp("^ *PO-Revision-Date:.*"))) { (*it) = temp; found=true; @@ -380,11 +380,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found=false; temp="Project-Id-Version: "+saveOptions.projectString+"\\n"; - temp.replace( "@PACKAGE@", packageName()); + temp.tqreplace( "@PACKAGE@", packageName()); for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Project-Id-Version:.*"))) + if((*it).tqcontains(TQRegExp("^ *Project-Id-Version:.*"))) { (*it) = temp; found=true; @@ -408,7 +408,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp+="\\n"; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Language-Team:.*"))) + if((*it).tqcontains(TQRegExp("^ *Language-Team:.*"))) { (*it) = temp; found=true; @@ -440,7 +440,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const it = headerList.begin(); while( it != headerList.end() ) { - if( (*it).find( TQRegExp( "^ *Content-Type:.*" ) ) != -1 ) + if( (*it).tqfind( TQRegExp( "^ *Content-Type:.*" ) ) != -1 ) { if ( found ) { @@ -483,7 +483,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Content-Transfer-Encoding:.*"))) + if((*it).tqcontains(TQRegExp("^ *Content-Transfer-Encoding:.*"))) { (*it) = temp; found=true; @@ -497,12 +497,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const } temp="X-Generator: KBabel %1\\n"; - temp=temp.arg(VERSION); + temp=temp.tqarg(VERSION); found=false; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *X-Generator:.*"))) + if((*it).tqcontains(TQRegExp("^ *X-Generator:.*"))) { (*it) = temp; found=true; @@ -519,7 +519,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found=false; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *MIME-Version:"))) + if((*it).tqcontains(TQRegExp("^ *MIME-Version:"))) { (*it) = temp; found=true; @@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp="Plural-Forms: %1\\n"; - temp=temp.arg(identityOptions.gnuPluralFormHeader); + temp=temp.tqarg(identityOptions.gnuPluralFormHeader); found=false; // update plural form header @@ -541,7 +541,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const { for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Plural-Forms:"))) + if((*it).tqcontains(TQRegExp("^ *Plural-Forms:"))) { (*it) = temp; found=true; @@ -564,7 +564,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = commentList.begin(); it != commentList.end(); ++it ) { // U+00A9 is the Copyright sign - if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 ) + if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 ) { found=true; break; @@ -572,21 +572,21 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const } if(found) { - if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 ) + if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 ) { //template string if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove) (*it).remove(" YEAR Free Software Foundation, Inc"); else - (*it).replace("YEAR", TQDate::currentDate().toString("yyyy")); + (*it).tqreplace("YEAR", TQDate::tqcurrentDate().toString("yyyy")); } else if( saveOptions.FSFCopyright == ProjectSettingsBase::Update ) { //update years - TQString cy = TQDate::currentDate().toString("yyyy"); - if( !(*it).contains( TQRegExp(cy)) ) // is the year already included? + TQString cy = TQDate::tqcurrentDate().toString("yyyy"); + if( !(*it).tqcontains( TQRegExp(cy)) ) // is the year already included? { - int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); + int index = (*it).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); if( index == -1 ) { KMessageBox::information(0,i18n("Free Software Foundation Copyright does not contain any year. " @@ -603,14 +603,14 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const && ( !saveOptions.descriptionString.isEmpty() ) ) { temp = "# "+saveOptions.descriptionString; - temp.replace( "@PACKAGE@", packageName()); - temp.replace( "@LANGUAGE@", identityOptions.languageName); + temp.tqreplace( "@PACKAGE@", packageName()); + temp.tqreplace( "@LANGUAGE@", identityOptions.languageName); temp = temp.stripWhiteSpace(); // The description strings has often buggy variants already in the file, these must be removed TQString regexpstr = "^#\\s+" + TQRegExp::escape( saveOptions.descriptionString.stripWhiteSpace() ) + "\\s*$"; - regexpstr.replace( "@PACKAGE@", ".*" ); - regexpstr.replace( "@LANGUAGE@", ".*" ); + regexpstr.tqreplace( "@PACKAGE@", ".*" ); + regexpstr.tqreplace( "@LANGUAGE@", ".*" ); //kdDebug() << "REGEXPSTR: " << regexpstr << endl; TQRegExp regexp ( regexpstr ); @@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const { temp+=(" <"+identityOptions.authorEmail+">"); } - temp+=", "+TQDate::currentDate().toString("yyyy")+"."; + temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+"."; // ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory) TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" ); @@ -683,11 +683,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const while ( it != commentList.end() ) { bool deleteItem = false; - if ( (*it).find ( "copyright", 0, false ) != -1 ) + if ( (*it).tqfind ( "copyright", 0, false ) != -1 ) { // We have a line with a copyright. It should not be moved. } - else if ( (*it).find ( regexpYearAlone ) != -1 ) + else if ( (*it).tqfind ( regexpYearAlone ) != -1 ) { // We have found a year number that is preceeded by a comma. // That is typical of KBabel 1.10 (and earlier?) when there is neither an author name nor an email @@ -699,9 +699,9 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const // Typical placeholder, remove it. deleteItem = true; } - else if ( (*it).find ( regexpAuthorYear ) != -1 ) // email address followed by year + else if ( (*it).tqfind ( regexpAuthorYear ) != -1 ) // email address followed by year { - if ( foundAuthors.find( (*it) ) == foundAuthors.end() ) + if ( foundAuthors.tqfind( (*it) ) == foundAuthors.end() ) { // The author line is new (and not a duplicate), so add it to the author line list foundAuthors.append( (*it) ); @@ -721,17 +721,17 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found = false; bool foundAuthor = false; - const TQString cy = TQDate::currentDate().toString("yyyy"); + const TQString cy = TQDate::tqcurrentDate().toString("yyyy"); ait = foundAuthors.end(); for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it ) { - if ( (*it).find( TQRegExp( + if ( (*it).tqfind( TQRegExp( TQRegExp::escape( identityOptions.authorName )+".*" + TQRegExp::escape( identityOptions.authorEmail ) ) ) != -1 ) { foundAuthor = true; - if( (*it).find( cy ) != -1 ) + if( (*it).tqfind( cy ) != -1 ) found = true; else ait = it; @@ -744,7 +744,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const else if ( ait != foundAuthors.end() ) { //update years - const int index = (*ait).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); + const int index = (*ait).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); if ( index == -1 ) (*ait)+=", "+cy; else @@ -760,7 +760,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const it=commentList.end(); do --it; - while( ( it != commentList.begin() ) && ( (*it).find( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) ); + while( ( it != commentList.begin() ) && ( (*it).tqfind( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) ); ++it; for( ait = foundAuthors.begin() ; ait != foundAuthors.end() ; ++ait ) { @@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on) } -void Catalog::removeFuzzyStatus(uint index) +void Catalog::removeFuzzytqStatus(uint index) { setFuzzy(index,false); } @@ -838,7 +838,7 @@ TQString Catalog::packageName() const TQString package=d->_url.fileName(); - int index=package.find(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$")); + int index=package.tqfind(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$")); if(index>0) package=package.left(index); @@ -848,7 +848,7 @@ TQString Catalog::packageName() const void Catalog::setPackage(const TQString& package ) { - const int pos = package.findRev( '/' ); + const int pos = package.tqfindRev( '/' ); if( pos < 0 ) { d->_packageDir = TQString(); @@ -888,10 +888,10 @@ TQString Catalog::encoding() const return encodingStr; } -ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) +ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package) { TQString target; - ConversionStatus error = OK; + ConversiontqStatus error = OK; if(KIO::NetAccess::download(url, target, NULL)) { @@ -971,8 +971,8 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) if( package.isEmpty() ) { - d->_packageName=TQString::null; - d->_packageDir=TQString::null; + d->_packageName=TQString(); + d->_packageDir=TQString(); } else setPackage(package); @@ -992,10 +992,10 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) } } -ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package) +ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package) { TQString target; - ConversionStatus error = OK; + ConversiontqStatus error = OK; if(KIO::NetAccess::download(openUrl, target, NULL)) { @@ -1069,8 +1069,8 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons d->_url = saveURL; if( package.isEmpty() ) { - d->_packageName=TQString::null; - d->_packageDir=TQString::null; + d->_packageName=TQString(); + d->_packageDir=TQString(); } else setPackage(package); @@ -1093,9 +1093,9 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons } } -Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) +Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors) { - if( !d->_mimeTypes.contains( "application/x-gettext" ) ) + if( !d->_mimeTypes.tqcontains( "application/x-gettext" ) ) return Msgfmt::Unsupported; TQString filename; @@ -1112,7 +1112,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) } Msgfmt msgfmt; - Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific ); + Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific ); if( clearErrors) clearErrorList(); @@ -1128,10 +1128,10 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) const TQStringList lines = TQStringList::split("\n",output); for ( TQStringList::const_iterator it = lines.constBegin(); it != lines.constEnd(); ++it ) { - if( (*it).find(TQRegExp("^.+:\\d+:")) >= 0 ) + if( (*it).tqfind(TQRegExp("^.+:\\d+:")) >= 0 ) { - const int begin=(*it).find(":",0)+1; - const int end=(*it).find(":",begin); + const int begin=(*it).tqfind(":",0)+1; + const int end=(*it).tqfind(":",begin); const TQString line=(*it).mid(begin,end-begin); @@ -1148,7 +1148,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) continue; } - if( !d->_errorIndex.contains(currentIndex) ) + if( !d->_errorIndex.tqcontains(currentIndex) ) { d->_errorIndex.append(currentIndex); d->_entries[currentIndex].setSyntaxError(true); @@ -1177,7 +1177,7 @@ void Catalog::clearErrorList() void Catalog::removeFromErrorList(uint index) { - if(d->_errorIndex.contains(index)) + if(d->_errorIndex.tqcontains(index)) { d->_errorIndex.remove(index); d->_entries[index].setSyntaxError(false); @@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index) } } -TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck) +TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck) { if ( d->_entries.isEmpty() ) return TQStringList(); @@ -1207,7 +1207,7 @@ TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> return item.errors(); } -TQStringList Catalog::itemStatus(uint index) +TQStringList Catalog::itemtqStatus(uint index) { if ( d->_entries.isEmpty() ) return TQStringList(); @@ -1241,7 +1241,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) { if( !tool->run( "validate", (void*)(&(*it)), "CatalogItem", "application/x-kbabel-catalogitem" )) { - if( !d->_errorIndex.contains(index) ) + if( !d->_errorIndex.tqcontains(index) ) { d->_errorIndex.append(index); hasErrors=true; @@ -1461,7 +1461,7 @@ bool Catalog::isUntranslated(uint index) const bool Catalog::hasError(uint index, DocPosition& pos) const { - if( d->_errorIndex.contains(index) ) + if( d->_errorIndex.tqcontains(index) ) { pos.item=index; pos.form=0; @@ -1734,7 +1734,7 @@ int Catalog::findNextInList(const TQValueList<uint>& list,uint index) const int nextIndex=-1; // find index in List - it=list.find(index); + it=list.tqfind(index); // if the given index is found in the list and not the last entry // in the list, return the next listentry @@ -1765,7 +1765,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const int prevIndex=-1; - it=list.find(index); + it=list.tqfind(index); // if the given index is found in the list and not the last entry // in the list, return the next listentry @@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const TQString Catalog::dateTime() const { - const TQDateTime dt = TQDateTime::currentDateTime(); + const TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQString dateTimeString; const SaveSettings options = d->_project->saveSettings(); @@ -1831,49 +1831,49 @@ TQString Catalog::dateTime() const const TQTime time = dt.time(); // the year - dateTimeString.replace( "%Y", TQString::number( date.year() ) ); - dateTimeString.replace( "%y", TQString::number( date.year() ).right(2) ); + dateTimeString.tqreplace( "%Y", TQString::number( date.year() ) ); + dateTimeString.tqreplace( "%y", TQString::number( date.year() ).right(2) ); // the month if(date.month()<10) { - dateTimeString.replace( "%m", "0"+TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%m", "0"+TQString::number( date.month() ) ); } else { - dateTimeString.replace( "%m", TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%m", TQString::number( date.month() ) ); } - dateTimeString.replace( "%f", TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%f", TQString::number( date.month() ) ); - dateTimeString.replace( "%b", date.longMonthName(date.month()) ); - dateTimeString.replace( "%h", date.longMonthName(date.month()) ); + dateTimeString.tqreplace( "%b", date.longMonthName(date.month()) ); + dateTimeString.tqreplace( "%h", date.longMonthName(date.month()) ); // the day - dateTimeString.replace( "%j", TQString::number( date.dayOfYear() ) ); - dateTimeString.replace( "%e", TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%j", TQString::number( date.dayOfYear() ) ); + dateTimeString.tqreplace( "%e", TQString::number( date.day() ) ); if(date.day() < 10) { - dateTimeString.replace( "%d", "0"+TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%d", "0"+TQString::number( date.day() ) ); } else { - dateTimeString.replace( "%d", TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%d", TQString::number( date.day() ) ); } - dateTimeString.replace( "%a", date.longDayName( date.dayOfWeek() ) ); + dateTimeString.tqreplace( "%a", date.longDayName( date.dayOfWeek() ) ); // hour - dateTimeString.replace( "%k", TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%k", TQString::number( time.hour() ) ); if(time.hour() < 10) { - dateTimeString.replace( "%H", "0"+TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%H", "0"+TQString::number( time.hour() ) ); } else { - dateTimeString.replace( "%H", TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%H", TQString::number( time.hour() ) ); } TQString zone; // AM or PM @@ -1888,46 +1888,46 @@ TQString Catalog::dateTime() const zone="AM"; } - dateTimeString.replace( "%I", TQString::number( hour ) ); + dateTimeString.tqreplace( "%I", TQString::number( hour ) ); if(hour < 10) { - dateTimeString.replace( "%i", "0"+TQString::number( hour ) ); + dateTimeString.tqreplace( "%i", "0"+TQString::number( hour ) ); } else { - dateTimeString.replace( "%i", TQString::number( hour ) ); + dateTimeString.tqreplace( "%i", TQString::number( hour ) ); } - dateTimeString.replace( "%p", zone ); + dateTimeString.tqreplace( "%p", zone ); // minutes if(time.minute() < 10) { - dateTimeString.replace( "%M", "0"+TQString::number( time.minute() ) ); + dateTimeString.tqreplace( "%M", "0"+TQString::number( time.minute() ) ); } else { - dateTimeString.replace( "%M", TQString::number( time.minute() ) ); + dateTimeString.tqreplace( "%M", TQString::number( time.minute() ) ); } // seconds if(time.second() < 10) { - dateTimeString.replace( "%S", "0"+TQString::number( time.second() ) ); + dateTimeString.tqreplace( "%S", "0"+TQString::number( time.second() ) ); } else { - dateTimeString.replace( "%S", TQString::number( time.second() ) ); + dateTimeString.tqreplace( "%S", TQString::number( time.second() ) ); } // timezone - dateTimeString.replace( "%Z", d->_project->identitySettings().timeZone ); + dateTimeString.tqreplace( "%Z", d->_project->identitySettings().timeZone ); TQTime t; const int offset = KRFCDate::localUTCOffset(); const int correction = offset < 0 ? -60 : 60; t = t.addSecs( offset * correction ); - dateTimeString.replace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") ); + dateTimeString.tqreplace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") ); break; } } @@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const } -ConversionStatus Catalog::saveFile() +ConversiontqStatus Catalog::saveFile() { if(d->_url.isEmpty()) { @@ -1947,11 +1947,11 @@ ConversionStatus Catalog::saveFile() return saveFileAs(d->_url,true); } -ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) +ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite) { if( d->_active ) return BUSY; - ConversionStatus status=OK; + ConversiontqStatus status=OK; bool newName=false; KURL targetURL=d->_url; @@ -2036,14 +2036,14 @@ TQString Catalog::saveTempFile() TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po"); if( writeFile(filename) != OK ) { - filename = TQString::null; + filename = TQString(); } return filename; } -ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) +ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite) { TQFileInfo info(localFile); @@ -2066,7 +2066,7 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) } } - ConversionStatus error = OK; + ConversiontqStatus error = OK; CatalogExportPlugin* filter=0; // gimme plugin for this MIME type @@ -2179,72 +2179,72 @@ PoInfo Catalog::headerInfo(const CatalogItem headerItem) // extract information from the header for(it=header.begin();it!=header.end();++it) { - if((*it).contains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$"))) + if((*it).tqcontains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$"))) { - info.project=(*it).replace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),""); + info.project=(*it).tqreplace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),""); if(info.project.right(2)=="\\n") info.project.remove(info.project.length()-2,2); info.project=info.project.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$"))) { - info.creation=(*it).replace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),""); + info.creation=(*it).tqreplace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),""); if(info.creation.right(2)=="\\n") info.creation.remove(info.creation.length()-2,2); info.creation=info.creation.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$"))) { - info.revision=(*it).replace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),""); + info.revision=(*it).tqreplace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),""); if(info.revision.right(2)=="\\n") info.revision.remove(info.revision.length()-2,2); info.revision=info.revision.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$"))) { - info.lastTranslator=(*it).replace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),""); + info.lastTranslator=(*it).tqreplace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),""); if(info.lastTranslator.right(2)=="\\n") info.lastTranslator.remove(info.lastTranslator.length()-2,2); info.lastTranslator=info.lastTranslator.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*"))) { - info.languageTeam=(*it).replace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),""); + info.languageTeam=(*it).tqreplace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),""); if(info.languageTeam.right(2)=="\\n") info.languageTeam.remove(info.languageTeam.length()-2,2); info.languageTeam=info.languageTeam.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*"))) { - info.mimeVersion=(*it).replace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),""); + info.mimeVersion=(*it).tqreplace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),""); if(info.mimeVersion.right(2)=="\\n") info.mimeVersion.remove(info.mimeVersion.length()-2,2); info.mimeVersion=info.mimeVersion.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*"))) { - info.contentType=(*it).replace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),""); + info.contentType=(*it).tqreplace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),""); if(info.contentType.right(2)=="\\n") info.contentType.remove(info.contentType.length()-2,2); info.contentType=info.contentType.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*"))) { - info.encoding=(*it).replace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),""); + info.encoding=(*it).tqreplace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),""); if(info.encoding.right(2)=="\\n") info.encoding.remove(info.encoding.length()-2,2); @@ -2590,9 +2590,9 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } if(findOpts->ignoreAccelMarker - && targetStr.contains(miscOptions.accelMarker)) + && targetStr.tqcontains(miscOptions.accelMarker)) { - accelMarkerPos = targetStr.find(miscOptions.accelMarker); + accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker); targetStr.remove(accelMarkerPos,1); if(docPos.offset > (uint)accelMarkerPos) @@ -2605,7 +2605,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2617,13 +2617,13 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } } else { - if( (pos=targetStr.find(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) { + if( (pos=targetStr.tqfind(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) { len=searchStr.length(); if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2839,9 +2839,9 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } if(findOpts->ignoreAccelMarker - && targetStr.contains(miscOptions.accelMarker)) + && targetStr.tqcontains(miscOptions.accelMarker)) { - accelMarkerPos = targetStr.find(miscOptions.accelMarker); + accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker); targetStr.remove(accelMarkerPos,1); if(docPos.offset > (uint)accelMarkerPos) @@ -2854,7 +2854,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le else if( findOpts->isRegExp ) { /* don't work!? - if((pos=targetStr.findRev(regexp,docPos.offset)) >= 0 ) { + if((pos=targetStr.tqfindRev(regexp,docPos.offset)) >= 0 ) { regexp.match(targetStr,pos,&len); // to get the length of the string */ bool found=false; @@ -2871,7 +2871,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2882,13 +2882,13 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } } } - else if( (pos=targetStr.findRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0 + else if( (pos=targetStr.tqfindRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0 && (uint)pos < docPos.offset) { len=searchStr.length(); if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -3071,8 +3071,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) // then look if the same msgid is contained in the diff file // FIXME: should care about plural forms in msgid TQString id = msgid(entry).first(); - id.replace( "\n",""); - if(d->msgidDiffList.contains(id)) + id.tqreplace( "\n",""); + if(d->msgidDiffList.tqcontains(id)) { // FIXME:: should care about plural forms in msgid *result = msgid(entry).first(); @@ -3091,8 +3091,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) // then look if there are entries with the same translation kdWarning() << "Diff feature (2) does not work with plural forms" << endl; TQString str = msgstr(entry).first(); - str.replace("\n",""); - if(d->msgstr2MsgidDiffList.contains(str)) + str.tqreplace("\n",""); + if(d->msgstr2MsgidDiffList.tqcontains(str)) { TQStringList list = d->msgstr2MsgidDiffList[str]; @@ -3134,7 +3134,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) int counter=0; int oldPercent=0; - int max = QMAX( d->msgidDiffList.count()-1, 1); + int max = TQMAX( d->msgidDiffList.count()-1, 1); TQStringList::ConstIterator it; for(it = d->msgidDiffList.begin(); @@ -3193,7 +3193,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) TQString r = wordDiff(idForDiff,id); //esp for plural forms - *result = r.replace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n"); + *result = r.tqreplace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n"); s = new TQString(*result); if( !d->diffCache.insert(entry,s) ) @@ -3220,7 +3220,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) d->msgstr2MsgidDiffList.clear(); d->diffCache.clear(); - uint max = QMAX(list.count()-1,1); + uint max = TQMAX(list.count()-1,1); int oldPercent=0; uint counter=0; TQValueList<DiffEntry>::ConstIterator it; @@ -3236,14 +3236,14 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) } TQString id = (*it).msgid; - id.replace("\n",""); + id.tqreplace("\n",""); TQString str = (*it).msgstr; - str.replace("\n",""); + str.tqreplace("\n",""); d->msgidDiffList.append(id); if(!str.isEmpty()) { - if(d->msgstr2MsgidDiffList.contains(str)) + if(d->msgstr2MsgidDiffList.tqcontains(str)) { TQStringList sl = d->msgstr2MsgidDiffList[str]; sl.append(id); @@ -3506,4 +3506,4 @@ void Catalog::wordCount (uint &total, uint &fuzzy, uint &untranslated) const #include "catalog.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/common/catalog.h b/kbabel/common/catalog.h index 6a5c0491..74fbcdd7 100644 --- a/kbabel/common/catalog.h +++ b/kbabel/common/catalog.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. @@ -107,9 +107,10 @@ struct DiffEntry * @short Class, that represents a translation catalog(po-file) * @author Matthias Kiefer <matthias.kiefer@gmx.de> */ -class KDE_EXPORT Catalog : public QObject +class KDE_EXPORT Catalog : public TQObject { Q_OBJECT + TQ_OBJECT public: enum DiffResult{DiffOk, DiffNotFound, DiffNeedList}; @@ -127,11 +128,11 @@ public: /** * A constructor for an empty message catalog. - * @param parent parent @ref TQObject for this catalog + * @param tqparent tqparent @ref TQObject for this catalog * @param name unique name for this object * @param configFile configuration file to read config from */ - Catalog(TQObject* parent=0, const char* name=0, TQString projectFile = TQString() ); + Catalog(TQObject* tqparent=0, const char* name=0, TQString projectFile = TQString() ); /** * Deprecated. A copy constructor. Do not use since each Catalog registers @@ -225,7 +226,7 @@ public: * @return the list of errors found for a given item index * @param index index of the item to check */ - TQStringList itemStatus(uint index); + TQStringList itemtqStatus(uint index); /** * @return the list of errors found for a given item index @@ -233,7 +234,7 @@ public: * @param recheck flag, if the item status should be checked now * @param whatToCheck what checks to do (a list of tools to be used */ - TQStringList itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck); + TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck); /** * replaces msgstr in catalog item at index index with msgstr @@ -252,7 +253,7 @@ public: bool setHeader(CatalogItem header); /** removes string ", fuzzy" from comment */ - void removeFuzzyStatus(uint index); + void removeFuzzytqStatus(uint index); /** sets or unsets fuzzy status of entry index */ void setFuzzy(uint index, bool on); @@ -296,19 +297,19 @@ public: * opens file url by using KDE's network downlad and calls * openFile with a local filename */ - ConversionStatus openURL(const KURL& url, const TQString& package=TQString::null); + ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString()); /** * opens file openURL by using KDE's network downlad and calls * openFile with a local filename * sets current URL to saveURL */ - ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString::null); + ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString()); /** save the file under the old filename */ - ConversionStatus saveFile(); + ConversiontqStatus saveFile(); /** saves the file under a new filename */ - ConversionStatus saveFileAs(const KURL& url,bool overwrite=false); + ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false); /** * saves the current catalog in a temporary file and @@ -341,7 +342,7 @@ public: * @param clearError should the errors be cleared before running msgfmt * @return the file codec used for the current catalog */ - Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true); + Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true); /** * checks using an external tool. The tool must provide the "validate" command @@ -478,12 +479,12 @@ public: TagSettings tagSettings() const; /** - * reads the header from QTextstream and puts it in header + * reads the header from TQTextstream and puts it in header * I made it static to be able to use this function for * the search in po-files. This way, I can easily find the first * catalog entry in the textstream */ -// static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header); +// static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header); void registerView(CatalogView* view); @@ -611,7 +612,7 @@ private: void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false); /** do the actual file write using plugin */ - ConversionStatus writeFile(TQString localfile, bool overwrite=false); + ConversiontqStatus writeFile(TQString localfile, bool overwrite=false); /** * generates lists that contain indexes of all fuzzy and untranslated entries diff --git a/kbabel/common/catalog_private.h b/kbabel/common/catalog_private.h index e27f1174..a02327b7 100644 --- a/kbabel/common/catalog_private.h +++ b/kbabel/common/catalog_private.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. @@ -112,9 +112,9 @@ public: TQStringList _catalogExtra; CatalogPrivate(Project::Ptr project) : - _packageName( TQString::null ), _packageDir( TQString::null ), + _packageName( TQString() ), _packageDir( TQString() ), _header (project), - _importID( TQString::null ), _mimeTypes( "text/plain" ), + _importID( TQString() ), _mimeTypes( "text/plain" ), _modified(false), _readOnly(false), _generatedFromDocbook(false), _active(false), _stop(false), fileCodec(0), diffCache(30,76), numberOfPluralForms(-1), diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h index 77b760e8..ea7cc245 100644 --- a/kbabel/common/catalogfileplugin.h +++ b/kbabel/common/catalogfileplugin.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. @@ -50,7 +50,7 @@ class CatalogExportPluginPrivate; /** * Result of the conversion */ -enum ConversionStatus { +enum ConversiontqStatus { OK, NOT_IMPLEMENTED, NO_FILE, @@ -79,12 +79,13 @@ enum ConversionStatus { * @short Base class for Catalog import plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogImportPlugin: public QObject +class KDE_EXPORT CatalogImportPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: - CatalogImportPlugin(TQObject* parent, const char* name); + CatalogImportPlugin(TQObject* tqparent, const char* name); virtual ~CatalogImportPlugin(); /** @@ -96,7 +97,7 @@ public: * @param catalog the catalog to be filled * @return result of the operation */ - ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog); + ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog); /** * Reimplement this method to load the local file passed as an argument. @@ -108,7 +109,7 @@ public: * @param file file to be loaded * @param mimetype the expected MIME type (the type used for plugin selection */ - virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0; + virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0; /** * Reimplement this method to return unique identification of your plugin */ @@ -174,14 +175,15 @@ private: * @short Base class for Catalog export plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogExportPlugin: public QObject +class KDE_EXPORT CatalogExportPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: - CatalogExportPlugin(TQObject* parent, const char* name); + CatalogExportPlugin(TQObject* tqparent, const char* name); virtual ~CatalogExportPlugin(); - virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0; + virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0; static TQStringList availableExportMimeTypes(); diff --git a/kbabel/common/catalogitem.cpp b/kbabel/common/catalogitem.cpp index bd55d7b6..14604438 100644 --- a/kbabel/common/catalogitem.cpp +++ b/kbabel/common/catalogitem.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. @@ -75,7 +75,7 @@ TQString CatalogItem::msgctxt(const bool noNewlines) const if( noNewlines ) { TQString tmp = d->_msgctxt; - tmp.replace("\n", " "); // ### TODO: " " or "" ? + tmp.tqreplace("\n", " "); // ### TODO: " " or "" ? return tmp; } else @@ -207,29 +207,29 @@ TQStringList CatalogItem::argList( RegExpExtractor& te) bool CatalogItem::isFuzzy() const { - return d->_comment.find( TQRegExp(",\\s*fuzzy") ) != -1; + return d->_comment.tqfind( TQRegExp(",\\s*fuzzy") ) != -1; } bool CatalogItem::isCformat() const { // Allow "possible-c-format" (from xgettext --debug) or "c-format" // Note the regexp (?: ) is similar to () but it does not capture (so it is faster) - return d->_comment.find( TQRegExp(",\\s*(?:possible-)c-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*(?:possible-)c-format") ) == -1; } bool CatalogItem::isNoCformat() const { - return d->_comment.find( TQRegExp(",\\s*no-c-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*no-c-format") ) == -1; } -bool CatalogItem::isQtformat() const +bool CatalogItem::isTQtformat() const { - return d->_comment.find( TQRegExp(",\\s*qt-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*qt-format") ) == -1; } -bool CatalogItem::isNoQtformat() const +bool CatalogItem::isNoTQtformat() const { - return d->_comment.find( TQRegExp(",\\s*no-qt-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*no-qt-format") ) == -1; } bool CatalogItem::isUntranslated() const @@ -252,23 +252,23 @@ int CatalogItem::totalLines() const int lines=0; if(!d->_comment.isEmpty()) { - lines = d->_comment.contains('\n')+1; + lines = d->_comment.tqcontains('\n')+1; } int msgctxtLines=0; if(!d->_msgctxt.isEmpty()) { - msgctxtLines=d->_msgctxt.contains('\n')+1; + msgctxtLines=d->_msgctxt.tqcontains('\n')+1; } int msgidLines=0; TQStringList::ConstIterator it; for(it=d->_msgid.begin(); it != d->_msgid.end(); ++it) { - msgidLines += (*it).contains('\n')+1; + msgidLines += (*it).tqcontains('\n')+1; } int msgstrLines=0; for(it=d->_msgstr.begin(); it != d->_msgstr.end(); ++it) { - msgstrLines += (*it).contains('\n')+1; + msgstrLines += (*it).tqcontains('\n')+1; } if(msgctxtLines>1) @@ -286,7 +286,7 @@ int CatalogItem::totalLines() const void CatalogItem::setSyntaxError(bool on) { - if(on && !d->_errors.contains("syntax error")) + if(on && !d->_errors.tqcontains("syntax error")) d->_errors.append("syntax error"); else d->_errors.remove("syntax error"); @@ -305,7 +305,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) TQRegExp fuzzyStr(",\\s*fuzzy"); int offset; - offset=comment.find(fuzzyStr); + offset=comment.tqfind(fuzzyStr); while(offset>=0) { cmd = new DelTextCmd(offset,fuzzyStr.cap(),0); @@ -314,11 +314,11 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,fuzzyStr.cap().length()); - offset=comment.find(fuzzyStr,offset+1); + offset=comment.tqfind(fuzzyStr,offset+1); } // remove empty comment lines - if( comment.contains( TQRegExp("^#\\s*$") )) + if( comment.tqcontains( TQRegExp("^#\\s*$") )) { cmd = new DelTextCmd(0,comment,0); cmd->setPart(Comment); @@ -326,9 +326,9 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment=""; } - if( comment.contains( TQRegExp("\n#\\s*$") )) + if( comment.tqcontains( TQRegExp("\n#\\s*$") )) { - offset=comment.find( TQRegExp("\n#\\s*$") ); + offset=comment.tqfind( TQRegExp("\n#\\s*$") ); while(offset>=0) { cmd = new DelTextCmd(offset,comment.mid(offset),0); @@ -337,15 +337,15 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,comment.length()-offset); - offset=comment.find( TQRegExp("\n#\\s*$"), offset+1 ); + offset=comment.tqfind( TQRegExp("\n#\\s*$"), offset+1 ); } } - if( comment.contains( TQRegExp("\n#\\s*\n") )) + if( comment.tqcontains( TQRegExp("\n#\\s*\n") )) { - offset=comment.find( TQRegExp("\n#\\s*\n") )+1; + offset=comment.tqfind( TQRegExp("\n#\\s*\n") )+1; while(offset>=0) { - int endIndex=comment.find("\n",offset)+1; + int endIndex=comment.tqfind("\n",offset)+1; cmd = new DelTextCmd(offset,comment.mid(offset,endIndex-offset),0); cmd->setPart(Comment); @@ -353,7 +353,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,endIndex-offset); - offset=comment.find( TQRegExp("\n#\\s*\n"), offset+1 ); + offset=comment.tqfind( TQRegExp("\n#\\s*\n"), offset+1 ); } } @@ -499,7 +499,7 @@ void CatalogItem::clearErrors() void CatalogItem::appendError(const TQString& error ) { - if( !d->_errors.contains( error ) ) + if( !d->_errors.tqcontains( error ) ) d->_errors.append(error); } @@ -518,4 +518,4 @@ void CatalogItem::setProject( Project::Ptr project ) d->_project = project; } -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/common/catalogitem.h b/kbabel/common/catalogitem.h index 51b7b21b..bb02b1d8 100644 --- a/kbabel/common/catalogitem.h +++ b/kbabel/common/catalogitem.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. @@ -95,14 +95,14 @@ public: * if the string ", qt-format" is contained in the comment * @since 1.11.2 (KDE 3.5.2) */ - bool isQtformat() const; + bool isTQtformat() const; /** * returns true, * if the string ", no-qt-format" is contained in the comment * @since 1.11.2 (KDE 3.5.2) */ - bool isNoQtformat() const; + bool isNoTQtformat() const; /** * returns true, if the Msgid is untranslated, this means the diff --git a/kbabel/common/catalogitem_private.h b/kbabel/common/catalogitem_private.h index 411e76b2..9304adda 100644 --- a/kbabel/common/catalogitem_private.h +++ b/kbabel/common/catalogitem_private.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. diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index 4b87f522..a25920ba 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.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. @@ -59,11 +59,11 @@ TQString KBabel::charsetString(const TQTextCodec *codec) if ( encodingStr.startsWith("CP " ) ) encodingStr.remove( 2, 1 ); else if ( encodingStr.startsWith("IBM " ) ) - encodingStr.replace( "IBM ", "CP" ); + encodingStr.tqreplace( "IBM ", "CP" ); return encodingStr; } else - return TQString::null; + return TQString(); } TQString KBabel::GNUPluralForms(const TQString& lang) @@ -192,7 +192,7 @@ TQString Defaults::Identity::authorEmail() TQString Defaults::Identity::mailingList() { TQString lang=Defaults::Identity::languageCode(); - int temp=lang.find("_"); + int temp=lang.tqfind("_"); lang=lang.left(temp); return lang+"@li.org"; } diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h index 50bdbada..552f88c5 100644 --- a/kbabel/common/catalogsettings.h +++ b/kbabel/common/catalogsettings.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. @@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings int encoding; bool useOldEncoding; - Qt::DateFormat dateFormat; + TQt::DateFormat dateFormat; TQString customDateFormat; TQString projectString; @@ -102,7 +102,7 @@ struct KDE_EXPORT MiscSettings { /** * The char, that marks keyboard accelerators. - * Default is '&' as used by Qt + * Default is '&' as used by TQt */ TQChar accelMarker; diff --git a/kbabel/common/catalogview.h b/kbabel/common/catalogview.h index 03056c43..0029c306 100644 --- a/kbabel/common/catalogview.h +++ b/kbabel/common/catalogview.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/common/diff.cpp b/kbabel/common/diff.cpp index 455a26f1..4d38babb 100644 --- a/kbabel/common/diff.cpp +++ b/kbabel/common/diff.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. diff --git a/kbabel/common/diff.h b/kbabel/common/diff.h index 2ce055bf..15454f17 100644 --- a/kbabel/common/diff.h +++ b/kbabel/common/diff.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. @@ -81,7 +81,7 @@ typedef enum inline TQString LCSprinter::getString() { - return resultString.join("").replace(TQChar('\n'), ""); //w/o replace we'd get whole line colored + return resultString.join("").tqreplace(TQChar('\n'), ""); //w/o replace we'd get whole line colored } #endif // DIFF_H diff --git a/kbabel/common/editcmd.cpp b/kbabel/common/editcmd.cpp index 4ea98364..b0c8cd09 100644 --- a/kbabel/common/editcmd.cpp +++ b/kbabel/common/editcmd.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. @@ -68,7 +68,7 @@ bool DelTextCmd::merge( EditCommand* other) && o->type() == type() && o->pluralNumber==pluralNumber ) { DelTextCmd* o = (DelTextCmd*) other; - if ( offset + int(str.length()) == o->offset && !str.contains(TQRegExp("^\\s$")) ) + if ( offset + int(str.length()) == o->offset && !str.tqcontains(TQRegExp("^\\s$")) ) { o->str.prepend( str ); o->offset = offset; @@ -95,7 +95,7 @@ bool InsTextCmd::merge( EditCommand* other) if ( o->index()==index() && o->part() == part() && o->type() == type() && o->pluralNumber==pluralNumber ) { - if ( offset == o->offset + int(o->str.length()) && !str.contains(TQRegExp("^\\s$")) ) + if ( offset == o->offset + int(o->str.length()) && !str.tqcontains(TQRegExp("^\\s$")) ) { o->str += str; return true; diff --git a/kbabel/common/editcmd.h b/kbabel/common/editcmd.h index 64bd4b93..5dc1c536 100644 --- a/kbabel/common/editcmd.h +++ b/kbabel/common/editcmd.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/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp index 327e85d0..3aa5af48 100644 --- a/kbabel/common/exportplugin.cpp +++ b/kbabel/common/exportplugin.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. @@ -45,7 +45,7 @@ struct KBabel::CatalogExportPluginPrivate bool _stop; }; -CatalogExportPlugin::CatalogExportPlugin(TQObject* parent, const char* name) : TQObject(parent,name) +CatalogExportPlugin::CatalogExportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name) { d = new CatalogExportPluginPrivate; d->_stop=false; diff --git a/kbabel/common/findoptions.h b/kbabel/common/findoptions.h index 518828df..9274a156 100644 --- a/kbabel/common/findoptions.h +++ b/kbabel/common/findoptions.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/common/importplugin.cpp b/kbabel/common/importplugin.cpp index 711d77cd..4ef1562c 100644 --- a/kbabel/common/importplugin.cpp +++ b/kbabel/common/importplugin.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. @@ -43,7 +43,7 @@ using namespace KBabel; -CatalogImportPlugin::CatalogImportPlugin(TQObject* parent, const char* name) : TQObject(parent,name) +CatalogImportPlugin::CatalogImportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name) { d = new CatalogImportPluginPrivate; d->_catalog = 0; @@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes ) d->_mimeTypes=mimetypes; } -ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog) +ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog) { d->_stopped=false; d->_catalog=catalog; startTransaction(); - ConversionStatus result = load(file, mimetype); + ConversiontqStatus result = load(file, mimetype); if( d->_stopped ) { d->_started=false; diff --git a/kbabel/common/importplugin_private.h b/kbabel/common/importplugin_private.h index 594ce21f..657a1879 100644 --- a/kbabel/common/importplugin_private.h +++ b/kbabel/common/importplugin_private.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/common/itempart.h b/kbabel/common/itempart.h index 842f195b..3aff285e 100644 --- a/kbabel/common/itempart.h +++ b/kbabel/common/itempart.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/common/kbabeldatatool.h b/kbabel/common/kbabeldatatool.h index 207f8bc5..ae1406c6 100644 --- a/kbabel/common/kbabeldatatool.h +++ b/kbabel/common/kbabeldatatool.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. @@ -47,9 +47,10 @@ namespace KBabel class KBabelDataTool: public KDataTool { Q_OBJECT + TQ_OBJECT protected: - KBabelDataTool( TQObject* parent, const char* name ) : KDataTool( parent, name ) {} + KBabelDataTool( TQObject* tqparent, const char* name ) : KDataTool( tqparent, name ) {} public slots: /** The only method to be redefined in inherited classes. * This method is called everytime the settings are changed. diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 0526bd74..1cb26723 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.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. @@ -53,8 +53,8 @@ using namespace KBabel; -KBabelMailer::KBabelMailer( TQWidget* parent, Project::Ptr project) - : _project( project ), m_parent( parent ) +KBabelMailer::KBabelMailer( TQWidget* tqparent, Project::Ptr project) + : _project( project ), m_parent( tqparent ) { m_tempDir.setAutoDelete( true ); readConfig(); @@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url) kapp->invokeMailer("", "", "", "", "", "", fileName); else { - KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) ); } } else @@ -133,7 +133,7 @@ TQString KBabelMailer::createArchive(TQStringList fileList, TQString initialName // do nothing if there are no files in the list if (fileList.empty()) - return TQString::null; + return TQString(); // determine the name of the archive, do nothing if none is given // or Cancel was pressed @@ -176,7 +176,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, KTar archive(archiveName, mimetype); if (!archive.open(IO_WriteOnly)) { KMessageBox::error( m_parent, i18n("Error while trying to create archive file.") ); - return TQString::null; + return TQString(); } // add files to this archive @@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, #endif TQString poTempName; if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) { - KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) ); continue; } @@ -199,13 +199,13 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, // actually reside in one of its subdirectories. Else they are stored // without relative path. TQString poArchFileName = url.path(); - if (_poBaseDir.isEmpty( ) || poArchFileName.find(_poBaseDir) != 0) + if (_poBaseDir.isEmpty( ) || poArchFileName.tqfind(_poBaseDir) != 0) poArchFileName = TQFileInfo( poArchFileName ).fileName(); else poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) ); if ( !archive.addLocalFile( poTempName, poArchFileName ) ) { - KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) ); } KIO::NetAccess::removeTempFile(poTempName); diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h index 17481636..1f35d6e2 100644 --- a/kbabel/common/kbmailer.h +++ b/kbabel/common/kbmailer.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. @@ -62,11 +62,11 @@ class KDE_EXPORT KBabelMailer /** * Constructor. * - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @param project The project to be used. - * @since 1.11.2 (KDE 3.5.2): @p parent parameter + * @since 1.11.2 (KDE 3.5.2): @p tqparent parameter */ - KBabelMailer( TQWidget* parent, Project::Ptr project); + KBabelMailer( TQWidget* tqparent, Project::Ptr project); virtual ~KBabelMailer(); /** @@ -91,7 +91,7 @@ class KDE_EXPORT KBabelMailer * @param fileList contains the names of the files to be sent. * @param initialName the possible name of the archive */ - void sendFiles(TQStringList fileList, const TQString& initialName = TQString::null); + void sendFiles(TQStringList fileList, const TQString& initialName = TQString()); /** * Sets the the PO files' base directory. * @@ -109,7 +109,7 @@ class KDE_EXPORT KBabelMailer * name is queried. * * @return name of the archive if it was created successfully, - * otherwise TQString::null. + * otherwise TQString(). */ TQString createArchive(TQStringList fileList, TQString initialName); @@ -157,7 +157,7 @@ class KDE_EXPORT KBabelMailer */ TQString _poBaseDir; - /// The parent widget + /// The tqparent widget TQWidget* m_parent; }; diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp index 73ac9dbd..99fece7e 100644 --- a/kbabel/common/kbproject.cpp +++ b/kbabel/common/kbproject.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. @@ -250,7 +250,7 @@ SaveSettings Project::saveSettings () settings.autoSyntaxCheck = _settings->autoSyntaxCheck(); settings.saveObsolete = _settings->saveObsolete(); settings.customDateFormat = _settings->customDateFormat(); - settings.dateFormat = (Qt::DateFormat)_settings->dateFormat(); + settings.dateFormat = (TQt::DateFormat)_settings->dateFormat(); settings.updateDescription = _settings->updateDescription(); settings.descriptionString = _settings->descriptionString(); settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright(); diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h index 4c3d6fc7..b9356c12 100644 --- a/kbabel/common/kbproject.h +++ b/kbabel/common/kbproject.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. @@ -46,6 +46,7 @@ namespace KBabel class KDE_EXPORT Project : public TQObject, public KShared { Q_OBJECT + TQ_OBJECT public: typedef KSharedPtr <Project> Ptr; diff --git a/kbabel/common/kbprojectmanager.cpp b/kbabel/common/kbprojectmanager.cpp index ab117c97..77a2fb9d 100644 --- a/kbabel/common/kbprojectmanager.cpp +++ b/kbabel/common/kbprojectmanager.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. diff --git a/kbabel/common/kbprojectmanager.h b/kbabel/common/kbprojectmanager.h index abfce3e4..40ec5884 100644 --- a/kbabel/common/kbprojectmanager.h +++ b/kbabel/common/kbprojectmanager.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/common/libgettext/pofiles.h b/kbabel/common/libgettext/pofiles.h index cf2e3ec8..a670bb9a 100644 --- a/kbabel/common/libgettext/pofiles.h +++ b/kbabel/common/libgettext/pofiles.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/common/libgettext/tokens.h b/kbabel/common/libgettext/tokens.h index dfbf693d..78e19c19 100644 --- a/kbabel/common/libgettext/tokens.h +++ b/kbabel/common/libgettext/tokens.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/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 61525a2f..86632720 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.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. @@ -46,14 +46,14 @@ using namespace KBabel; -Msgfmt::Msgfmt(TQObject* parent,const char* name) - : TQObject(parent , name) +Msgfmt::Msgfmt(TQObject* tqparent,const char* name) + : TQObject(tqparent , name) { } -Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) +Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) { - Status stat=Ok; + tqStatus stat=Ok; // this method does not return the right retrun values at the moment :-( KProcess proc; @@ -80,7 +80,7 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) } else if(proc.normalExit()) { - if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( + if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( stat=SyntaxError; } else @@ -92,9 +92,9 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) return stat; } -Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output) +Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output) { - Status stat=Ok; + tqStatus stat=Ok; // this method does not return the right return values at the moment :-( KProcess proc; @@ -109,7 +109,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o _output=""; proc << "IFS='\n'; msgfmt --statistics -o /dev/null " - "$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")"; + "$(tqfind" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")"; if(!proc.start(KProcess::Block,KProcess::Stderr)) { @@ -117,7 +117,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o } else if(proc.normalExit()) { - if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( + if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( stat=SyntaxError; } else diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h index 1a025312..9831a43f 100644 --- a/kbabel/common/msgfmt.h +++ b/kbabel/common/msgfmt.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. @@ -42,15 +42,16 @@ class TQString; namespace KBabel { -class KDE_EXPORT Msgfmt : private QObject +class KDE_EXPORT Msgfmt : private TQObject { Q_OBJECT + TQ_OBJECT public: - enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported}; - Msgfmt(TQObject* parent=0,const char* name=0); + enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported}; + Msgfmt(TQObject* tqparent=0,const char* name=0); - Status checkSyntax(TQString file,TQString& output, bool gnu = false); - Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output); + tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false); + tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output); private slots: void addToOutput(KProcess*,char *buffer, int buflen); diff --git a/kbabel/common/pluralforms.h b/kbabel/common/pluralforms.h index f65dba01..5e84fa2d 100644 --- a/kbabel/common/pluralforms.h +++ b/kbabel/common/pluralforms.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/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 68e13da8..f7245141 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.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. @@ -123,7 +123,7 @@ void PoInfo::cacheRead() // Check the file cache version. // If it is not the current version, we do not read the cache file - Q_UINT32 version; + TQ_UINT32 version; s >> version; if( version != POINFOCACHE_VERSION ) { // Wrong POINFOCACHE_VERSION, so abort @@ -134,13 +134,13 @@ void PoInfo::cacheRead() /* * Check the version of the TQDataStream with which the cache file was written * - * If the cache file was written by an incompatible future version of Qt, + * If the cache file was written by an incompatible future version of TQt, * the cache file will not be read. * - * On the other side, a cache file written by a previous version of Qt can be read, + * On the other side, a cache file written by a previous version of TQt can be read, * by setting the version of the TQDataStream used. */ - Q_INT32 qdatastreamVersion; + TQ_INT32 qdatastreamVersion; s >> qdatastreamVersion; if( qdatastreamVersion > 0 && qdatastreamVersion <= s.version() ) { s.setVersion( qdatastreamVersion ); @@ -173,13 +173,13 @@ void PoInfo::cacheWrite() if( stream ) { // Write the cache file version - // We choose to fix a format (Q_UINT32) for compatibility (Qt version, platforms, architectures) - const Q_UINT32 version = POINFOCACHE_VERSION; + // We choose to fix a format (TQ_UINT32) for compatibility (TQt version, platforms, architectures) + const TQ_UINT32 version = POINFOCACHE_VERSION; *stream << version; - // Write the version of the QDataStream - // Here too we choose a fixed format (Q_INT32) for compatibility - const Q_INT32 qdatastreamVersion = stream->version(); + // Write the version of the TQDataStream + // Here too we choose a fixed format (TQ_INT32) for compatibility + const TQ_INT32 qdatastreamVersion = stream->version(); *stream << qdatastreamVersion; TQDictIterator<poInfoCacheItem> it( _poInfoCache ); // iterator for dict @@ -209,7 +209,7 @@ bool PoInfo::cacheFind(const TQString url, PoInfo& info) cacheRead(); } - poInfoCacheItem *item = _poInfoCache.find( url ); + poInfoCacheItem *item = _poInfoCache.tqfind( url ); if( item ) { TQFileInfo fi( url ); @@ -297,7 +297,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) { bool knownKey=false; // We search for the : character, which is the separator between key and value - const int res=(*it).find(':'); + const int res=(*it).tqfind(':'); if (res>=0) { knownKey=true; // We know most keys, if not it will be changed to false in the "else" case @@ -305,7 +305,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) TQString value=(*it).mid(res+1); // "Chop" the \n at the end if (value.endsWith("\\n")) - value.remove(value.length()-2,2); // ### Qt4: use value.chop(2) + value.remove(value.length()-2,2); // ### TQt4: use value.chop(2) value=value.simplifyWhiteSpace(); kdDebug(KBABEL) << "Header key: " << key << " value: " << value << endl; if (key=="Project-Id-Version") @@ -335,7 +335,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) TQString line=(*it); if(line.right(2)=="\\n") - line.remove(line.length()-2,2); // ### Qt4: use value.chop(2) + line.remove(line.length()-2,2); // ### TQt4: use value.chop(2) if(!info.others.isEmpty()) info.others+='\n'; @@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) } -ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) +ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) { return PoInfo::info( url, info, wordList, updateWordList, interactive, true); } -ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) +ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) { stopStaticRead = false; @@ -372,7 +372,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w // First check file with msgfmt to be sure, it is syntactically correct Msgfmt msgfmt; TQString output; - Msgfmt::Status stat = msgfmt.checkSyntax( target , output ); + Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output ); if(stat == Msgfmt::SyntaxError) { KIO::NetAccess::removeTempFile(target); @@ -395,7 +395,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w lexer->yylex(); // now parse the rest of the file - ConversionStatus success=OK; + ConversiontqStatus success=OK; while( lexer->lastToken != T_EOF && success==OK) { @@ -415,7 +415,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { success=OK; - if( temp.comment().contains("\n#~") ) continue; // skip obsolete + if( temp.comment().tqcontains("\n#~") ) continue; // skip obsolete if( temp.msgid().first().isEmpty()) //header { @@ -453,7 +453,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } st = temp.msgstr().join(" " ).simplifyWhiteSpace().lower(); sl = TQStringList::split( ' ', st ); @@ -461,7 +461,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } st = temp.comment().simplifyWhiteSpace().lower(); sl = TQStringList::split( ' ', st ); @@ -469,7 +469,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } } } @@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) // first read header CatalogItem temp; - ConversionStatus status = fastRead( temp, lexer, true ); + ConversiontqStatus status = fastRead( temp, lexer, true ); if( status != OK || !temp.msgid().first().isEmpty() ) { delete lexer; @@ -560,15 +560,15 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.isRegExp ) pos=regexp.search(text, 0 ); else - pos=text.find(searchStr,0,options.caseSensitive); + pos=text.tqfind(searchStr,0,options.caseSensitive); if( pos >= 0) { if( options.wholeWords) { len = searchStr.length(); TQString pre = text.mid(pos-1,1); TQString post = text.mid(pos+len,1); - if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) && - !post.contains( TQRegExp("[a-zA-Z0-9]") ) + if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) && + !post.tqcontains( TQRegExp("[a-zA-Z0-9]") ) ) { delete lexer; delete stream; @@ -601,7 +601,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.ignoreAccelMarker ) { - pos = text.find( options.accelMarker ); + pos = text.tqfind( options.accelMarker ); if( pos >= 0 ) text.remove( pos, 1 ); } @@ -609,7 +609,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.isRegExp ) pos=regexp.search(text, 0 ); else - pos=text.find(searchStr,0,options.caseSensitive); + pos=text.tqfind(searchStr,0,options.caseSensitive); if( pos >= 0) { @@ -617,8 +617,8 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) len = searchStr.length(); TQString pre = text.mid(pos-1,1); TQString post = text.mid(pos+len,1); - if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) && - !post.contains( TQRegExp("[a-zA-Z0-9]") ) + if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) && + !post.tqcontains( TQRegExp("[a-zA-Z0-9]") ) ) { delete lexer; delete stream; @@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) } // this does not like any incorrect files -ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) +ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) { item.clear(); _gettextPluralForm = false; @@ -758,7 +758,7 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b { TQStringList msgstrs = item.msgstr(); TQString s = TQString::fromUtf8(lexer->YYText()); - while( lexer->lastToken == T_MSGSTR && s.contains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) ) + while( lexer->lastToken == T_MSGSTR && s.tqcontains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) ) { if( lexer->yylex() != T_STRING ) return PARSE_ERROR; it = msgstrs.fromLast(); @@ -778,4 +778,4 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b return OK; } -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h index 830d35eb..58e0bc66 100644 --- a/kbabel/common/poinfo.h +++ b/kbabel/common/poinfo.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. @@ -105,7 +105,7 @@ public: * being parsed? * @since KBabel 1.11 (KDE 3.5) */ - static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt); + static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt); /** * @brief Get information about the PO file @@ -121,7 +121,7 @@ public: * KBabel 1.11.1 (KDE 3.5.1) * @note This function always call Gettext's mgfmt before parsing each file */ - static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true); + static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true); static PoInfo headerInfo(const CatalogItem&); static bool findInFile(const TQString& url, FindOptions options ); @@ -147,7 +147,7 @@ private: */ static void cacheRead(); - static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText ); + static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText ); static bool _gettextPluralForm; }; diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp index 3f8f47a3..1d3efd77 100644 --- a/kbabel/common/projectsettings.cpp +++ b/kbabel/common/projectsettings.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. diff --git a/kbabel/common/projectsettings.h b/kbabel/common/projectsettings.h index 49afc0a6..556088dd 100644 --- a/kbabel/common/projectsettings.h +++ b/kbabel/common/projectsettings.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. @@ -108,7 +108,7 @@ struct SourceContextSettings */ TQStringList sourcePaths; - void SourceContextSettins() { codeRoot = TQString::null; sourcePaths.clear(); } + void SourceContextSettins() { codeRoot = TQString(); sourcePaths.clear(); } }; /** diff --git a/kbabel/common/regexpextractor.cpp b/kbabel/common/regexpextractor.cpp index 058834ea..d07c36ed 100644 --- a/kbabel/common/regexpextractor.cpp +++ b/kbabel/common/regexpextractor.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. @@ -42,7 +42,7 @@ using namespace KBabel; RegExpExtractor::RegExpExtractor(const TQStringList& regexps) : _regExpList( regexps ) { - _string=TQString::null; + _string=TQString(); _matches.setAutoDelete(true); } @@ -64,7 +64,7 @@ TQString RegExpExtractor::firstMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::nextMatch() @@ -76,7 +76,7 @@ TQString RegExpExtractor::nextMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::match(uint tagnumber) @@ -85,7 +85,7 @@ TQString RegExpExtractor::match(uint tagnumber) if(ti) return ti->extracted; - return TQString::null; + return TQString(); } int RegExpExtractor::matchIndex(uint tagnumber) @@ -103,7 +103,7 @@ TQString RegExpExtractor::prevMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::lastMatch() @@ -112,7 +112,7 @@ TQString RegExpExtractor::lastMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQStringList RegExpExtractor::matches() @@ -140,7 +140,7 @@ TQString RegExpExtractor::plainString(bool keepPos) { s+=' '; } - tmp.replace(ti->index,len,s); + tmp.tqreplace(ti->index,len,s); } if(!keepPos) @@ -151,18 +151,18 @@ TQString RegExpExtractor::plainString(bool keepPos) return tmp; } -TQString RegExpExtractor::matchesReplaced(const TQString& replace) +TQString RegExpExtractor::matchesReplaced(const TQString& tqreplace) { TQString tmp=_string; int posCorrection=0; - int replaceLen=replace.length(); + int replaceLen=tqreplace.length(); MatchedEntryInfo *ti; for(ti=_matches.first(); ti != 0; ti=_matches.next()) { uint len=ti->extracted.length(); - tmp.replace(ti->index + posCorrection,len,replace); + tmp.tqreplace(ti->index + posCorrection,len,tqreplace); posCorrection+=(replaceLen-len); } @@ -213,7 +213,7 @@ void RegExpExtractor::processString() { s+=' '; } - tmp.replace(pos,tag.length(),s); + tmp.tqreplace(pos,tag.length(),s); break; } diff --git a/kbabel/common/regexpextractor.h b/kbabel/common/regexpextractor.h index 83ff8f60..06de48c0 100644 --- a/kbabel/common/regexpextractor.h +++ b/kbabel/common/regexpextractor.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. @@ -125,7 +125,7 @@ public: /** * @return the string, where matches are replaced with the given string */ - TQString matchesReplaced(const TQString& replace); + TQString matchesReplaced(const TQString& tqreplace); //Functions that allow user to define his own regexps. diff --git a/kbabel/common/resources.h b/kbabel/common/resources.h index d6054b43..35c2baca 100644 --- a/kbabel/common/resources.h +++ b/kbabel/common/resources.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/common/stringdistance.cpp b/kbabel/common/stringdistance.cpp index 8de11c98..3ffc4194 100644 --- a/kbabel/common/stringdistance.cpp +++ b/kbabel/common/stringdistance.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. @@ -41,7 +41,7 @@ const int Distance::editCost_replace_base = 1; const int HammingDistance::editCost = 1; -const int LevenshteinDistance::editCost_replace = 1; +const int LevenshteinDistance::editCost_tqreplace = 1; const int LevenshteinDistance::editCost_insert = 1; const int LevenshteinDistance::editCost_delete = 1; @@ -166,9 +166,9 @@ double LevenshteinDistance::calculate(const TQString& left_string, const TQStri { for(r = 1; r < right_size; r++) { - tmp_value = QMIN( ( D(l-1,r) + editCost_delete ), + tmp_value = TQMIN( ( D(l-1,r) + editCost_delete ), ( D(l-1,r-1) + nodeDistance(left_string[l-1], right_string[r-1]) ) ) ; - D(l,r) = QMIN( tmp_value, + D(l,r) = TQMIN( tmp_value, ( D(l,r-1) + editCost_insert ) ); } } diff --git a/kbabel/common/stringdistance.h b/kbabel/common/stringdistance.h index 89c60627..7520c863 100644 --- a/kbabel/common/stringdistance.h +++ b/kbabel/common/stringdistance.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. @@ -63,7 +63,7 @@ private: // emphasize the following members are private * * The class Distance calculates the distance * between two Entities (left & right). - * It is the parent for other distance-classes. + * It is the tqparent for other distance-classes. */ class Distance : public NonCopyable { @@ -114,8 +114,8 @@ class LevenshteinDistance : public Distance { protected: virtual double calculate(const TQString& left_string, const TQString& right_string); - int editCostReplace() { return editCost_replace; } - static const int editCost_replace; + int editCostReplace() { return editCost_tqreplace; } + static const int editCost_tqreplace; static const int editCost_insert; static const int editCost_delete; }; diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp index fded2703..4fae0e7b 100644 --- a/kbabel/common/tagextractor.cpp +++ b/kbabel/common/tagextractor.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. diff --git a/kbabel/common/tagextractor.h b/kbabel/common/tagextractor.h index 3845b9fd..d6018f37 100644 --- a/kbabel/common/tagextractor.h +++ b/kbabel/common/tagextractor.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. diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index 07a35c2f..f0da9701 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.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. @@ -42,41 +42,41 @@ #include <kdialog.h> -CmdEdit::CmdEdit(TQWidget* parent, const char* name) - : TQWidget(parent,name) +CmdEdit::CmdEdit(TQWidget* tqparent, const char* name) + : TQWidget(tqparent,name) { - TQGridLayout* layout = new TQGridLayout( this , 1 , 1 ); - layout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this); TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this); - layout->addWidget( nameLabel, 0 , 0 ); - layout->addWidget( cmdLabel, 0 , 1 ); + tqlayout->addWidget( nameLabel, 0 , 0 ); + tqlayout->addWidget( cmdLabel, 0 , 1 ); _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" ); _cmdNameEdit->setMaxLength(20); nameLabel->setBuddy(_cmdNameEdit); - layout->addWidget( _cmdNameEdit , 1 , 0 ); + tqlayout->addWidget( _cmdNameEdit , 1 , 0 ); _cmdEdit = new TQLineEdit( this , "cmdEdit" ); cmdLabel->setBuddy(_cmdEdit); - layout->addWidget( _cmdEdit , 1 , 1 ); + tqlayout->addWidget( _cmdEdit , 1 , 1 ); _addButton = new TQPushButton( i18n("&Add"), this ); _addButton->setEnabled(false); - layout->addWidget( _addButton , 1 , 2 ); + tqlayout->addWidget( _addButton , 1 , 2 ); _editButton = new TQPushButton( i18n("&Edit"), this ); _editButton->setEnabled(false); - layout->addWidget( _editButton , 3 , 2 ); + tqlayout->addWidget( _editButton , 3 , 2 ); _removeButton = new TQPushButton( i18n("&Remove"), this ); _removeButton->setEnabled(false); - layout->addWidget( _removeButton , 4 , 2 ); + tqlayout->addWidget( _removeButton , 4 , 2 ); TQHBoxLayout* hbox = new TQHBoxLayout(); - layout->addLayout(hbox,5,2); + tqlayout->addLayout(hbox,5,2); _upButton = new TQToolButton(UpArrow,this); _upButton->setFixedSize(20,20); @@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name) _commandNames = new TQListBox( this , "commandNamesBox" ); _commandNames->setMinimumSize(100, 100); - layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0); + tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0); _commands = new TQListBox( this , "commandsBox" ); _commands->setMinimumSize(160, 100); - layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 ); + tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 ); - layout->setColStretch(0,1); - layout->setColStretch(1,2); - layout->setColStretch(2,0); + tqlayout->setColStretch(0,1); + tqlayout->setColStretch(1,2); + tqlayout->setColStretch(2,0); - layout->addRowSpacing(2, KDialog::spacingHint()); - layout->addRowSpacing(6, KDialog::spacingHint()); + tqlayout->addRowSpacing(2, KDialog::spacingHint()); + tqlayout->addRowSpacing(6, KDialog::spacingHint()); - setMinimumSize(layout->sizeHint()); + setMinimumSize(tqlayout->tqsizeHint()); connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ; diff --git a/kbabel/commonui/cmdedit.h b/kbabel/commonui/cmdedit.h index 288b6fb5..bd091166 100644 --- a/kbabel/commonui/cmdedit.h +++ b/kbabel/commonui/cmdedit.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. @@ -45,11 +45,12 @@ class TQLineEdit; class TQPushButton; class TQToolButton; -class CmdEdit : public QWidget +class CmdEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CmdEdit(TQWidget* parent=0,const char* name=0); + CmdEdit(TQWidget* tqparent=0,const char* name=0); void setCommands(const TQStringList& commands,const TQStringList& commandNames); void commands(TQStringList& commands, TQStringList& commandNames); diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 55c0f196..63e07b28 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.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. @@ -62,8 +62,8 @@ #include <ktexteditor/selectioninterface.h> #include <ktexteditor/viewcursorinterface.h> -SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent) - , m_parent( parent ) +SourceContext::SourceContext(TQWidget *tqparent, KBabel::Project::Ptr project): TQWidget(tqparent) + , m_parent( tqparent ) , _part(0) , _view(0) , _referenceCombo(0) @@ -160,14 +160,14 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, if ( !poDir.isEmpty() ) { - pref.replace( "@POFILEDIR@", poDir ); + pref.tqreplace( "@POFILEDIR@", poDir ); } - else if ( pref.find( "@POFILEDIR@ " ) != -1 ) + else if ( pref.tqfind( "@POFILEDIR@ " ) != -1 ) continue; // No need to keep this path pattern, as we have no PO file dir - pref.replace( "@PACKAGEDIR@", packageDir); - pref.replace( "@PACKAGE@", packageName); - pref.replace( "@CODEROOT@", _project->settings()->codeRoot()); + pref.tqreplace( "@PACKAGEDIR@", packageDir); + pref.tqreplace( "@PACKAGE@", packageName); + pref.tqreplace( "@CODEROOT@", _project->settings()->codeRoot()); prefixes.append(pref); } @@ -191,7 +191,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, ref.line = re.cap(2).toInt(); ref.path = re.cap(1); // ### TODO KDE4: perhaps we should not do the replace if compiled for Windows - ref.path.replace( TQChar( '\\' ), TQChar( '/' ) ); + ref.path.tqreplace( TQChar( '\\' ), TQChar( '/' ) ); rawRefList.append( ref ); } } @@ -223,7 +223,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, ref.line = res.cap(2).toInt(); ref.path = res.cap(1); // ### TODO KDE4: perhaps we should not do the replace if compiled for Windows - ref.path.replace( TQChar( '\\' ), TQChar( '/' ) ); + ref.path.tqreplace( TQChar( '\\' ), TQChar( '/' ) ); rawRefList.append( ref ); } } @@ -240,7 +240,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, for ( TQStringList::const_iterator it1 = prefixes.constBegin(); it1 != prefixes.constEnd(); ++it1 ) { TQString path = (*it1); - path.replace( "@COMMENTPATH@", fileName); + path.tqreplace( "@COMMENTPATH@", fileName); //kdDebug() << "CONTEXT PATH: " << path << endl; // DEBUG TQFileInfo pathInfo( path ); @@ -302,4 +302,4 @@ void SourceContext::setProject( KBabel::Project::Ptr project ) #include "context.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/commonui/context.h b/kbabel/commonui/context.h index ab52fb8b..dd7218b4 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.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. @@ -74,11 +74,12 @@ struct ContextInfo * @note It requires a KPart implementing KTextEditor interface with selections. * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT SourceContext : public QWidget +class KDE_EXPORT SourceContext : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SourceContext(TQWidget* parent, KBabel::Project::Ptr project); + SourceContext(TQWidget* tqparent, KBabel::Project::Ptr project); void setProject(KBabel::Project::Ptr project); diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui index a3ea5a4e..301842af 100644 --- a/kbabel/commonui/diffpreferences.ui +++ b/kbabel/commonui/diffpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DiffPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DiffPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_UseDBForDiff</cstring> </property> @@ -44,7 +44,7 @@ in KBabel's main window.</p></qt></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -52,7 +52,7 @@ in KBabel's main window.</p></qt></string> <string>Use &file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -60,7 +60,7 @@ in KBabel's main window.</p></qt></string> <string>Use messages from &translation database</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -70,15 +70,15 @@ in KBabel's main window.</p></qt></string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -116,7 +116,7 @@ the database are used for diffing.</p></qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -133,7 +133,7 @@ the database are used for diffing.</p></qt></string> <functions> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/commonui/diffpreferences.ui.h b/kbabel/commonui/diffpreferences.ui.h index 5b02d278..2050dff3 100644 --- a/kbabel/commonui/diffpreferences.ui.h +++ b/kbabel/commonui/diffpreferences.ui.h @@ -2,7 +2,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. *****************************************************************************/ diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index d210811a..a08347fc 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.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. @@ -52,20 +52,20 @@ using namespace KBabel; -FindDialog::FindDialog(bool forReplace, TQWidget* parent) - :KDialogBase(parent, "finddialog",true, "", Ok|Cancel, Ok) +FindDialog::FindDialog(bool forReplace, TQWidget* tqparent) + :KDialogBase(tqparent, "finddialog",true, "", Ok|Cancel, Ok) , _regExpEditDialog(0), _replaceDlg(forReplace) { TQWidget* page = new TQWidget(this); - TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint()); TQLabel *label = new TQLabel(i18n("&Find:"),page); - layout->addWidget(label); + tqlayout->addWidget(label); _findCombo = new KComboBox(true, page, "findCombo"); _findCombo->setMaxCount(10); _findCombo->setInsertionPolicy(KComboBox::AtTop); - layout->addWidget(_findCombo); + tqlayout->addWidget(_findCombo); label->setBuddy(_findCombo); TQString msg=i18n("<qt><p><b>Find text</b></p>" @@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) setButtonOK(i18n("&Replace")); _replaceLabel = new TQLabel(i18n("&Replace with:"),page); - layout->addWidget(_replaceLabel); + tqlayout->addWidget(_replaceLabel); _replaceCombo = new KComboBox(true, page, "replaceCombo"); _replaceCombo->setMaxCount(10); _replaceCombo->setInsertionPolicy(KComboBox::AtTop); - layout->addWidget(_replaceCombo); + tqlayout->addWidget(_replaceCombo); _replaceLabel->setBuddy(_replaceCombo); msg=i18n("<qt><p><b>Replace text</b></p>" @@ -99,7 +99,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) } else { setCaption(i18n("Find")); - setButtonOK(KGuiItem(i18n("&Find"),"find")); + setButtonOK(KGuiItem(i18n("&Find"),"tqfind")); _replaceLabel=0; _replaceCombo=0; @@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) _buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page); connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int))); - layout->addWidget(_buttonGrp); + tqlayout->addWidget(_buttonGrp); _inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp); _inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp); @@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page); - layout->addWidget(box); + tqlayout->addWidget(box); _caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box); _wholeWords = new TQCheckBox(i18n("O&nly whole words"),box); @@ -502,7 +502,7 @@ void FindDialog::saveSettings() void FindDialog::inButtonsClicked(int id) { // check if at least one button is checked - if(! _buttonGrp->find(id)->isOn() ) { + if(! _buttonGrp->tqfind(id)->isOn() ) { if(!_inMsgstr->isOn() && !_inComment->isOn() ) { if(_inMsgid->isEnabled()) { if( !_inMsgid->isOn() ) { @@ -520,7 +520,7 @@ void FindDialog::inButtonsClicked(int id) void FindDialog::regExpButtonClicked() { if ( _regExpEditDialog == 0 ) - _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -531,17 +531,17 @@ void FindDialog::regExpButtonClicked() } } -ReplaceDialog::ReplaceDialog(TQWidget* parent) - :KDialogBase(Plain, "", Close|User1|User2|User3, User1, parent,"finddialog" +ReplaceDialog::ReplaceDialog(TQWidget* tqparent) + :KDialogBase(Plain, "", Close|User1|User2|User3, User1, tqparent,"finddialog" , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All")) { TQWidget* page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint()); TQLabel *label = new TQLabel(i18n("Replace this string?"),page); - layout->addWidget(label); + tqlayout->addWidget(label); - connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace())); + connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(tqreplace())); connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next())); connect(this,TQT_SIGNAL(user3Clicked()),this,TQT_SIGNAL(replaceAll())); } diff --git a/kbabel/commonui/finddialog.h b/kbabel/commonui/finddialog.h index e489c51a..174d8b81 100644 --- a/kbabel/commonui/finddialog.h +++ b/kbabel/commonui/finddialog.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. @@ -47,12 +47,13 @@ class KComboBox; class KDE_EXPORT FindDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param replaceDlg flag, if this is a replace dialog */ - FindDialog(bool replaceDlg, TQWidget* parent); + FindDialog(bool replaceDlg, TQWidget* tqparent); ~FindDialog(); /** @@ -122,12 +123,13 @@ private: class KDE_EXPORT ReplaceDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ReplaceDialog(TQWidget* parent); + ReplaceDialog(TQWidget* tqparent); ~ReplaceDialog(); signals: - void replace(); + void tqreplace(); void replaceAll(); void next(); diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp index 699dcc26..52a60bbf 100644 --- a/kbabel/commonui/kactionselector.cpp +++ b/kbabel/commonui/kactionselector.cpp @@ -17,11 +17,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. * @@ -57,8 +57,8 @@ class KActionSelectorPrivate { //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KActionSelector::KActionSelector( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { d = new KActionSelectorPrivate(); d->moveOnDoubleClick = true; @@ -360,7 +360,7 @@ void KActionSelector::polish() void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; - if ( (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ControlButton) ) { switch ( e->key() ) { @@ -387,7 +387,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h index f9bae466..421597ba 100644 --- a/kbabel/commonui/kactionselector.h +++ b/kbabel/commonui/kactionselector.h @@ -17,11 +17,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. * @@ -86,18 +86,19 @@ class KActionSelectorPrivate; class KActionSelector : public TQWidget { Q_OBJECT + TQ_OBJECT Q_ENUMS( ButtonIconSize InsertionPolicy ) - Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) - Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) - Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) - Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) - Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) - Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) - Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) - Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) + TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) + TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) + TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) + TQ_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) + TQ_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) + TQ_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) + TQ_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) + TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *parent=0, const char *name=0 ); + KActionSelector( TQWidget *tqparent=0, const char *name=0 ); ~KActionSelector(); /** diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui index 63fbfceb..cb6c43ac 100644 --- a/kbabel/commonui/klisteditor.ui +++ b/kbabel/commonui/klisteditor.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KListEditor</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KListEditor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>_frame</cstring> </property> @@ -55,7 +55,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -69,12 +69,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -88,7 +88,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -97,14 +97,14 @@ <property name="name"> <cstring>_list</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5_2</cstring> </property> @@ -118,7 +118,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_addButton</cstring> </property> @@ -129,7 +129,7 @@ <string>Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_removeButton</cstring> </property> @@ -140,7 +140,7 @@ <string>Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_upButton</cstring> </property> @@ -151,7 +151,7 @@ <string>Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_downButton</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -242,10 +242,10 @@ <includes> <include location="local" impldecl="in implementation">klisteditor.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>itemsChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>addToList()</slot> <slot>downInList()</slot> <slot>removeFromList()</slot> @@ -255,7 +255,7 @@ <slot>setList( QStringList contents )</slot> <slot access="protected">editChanged( const QString & s )</slot> <slot>setTitle( const QString & s )</slot> - <slot returnType="QStringList">list()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot returnType="TQStringList">list()</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/commonui/klisteditor.ui.h b/kbabel/commonui/klisteditor.ui.h index 3d0e17df..1845943c 100644 --- a/kbabel/commonui/klisteditor.ui.h +++ b/kbabel/commonui/klisteditor.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 slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 16e6c114..f34d2cc2 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.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. diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h index ce4e7f86..07cae2f1 100644 --- a/kbabel/commonui/projectpref.h +++ b/kbabel/commonui/projectpref.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. @@ -58,6 +58,7 @@ namespace KBabel { class KDE_EXPORT ProjectDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: ProjectDialog(Project::Ptr project); diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 0357065e..4a363c47 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.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. @@ -76,18 +76,18 @@ using namespace KBabel; -static TQSize sizeHintForWidget(const TQWidget* widget) +static TQSize tqsizeHintForWidget(const TQWidget* widget) { // - // The size is computed by adding the sizeHint().height() of all - // widget children and taking the width of the widest child and adding - // layout()->margin() and layout()->spacing() + // The size is computed by adding the tqsizeHint().height() of all + // widget tqchildren and taking the width of the widest child and adding + // tqlayout()->margin() and tqlayout()->spacing() // TQSize size; int numChild = 0; - TQObjectList *l = (TQObjectList*)(widget->children()); + TQObjectList *l = (TQObjectList*)(widget->tqchildren()); for( uint i=0; i < l->count(); i++ ) { @@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget) numChild += 1; TQWidget *w=((TQWidget*)o); - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); if( s.isEmpty() == true ) { s = TQSize( 50, 100 ); // Default size @@ -109,8 +109,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget) if( numChild > 0 ) { - size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) ); - size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 ); + size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) ); + size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 ); } else { @@ -123,16 +123,16 @@ static TQSize sizeHintForWidget(const TQWidget* widget) -SavePreferences::SavePreferences(TQWidget *parent) - : KTabCtl(parent) +SavePreferences::SavePreferences(TQWidget *tqparent) + : KTabCtl(tqparent) { TQWidget* page = new TQWidget(this); - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); - layout->addWidget(box); + tqlayout->addWidget(box); box->setMargin(KDialog::marginHint()); _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate"); @@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent) _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete"); TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page); - layout->addWidget(descBox); + tqlayout->addWidget(descBox); descBox->setMargin(KDialog::marginHint()); _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString"); @@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent) TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding") ,page); encodingBox->setMargin(KDialog::marginHint()); - layout->addWidget(encodingBox); + tqlayout->addWidget(encodingBox); TQHBox *b = new TQHBox(encodingBox); TQLabel* tempLabel=new TQLabel(i18n("Default:"),b); @@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent) _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page ); _autoSaveBox->setMargin( KDialog::marginHint( ) ); - layout->addWidget( _autoSaveBox ); + tqlayout->addWidget( _autoSaveBox ); _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" ); _autoSaveDelay->setRange( 0, 60 ); _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) ); _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) ); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("&General")); page = new TQWidget(this); - layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page); - layout->addWidget(gridBox); + tqlayout->addWidget(gridBox); gridBox->setMargin(KDialog::marginHint()); _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate"); @@ -204,10 +204,10 @@ SavePreferences::SavePreferences(TQWidget *parent) _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject"); TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat"); - layout->addWidget(dateBox); + tqlayout->addWidget(dateBox); box->setMargin(KDialog::marginHint()); - // we remove/insert default date button to correctly map Qt::DateFormat to our Ids + // we remove/insert default date button to correctly map TQt::DateFormat to our Ids _defaultDateButton = new TQRadioButton( i18n("De&fault date format"),dateBox ); dateBox->remove (_defaultDateButton); _localDateButton = new TQRadioButton( i18n("Local date fo&rmat"),dateBox ); @@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent) TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String") ,page); projectBox->setMargin(KDialog::marginHint()); - layout->addWidget(projectBox); + tqlayout->addWidget(projectBox); b = new TQHBox(projectBox); tempLabel=new TQLabel(i18n("Project-Id:"),b); @@ -234,32 +234,32 @@ SavePreferences::SavePreferences(TQWidget *parent) b->setSpacing(KDialog::spacingHint()); tempLabel->setBuddy(_projectEdit); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("&Header")); page = new TQWidget(this); - layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page); translatorCopyrightBox->setMargin(KDialog::marginHint()); _translatorCopyrightButton = new TQCheckBox(i18n("Update &translator copyright") ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright"); - layout->addWidget(translatorCopyrightBox); + tqlayout->addWidget(translatorCopyrightBox); TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright"); - layout->addWidget(fsfBox); + tqlayout->addWidget(fsfBox); fsfBox->setMargin(KDialog::marginHint()); _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox); _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox); _nochangeFSFButton = new TQRadioButton(i18n("Do ¬ change"),fsfBox); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("Cop&yright")); TQWhatsThis::add(_updateButton, @@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent) "<ul><li><b>%1</b>: this is the encoding that fits the character " "set of your system language.</li>" "<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>" -"</ul></qt>").arg(defaultName).arg(utf8Name) ); +"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) ); TQWhatsThis::add(_oldEncodingButton @@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent) "in the online help.</p>" "</qt>") ); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -398,22 +398,22 @@ void SavePreferences::setAutoSaveVisible( const bool on ) -IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& project) - : TQWidget(parent) +IdentityPreferences::IdentityPreferences(TQWidget* tqparent, const TQString& project) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); if( !project.isEmpty() ) { // show the project name in the widget at the top - layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page)); + tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page)); } TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page); - layout->addWidget(group); + tqlayout->addWidget(group); group->setMargin(KDialog::marginHint()); TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group); @@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje tempLabel=new TQLabel(i18n("&Language mailing list:"),group); _listEdit = new TQLineEdit(group, "kcfg_Mailinglist"); - _listEdit->setMinimumSize(100,_listEdit->sizeHint().height()); + _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height()); tempLabel->setBuddy(_listEdit); tempLabel=new TQLabel(i18n("&Timezone:"), group); _timezoneEdit = new TQLineEdit(group, "kcfg_Timezone"); - _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height()); + _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height()); tempLabel->setBuddy(_timezoneEdit); @@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje group = new TQGroupBox(1,Qt::Horizontal,page); - layout->addWidget(group); + tqlayout->addWidget(group); group->setMargin(KDialog::marginHint()); hbox = new TQHBox(group); @@ -534,11 +534,11 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje "GNU gettext tools for currently set language; just press the <b>Lookup</b> " "button.</p></qt>")); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); _mailEdit->installEventFilter(this); _listEdit->installEventFilter(this); @@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm() "of singular/plural forms automatically for the " "language code \"%1\".\n" "Do you have kdelibs.po installed for this language?\n" - "Please set the correct number manually.").arg(lang); + "Please set the correct number manually.").tqarg(lang); } else { msg = i18n("The number of singular/plural forms found for " - "the language code \"%1\" is %2.").arg(lang).arg(number); + "the language code \"%1\" is %2.").tqarg(lang).tqarg(number); } if(!msg.isEmpty()) @@ -658,18 +658,18 @@ void IdentityPreferences::lookupGnuPluralFormHeader() } -MiscPreferences::MiscPreferences(TQWidget *parent) - : TQWidget(parent), _regExpEditDialog(0) +MiscPreferences::MiscPreferences(TQWidget *tqparent) + : TQWidget(tqparent), _regExpEditDialog(0) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); TQHBox *hbox = new TQHBox(box); hbox->setSpacing(KDialog::spacingHint()); @@ -681,7 +681,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) hbox->setStretchFactor(accelMarkerEdit,1); TQString msg=i18n("<qt><p><b>Marker for keyboard accelerator</b></p>" "<p>Define here, what character marks the following " - "character as keyboard accelerator. For example in Qt it is " + "character as keyboard accelerator. For example in TQt it is " "'&' and in Gtk it is '_'.</p></qt>"); TQWhatsThis::add(label,msg); TQWhatsThis::add(accelMarkerEdit,msg); @@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) vbgroup->setTitle(i18n("Compression Method for Mail Attachments")); vbgroup->setRadioButtonExclusive(true); vbgroup->setMargin(KDialog::marginHint()); - layout->addWidget(vbgroup); + tqlayout->addWidget(vbgroup); bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression"); gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup); @@ -723,8 +723,8 @@ MiscPreferences::MiscPreferences(TQWidget *parent) compressSingle = new TQCheckBox(i18n("&Use compression when sending " "a single file"), vbgroup, "kcfg_CompressSingleFile"); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); } void MiscPreferences::defaults(const MiscSettings& settings) @@ -770,7 +770,7 @@ TQString MiscPreferences::contextInfo() const void MiscPreferences::setContextInfo(TQString reg) { - reg.replace("\n","\\n"); + reg.tqreplace("\n","\\n"); contextInfoEdit->setText(reg); } @@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked() { if ( _regExpEditDialog==0 ) _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog> - ("KRegExpEditor/KRegExpEditor", TQString::null, this ); + ("KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -790,34 +790,34 @@ void MiscPreferences::regExpButtonClicked() } -SpellPreferences::SpellPreferences(TQWidget* parent) - : TQWidget(parent) +SpellPreferences::SpellPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck"); - layout->addWidget(onFlyBtn); + tqlayout->addWidget(onFlyBtn); TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>" "<p>Activate this to let KBabel spell check the text " "as you type. Mispelled words will be colored by the error color.</p></qt>")); spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false); - layout->addWidget(spellConfig); + tqlayout->addWidget(spellConfig); remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored"); - layout->addWidget(remIgnoredBtn); + tqlayout->addWidget(remIgnoredBtn); connect( spellConfig, TQT_SIGNAL( configChanged() ) , this, TQT_SIGNAL ( settingsChanged() ) ); TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page); - layout->addWidget(tempLabel); + tqlayout->addWidget(tempLabel); ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL"); - layout->addWidget(ignoreURLEdit); + tqlayout->addWidget(ignoreURLEdit); tempLabel->setBuddy(ignoreURLEdit); connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit @@ -833,11 +833,11 @@ SpellPreferences::SpellPreferences(TQWidget* parent) TQWhatsThis::add(tempLabel,msg); TQWhatsThis::add(ignoreURLEdit,msg); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -874,18 +874,18 @@ void SpellPreferences::defaults(const SpellcheckSettings& settings) *spellConfig = spCfg; } -CatmanPreferences::CatmanPreferences(TQWidget* parent) - : TQWidget(parent) +CatmanPreferences::CatmanPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box); TQHBox* hbox = new TQHBox(box); @@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir"); _poDirEdit->setMode( mode ); - _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height()); + _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height()); label->setBuddy(_poDirEdit); @@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir"); _potDirEdit->setMode( mode ); - _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height()); + _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height()); label->setBuddy(_potDirEdit); @@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow"); @@ -939,7 +939,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _indexButton = new TQCheckBox( i18n("Create inde&x for file contents"), box, "kcfg_IndexWords" ); TQWhatsThis::add( _indexButton , i18n("<qt><p><b>Create index for file contents</b></p>\n" -"<p>If you check this, KBabel will create an index for each PO file to speed up the find/replace functions.</p>\n" +"<p>If you check this, KBabel will create an index for each PO file to speed up the tqfind/replace functions.</p>\n" "<p>NOTE: This will slow down updating the file information considerably.</p></qt>") ); m_msgfmtButton = new TQCheckBox( i18n("Run &msgfmt before processing a file"), box, "kcfg_msgfmt" ); @@ -956,11 +956,11 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) "so invalid PO files could be shown as good ones, " "even if Gettext tools would reject such files.</p></qt>") ); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -976,18 +976,18 @@ void CatmanPreferences::defaults(const CatManSettings& settings) m_msgfmtButton->setChecked( settings.msgfmt ); } -DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) - : TQWidget(parent) +DirCommandsPreferences::DirCommandsPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page ); box->setMargin( KDialog::marginHint() ); - layout->addWidget( box ); + tqlayout->addWidget( box ); _dirCmdEdit = new CmdEdit( box ); new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n" @@ -1010,10 +1010,10 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1039,18 +1039,18 @@ void DirCommandsPreferences::defaults(const CatManSettings& settings) } -FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) - : TQWidget(parent) +FileCommandsPreferences::FileCommandsPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page ); box->setMargin( KDialog::marginHint() ); - layout->addWidget( box ); + tqlayout->addWidget( box ); _fileCmdEdit = new CmdEdit( box ); new TQLabel( i18n("Replaceables:\n" @@ -1074,10 +1074,10 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1102,18 +1102,18 @@ void FileCommandsPreferences::defaults(const CatManSettings& settings) _fileCmdEdit->setCommands( settings.fileCommands, settings.fileCommandNames ); } -ViewPreferences::ViewPreferences(TQWidget* parent) - : TQWidget(parent) +ViewPreferences::ViewPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" ); _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" ); @@ -1126,11 +1126,11 @@ ViewPreferences::ViewPreferences(TQWidget* parent) TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n" "<p></p></qt>")); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1145,12 +1145,12 @@ void ViewPreferences::defaults(const CatManSettings& _settings) _translatorColumnCheckbox->setChecked(_settings.translatorColumn); } -SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent) +SourceContextPreferences::SourceContextPreferences(TQWidget* tqparent): TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQHBox* box = new TQHBox(page); box->setSpacing(KDialog::spacingHint()); @@ -1159,21 +1159,21 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); _coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" ); _coderootEdit->setMode( mode ); - _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() ); + _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() ); tempLabel->setBuddy( _coderootEdit ); - layout->addWidget(box); + tqlayout->addWidget(box); // FIXME: use KConfigXT _pathsEditor = new KListEditor(page); _pathsEditor->setTitle(i18n("Path Patterns")); - layout->addWidget(_pathsEditor); + tqlayout->addWidget(_pathsEditor); connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ()) , this, TQT_SIGNAL (itemsChanged ())); _pathsEditor->installEventFilter(this); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } SourceContextPreferences::~SourceContextPreferences() diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h index ea5b9d30..f5fef9e2 100644 --- a/kbabel/commonui/projectprefwidgets.h +++ b/kbabel/commonui/projectprefwidgets.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. @@ -65,8 +65,9 @@ struct ModuleInfo; class KDE_EXPORT SavePreferences : public KTabCtl { Q_OBJECT + TQ_OBJECT public: - SavePreferences(TQWidget* parent=0); + SavePreferences(TQWidget* tqparent=0); void defaults(const KBabel::SaveSettings& settings); void setAutoSaveVisible(const bool on); @@ -108,11 +109,12 @@ private slots: }; -class IdentityPreferences : public QWidget +class IdentityPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IdentityPreferences(TQWidget *parent = 0, const TQString& project = ""); + IdentityPreferences(TQWidget *tqparent = 0, const TQString& project = ""); virtual bool eventFilter(TQObject *, TQEvent*); void defaults(const KBabel::IdentitySettings& settings); @@ -138,11 +140,12 @@ private: }; -class MiscPreferences : public QWidget +class MiscPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MiscPreferences(TQWidget *parent=0); + MiscPreferences(TQWidget *tqparent=0); void defaults(const KBabel::MiscSettings& settings); private slots: @@ -163,11 +166,12 @@ private: TQCheckBox* compressSingle; }; -class SpellPreferences : public QWidget +class SpellPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SpellPreferences(TQWidget *parent=0); + SpellPreferences(TQWidget *tqparent=0); void mergeSettings(KBabel::SpellcheckSettings& set) const; void updateWidgets(const KBabel::SpellcheckSettings& settings); @@ -184,11 +188,12 @@ private: }; -class CatmanPreferences : public QWidget +class CatmanPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CatmanPreferences(TQWidget *parent = 0); + CatmanPreferences(TQWidget *tqparent = 0); void defaults(const KBabel::CatManSettings& settings); private: @@ -202,11 +207,12 @@ private: TQCheckBox* m_msgfmtButton; }; -class DirCommandsPreferences : public QWidget +class DirCommandsPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DirCommandsPreferences(TQWidget *parent = 0); + DirCommandsPreferences(TQWidget *tqparent = 0); virtual ~DirCommandsPreferences(); void mergeSettings(KBabel::CatManSettings& settings) const; @@ -220,11 +226,12 @@ private: CmdEdit* _dirCmdEdit; }; -class FileCommandsPreferences : public QWidget +class FileCommandsPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileCommandsPreferences(TQWidget *parent = 0); + FileCommandsPreferences(TQWidget *tqparent = 0); virtual ~FileCommandsPreferences(); void mergeSettings(KBabel::CatManSettings& settings) const; @@ -238,11 +245,12 @@ private: CmdEdit* _fileCmdEdit; }; -class ViewPreferences : public QWidget +class ViewPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ViewPreferences(TQWidget *parent = 0); + ViewPreferences(TQWidget *tqparent = 0); void defaults(const KBabel::CatManSettings& settings); private: @@ -261,11 +269,12 @@ private: * @short Class for setting preferences for source context * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class SourceContextPreferences : public QWidget +class SourceContextPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SourceContextPreferences(TQWidget* parent=0); + SourceContextPreferences(TQWidget* tqparent=0); virtual ~SourceContextPreferences(); void mergeSettings(KBabel::SourceContextSettings& settings) const; diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index e5df7285..5858195b 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.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. @@ -47,8 +47,8 @@ using namespace KBabel; -ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) - : KWizard(parent,name,true) +ProjectWizard::ProjectWizard(TQWidget *tqparent,const char *name) + : KWizard(tqparent,name,true) { _wizard = new ProjectStep1(this,"project wizard widget"); @@ -60,8 +60,8 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) { // we need untranslated entries here, because of Translation Robot! TQString entry = (*it); - const int i = entry.find('_'); - entry.replace(0, i, entry.left(i).lower()); + const int i = entry.tqfind('_'); + entry.tqreplace(0, i, entry.left(i).lower()); all_languages.setGroup(entry); entry = all_languages.readEntryUntranslated("Name"); if( ! entry.isEmpty() ) @@ -138,7 +138,7 @@ void ProjectWizard::next() if( file.exists() ) { if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n" - "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel) + "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel) return; } diff --git a/kbabel/commonui/projectwizard.h b/kbabel/commonui/projectwizard.h index 7805190f..487a16e7 100644 --- a/kbabel/commonui/projectwizard.h +++ b/kbabel/commonui/projectwizard.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. @@ -48,8 +48,9 @@ namespace KBabel { class KDE_EXPORT ProjectWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - ProjectWizard(TQWidget* parent = 0, const char * name = 0); + ProjectWizard(TQWidget* tqparent = 0, const char * name = 0); Project::Ptr project(); diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui index 3ad04de7..592b6792 100644 --- a/kbabel/commonui/projectwizardwidget.ui +++ b/kbabel/commonui/projectwizardwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProjectStep1</class> <author>Stanislav Visnovsky <visnovsky@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectStep1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -38,9 +38,9 @@ and also a type of the translation project. </p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -66,7 +66,7 @@ project.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -86,7 +86,7 @@ standard.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -110,7 +110,7 @@ as well as in the title of windows opened for the project. </p></qt></string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>_projectLanguage</cstring> </property> @@ -127,7 +127,7 @@ standard.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -176,7 +176,7 @@ as well as in the title of windows opened for the project. </p></qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -194,7 +194,7 @@ project.</p> </qt></string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>KDE</string> @@ -255,8 +255,8 @@ done</li> <includes> <include location="local" impldecl="in implementation">projectwizardwidget.ui.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kbabel/commonui/projectwizardwidget.ui.h b/kbabel/commonui/projectwizardwidget.ui.h index 6f16e162..c9ed3465 100644 --- a/kbabel/commonui/projectwizardwidget.ui.h +++ b/kbabel/commonui/projectwizardwidget.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. *****************************************************************************/ diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui index 05d21a20..33c9ab11 100644 --- a/kbabel/commonui/projectwizardwidget2.ui +++ b/kbabel/commonui/projectwizardwidget2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProjectStep2</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectStep2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ The files and the folders in these folders will then be merged into one tree.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -44,15 +44,15 @@ leave the entries empty, the Catalog Manager will not work.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -86,15 +86,15 @@ will not work.</string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -138,7 +138,7 @@ will not work.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>100</height> @@ -149,7 +149,7 @@ will not work.</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 75395630..5c8f76a6 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.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. @@ -64,8 +64,8 @@ using namespace KBabel; RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat - , TQWidget *parent,const char *name) - : KDialogBase(parent,name,true + , TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true ,i18n("Caption of dialog","Rough Translation") , User1|User2|User3|Close) ,catalog(cat) @@ -77,7 +77,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat ,partTransCounter(0) ,totalTried(0) { - setButtonBoxOrientation(Vertical); + setButtonBoxQt::OrientationQt::Vertical); setButtonText(User1,i18n("&Start")); setButtonText(User2,i18n("S&top")); setButtonText(User3,i18n("C&ancel")); @@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat progressbar = new KProgress(mw,"progressbar"); progressbar->setTextEnabled(true); progressbar->setFormat("%v/%m (%p%)"); - TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout); - pblayout->add(label); - pblayout->add(progressbar); + TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout); + pbtqlayout->add(label); + pbtqlayout->add(progressbar); transButton->setChecked(config->readBoolEntry("Translated",false)); untransButton->setChecked(config->readBoolEntry("Untranslated",true)); @@ -292,7 +292,7 @@ void RoughTransDlg::translate() if( catalog->pluralForm(i) == NoPluralForm ) { TQString origTrans = catalog->msgstr(i).first(); - if(msg.find("_: NAME OF TRANSLATORS\\n")==0) + if(msg.tqfind("_: NAME OF TRANSLATORS\\n")==0) { TQString authorName; if( !catalog->identitySettings().authorLocalizedName.isEmpty() ) @@ -302,24 +302,24 @@ void RoughTransDlg::translate() authorName = catalog->identitySettings().authorName; else continue; // there is no name to be inserted - if( !TQStringList::split(',', origTrans).contains(authorName) ) + if( !TQStringList::split(',', origTrans).tqcontains(authorName) ) { if(origTrans.isEmpty() ) translation=authorName; else translation+=origTrans+","+authorName; } } - else if(msg.find("_: EMAIL OF TRANSLATORS\\n")==0) + else if(msg.tqfind("_: EMAIL OF TRANSLATORS\\n")==0) { // skip, if email is not specified in settings if( catalog->identitySettings().authorEmail.isEmpty() ) continue; - if( !TQStringList::split(',', origTrans).contains(catalog->identitySettings().authorEmail) ) + if( !TQStringList::split(',', origTrans).tqcontains(catalog->identitySettings().authorEmail) ) { if(origTrans.isEmpty() ) translation=catalog->identitySettings().authorEmail; else translation=origTrans+","+catalog->identitySettings().authorEmail; } } - else if (msg.find("ROLES_OF_TRANSLATORS") == 0) + else if (msg.tqfind("ROLES_OF_TRANSLATORS") == 0) { TQString temp = "<othercredit role=\\\"translator\\\">\n<firstname></firstname>" "<surname></surname>\n<affiliation><address><email>" + @@ -327,10 +327,10 @@ void RoughTransDlg::translate() "</affiliation><contrib></contrib></othercredit>"; if (origTrans.isEmpty( )) translation = temp; - else if (origTrans.find(catalog->identitySettings( ).authorEmail) < 0) + else if (origTrans.tqfind(catalog->identitySettings( ).authorEmail) < 0) translation = origTrans + "\n" + temp; } - else if (msg.find("CREDIT_FOR_TRANSLATORS") == 0) + else if (msg.tqfind("CREDIT_FOR_TRANSLATORS") == 0) { TQString authorName; if (!catalog->identitySettings( ).authorLocalizedName.isEmpty( )) @@ -341,8 +341,8 @@ void RoughTransDlg::translate() catalog->identitySettings( ).authorEmail + "</email></para>"; if (origTrans.isEmpty( )) translation = temp; - else if (origTrans.find(authorName) < 0 && - origTrans.find(catalog->identitySettings( ).authorEmail) < 0) + else if (origTrans.tqfind(authorName) < 0 && + origTrans.tqfind(catalog->identitySettings( ).authorEmail) < 0) translation = origTrans + "\n" + temp; } } @@ -350,8 +350,8 @@ void RoughTransDlg::translate() else // not kdeSpecific { // skip KDE specific texts - if( msg.find("_: EMAIL OF TRANSLATORS\\n")==0 || msg.find("_: NAME OF TRANSLATORS\\n")==0 || - msg.find("ROLES_OF_TRANSLATORS")==0 || msg.find("CREDIT_FOR_TRANSLATORS")==0) + if( msg.tqfind("_: EMAIL OF TRANSLATORS\\n")==0 || msg.tqfind("_: NAME OF TRANSLATORS\\n")==0 || + msg.tqfind("ROLES_OF_TRANSLATORS")==0 || msg.tqfind("CREDIT_FOR_TRANSLATORS")==0) continue; } @@ -364,9 +364,9 @@ void RoughTransDlg::translate() totalTried++; - if(msg.contains(contextReg)) + if(msg.tqcontains(contextReg)) { - msg.replace(contextReg,""); + msg.tqreplace(contextReg,""); } // try exact translation @@ -442,7 +442,7 @@ void RoughTransDlg::translate() TQStringList wordList; TQChar accel; TQString endingPunctuation; - int pos = msg.findRev(endPunctReg); + int pos = msg.tqfindRev(endPunctReg); if(pos >= 0) { endingPunctuation = msg.right(msg.length()-pos); @@ -475,18 +475,18 @@ void RoughTransDlg::translate() } else if(!word.isEmpty() ) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } @@ -500,37 +500,37 @@ void RoughTransDlg::translate() { if(msg[index+1]=='n' && msg[index+2].isSpace()) { - if(!word.isEmpty() && !word.contains(digitReg)) + if(!word.isEmpty() && !word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); wordList.append("\\n\n"); index+=2; } else if(!word.isEmpty() ) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) { + if(!word.tqcontains(digitReg)) { wordList.append(word); } - word=TQString::null; + word=TQString(); } } @@ -571,7 +571,7 @@ void RoughTransDlg::translate() } if(wordCounter==0) - translation=TQString::null; + translation=TQString(); ++dit; } @@ -582,7 +582,7 @@ void RoughTransDlg::translate() // try to set the correct keyboard accelerator if(!accel.isNull()) { - int index = translation.find(accel,0,false); + int index = translation.tqfind(accel,0,false); if(index >= 0) { translation.insert(index,accelMarker); @@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics() "Exact translations: %2 (%3%)\n" "Approximate translations: %4 (%5%)\n" "Nothing found: %6 (%7%)") - .arg( locale->formatNumber(totalTried,0) ) - .arg( locale->formatNumber(exactTransCounter,0) ) - .arg( locale->formatNumber( ((double)(10000*exactTransCounter/QMAX(totalTried,1)))/100) ) - .arg( locale->formatNumber(partTransCounter,0) ) - .arg( locale->formatNumber(((double)(10000*partTransCounter/QMAX(totalTried,1)))/100) ) - .arg( locale->formatNumber(nothing,0) ) - .arg( locale->formatNumber(((double)(10000*nothing/QMAX(totalTried,1)))/100) ); + .tqarg( locale->formatNumber(totalTried,0) ) + .tqarg( locale->formatNumber(exactTransCounter,0) ) + .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) ) + .tqarg( locale->formatNumber(partTransCounter,0) ) + .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) ) + .tqarg( locale->formatNumber(nothing,0) ) + .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) ); KMessageBox::information(this, statMsg , i18n("Rough Translation Statistics")); @@ -717,7 +717,7 @@ void RoughTransDlg::msgButtonClicked(int id) if(!transButton->isChecked() && !untransButton->isChecked() && !fuzzyButton->isChecked()) { - TQButton *button = whatBox->find(id); + TQButton *button = whatBox->tqfind(id); if(button == transButton) { transButton->setChecked(true); @@ -748,7 +748,7 @@ void RoughTransDlg::fuzzyButtonToggled(bool on) "check the results carefully. Deactivate this option only if " "you know what you are doing.</p></qt>"); - KMessageBox::information(this, msg, TQString::null,"MarkFuzzyWarningInRoughTransDlg"); + KMessageBox::information(this, msg, TQString(),"MarkFuzzyWarningInRoughTransDlg"); } } diff --git a/kbabel/commonui/roughtransdlg.h b/kbabel/commonui/roughtransdlg.h index aa33a66f..ec7dc609 100644 --- a/kbabel/commonui/roughtransdlg.h +++ b/kbabel/commonui/roughtransdlg.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. @@ -53,9 +53,10 @@ class TQVBox; class KDE_EXPORT RoughTransDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *parent + RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *tqparent , const char *name=0); ~RoughTransDlg(); diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 20dac847..ebb52bb4 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -18,11 +18,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. @@ -34,8 +34,8 @@ #include <kdebug.h> ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, - TQObject * parent, const char * name ) - : KAction( text, info.iconName() == "unknown" ? TQString::null : info.iconName(), cut, parent, name ), + TQObject * tqparent, const char * name ) + : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, tqparent, name ), m_command( command ), m_info( info ) { @@ -46,7 +46,7 @@ void ToolAction::slotActivated() emit toolActivated( m_info, m_command ); } -TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix ) +TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent, const TQString& namePrefix ) { TQPtrList<KAction> actionList; if ( tools.isEmpty() ) @@ -69,12 +69,12 @@ TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolIn TQStringList::ConstIterator sit = shortcuts.begin(); for (; uit != userCommands.end() && cit != commands.end(); ++uit, ++cit) { - if( !excludeCommand == command.contains(*cit) ) + if( !excludeCommand == command.tqcontains(*cit) ) { TQString sc=*sit; - ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString::null:sc), *entry, *cit - , parent + ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString():sc), *entry, *cit + , tqparent , TQString(namePrefix+(*entry).service()->library()+"_"+(*cit)).utf8() ); connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); @@ -96,7 +96,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools() for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry ) { - if( (*entry).commands().contains("validate") ) + if( (*entry).commands().tqcontains("validate") ) { result.append( *entry ); } diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h index 7159aaf2..064b8981 100644 --- a/kbabel/commonui/toolaction.h +++ b/kbabel/commonui/toolaction.h @@ -18,11 +18,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. @@ -42,15 +42,16 @@ class KActionCollection; class KDE_EXPORT ToolAction : public KAction { Q_OBJECT + TQ_OBJECT public: - ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0); + ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * tqparent = 0, const char * name = 0); /** * return the list of KActions created for a list of tools. @ref command * allows to specify rescriction of commands, for which the list should * or shouldn't be created according to the @ref excludeCommand flag. */ - static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString::null ); + static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent=0, const TQString& namePrefix=TQString() ); /** * returns information about all available validation tools (KDataTools with support for CatalogItem diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp index 1e97f473..4fadd865 100644 --- a/kbabel/commonui/toolselectionwidget.cpp +++ b/kbabel/commonui/toolselectionwidget.cpp @@ -18,11 +18,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,8 +36,8 @@ #include <tqlistbox.h> -ToolSelectionWidget::ToolSelectionWidget( TQWidget * parent, const char * name ) - : KActionSelector( parent, name ) +ToolSelectionWidget::ToolSelectionWidget( TQWidget * tqparent, const char * name ) + : KActionSelector( tqparent, name ) { } @@ -63,7 +63,7 @@ void ToolSelectionWidget::loadTools( const TQStringList &commands, TQStringList::ConstIterator cit = toolCommands.begin(); for (; uit != userCommands.end() && cit != toolCommands.end(); ++uit, ++cit ) { - if( commands.contains(*cit) ) + if( commands.tqcontains(*cit) ) { availableListBox()->insertItem( *uit ); } @@ -79,7 +79,7 @@ void ToolSelectionWidget::setSelectedTools( const TQStringList& tools ) for( ; entry != _allTools.end(); ++entry ) { TQString uic=*(*entry).userCommands().at((*entry).commands().findIndex("validate")); - if( tools.contains((*entry).service()->library()) ) + if( tools.tqcontains((*entry).service()->library()) ) selectedListBox()->insertItem( uic ); else availableListBox()->insertItem( uic ); @@ -96,7 +96,7 @@ TQStringList ToolSelectionWidget::selectedTools() TQValueList<KDataToolInfo>::ConstIterator entry = _allTools.begin(); for( ; entry != _allTools.end(); ++entry ) { - if( usedNames.contains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) ) + if( usedNames.tqcontains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) ) result += (*entry).service()->library(); } return result; diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h index bbc08ca0..a019b823 100644 --- a/kbabel/commonui/toolselectionwidget.h +++ b/kbabel/commonui/toolselectionwidget.h @@ -18,11 +18,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,8 +40,9 @@ class KDataToolInfo; class KDE_EXPORT ToolSelectionWidget : public KActionSelector { Q_OBJECT + TQ_OBJECT public: - ToolSelectionWidget(TQWidget* parent=0, const char* name=0 ); + ToolSelectionWidget(TQWidget* tqparent=0, const char* name=0 ); TQStringList selectedTools(); diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc index 632eb7b5..b082c635 100644 --- a/kbabel/datatools/accelerators/main.cc +++ b/kbabel/datatools/accelerators/main.cc @@ -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. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_accelstool, KGenericFactory<AcceleratorTool> using namespace KBabel; -AcceleratorTool::AcceleratorTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +AcceleratorTool::AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { // bogus translation just for allowing the translation i18n("what check found errors","accelerator"); @@ -97,8 +97,8 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& { // FIXME: this should care about plural forms in msgid TQString lineid=item->msgid().first(); - lineid.replace( _context, ""); - lineid.replace(TQRegExp("\\n"),""); + lineid.tqreplace( _context, ""); + lineid.tqreplace(TQRegExp("\\n"),""); lineid.simplifyWhiteSpace(); TQString regStr(_marker); regStr+="[^\\s]"; @@ -110,12 +110,12 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& TQString linestr=(*form); linestr.simplifyWhiteSpace(); - int n = lineid.contains(reg); + int n = lineid.tqcontains(reg); if( _marker == '&' ) - n = n - lineid.contains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); - int m = linestr.contains(reg); + n = n - lineid.tqcontains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); + int m = linestr.tqcontains(reg); if( _marker == '&' ) - m = m - linestr.contains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); + m = m - linestr.tqcontains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); hasError = hasError || ( n<=1 && m != n); } } diff --git a/kbabel/datatools/accelerators/main.h b/kbabel/datatools/accelerators/main.h index ee9ae3a8..df1617cf 100644 --- a/kbabel/datatools/accelerators/main.h +++ b/kbabel/datatools/accelerators/main.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. @@ -42,9 +42,10 @@ class AcceleratorTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - AcceleratorTool( TQObject* parent, const char* name, const TQStringList & ); + AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc index e80c7c35..4b533061 100644 --- a/kbabel/datatools/arguments/main.cc +++ b/kbabel/datatools/arguments/main.cc @@ -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. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_argstool, KGenericFactory<ArgumentTool> ( "kb using namespace KBabel; -ArgumentTool::ArgumentTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +ArgumentTool::ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n( "what check found errors","arguments"); } @@ -110,46 +110,46 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( line.startsWith("_n:" )) { // truncate text after first \n to get args only once - line = line.mid(0,line.find("\\n")); + line = line.mid(0,line.tqfind("\\n")); } } - line.replace(_context, ""); - line.replace(TQRegExp("\\n"),""); + line.tqreplace(_context, ""); + line.tqreplace(TQRegExp("\\n"),""); line.simplifyWhiteSpace(); // flag, for GNU only we can allow reordering bool non_gnu = (item->pluralForm() == KDESpecific); - int index=line.find(TQRegExp("%.")); + int index=line.tqfind(TQRegExp("%.")); while(index>=0) { - int endIndex=line.find(TQRegExp("[^\\d]"),index+1); + int endIndex=line.tqfind(TQRegExp("[^\\d]"),index+1); if(endIndex<0) { endIndex=line.length(); } - else if( formatChars.contains(line[endIndex]) ) + else if( formatChars.tqcontains(line[endIndex]) ) { endIndex++; } if(endIndex - index > 1 ) { TQString arg = line.mid(index,endIndex-index); - if( arg.contains( TQRegExp("\\d") ) ) { + if( arg.tqcontains( TQRegExp("\\d") ) ) { non_gnu = true; } argList.append(arg); } - index=line.find(TQRegExp("%."),endIndex); + index=line.tqfind(TQRegExp("%."),endIndex); } if( item->pluralForm()==KDESpecific) { // FIXME: this is KDE specific - if( _checkPlurals && line.startsWith("_n:" ) && !argList.contains("%n") ) + if( _checkPlurals && line.startsWith("_n:" ) && !argList.tqcontains("%n") ) { argList.append("%n"); } @@ -180,7 +180,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat line=(*i); - line.replace(TQRegExp("\\n"),""); + line.tqreplace(TQRegExp("\\n"),""); TQRegExp argdesc( "%((["+formatChars+"])" @@ -196,7 +196,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( index == -1 ) break; // do not add a redundant argument, if it is non GNU - if( !non_gnu || !foundArgs.contains( argdesc.cap(0) ) ) + if( !non_gnu || !foundArgs.tqcontains( argdesc.cap(0) ) ) foundArgs.append( argdesc.cap( 0 ) ); } while( true ); @@ -205,7 +205,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( non_gnu ) { for ( TQStringList::Iterator it = foundArgs.begin(); it != foundArgs.end(); ++it ) { - if( argList.find( *it ) == argList.end() ) { + if( argList.tqfind( *it ) == argList.end() ) { hasError = true; break; } else { @@ -224,10 +224,10 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat for ( TQStringList::Iterator it = foundArgs.begin(); it != foundArgs.end(); ++it , ++oit) { if( *it == *oit ) { // argument is the same, mark as used - *oit = TQString::null; + *oit = TQString(); } else { // try to strip replacement - int index = (*it).find( '$' ); + int index = (*it).tqfind( '$' ); if( index == -1 ) { // there is no replacement, this is wrong hasError = true; @@ -239,7 +239,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat TQStringList::Iterator a = argList.at( place.toInt()-1 ); if( a != argList.end() && (*a) == arg ) { - (*a) = TQString::null; + (*a) = TQString(); } else { diff --git a/kbabel/datatools/arguments/main.h b/kbabel/datatools/arguments/main.h index ea7e4e23..1831ea33 100644 --- a/kbabel/datatools/arguments/main.h +++ b/kbabel/datatools/arguments/main.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. @@ -42,9 +42,10 @@ class ArgumentTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - ArgumentTool( TQObject* parent, const char* name, const TQStringList & ); + ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc index 066ef430..ed89f125 100644 --- a/kbabel/datatools/context/main.cc +++ b/kbabel/datatools/context/main.cc @@ -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. @@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_contexttool, KGenericFactory<ContextTool> ( " using namespace KBabel; -ContextTool::ContextTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +ContextTool::ContextTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n("what check found errors","context info"); } @@ -92,8 +92,8 @@ bool ContextTool::run( const TQString& command, void* data, const TQString& data bool hasError = false; - if(!item->isUntranslated() && item->msgid().first().contains(_context) - && item->msgstr().first().contains(_context) ) + if(!item->isUntranslated() && item->msgid().first().tqcontains(_context) + && item->msgstr().first().tqcontains(_context) ) { hasError = true; } diff --git a/kbabel/datatools/context/main.h b/kbabel/datatools/context/main.h index 8dc24e9f..c85d8d83 100644 --- a/kbabel/datatools/context/main.h +++ b/kbabel/datatools/context/main.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. @@ -40,9 +40,10 @@ class ContextTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - ContextTool( TQObject* parent, const char* name, const TQStringList & ); + ContextTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc index 64d19adf..96cb3057 100644 --- a/kbabel/datatools/equations/main.cc +++ b/kbabel/datatools/equations/main.cc @@ -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. @@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_equationstool, KGenericFactory<EquationsTool> using namespace KBabel; -EquationsTool::EquationsTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _equation("^[a-zA-Z0-9]+=.+") +EquationsTool::EquationsTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _equation("^[a-zA-Z0-9]+=.+") { i18n("what check found errors","equations"); } @@ -86,12 +86,12 @@ bool EquationsTool::run( const TQString& command, void* data, const TQString& da bool hasError = false; - if(!item->isUntranslated() && !item->msgid().first().contains('\n') - && item->msgid().first().contains(_equation)) + if(!item->isUntranslated() && !item->msgid().first().tqcontains('\n') + && item->msgid().first().tqcontains(_equation)) { - int index = item->msgid().first().find('='); + int index = item->msgid().first().tqfind('='); TQString left = item->msgid().first().left(index); - index = item->msgstr().first().find('='); + index = item->msgstr().first().tqfind('='); if(left != item->msgstr().first().left(index)) hasError = true; } diff --git a/kbabel/datatools/equations/main.h b/kbabel/datatools/equations/main.h index 72fae529..11adddaf 100644 --- a/kbabel/datatools/equations/main.h +++ b/kbabel/datatools/equations/main.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. @@ -39,9 +39,10 @@ class EquationsTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - EquationsTool( TQObject* parent, const char* name, const TQStringList & ); + EquationsTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: TQRegExp _equation; diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc index 5b2bc411..2851429e 100644 --- a/kbabel/datatools/length/main.cc +++ b/kbabel/datatools/length/main.cc @@ -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. @@ -55,8 +55,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_lengthtool, KGenericFactory<LengthTool> ( "kb using namespace KBabel; -LengthTool::LengthTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +LengthTool::LengthTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n("which check found errors","translation has inconsistent length"); } @@ -104,7 +104,7 @@ bool LengthTool::run( const TQString& command, void* data, const TQString& datat if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); @@ -113,12 +113,12 @@ bool LengthTool::run( const TQString& command, void* data, const TQString& datat //Check for translations that are too short or too long //This may not be totally correct but we check both //the singular and plural forms against each translated plural. - //FIXME: replace 10% check with configurable setting or a statistical + //FIXME: tqreplace 10% check with configurable setting or a statistical //based expected length relationship int idlen, strlen; for( TQStringList::Iterator i = id.begin() ; i != id.end() ; i++ ) { TQString iditem = (*i); - idlen = iditem.replace( TQRegExp(_context),"").length(); + idlen = iditem.tqreplace( TQRegExp(_context),"").length(); for( TQStringList::Iterator j = str.begin() ; j != str.end() ; j++ ) { TQString stritem = (*j); strlen = stritem.length(); diff --git a/kbabel/datatools/length/main.h b/kbabel/datatools/length/main.h index 6a4ec06f..cff49df8 100644 --- a/kbabel/datatools/length/main.h +++ b/kbabel/datatools/length/main.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,9 +41,10 @@ class LengthTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - LengthTool( TQObject* parent, const char* name, const TQStringList & ); + LengthTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc index 22e23c84..3082c552 100644 --- a/kbabel/datatools/not-translated/main.cc +++ b/kbabel/datatools/not-translated/main.cc @@ -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. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_nottranslatedtool, KGenericFactory<NotTransla using namespace KBabel; -NotTranslatedTool::NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) , _cache_origin( 0 ) +NotTranslatedTool::NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) , _cache_origin( 0 ) { i18n("which check found errors","English text in translation"); } @@ -101,13 +101,13 @@ bool NotTranslatedTool::run( const TQString& command, void* data, const TQString if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); } for( TQStringList::Iterator i = id.begin() ; i != id.end() ; i++ ) { - TQString id_str = (*i).replace( TQRegExp(_context), ""); + TQString id_str = (*i).tqreplace( TQRegExp(_context), ""); for( TQStringList::Iterator j = str.begin() ; j != str.end() ; j++ ) { TQString str_str = (*j); hasError = hasError || ( id_str == str_str ); diff --git a/kbabel/datatools/not-translated/main.h b/kbabel/datatools/not-translated/main.h index c1aeabd8..a9cba848 100644 --- a/kbabel/datatools/not-translated/main.h +++ b/kbabel/datatools/not-translated/main.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,9 +41,10 @@ class NotTranslatedTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & ); + NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc index 87dfef71..9005b4ce 100644 --- a/kbabel/datatools/pluralforms/main.cc +++ b/kbabel/datatools/pluralforms/main.cc @@ -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. @@ -53,8 +53,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_pluraltool, KGenericFactory<PluralsTool> ( "k using namespace KBabel; -PluralsTool::PluralsTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ), _neededForms(-1) +PluralsTool::PluralsTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ), _neededForms(-1) { i18n("what check found errors", "plural forms"); } @@ -102,11 +102,11 @@ bool PluralsTool::run( const TQString& command, void* data, const TQString& data if(!item->isUntranslated() && item->pluralForm() == KDESpecific ) { - if(_neededForms <= 0 || item->msgstr().first().contains(_plurals)) + if(_neededForms <= 0 || item->msgstr().first().tqcontains(_plurals)) { hasError = true; } - else if( item->msgstr().first().contains(TQString("\\n"))+1 != _neededForms ) + else if( item->msgstr().first().tqcontains(TQString("\\n"))+1 != _neededForms ) { hasError = true; } diff --git a/kbabel/datatools/pluralforms/main.h b/kbabel/datatools/pluralforms/main.h index 420824d2..ee6617dd 100644 --- a/kbabel/datatools/pluralforms/main.h +++ b/kbabel/datatools/pluralforms/main.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. @@ -40,9 +40,10 @@ class PluralsTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - PluralsTool( TQObject* parent, const char* name, const TQStringList & ); + PluralsTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc index 8806b536..42b2f2eb 100644 --- a/kbabel/datatools/punctuation/main.cc +++ b/kbabel/datatools/punctuation/main.cc @@ -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. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_punctuationtool, KGenericFactory<PunctuationT using namespace KBabel; -PunctuationTool::PunctuationTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +PunctuationTool::PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { // bogus translation just for allowing the translation i18n("what check found errors","punctuation"); @@ -92,7 +92,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& // lookup punctuation in original text TQRegExp punc("[\\.!\\?:]+$"); - int i = lineid.find(punc); + int i = lineid.tqfind(punc); TQString t(""); @@ -102,7 +102,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& { // check, that both plural forms contain the same punctuation TQString pl = *(item->msgid().at(1)); - int j = pl.find(punc); + int j = pl.tqfind(punc); TQString tp(""); if( j != -1 ) tp = pl.right(pl.length()-j); @@ -122,7 +122,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& { TQString linestr=(*form); - int j = linestr.find(punc); + int j = linestr.tqfind(punc); // there is no punctuation in original, but one in the translation if( i == -1 && j != i ) diff --git a/kbabel/datatools/punctuation/main.h b/kbabel/datatools/punctuation/main.h index eb30293f..6d58783e 100644 --- a/kbabel/datatools/punctuation/main.h +++ b/kbabel/datatools/punctuation/main.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. @@ -38,9 +38,10 @@ class PunctuationTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - PunctuationTool( TQObject* parent, const char* name, const TQStringList & ); + PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); }; diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc index eca0be81..132a8c21 100644 --- a/kbabel/datatools/regexp/main.cc +++ b/kbabel/datatools/regexp/main.cc @@ -49,13 +49,13 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_regexptool, KGenericFactory<RegExpTool> ( "kb using namespace KBabel; -RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +RegExpTool::RegExpTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { i18n("which check found errors","translation has inconsistent length"); loadExpressions(); if ( ! _error.isNull() ) - KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).arg( _error ) ); + KMessageBox::error( (TQWidget*)tqparent, i18n( "Error loading data (%1)" ).tqarg( _error ) ); } bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype ) diff --git a/kbabel/datatools/regexp/main.h b/kbabel/datatools/regexp/main.h index 64df538b..c28c37d0 100644 --- a/kbabel/datatools/regexp/main.h +++ b/kbabel/datatools/regexp/main.h @@ -57,9 +57,10 @@ typedef TQValueList<Expression> ExpressionList; class RegExpTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - RegExpTool( TQObject* parent, const char* name, const TQStringList & ); + RegExpTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc index 54bbcb57..192dc4f6 100644 --- a/kbabel/datatools/setfuzzy/main.cc +++ b/kbabel/datatools/setfuzzy/main.cc @@ -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. @@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_setfuzzytool, KGenericFactory<SetFuzzyTool> ( using namespace KBabel; -SetFuzzyTool::SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +SetFuzzyTool::SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { } diff --git a/kbabel/datatools/setfuzzy/main.h b/kbabel/datatools/setfuzzy/main.h index 45e0bc38..729abd1a 100644 --- a/kbabel/datatools/setfuzzy/main.h +++ b/kbabel/datatools/setfuzzy/main.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. @@ -38,9 +38,10 @@ class SetFuzzyTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & ); + SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); }; diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc index 7bfa50b2..3fdd0f47 100644 --- a/kbabel/datatools/whitespace/main.cc +++ b/kbabel/datatools/whitespace/main.cc @@ -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. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_whitespacetool, KGenericFactory<WhitespaceToo using namespace KBabel; -WhitespaceTool::WhitespaceTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=") +WhitespaceTool::WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=") { i18n("which check found errors","whitespace only translation"); } @@ -104,27 +104,27 @@ bool WhitespaceTool::run( const TQString& command, void* data, const TQString& d if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); } //Strip equations - id.first().replace( TQRegExp(_equation), ""); - str.first().replace( TQRegExp(_equation), ""); + id.first().tqreplace( TQRegExp(_equation), ""); + str.first().tqreplace( TQRegExp(_equation), ""); //Ignore Messages with blank msgid components for( TQStringList::Iterator it = id.begin() ; it != id.end() ; it++ ) { TQString resultstring = (*it); - hasIdError = hasIdError || resultstring.contains(_whitespace); + hasIdError = hasIdError || resultstring.tqcontains(_whitespace); } if( hasIdError ) return true; //Check each TQString in the List is not whitespace for( TQStringList::Iterator it = str.begin() ; it != str.end() ; it++ ) { TQString resultstring = (*it); - hasStrError = hasStrError || resultstring.contains(_whitespace); + hasStrError = hasStrError || resultstring.tqcontains(_whitespace); } } diff --git a/kbabel/datatools/whitespace/main.h b/kbabel/datatools/whitespace/main.h index c8cd373a..9c6c4f24 100644 --- a/kbabel/datatools/whitespace/main.h +++ b/kbabel/datatools/whitespace/main.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. @@ -42,9 +42,10 @@ class WhitespaceTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - WhitespaceTool( TQObject* parent, const char* name, const TQStringList & ); + WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc index 3bcf66da..57a6f785 100644 --- a/kbabel/datatools/xml/main.cc +++ b/kbabel/datatools/xml/main.cc @@ -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. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xmltool, KGenericFactory<XMLTool> ( "kbabelda using namespace KBabel; -XMLTool::XMLTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +XMLTool::XMLTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n( "what check found errors", "XML tags" ); } @@ -94,12 +94,12 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype uint correctnessLevel = 0; TQString msgid = item->msgid().first(); - msgid.replace( "\\\"", "\"" ); // Change '\"' to '"' - msgid.replace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); - msgid.replace( _context, "" ); - msgid.replace("\n",""); // delete newlines + msgid.tqreplace( "\\\"", "\"" ); // Change '\"' to '"' + msgid.tqreplace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); + msgid.tqreplace( _context, "" ); + msgid.tqreplace("\n",""); // delete newlines - if( _levelCache.contains(msgid) ) + if( _levelCache.tqcontains(msgid) ) { correctnessLevel = _levelCache[msgid]; } @@ -134,8 +134,8 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype for( TQStringList::Iterator form = str.begin() ; form != str.end() ; form++ ) { TQString text=(*form); - text.replace( "\\\"", "\"" ); // Change '\"' to '"' - text.replace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); + text.tqreplace( "\\\"", "\"" ); // Change '\"' to '"' + text.tqreplace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); // isNonCaseWithoutCommonCompliant can fail // even though higher level checks works @@ -189,16 +189,16 @@ bool XMLTool::isNonCaseWithoutCommonCompliant( const TQString& text) TQDomDocument doc; TQString test = text.lower(); TQRegExp rx( "(<br>)|(<hr>)|(<p>)||(<\\w+@(\\w+.)*\\w+>)" ); - test.replace( rx, "" ); + test.tqreplace( rx, "" ); TQString a; do { a = test; - test.replace( TQRegExp("<[^_:A-Za-z/]"), "" ); + test.tqreplace( TQRegExp("<[^_:A-Za-z/]"), "" ); } while( a!=test); - test.replace( TQRegExp("<$"), "" ); + test.tqreplace( TQRegExp("<$"), "" ); return doc.setContent("<para>" + test + "</para>" ); } diff --git a/kbabel/datatools/xml/main.h b/kbabel/datatools/xml/main.h index 68c06cdb..1b983475 100644 --- a/kbabel/datatools/xml/main.h +++ b/kbabel/datatools/xml/main.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. @@ -41,9 +41,10 @@ class XMLTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - XMLTool( TQObject* parent, const char* name, const TQStringList & ); + XMLTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: bool isFullyCompliant( const TQString& text); diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index c2fe9c67..21db665e 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.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. @@ -51,12 +51,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextexport, KGenericFactory<GettextExportP using namespace KBabel; -GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &) : - CatalogExportPlugin(parent,name), m_wrapWidth( -1 ) +GettextExportPlugin::GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &) : + CatalogExportPlugin(tqparent,name), m_wrapWidth( -1 ) { } -ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) +ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) { // check, whether we know how to handle the extra data if( catalog->importPluginID() != "GNU gettext") @@ -70,7 +70,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS if(file.open(IO_WriteOnly)) { - int progressRatio = QMAX(100/ QMAX(catalog->numberOfEntries(),1), 1); + int progressRatio = TQMAX(100/ TQMAX(catalog->numberOfEntries(),1), 1); emit signalResetProgressBar(i18n("saving file"),100); TQTextStream stream(&file); @@ -196,7 +196,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS } else { - //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii())); + //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii())); return OS_ERROR; } @@ -211,7 +211,7 @@ void GettextExportPlugin::writeComment( TQTextStream& stream, const TQString& co int pos = 0; for(;;) { - const int newpos = comment.find( '\n', pos, false ); + const int newpos = comment.tqfind( '\n', pos, false ); if ( newpos == pos ) { ++pos; @@ -305,7 +305,7 @@ void GettextExportPlugin::writeKeyword( TQTextStream& stream, const TQString& ke realText.remove( '\n' ); bool needFirstEmptyLine = false; - if ( realText.find( "\\n" ) != -1 ) + if ( realText.tqfind( "\\n" ) != -1 ) { // We have more than one (logical) line, so write the extra empty line needFirstEmptyLine = true; @@ -340,7 +340,7 @@ void GettextExportPlugin::writeKeyword( TQTextStream& stream, const TQString& ke // Be sure that at least two useful characters are written, even if the wrap width is too small availableWidth = 2; } - const int newlinePos = realText.find ( "\\n", pos ); + const int newlinePos = realText.tqfind ( "\\n", pos ); if ( ( newlinePos >= 0 ) && ( newlinePos - pos + 2 < availableWidth ) ) { // The newline is near than the maximum available numbers of characters diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h index 2d1b9681..cfe46ed0 100644 --- a/kbabel/filters/gettext/gettextexport.h +++ b/kbabel/filters/gettext/gettextexport.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. @@ -53,8 +53,8 @@ class TQTextCodec; class GettextExportPlugin: public KBabel::CatalogExportPlugin { public: - GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); + GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &); + virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); private: /** diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index 9210c1a9..848cfeb1 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 3; replace-tabs on; +// kate: space-indent on; indent-width 3; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -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. @@ -53,11 +53,11 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportP using namespace KBabel; -GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &) : CatalogImportPlugin(parent,name) +GettextImportPlugin::GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &) : CatalogImportPlugin(tqparent,name) { } -ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&) +ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&) { kdDebug( KBABEL ) << k_funcinfo << endl; @@ -117,7 +117,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr kdDebug(KBABEL) << "start parsing..." << endl; // first read header - const ConversionStatus status = readHeader(stream); + const ConversiontqStatus status = readHeader(stream); if ( status == RECOVERED_PARSE_ERROR ) @@ -163,7 +163,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr } // check if header seems to indicate docbook content generated by xml2pot - const bool docbookContent = (tempHeader.msgstr().find("application/x-xml2pot") != tempHeader.msgstr().end()); + const bool docbookContent = (tempHeader.msgstr().tqfind("application/x-xml2pot") != tempHeader.msgstr().end()); // now parse the rest of the file uint counter=0; @@ -179,7 +179,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr return STOPPED; } - const ConversionStatus success=readEntry(stream); + const ConversiontqStatus success=readEntry(stream); if(success==OK) { @@ -200,7 +200,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr appendCatalogItem(tempCatItem); // check if first comment seems to indicate a docbook source file if(counter==0) - docbookFile = ( tempCatItem.comment().find(".docbook") != -1 ); + docbookFile = ( tempCatItem.comment().tqfind(".docbook") != -1 ); } } else if(success==RECOVERED_PARSE_ERROR) @@ -297,12 +297,12 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod } TQTextStream stream( array, IO_ReadOnly ); - // ### TODO Qt4: see if it can be done with TQByteArray alone, in an encoding-neutral way. + // ### TODO TQt4: see if it can be done with TQByteArray alone, in an encoding-neutral way. // Set ISO-8859-1 as it is a relatively neutral encoding when reading (compared to UTF-8 or a random locale encoing) stream.setEncoding( TQTextStream::Latin1 ); // first read header - ConversionStatus status = readHeader(stream); + ConversiontqStatus status = readHeader(stream); if(status!=OK && status != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL) << "wasn't able to read header" << endl; @@ -360,11 +360,11 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod return codec; } -ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream) { CatalogItem temp; int filePos=stream.device()->at(); - ConversionStatus status=readEntry(stream); + ConversiontqStatus status=readEntry(stream); if(status==OK || status==RECOVERED_PARSE_ERROR) { @@ -380,7 +380,7 @@ ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) return PARSE_ERROR; } -ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream) { //kdDebug( KBABEL ) << k_funcinfo << " START" << endl; enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin; @@ -408,7 +408,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) //kdDebug() << "Parsing line: " << line << endl; - // ### Qt4: no need of a such a check + // ### TQt4: no need of a such a check if(line.isNull()) // file end break; else if ( line.startsWith( "<<<<<<<" ) || line.startsWith( "=======" ) || line.startsWith( ">>>>>>>" ) ) @@ -439,7 +439,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) part=Comment; _comment=line; } - else if(line.find(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) { part=Msgctxt; @@ -449,7 +449,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgctxt=line; seenMsgctxt=true; } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -460,7 +460,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -494,7 +494,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { _comment+=("\n"+line); } - else if(line.find(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) { part=Msgctxt; @@ -504,7 +504,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgctxt=line; seenMsgctxt=true; } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -515,7 +515,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -539,7 +539,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { if(line.isEmpty()) continue; - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -551,7 +551,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) else _msgctxt+=("\n"+line); } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -562,7 +562,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -586,7 +586,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { if(line.isEmpty()) continue; - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -604,7 +604,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) else (*it)+=("\n"+line); } - else if(line.find(TQRegExp("^msgid_plural\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid_plural\\s*\".*\"$")) != -1) { part=Msgid; _gettextPluralForm = true; @@ -616,7 +616,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgid.append(line); } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid_plural\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid_plural\\s*\"?.*\"?$")) != -1) { part=Msgid; _gettextPluralForm = true; @@ -631,7 +631,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) recoverableError=true; } else if(!_gettextPluralForm - && (line.find(TQRegExp("^msgstr\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\s*\".*\\n?\"$")) != -1)) { part=Msgstr; @@ -642,7 +642,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)=line; } else if(!_gettextPluralForm - && line.find(TQRegExp("^msgstr\\s*\"?.*\\n?\"?$")) != -1) + && line.tqfind(TQRegExp("^msgstr\\s*\"?.*\\n?\"?$")) != -1) { part=Msgstr; @@ -656,7 +656,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) recoverableError=true; } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[0\\]\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[0\\]\\s*\".*\\n?\"$")) != -1)) { part=Msgstr; @@ -667,7 +667,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)=line; } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[0\\]\\s*\"?.*\\n?\"?$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[0\\]\\s*\"?.*\\n?\"?$")) != -1)) { part=Msgstr; @@ -694,7 +694,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) break; } // a line of the msgid with a missing quotation mark - else if(line.find(TQRegExp("^\"?.+\\n?\"?$")) != -1) + else if(line.tqfind(TQRegExp("^\"?.+\\n?\"?$")) != -1) { recoverableError=true; @@ -726,7 +726,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) if(line.isEmpty()) continue; // another line of the msgstr - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -738,7 +738,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)+=("\n"+line); } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\".*\\n?\"$")) != -1)) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\"?")); @@ -747,7 +747,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) msgstrIt=_msgstr.append(line); } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?.*\\n?\"?$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?.*\\n?\"?$")) != -1)) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?")); @@ -758,7 +758,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) if(!line.isEmpty()) recoverableError=true; } - else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1)) + else if((line.tqfind(TQRegExp("^\\s*msgid")) != -1) || (line.tqfind(TQRegExp("^\\s*#")) != -1)) { // We have read successfully one entry, so end loop. stream.device()->at(pos);// reset position in stream to beginning of this line @@ -771,7 +771,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) break; } // another line of the msgstr with a missing quotation mark - else if(line.find(TQRegExp("^\"?.+\\n?\"?$")) != -1) + else if(line.tqfind(TQRegExp("^\"?.+\\n?\"?$")) != -1) { recoverableError=true; diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h index 54ced3f0..5549168b 100644 --- a/kbabel/filters/gettext/gettextimport.h +++ b/kbabel/filters/gettext/gettextimport.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. @@ -49,14 +49,14 @@ class TQTextCodec; class GettextImportPlugin: public KBabel::CatalogImportPlugin { public: - GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype); + GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &); + virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype); virtual const TQString id() { return "GNU gettext"; } private: TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec); - KBabel::ConversionStatus readHeader(TQTextStream& stream); - KBabel::ConversionStatus readEntry(TQTextStream& stream); + KBabel::ConversiontqStatus readHeader(TQTextStream& stream); + KBabel::ConversiontqStatus readEntry(TQTextStream& stream); // description of the last read entry TQString _msgctxt; diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp index af0a3298..3b5bc5fc 100644 --- a/kbabel/filters/linguist/linguistexport.cpp +++ b/kbabel/filters/linguist/linguistexport.cpp @@ -24,11 +24,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 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistexport, KGenericFactory<LinguistExpor using namespace KBabel; -LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogExportPlugin( parent, name ) +LinguistExportPlugin::LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogExportPlugin( tqparent, name ) { } -ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. - if ( catalog->importPluginID( ) != "Qt translation source" ) + if ( catalog->importPluginID( ) != "TQt translation source" ) return UNSUPPORTED_TYPE; TQFile file( filename ); @@ -76,7 +76,7 @@ ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQS doc.appendChild( doc.createElement( "TS" ) ); // Create a default context just in case none is given in the messages. - context = "Default"; // ### FIXME: Qt's default seems named "@default" + context = "Default"; // ### FIXME: TQt's default seems named "@default" bool fuzzy; @@ -123,17 +123,17 @@ const TQString LinguistExportPlugin::extractComment( TQDomDocument& doc, const T * writing the comment for Linguist */ - int pos = comment.find("#, fuzzy"); + int pos = comment.tqfind("#, fuzzy"); if ( pos >= 0) { fuzzy = true; comment.remove("#, fuzzy"); } TQString newContext; - pos = comment.find( '\n' ); + pos = comment.tqfind( '\n' ); if ( pos >= 0 ) { newContext = comment.left( pos ); - comment.replace( 0, pos + 1, "" ); // ### TODO: use TQString::remove + comment.tqreplace( 0, pos + 1, "" ); // ### TODO: use TQString::remove } else { newContext = comment; comment = ""; // ### TODO: use TQString() instead of "" diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h index b3399ed1..f4ed3240 100644 --- a/kbabel/filters/linguist/linguistexport.h +++ b/kbabel/filters/linguist/linguistexport.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. @@ -51,8 +51,8 @@ class Catalog; class LinguistExportPlugin : public KBabel::CatalogExportPlugin { public: - LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy ); diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp index a1870bd7..b46f5f97 100644 --- a/kbabel/filters/linguist/linguistimport.cpp +++ b/kbabel/filters/linguist/linguistimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -26,18 +26,18 @@ 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. **************************************************************************** */ -// Qt include files +// TQt include files #include <tqfile.h> #include <tqfileinfo.h> #include <tqobject.h> @@ -55,12 +55,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistimport, KGenericFactory<LinguistImpor using namespace KBabel; -LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogImportPlugin( parent, name ) +LinguistImportPlugin::LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogImportPlugin( tqparent, name ) { } -ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( ) << "fatal error: empty filename to open" << endl; @@ -113,9 +113,9 @@ ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQS return OK; } -void LinguistImportPlugin::parse( const TQDomElement& parentElement ) +void LinguistImportPlugin::parse( const TQDomElement& tqparentElement ) { - TQDomNode node = parentElement.firstChild( ); + TQDomNode node = tqparentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h index 175a28f8..fa7aa36c 100644 --- a/kbabel/filters/linguist/linguistimport.h +++ b/kbabel/filters/linguist/linguistimport.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. @@ -45,18 +45,18 @@ class TQString; class TQStringList; /** - * The class for importing Qt's translation source files. + * The class for importing TQt's translation source files. */ class LinguistImportPlugin : public KBabel::CatalogImportPlugin { public: - LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& ); + LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); - virtual const TQString id( ) { return "Qt translation source"; } + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); + virtual const TQString id( ) { return "TQt translation source"; } private: - void parse( const TQDomElement& parentElement ); + void parse( const TQDomElement& tqparentElement ); private: uint msgcnt; diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp index 9400b9c6..82033521 100644 --- a/kbabel/filters/xliff/xliffexport.cpp +++ b/kbabel/filters/xliff/xliffexport.cpp @@ -24,11 +24,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,12 +53,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffexport, KGenericFactory<XLIFFExportPlugi using namespace KBabel; -XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogExportPlugin( parent, name ) +XLIFFExportPlugin::XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogExportPlugin( tqparent, name ) { } -ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. if ( catalog->importPluginID( ) != "XLIFF 1.1" ) @@ -147,7 +147,7 @@ void XLIFFExportPlugin::createMessage( TQDomDocument& doc, TQDomElement& transla TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& file, const TQString& id ) { // Find out whether there is already such a context in the TQDomDocument. - TQDomNode parentelem = doc.documentElement(); + TQDomNode tqparentelem = doc.documentElement(); TQDomNode elem = doc.documentElement( ).firstChild( ); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "file" && elem.toElement().attribute ("original") == file ) { @@ -162,12 +162,12 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "File not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("file"); newelem.setAttribute ("original", file); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } // lookup body tag - parentelem = elem; + tqparentelem = elem; elem = elem.firstChild (); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "body" ) { @@ -181,7 +181,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& { kdError () << "File body not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("body"); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } @@ -192,7 +192,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "Trans-unit not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("trans-unit"); newelem.setAttribute ("id", id); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h index cc44cbec..71253133 100644 --- a/kbabel/filters/xliff/xliffexport.h +++ b/kbabel/filters/xliff/xliffexport.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. @@ -51,8 +51,8 @@ class Catalog; class XLIFFExportPlugin : public KBabel::CatalogExportPlugin { public: - XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: TQDomElement extractComment( TQDomDocument& doc, const TQString& s ); diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp index 25f34ec3..9d14c054 100644 --- a/kbabel/filters/xliff/xliffimport.cpp +++ b/kbabel/filters/xliff/xliffimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -26,11 +26,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,7 +47,7 @@ optional comments */ -// Qt include files +// TQt include files #include <tqfile.h> #include <tqfileinfo.h> #include <tqobject.h> @@ -68,12 +68,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffimport, KGenericFactory<XLIFFImportPlugi using namespace KBabel; -XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogImportPlugin( parent, name ) +XLIFFImportPlugin::XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogImportPlugin( tqparent, name ) { } -ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl; @@ -128,9 +128,9 @@ ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQStri return OK; } -void XLIFFImportPlugin::parse( const TQDomElement& parentElement ) +void XLIFFImportPlugin::parse( const TQDomElement& tqparentElement ) { - TQDomNode node = parentElement.firstChild( ); + TQDomNode node = tqparentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h index e86d59a3..2dbe1066 100644 --- a/kbabel/filters/xliff/xliffimport.h +++ b/kbabel/filters/xliff/xliffimport.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. @@ -50,13 +50,13 @@ class TQStringList; class XLIFFImportPlugin : public KBabel::CatalogImportPlugin { public: - XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& ); + XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); virtual const TQString id( ) { return "XLIFF 1.1"; } private: - void parse( const TQDomElement& parentElement ); + void parse( const TQDomElement& tqparentElement ); private: uint msgcnt; diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 2e58b084..f174c3ed 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.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. @@ -49,17 +49,17 @@ using namespace KBabel; -CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); - layout->setSpacing( KDialog::spacingHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQHBox* bar = new TQHBox(this); bar->setSpacing( KDialog::spacingHint() ); - layout->addWidget (bar); + tqlayout->addWidget (bar); TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar ); _tableNum = new TQSpinBox( 0, 255, 1, bar ); @@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent _table->setNumRows(16); scroll->addChild(_table); - layout->addWidget (scroll); + tqlayout->addWidget (scroll); connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h index 160b5295..4d0ee3a6 100644 --- a/kbabel/kbabel/charselectview.h +++ b/kbabel/kbabel/charselectview.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,11 +41,12 @@ class TQSpinBox; class CharacterSelectorView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index 97e89df6..73f6b8d9 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ColorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -44,7 +44,7 @@ <cstring>kcfg_BackgroundColor</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -55,7 +55,7 @@ <cstring>kcfg_QuotedColor</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -74,7 +74,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>label</cstring> </property> @@ -97,7 +97,7 @@ phrases.</qt></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -124,7 +124,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,7 +143,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -164,7 +164,7 @@ phrases.</qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -175,7 +175,7 @@ phrases.</qt></string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 57d838b9..7126f422 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.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. @@ -62,12 +62,12 @@ using namespace KBabel; -CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent, project) +CommentView::CommentView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent, project) { setAcceptDrops(true); - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); commentEdit = new MsgMultiLineEdit(0, 0, this); commentEdit->setMinimumHeight(50); @@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(commentEdit); - layout->setStretchFactor(commentEdit,1); + tqlayout->addWidget(commentEdit); + tqlayout->setStretchFactor(commentEdit,1); TQWhatsThis::add(this, i18n("<qt><p><b>Comment Editor</b></p>\n\ diff --git a/kbabel/kbabel/commentview.h b/kbabel/kbabel/commentview.h index 8dcce18d..f00d1241 100644 --- a/kbabel/kbabel/commentview.h +++ b/kbabel/kbabel/commentview.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. @@ -47,11 +47,12 @@ class MsgMultiLineEdit; class CommentView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CommentView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CommentView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); /** * this is called from the catalog when updating his views. diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index 264d4e84..72303fef 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.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. @@ -47,17 +47,17 @@ using namespace KBabel; -ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ContextView::ContextView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this, "context textview"); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget (_textview); + tqlayout->addWidget (_textview); TQWhatsThis::add(this, i18n("<qt><p><b>PO Context</b></p>" @@ -92,7 +92,7 @@ void ContextView::updateView() startIndex = _currentIndex-context; } - for(uint i=startIndex; i < QMIN(startIndex+(2*context+1), total); i++) + for(uint i=startIndex; i < TQMIN(startIndex+(2*context+1), total); i++) { if(i == _currentIndex) { @@ -106,15 +106,15 @@ void ContextView::updateView() if(!temp.isEmpty()) { temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += "<i>"+temp+"</i><br/>"; } // FIXME: should care about plural forms temp = TQStyleSheet::convertFromPlainText(_catalog->msgid(i).first()); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp + "<br/>---<br/>"; TQStringList tempList = _catalog->msgstr(i); @@ -137,12 +137,12 @@ void ContextView::updateView() temp = ""; for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i) { - temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i); + temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i); } } temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp+"<br/>"; } diff --git a/kbabel/kbabel/contextview.h b/kbabel/kbabel/contextview.h index 72faa160..9f0b2405 100644 --- a/kbabel/kbabel/contextview.h +++ b/kbabel/kbabel/contextview.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,11 +40,12 @@ class TQTextView; class ContextView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ContextView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ContextView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index db21bc8e..14e9c44c 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorDiffPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorDiffPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -36,7 +36,7 @@ <string>Added Characters</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -47,7 +47,7 @@ <cstring>kcfg_DiffAddUnderline</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -58,7 +58,7 @@ <cstring>kcfg_DiffAddColor</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -66,7 +66,7 @@ <string>Removed Characters</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -77,7 +77,7 @@ <cstring>kcfg_DiffDelStrikeOut</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -88,7 +88,7 @@ <cstring>kcfg_DiffDelColor</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -118,7 +118,7 @@ </color> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -150,9 +150,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -184,7 +184,7 @@ <functions> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index ee8632f9..13c49925 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,11 +17,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -32,7 +32,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame6</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoUnsetFuzzy</cstring> </property> @@ -60,7 +60,7 @@ unset (this means the string <i>, fuzzy</i> is removed from the entry's comment).</p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CleverEditing</cstring> </property> @@ -81,7 +81,7 @@ generate syntactically incorrect text.</p></qt></string> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -105,7 +105,7 @@ activated, you will still see a message in the statusbar. <cstring>_kcfg_AutoCheckTools</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_BeepOnError</cstring> </property> @@ -113,7 +113,7 @@ activated, you will still see a message in the statusbar. <string>&Beep on error</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoCheckColorError</cstring> </property> @@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -142,7 +142,7 @@ activated, you will still see a message in the statusbar. </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -153,7 +153,7 @@ activated, you will still see a message in the statusbar. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -167,7 +167,7 @@ activated, you will still see a message in the statusbar. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_HighlightSyntax</cstring> </property> @@ -175,7 +175,7 @@ activated, you will still see a message in the statusbar. <string>H&ighlight syntax</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_HighlightBackground</cstring> </property> @@ -183,7 +183,7 @@ activated, you will still see a message in the statusbar. <string>Highlight backgrou&nd</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>kcfg_WhitespacePoints</cstring> </property> @@ -191,7 +191,7 @@ activated, you will still see a message in the statusbar. <string>Mark &whitespaces with points</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>kcfg_EnableQuotes</cstring> </property> @@ -201,22 +201,22 @@ activated, you will still see a message in the statusbar. </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> - <string>Status LEDs</string> + <string>tqStatus LEDs</string> </property> <property name="whatsThis" stdset="0"> - <string><qt><p><b>Status LEDs</b></p> + <string><qt><p><b>tqStatus LEDs</b></p> <p>Choose here where the status LEDs are displayed and what color they have.</p></qt></string> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_LedInStatusbar</cstring> </property> @@ -224,7 +224,7 @@ activated, you will still see a message in the statusbar. <string>Display in stat&usbar</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -245,14 +245,14 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>29</height> @@ -341,11 +341,11 @@ activated, you will still see a message in the statusbar. <includes> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>toolselectionwidget.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h index b7f9827c..99819cde 100644 --- a/kbabel/kbabel/editorpreferences.ui.h +++ b/kbabel/kbabel/editorpreferences.ui.h @@ -2,7 +2,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. *****************************************************************************/ diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp index c49c7940..74deba91 100644 --- a/kbabel/kbabel/errorlistview.cpp +++ b/kbabel/kbabel/errorlistview.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. @@ -47,17 +47,17 @@ using namespace KBabel; -ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget(_textview); + tqlayout->addWidget(_textview); TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>" "<p>This window shows the list of errors found by validator tools " @@ -70,7 +70,7 @@ void ErrorListView::updateView() if( _catalog->numberOfEntries() == 0 ) return; - _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) ); + _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) ); } #include "errorlistview.moc" diff --git a/kbabel/kbabel/errorlistview.h b/kbabel/kbabel/errorlistview.h index 320e122d..022d94c1 100644 --- a/kbabel/kbabel/errorlistview.h +++ b/kbabel/kbabel/errorlistview.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. @@ -39,11 +39,12 @@ class TQTextView; class ErrorListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ErrorListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ErrorListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index aefb8c7e..24c68e35 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FontPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FontPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -56,8 +56,8 @@ <includes> <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">showOnlyFixedFonts( bool on )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui.h b/kbabel/kbabel/fontpreferences.ui.h index 065318f1..20e02941 100644 --- a/kbabel/kbabel/fontpreferences.ui.h +++ b/kbabel/kbabel/fontpreferences.ui.h @@ -2,7 +2,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. *****************************************************************************/ diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp index b08b0098..9bec7bf7 100644 --- a/kbabel/kbabel/gotodialog.cpp +++ b/kbabel/kbabel/gotodialog.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. @@ -37,8 +37,8 @@ #include "gotodialog.h" -GotoDialog::GotoDialog(int max,TQWidget* parent) - : KDialogBase(parent,0,true,i18n("Go to Entry"),Ok|Cancel) +GotoDialog::GotoDialog(int max,TQWidget* tqparent) + : KDialogBase(tqparent,0,true,i18n("Go to Entry"),Ok|Cancel) { TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,i18n("Go to Entry"),this); _spinBox= new KIntSpinBox(1,max,1,1,10,box); diff --git a/kbabel/kbabel/gotodialog.h b/kbabel/kbabel/gotodialog.h index 4c033973..afd9b250 100644 --- a/kbabel/kbabel/gotodialog.h +++ b/kbabel/kbabel/gotodialog.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. @@ -45,7 +45,7 @@ class KIntSpinBox; class GotoDialog : public KDialogBase { public: - GotoDialog(int max, TQWidget* parent); + GotoDialog(int max, TQWidget* tqparent); virtual ~GotoDialog(); /** reimplemented to select contents when shown*/ diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 2f686652..553724bc 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.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. @@ -49,7 +49,7 @@ using namespace KBabel; HeaderEditor::HeaderEditor(Catalog* cat,const char* name) - : KDialogBase((TQWidget*)0,name,false,TQString::null, Ok|Cancel|Default|User1) + : KDialogBase((TQWidget*)0,name,false,TQString(), Ok|Cancel|Default|User1) { restoreSettings(); @@ -108,7 +108,7 @@ bool HeaderEditor::isModified() void HeaderEditor::readHeader(bool readOnly) { - setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL())); + setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL())); _editor->headerEdit->setReadOnly(readOnly); _editor->commentEdit->setReadOnly(readOnly); diff --git a/kbabel/kbabel/headereditor.h b/kbabel/kbabel/headereditor.h index 88dda5ee..03159212 100644 --- a/kbabel/kbabel/headereditor.h +++ b/kbabel/kbabel/headereditor.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. @@ -47,6 +47,7 @@ class HeaderWidget; class HeaderEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * constructor for the HeaderEditor diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index f74a9ef5..ce241a3d 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>HeaderWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HeaderWidget</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>commentLabel</cstring> </property> @@ -35,7 +35,7 @@ <enum>NoWrap</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>headerLabel</cstring> </property> @@ -56,7 +56,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 60a62da4..d1458fb4 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -15,11 +15,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,8 +41,8 @@ using namespace KBabel; -HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *parent, const char *name ) : - TQWidgetStack(parent,name) +HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *tqparent, const char *name ) : + TQWidgetStack(tqparent,name) , _singleEdit(0) , _multipleEdit(0) , _eventFilter(eventFilter) @@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) MsgMultiLineEdit* pl; for(uint i=0 ; i< _numberOfPlurals ; i++) { - pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit()); + pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit()); _allEdits.append(pl); - _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1)); + _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1)); if( _eventFilter ) pl->installEventFilter(_eventFilter); } diff --git a/kbabel/kbabel/hidingmsgedit.h b/kbabel/kbabel/hidingmsgedit.h index b38a3bd5..65c65d40 100644 --- a/kbabel/kbabel/hidingmsgedit.h +++ b/kbabel/kbabel/hidingmsgedit.h @@ -15,11 +15,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. @@ -51,8 +51,9 @@ namespace KBabel class HidingMsgEdit : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *parent=0, const char *name=0); + HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *tqparent=0, const char *name=0); ~HidingMsgEdit(); void setNumberOfPlurals(uint numberOfPlurals); @@ -101,7 +102,7 @@ public: // reiplemented to return correct value bool hasFocus (); public slots: // Public slots - void setText(TQStringList texts, TQString msgctxt = TQString::null); + void setText(TQStringList texts, TQString msgctxt = TQString()); void showSingle(); void showMultiple(); void showPlurals( bool on ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 0c3c897d..73f4d365 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.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. @@ -113,11 +113,11 @@ TQPtrList<KBabelPreferences> KBabelMW::prefDialogs; class MyKProgress: public KProgress { public: - MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name ) + MyKProgress( TQWidget *tqparent, const char *name ) : KProgress( tqparent, name ) { - setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); } - TQSize sizeHint() const { return TQSize( 1, 1);} + TQSize tqsizeHint() const { return TQSize( 1, 1);} }; KBabelMW::KBabelMW(TQString projectFile) @@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile) if ( _project == NULL ) // FIXME should not happen anymore { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile) if ( _project == NULL ) { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog) "The minimum requirement is to fill out the Identity page.\n" "Also check the encoding on the Save page, which is currently " "set to %1. You may want to change this setting " - "according to the settings of your language team.").arg(encodingStr)); + "according to the settings of your language team.").tqarg(encodingStr)); TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure())); } @@ -437,10 +437,10 @@ void KBabelMW::setupActions() action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection()); action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection()); action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(m_view, TQT_SLOT(find()), actionCollection()); + action = KStdAction::tqfind(m_view, TQT_SLOT(tqfind()), actionCollection()); action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection()); action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(m_view, TQT_SLOT(replace()), actionCollection()); + action = KStdAction::tqreplace(m_view, TQT_SLOT(tqreplace()), actionCollection()); action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" ); @@ -454,8 +454,8 @@ void KBabelMW::setupActions() action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view - , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, m_view + , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy"); action = new KAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()), actionCollection(), "edit_edit_header"); @@ -710,7 +710,7 @@ void KBabelMW::setupStatusBar() TQColor ledColor=KBabelSettings::ledColor(); TQHBox* statusBox = new TQHBox(statusBar(),"statusBox"); statusBox->setSpacing(2); - new TQLabel(" "+i18n("Status: "),statusBox); + new TQLabel(" "+i18n("tqStatus: "),statusBox); _fuzzyLed = new KLed(ledColor,KLed::Off,KLed::Sunken,KLed::Rectangular ,statusBox); _fuzzyLed->setFixedSize(15,12); @@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar() _errorLed->setFixedSize(15,12); new TQLabel(i18n("faulty")+" ",statusBox); - statusBox->setFixedWidth(statusBox->sizeHint().width()); + statusBox->setFixedWidth(statusBox->tqsizeHint().width()); statusBar()->addWidget(statusBox); } @@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar() statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY); - statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1) + statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1) ,ID_STATUS_CURSOR); TQHBox* progressBox = new TQHBox(statusBar(),"progressBox"); @@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar() progressBox->setStretchFactor(_progressBar,1); statusBar()->addWidget(progressBox,1); - statusBar()->setMinimumHeight(progressBox->sizeHint().height()); + statusBar()->setMinimumHeight(progressBox->tqsizeHint().height()); TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n\ @@ -996,10 +996,10 @@ void KBabelMW::wheelEvent(TQWheelEvent *e) void KBabelMW::openRecent(const KURL& url) { - KBabelView *view = KBabelView::viewForURL(url,TQString::null); + KBabelView *view = KBabelView::viewForURL(url,TQString()); if(view) { - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1008,7 +1008,7 @@ void KBabelMW::openRecent(const KURL& url) void KBabelMW::open(const KURL& url) { - open(url,TQString::null,false); + open(url,TQString(),false); } void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) @@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) if(view) { kdDebug(KBABEL) << "there is a such view" << endl; - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag) void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos) { - statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT); + statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT); _currentIndex = pos.item; } void KBabelMW::setNumberOfTotal(uint number) { - statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL); + statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL); } void KBabelMW::setNumberOfFuzzies(uint number) { - statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY); + statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY); } void KBabelMW::setNumberOfUntranslated(uint number) { - statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS); + statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS); } void KBabelMW::hasFuzzyAfterwards(bool flag) @@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp() if(!error.isEmpty()) { KMessageBox::sorry(this,i18n("An error occurred while " - "trying to open the gettext info page:\n%1").arg(error)); + "trying to open the gettext info page:\n%1").tqarg(error)); } } @@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus() void KBabelMW::updateCursorPosition(int line, int col) { - statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1) + statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1) ,ID_STATUS_CURSOR); } @@ -1614,10 +1614,10 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) KBabelView *v = KBabelView::viewForURL(url,project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1634,10 +1634,10 @@ KBabelMW *KBabelMW::emptyWin(TQString project) KBabelView *v = KBabelView::emptyView(project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1668,7 +1668,7 @@ void KBabelMW::spellcheckDone( int result) TQString file = _toSpellcheck.first(); _toSpellcheck.pop_front(); if( m_view->isModified() ) fileSave(); - open(KURL( file ), TQString::null, false); + open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti())); } @@ -1710,7 +1710,7 @@ void KBabelMW::projectOpen() { oldproject = TQString(); } - const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString(), this); if (file.isEmpty()) { return; @@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file) } else { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); m_view->useProject(_project); diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 10f57336..392f71ad 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.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. @@ -82,6 +82,7 @@ namespace KBabel class KBabelMW : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -111,20 +112,20 @@ public: * @return A pointer to a KBabel, that has opened file URL or 0 if no * KBabel was found */ - static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString::null); + static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString()); /** * @return A pointer to a KBabel, that has opened no file URL or 0 if no * KBabel was found */ - static KBabelMW *emptyWin(TQString projectFile = TQString::null); + static KBabelMW *emptyWin(TQString projectFile = TQString()); public slots: void toggleEditMode(); protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/kbabel/kbabel/kbabeliface.h b/kbabel/kbabel/kbabeliface.h index 49d19f5c..854172b6 100644 --- a/kbabel/kbabel/kbabeliface.h +++ b/kbabel/kbabel/kbabeliface.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/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 2592385e..2bc23b9d 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.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. diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h index 6d72aaf1..827caa8e 100644 --- a/kbabel/kbabel/kbabelpref.h +++ b/kbabel/kbabel/kbabelpref.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. @@ -45,6 +45,7 @@ struct ModuleInfo; class KBabelPreferences : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: KBabelPreferences(TQPtrList<ModuleInfo>); diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp index 4166cffe..e5dcf563 100644 --- a/kbabel/kbabel/kbabelsplash.cpp +++ b/kbabel/kbabel/kbabelsplash.cpp @@ -15,11 +15,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,8 +40,8 @@ KBabelSplash* KBabelSplash::instance = 0; -KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) - : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) +KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) { setMargin( 0 ); setSpacing( 0 ); @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set geometry, with support for Xinerama systems + // Set tqgeometry, with support for Xinerama systems TQRect r; - r.setSize(sizeHint()); + r.setSize(tqsizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabel/kbabelsplash.h b/kbabel/kbabel/kbabelsplash.h index af23460b..24f2865a 100644 --- a/kbabel/kbabel/kbabelsplash.h +++ b/kbabel/kbabel/kbabelsplash.h @@ -15,11 +15,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. @@ -38,12 +38,13 @@ class TQPaintEvent; class TQString; -class KBabelSplash : public QVBox +class KBabelSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBabelSplash( TQWidget* parent = 0, const char* name = 0 ); + KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~KBabelSplash() { instance = 0; } static KBabelSplash* instance; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index ca41a7ad..0e685f0c 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.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. @@ -115,11 +115,11 @@ using namespace KBabel; TQPtrList<KBabelView> *KBabelView::viewList = 0; -KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project) - : TQWidget(parent) +KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *tqparent, Project::Ptr project) + : TQWidget(tqparent) , _redirectedBackSearch (false) , _project (project) - , m_mainwindow (parent) + , m_mainwindow (tqparent) , m_sourceview (0) { if(!viewList) @@ -307,7 +307,7 @@ void KBabelView::initDockWidgets() TQWidget *tempWidget=new TQWidget(this,"msgidWidget"); tempWidget->setMinimumSize(350,150); - TQVBoxLayout *layout=new TQVBoxLayout(tempWidget); + TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget); msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel"); msgidLabel->installEventFilter(this); @@ -328,16 +328,16 @@ void KBabelView::initDockWidgets() "and the behavior of KBabel and to Stephan Kulow, who always\n" "lends me a helping hand.\n\n" "Many good ideas, especially for the Catalog Manager, are taken\n" -"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006)); +"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006)); TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(msgidLabel); - layout->setStretchFactor(msgidLabel,1); + tqlayout->addWidget(msgidLabel); + tqlayout->setStretchFactor(msgidLabel,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Original String</b></p>\n\ @@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>")); tempWidget=new TQWidget(this,"msgstrWidget"); tempWidget->setMinimumSize(350,150); - layout=new TQVBoxLayout(tempWidget); + tqlayout=new TQVBoxLayout(tempWidget); // if undefined number of plural forms, use 1 int pf = _catalog->defaultNumberOfPluralForms(); @@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>")); label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget); - hb=new TQHBoxLayout(layout); + hb=new TQHBoxLayout(tqlayout); hb->setSpacing(KDialog::spacingHint()); hb->addSpacing(KDialog::marginHint()); @@ -404,7 +404,7 @@ of the currently displayed entry.</p></qt>")); if(! KBabelSettings::ledInStatusbar()) { - _fuzzyLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _fuzzyLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _fuzzyLed->setFixedSize(15,12); label = new TQLabel(i18n("fuzzy"),tempWidget); @@ -413,7 +413,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::spacingHint()); - _untransLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _untransLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _untransLed->setFixedSize(15,12); label = new TQLabel(i18n("untranslated"),tempWidget); @@ -422,7 +422,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::marginHint()); - _errorLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _errorLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _errorLed->setFixedSize(15,12); label = new TQLabel(i18n("faulty"),tempWidget); @@ -434,7 +434,7 @@ of the currently displayed entry.</p></qt>")); hb->addStretch(1); // ### TODO: perhaps it should be moreprecise where the setting can be changed - TQString ledMsg=i18n("<qt><p><b>Status LEDs</b></p>\n" + TQString ledMsg=i18n("<qt><p><b>tqStatus LEDs</b></p>\n" "<p>These LEDs display the status of the currently displayed message.\n" "You can change their color in the preferences dialog section\n" "<b>Editor</b> on page <b>Appearance</b></p></qt>"); @@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>")); TQWhatsThis::add(_errorLed,ledMsg); } - layout->addWidget(msgstrEdit); - layout->setStretchFactor(msgstrEdit,1); + tqlayout->addWidget(msgstrEdit); + tqlayout->setStretchFactor(msgstrEdit,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Translation Editor</b></p>\n\ @@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } setupAutoCheckTools(); @@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project) { // turn off spellchecker msgstrEdit->setSpellChecker(0); - // invalidate the current settings, to make sure they are updated when needed + // tqinvalidate the current settings, to make sure they are updated when needed _spellcheckSettings.valid = false; } @@ -854,12 +854,12 @@ void KBabelView::updateSettings() } disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -931,7 +931,7 @@ void KBabelView::setupAutoCheckTools() TQValueList<KDataToolInfo>::Iterator it; for( it=tools.begin(); it!=tools.end() ; ++it ) { - if(KBabelSettings::autoCheckTools().contains((*it).service()->library()) ) + if(KBabelSettings::autoCheckTools().tqcontains((*it).service()->library()) ) { // maybe we can reuse the tools KDataTool* t = (*it).createTool(); @@ -1013,7 +1013,7 @@ void KBabelView::restoreSession(KConfig* config) if(!url.isEmpty()) { - open(KURL( url ), TQString::null, false,true); + open(KURL( url ), TQString(), false,true); } @@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo cu.cleanPath(); if(checkIfModified && !url.isEmpty() && cu==url) { - KWin::activateWindow(topLevelWidget()->winId()); + KWin::activateWindow(tqtopLevelWidget()->winId()); return; } @@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo return; } else { - KWin::activateWindow(v->topLevelWidget()->winId()); + KWin::activateWindow(v->tqtopLevelWidget()->winId()); return; } } - ConversionStatus stat=_catalog->openURL(url, package); + ConversiontqStatus stat=_catalog->openURL(url, package); switch(stat) { @@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo { 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())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(url.prettyURL())); + "No entry found.").tqarg(url.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo case NO_PERMISSIONS: { KMessageBox::error(this,i18n( - "You do not have permissions to read file:\n %1").arg(url.prettyURL())); + "You do not have permissions to read file:\n %1").tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::error(this,i18n( - "You have not specified a valid file:\n %1").arg(url.prettyURL())); + "You have not specified a valid file:\n %1").tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } case STOPPED: @@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo default: { 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())); break; } @@ -1268,7 +1268,7 @@ void KBabelView::revertToSaved() } } - open(_catalog->currentURL(),TQString::null,false); + open(_catalog->currentURL(),TQString(),false); } void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) @@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) setCursor(KCursor::waitCursor());*/ - ConversionStatus stat=_catalog->openURL(openURL,saveURL); + ConversiontqStatus stat=_catalog->openURL(openURL,saveURL); switch(stat) { @@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("There was an error while reading the file header of file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case PARSE_ERROR: { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(openURL.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(openURL.prettyURL())); + "No entry found.").tqarg(openURL.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("Minor syntax errors were found while reading file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case NO_PERMISSIONS: { - KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_FILE: { - KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case STOPPED: break; default: { - KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL())); break; } @@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck) } else { - ConversionStatus stat=_catalog->saveFile(); + ConversiontqStatus stat=_catalog->saveFile(); int whatToDo = -1; @@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case BUSY: @@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } @@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { - if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url.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(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return false; } @@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) bool wasReadOnly=_catalog->isReadOnly(); - ConversionStatus stat=_catalog->saveFileAs(url,true); + ConversiontqStatus stat=_catalog->saveFileAs(url,true); // if the file was not saved sucessfully ask for saving to another file @@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) case NO_PERMISSIONS: { message=i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_FILE: { message=i18n("You have specified a folder:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_PLUGIN: { - message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()); + message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()); break; } case UNSUPPORTED_TYPE: { message=i18n( - "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()); + "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()); break; } default: { message=i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } } @@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n" - "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) + "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) { stat=_catalog->saveFileAs(url); if(stat!=OK) @@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question) bool returnCode=true; TQString output; - Msgfmt::Status result=_catalog->checkSyntax( output ); + Msgfmt::tqStatus result=_catalog->checkSyntax( output ); const TQStringList outputLines = TQStringList::split("\n",output); @@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); - msgidLabel->repaint(); + msgidLabel->tqrepaint(); msgstrEdit->setText(_catalog->msgstr(_currentIndex)); msgstrEdit->showForm( form ); - msgstrEdit->repaint(); + msgstrEdit->tqrepaint(); m_cataloglistview->setSelectedItem(_currentIndex); if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->blockSignals(false); @@ -2034,7 +2034,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>End of document reached.<br>Continue from the beginning?</qt>", "<qt>%n replacements made.<br>End of document reached.<br>Continue from the beginning?</qt>", - _replacesTotal), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2042,7 +2042,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue from the beginning?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the beginning?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { if(opts.inMsgid && !forReplace) @@ -2078,7 +2078,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) if( opts.askForNextFile ) { int r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue in the next file?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue in the next file?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); if( r != KMessageBox::Yes ) return false; } @@ -2219,7 +2219,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>Beginning of document reached.<br>Continue from the end?</qt>", "<qt>%n replacements made.<br>Beginning of document reached.<br>Continue from the end?</qt>", - _replacesTotal),TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal),TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2228,7 +2228,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("Beginning of document reached.\n" - "Continue from the end?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the end?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { pos.item = _catalog->numberOfEntries()-1; @@ -2331,7 +2331,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } -void KBabelView::find() +void KBabelView::tqfind() { Part hadFocus; if(msgidLabel->hasFocus()) @@ -2425,7 +2425,7 @@ void KBabelView::find() } } -void KBabelView::replace() +void KBabelView::tqreplace() { _replacesTotal=0; _replaceLen=0; @@ -2518,7 +2518,7 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2749,7 +2749,7 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2803,37 +2803,37 @@ void KBabelView::msgid2msgstr() TQString text = _catalog->msgid(_currentIndex).first(); // this is KDE specific: - if(text.find("_: NAME OF TRANSLATORS\\n")==0) + if(text.tqfind("_: NAME OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorLocalizedName; } - else if(text.find("_: EMAIL OF TRANSLATORS\\n")==0) + else if(text.tqfind("_: EMAIL OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorEmail; } - else if(_catalog->isGeneratedFromDocbook() && text.find("ROLES_OF_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("ROLES_OF_TRANSLATORS")==0) { text="<othercredit role=\\\"translator\\\">\n" "<firstname></firstname><surname></surname>\n" "<affiliation><address><email>"+_catalog->identitySettings().authorEmail+"</email></address>\n" "</affiliation><contrib></contrib></othercredit>"; } - else if(_catalog->isGeneratedFromDocbook() && text.find("CREDIT_FOR_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("CREDIT_FOR_TRANSLATORS")==0) { text="<para>"+_catalog->identitySettings().authorLocalizedName+"\n"+ "<email>"+_catalog->identitySettings().authorEmail+"</email></para>"; } - else if(text.contains(_catalog->miscSettings().singularPlural)) + else if(text.tqcontains(_catalog->miscSettings().singularPlural)) { - text.replace(_catalog->miscSettings().singularPlural,""); + text.tqreplace(_catalog->miscSettings().singularPlural,""); } // end of KDE specific part TQRegExp reg=_catalog->miscSettings().contextInfo; - if(text.contains(reg)) + if(text.tqcontains(reg)) { - text.replace(reg,""); + text.tqreplace(reg,""); } modifyMsgstrText(0,text,true); @@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory() } } -void KBabelView::removeFuzzyStatus() +void KBabelView::removeFuzzytqStatus() { bool newState = !_catalog->isFuzzy(_currentIndex); _catalog->setFuzzy(_currentIndex,newState); @@ -3204,9 +3204,9 @@ void KBabelView::startSearch(bool delay) { TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(KBabelSettings::defaultModule()); @@ -3225,9 +3225,9 @@ void KBabelView::startSearch(const TQString module) // FIXME: should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(module); @@ -3258,9 +3258,9 @@ void KBabelView::startSelectionSearch(const TQString module) // should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->startSearch(msg); @@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState() TQPalette palette=msgstrEdit->palette(); palette.setColor( TQColorGroup::Text, red ); - if( _catalog->itemStatus(_currentIndex).contains("syntax error")) + if( _catalog->itemtqStatus(_currentIndex).tqcontains("syntax error")) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } else - if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) + if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } @@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated() emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex)); } -void KBabelView::autoRemoveFuzzyStatus() +void KBabelView::autoRemoveFuzzytqStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); - //removeFuzzyStatus(); + //removeFuzzytqStatus(); } void KBabelView::toggleFuzzyLed(bool on) @@ -3446,7 +3446,7 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event) { // This is a little workaround to use CTRL+ALT+Home, CTRL+ALT+End, Undo keys // to go to the first and the last entry. Because otherwise - // CTRL+Home and CTRL+End and Undo are caught by QTextEdit + // CTRL+Home and CTRL+End and Undo are caught by TQTextEdit TQKeyEvent *ke = (TQKeyEvent*)event; if(ke->key() == Key_Home && ke->state() == (AltButton | ControlButton)) @@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd) _catalog->applyBeginCommand(_currentIndex,Msgstr,this); - removeFuzzyStatus(); + removeFuzzytqStatus(); } cmd->setPart(Msgstr); @@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if( !_autocheckTools.isEmpty() ) { - TQStringList oldStatus = _catalog->itemStatus(_currentIndex); + TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex); - TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools ); + TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools ); // if there is more than one view, the status changes only in // one view, so we have to update always. - if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status) + if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status) return; if( !status.isEmpty() ) @@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged) else msg += ", "+locale->translate("what check found errors",(*it).utf8()); } - //i18n: translators: Status bar text that automatic checks have found some errors - emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg)); + //i18n: translators: tqStatus bar text that automatic checks have found some errors + emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg)); emit signalFaultyDisplayed(true); if(KBabelSettings::autoCheckColorError()) @@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if(onlyWhenChanged) { - if(oldStatus != status && oldStatus.isEmpty() ) + if(oldtqStatus != status && oldtqStatus.isEmpty() ) { KNotifyClient::beep(); } @@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) } } } - else if( _catalog->itemStatus(_currentIndex).isEmpty() ) + else if( _catalog->itemtqStatus(_currentIndex).isEmpty() ) { _catalog->removeFromErrorList(_currentIndex); @@ -3732,7 +3732,7 @@ void KBabelView::addSpellcheckWords( uint pos, TQString text, uint index, uint f } else if( c == '\\') { - if(pos+1 < textLength && spclChars.contains(text[pos+1]) ) + if(pos+1 < textLength && spclChars.tqcontains(text[pos+1]) ) { pos+=2; } @@ -3895,7 +3895,7 @@ void KBabelView::spellcheck() uint lastPercent=0; for(uint i=first; i <= last; i++) { - if(emitProgress && 100*i/ QMAX(total,1) > lastPercent) + if(emitProgress && 100*i/ TQMAX(total,1) > lastPercent) { lastPercent++; emit signalProgress(lastPercent); @@ -3981,9 +3981,9 @@ void KBabelView::spellStart(KSpell *) if(_spellcheckSettings.rememberIgnored) { TQString urlString = _spellcheckSettings.ignoreURL; - if(urlString.contains("@PACKAGE@")) + if(urlString.tqcontains("@PACKAGE@")) { - urlString.replace("@PACKAGE@",_catalog->packageName()); + urlString.tqreplace("@PACKAGE@",_catalog->packageName()); } // ### TODO: correctly set the URL; support for MostLocalURL KURL url(urlString); @@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Error opening the file that contains words " "to ignore during spell checking:\n" - "%1").arg(file.name())); + "%1").tqarg(file.name())); } } else @@ -4012,7 +4012,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Only local files are allowed for saving " "ignored words to during spell checking:\n" - "%1").arg(urlString)); + "%1").tqarg(urlString)); } if(spell.ignoreList.count() > 0) @@ -4085,13 +4085,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) text=text.mid(begin,end-begin); TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(text.contains(accelMarker)) + if(text.tqcontains(accelMarker)) { - text.replace(accelMarker,""); + text.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } bool textOk=true; @@ -4099,8 +4099,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) { // if text and orig are not the same, // maybe it was a word with hyphens - int n=text.contains('-'); - n+=text.contains('\''); + int n=text.tqcontains('-'); + n+=text.tqcontains('\''); if( n > 0 ) { // re-get the original text since we replace some things above @@ -4113,8 +4113,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) while(!textFound && i <= n) { int lastPos=e+1; - e = text.find('-',lastPos); - int tmp = text.find('\'',lastPos); + e = text.tqfind('-',lastPos); + int tmp = text.tqfind('\'',lastPos); if(e < 0 && tmp > 0) { e=tmp; @@ -4127,13 +4127,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) if(e<0) e=text.length(); TQString w=text.mid(lastPos,e-lastPos); - if(w.contains(accelMarker)) + if(w.tqcontains(accelMarker)) { - w.replace(accelMarker,""); + w.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } if( w == orig) { @@ -4225,15 +4225,15 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi TQString marked=msgstrEdit->selectedText(); spell.origWords.append(marked); - if(marked.contains("\n") && !newWord.contains('\n')) + if(marked.tqcontains("\n") && !newWord.tqcontains('\n')) { TQString s1=newWord; - s1.replace(" ","\n"); + s1.tqreplace(" ","\n"); // if only a newline has been replaced with a white space if(s1==marked) { - newWord.replace(" "," \n"); + newWord.tqreplace(" "," \n"); } } @@ -4241,11 +4241,11 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi // word has no accelerator, try to add the accelerator for // the same char else add in at the same position TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(marked.contains(accelMarker) && !newWord.contains(accelMarker)) + if(marked.tqcontains(accelMarker) && !newWord.tqcontains(accelMarker)) { - int b=marked.find(accelMarker); + int b=marked.tqfind(accelMarker); TQChar accel=marked[b+1]; - int nb=newWord.find(accel,0,false); + int nb=newWord.tqfind(accel,0,false); if(nb>=0) { newWord.insert(nb,accelMarker); @@ -4379,7 +4379,7 @@ void KBabelView::spellCleanDone() // if the pointer is cleared, you have finished correcly if( !spell.kspell ) return; - KSpell::spellStatus status = spell.kspell->status(); + KSpell::spelltqStatus status = spell.kspell->status(); if(status == KSpell::Error || status == KSpell::Crashed) { @@ -4422,7 +4422,7 @@ void KBabelView::cancelSpellcheck() void KBabelView::spellAddIgnore(const TQString &word) { - if(!spell.ignoreList.contains(word)) + if(!spell.ignoreList.tqcontains(word)) { spell.newIgnoreList.append(word); } diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index be492548..8fecb9f0 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.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. @@ -93,12 +93,13 @@ class TagListView; class KBabelView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor * @param buildLeds flag, if status leds should be created in editor */ - KBabelView(KBCatalog* catalog,KBabelMW *parent, KBabel::Project::Ptr project); + KBabelView(KBCatalog* catalog,KBabelMW *tqparent, KBabel::Project::Ptr project); /** * Destructor @@ -202,7 +203,7 @@ public slots: /** opens a filedialog and asks for an url */ void open(); - void open(const KURL& url, const TQString & package=TQString::null, bool checkModified=true, bool newView=false); + void open(const KURL& url, const TQString & package=TQString(), bool checkModified=true, bool newView=false); void setFilePackage(); void revertToSaved(); @@ -216,10 +217,10 @@ public slots: void textPaste(); bool findNext(); bool findPrev(); - void find(); + void tqfind(); void findInFile(TQCString fileSource, KBabel::FindOptions options); void replaceInFile(TQCString fileSource, KBabel::ReplaceOptions options); - void replace(); + void tqreplace(); void selectAll(); void deselectAll(); void clear(); @@ -267,7 +268,7 @@ public slots: void skipToTagFromTool(int index); void wordCount(); - void removeFuzzyStatus(); + void removeFuzzytqStatus(); /** opens the header editor for the po-file */ void editHeader(); @@ -450,7 +451,7 @@ protected slots: private slots: void msgstrPluralFormChanged (uint index); - void autoRemoveFuzzyStatus(); + void autoRemoveFuzzytqStatus(); /** connected to the catalog. it is called when a new file is opened*/ void newFileOpened(bool readOnly); @@ -469,13 +470,13 @@ private slots: */ void replaceNext(); /** - * called from a signal from ReplaceDialog to replace + * called from a signal from ReplaceDialog to tqreplace * all without asking anymore. */ void replaceAll(); /** * called from a signal from ReplaceDialog to go to next - * string to replace + * string to tqreplace */ void findNextReplace(); diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 101674a3..7b700390 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.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. @@ -203,7 +203,7 @@ void KBabelView::updateTags() { TQString s = *it; if( s.startsWith("&") ) s = "&"+s; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _tagsMenu->insertItem(s,counter); tList.append(s); @@ -297,7 +297,7 @@ void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool void KBabelView::insertTag(int n) { TQString tag = _tagsMenu->text(n); - if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // replace && -> &. && is used for correct menu display + if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // tqreplace && -> &. && is used for correct menu display modifyMsgstrText( msgstrEdit->currentIndex(), tag ); } @@ -331,10 +331,10 @@ void KBabelView::insertNextTagMsgid() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -382,7 +382,7 @@ void KBabelView::updateArgs() for(it=_args.begin(); it!=_args.end(); ++it) { TQString s = *it; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _argsMenu->insertItem(s,counter); tList.append(s); @@ -427,10 +427,10 @@ void KBabelView::insertNextArg() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf) KMessageBox::sorry(this ,i18n("An error occurred while trying to get the list " "of messages for this file from the database:\n" - "%1").arg(error)); + "%1").tqarg(error)); _diffing=false; _diffEnabled=false; @@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff) connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); - ConversionStatus stat = cat.openURL(url); + ConversiontqStatus stat = cat.openURL(url); emit signalClearProgressBar(); @@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff) { KMessageBox::sorry(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())); break; } case NO_PERMISSIONS: { KMessageBox::sorry(this,i18n( "You do not have permissions to read file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::sorry(this,i18n( "You have not specified a valid file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } default: { KMessageBox::sorry(this,i18n( "Error while trying to open file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } @@ -802,12 +802,12 @@ void KBabelView::showTryLaterMessageBox() "However, the string might be found " "in the files being searched at the moment.\n" "Please try later."), contents); - label2->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak ); - label2->setMinimumSize(label2->sizeHint()); + label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak ); + label2->setMinimumSize(label2->tqsizeHint()); lay->add( label2 ); lay->addStretch(1); - TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this find/replace session again"), topcontents); + TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this tqfind/replace session again"), topcontents); dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); @@ -822,7 +822,7 @@ void KBabelView::showTryLaterMessageBox() void KBabelView::setFilePackage() { bool result=false; - TQString p = KInputDialog::getText(TQString::null, i18n("Enter new package for the current file:"),_catalog->package(),&result,this); + TQString p = KInputDialog::getText(TQString(), i18n("Enter new package for the current file:"),_catalog->package(),&result,this); if( result ) { _catalog->setPackage(p); @@ -904,10 +904,10 @@ void KBabelView::plural2msgstr() case KDESpecific: { pos = msgstrEdit->currentIndex(); - currentFormBegin=text.findRev("\\n",pos); + currentFormBegin=text.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - currentFormEnd=text.find("\\n",pos); + currentFormEnd=text.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=text.length(); text=text.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -1020,6 +1020,6 @@ void KBabelView::wordCount() KMessageBox::information( this , i18n("Total words: %1\n\n" "Words in untranslated messages: %2\n\n" -"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy) +"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy) , i18n("Word Count") ); } diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 2685905b..4d3f0a37 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.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. @@ -48,12 +48,12 @@ KBabelBookmark::KBabelBookmark(int msgindex, TQString msgtext) } // insert one '&' before every consecutive group of ampersands to keep the - // first of these from acting either as accelerator or mask in the menu + // first of these from acting either as accelerator or tqmask in the menu TQRegExp rx("&+"); - int pos = msgtext.find(rx); + int pos = msgtext.tqfind(rx); while (pos >= 0) { msgtext.insert(pos, '&'); - pos = msgtext.find(rx, pos + rx.matchedLength() + 1); + pos = msgtext.tqfind(rx, pos + rx.matchedLength() + 1); } _msgtext = msgtext; @@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); - _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), + _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()), this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } diff --git a/kbabel/kbabel/kbbookmarkhandler.h b/kbabel/kbabel/kbbookmarkhandler.h index 3f4987f2..5de46cb1 100644 --- a/kbabel/kbabel/kbbookmarkhandler.h +++ b/kbabel/kbabel/kbbookmarkhandler.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. @@ -85,9 +85,10 @@ class KBabelBookmark /** * Simple class for managing bookmarks in KBabel. */ -class KBabelBookmarkHandler : public QObject +class KBabelBookmarkHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kbabel/kbabel/kbcatalog.cpp b/kbabel/kbabel/kbcatalog.cpp index 4c4e269a..933df9de 100644 --- a/kbabel/kbabel/kbcatalog.cpp +++ b/kbabel/kbabel/kbcatalog.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. @@ -35,8 +35,8 @@ #include "headereditor.h" -KBCatalog::KBCatalog(TQString configFile, TQObject* parent, const char* name) - : KBabel::Catalog(parent,name,configFile) +KBCatalog::KBCatalog(TQString configFile, TQObject* tqparent, const char* name) + : KBabel::Catalog(tqparent,name,configFile) { _headerEditor=0; } diff --git a/kbabel/kbabel/kbcatalog.h b/kbabel/kbabel/kbcatalog.h index 2c2846d4..9911180b 100644 --- a/kbabel/kbabel/kbcatalog.h +++ b/kbabel/kbabel/kbcatalog.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. @@ -46,9 +46,10 @@ class HeaderEditor; class KBCatalog : public KBabel::Catalog { Q_OBJECT + TQ_OBJECT public: - KBCatalog(TQString configFile = TQString::null ,TQObject* parent=0, const char* name=0); + KBCatalog(TQString configFile = TQString() ,TQObject* tqparent=0, const char* name=0); virtual ~KBCatalog(); HeaderEditor* headerEditor(); diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index e04da3c2..40fb29e8 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -34,11 +34,11 @@ using namespace KBabel; -KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project) - : TQWidget(parent) +KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project) + : TQWidget(tqparent) { m_catalog= catalog; - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); m_listview = new KListView(this, "catalogListView"); m_listview->addColumn(i18n("Id")); @@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_listview->setAllColumnsShowFocus(true); m_listview->resize(this->size()); - layout->addWidget(m_listview); - layout->setStretchFactor(m_listview,1); + tqlayout->addWidget(m_listview); + tqlayout->setStretchFactor(m_listview,1); connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); } @@ -63,7 +63,7 @@ KBCatalogListView::~KBCatalogListView() void KBCatalogListView::selectionChanged ( TQListViewItem * item) { DocPosition pos; - int number = m_items->find(reinterpret_cast<KBCatalogListViewItem*>(item)); + int number = m_items->tqfind(reinterpret_cast<KBCatalogListViewItem*>(item)); if(number<0) number = 0; pos.item=number; diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h index c2c46bdf..53e7327a 100644 --- a/kbabel/kbabel/kbcataloglistview.h +++ b/kbabel/kbabel/kbcataloglistview.h @@ -50,8 +50,9 @@ class KListView; class KBCatalogListView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: - KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project); + KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project); ~KBCatalogListView(); diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 4bbc3049..1889e518 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -23,8 +23,8 @@ #include "kbcataloglistviewitem.h" #include <assert.h> -KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr) - : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) +KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr) + : Super(lv, tqparent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) { setText(0,TQString::number(id)); } @@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st) { m_msgid = st; setup(); - repaint(); + tqrepaint(); } void KBCatalogListViewItem::setMsgStr(const TQString& st) { m_msgstr = st; setup(); - repaint(); + tqrepaint(); } uint KBCatalogListViewItem::getId() @@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id) { m_id = id; setup(); - repaint(); + tqrepaint(); } TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{ @@ -205,9 +205,9 @@ TQString KBCatalogListViewItem::formatMsg(const TQString str) { // TODO: Use KBHighlighting for this TQString tmp_msgid = str; - tmp_msgid = tmp_msgid.replace( "\\n", "<br>" ); - tmp_msgid = tmp_msgid.replace( "<", "<" ); - tmp_msgid = tmp_msgid.replace( ">", ">" ); + tmp_msgid = tmp_msgid.tqreplace( "\\n", "<br>" ); + tmp_msgid = tmp_msgid.tqreplace( "<", "<" ); + tmp_msgid = tmp_msgid.tqreplace( ">", ">" ); return tmp_msgid; } diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 4a24c159..16353c70 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -34,7 +34,7 @@ class KBCatalogListViewItem : public KListViewItem { typedef KListViewItem Super; public: - KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr); + KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr); ~KBCatalogListViewItem(); diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index ae701c4e..fc7898f7 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.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,8 +36,8 @@ using namespace KBabel; -KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr project) - : TQWidget (parent), KBabel::CatalogView () , _project (project) +KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, Project::Ptr project) + : TQWidget (tqparent), KBabel::CatalogView () , _project (project) { if (catalog == 0) kdFatal(KBABEL) << "catalog==0" << endl; diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h index 355e2a4c..33cf8904 100644 --- a/kbabel/kbabel/kbcatalogview.h +++ b/kbabel/kbabel/kbcatalogview.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. @@ -43,11 +43,12 @@ class KBCatalogView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KBCatalogView(KBCatalog* catalog, TQWidget* parent, KBabel::Project::Ptr project); + KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, KBabel::Project::Ptr project); /** * Destructor diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 8dd87bcc..b2719386 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.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. @@ -41,8 +41,8 @@ #include <tqspinbox.h> #include <tqscrollview.h> -KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) - : TQVBox(parent,name) +KBCharSelect::KBCharSelect(TQWidget* tqparent,const char* name) + : TQVBox(tqparent,name) { setSpacing( KDialog::spacingHint() ); diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h index 83de635d..a13071bf 100644 --- a/kbabel/kbabel/kbcharselect.h +++ b/kbabel/kbabel/kbcharselect.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,11 +39,12 @@ class KConfig; class KCharSelectTable; class TQSpinBox; -class KBCharSelect : public QVBox +class KBCharSelect : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBCharSelect(TQWidget* parent, const char* name=0); + KBCharSelect(TQWidget* tqparent, const char* name=0); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3d555d7b..f4109a34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.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. @@ -98,7 +98,7 @@ void KBabelHighlighter::highlight( ) // create a single line out of the text: remove "\n", so that we only // have to deal with one single line of text. TQString text = _edit->text( ); - text.replace( "\n", "" ); + text.tqreplace( "\n", "" ); TQRegExp rx; int pos; @@ -107,10 +107,10 @@ void KBabelHighlighter::highlight( ) { for ( uint i = 0; i < regexps.count( ); ++i ) { rx.setPattern( regexps[i] ); - pos = text.find( rx ); + pos = text.tqfind( rx ); while ( pos >= 0 ) { doHighlighting( (HighlightType)(i+1), pos, rx.matchedLength( ) ); - pos = text.find( rx, pos + rx.matchedLength( ) ); + pos = text.tqfind( rx, pos + rx.matchedLength( ) ); } } } @@ -223,7 +223,7 @@ void KBabelHighlighter::flushCurrentWord() currentPos += tags.matchedLength(); } - currentWord.replace ( tags, "" ); + currentWord.tqreplace ( tags, "" ); if (!currentWord.isEmpty()) { bool isPlainWord = true; @@ -251,7 +251,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // word first. TQString word = wordRaw; kdDebug(KBABEL) << "isampersand: checking (raw):" << word << endl; - word.replace("&", "" ); + word.tqreplace("&", "" ); kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl; // Normally isMisspelled would look up a dictionary and return @@ -266,7 +266,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // there is no 'spelt correctly' signal so default to Okay kdDebug(KBABEL) << "Adding word " << word << endl; - dict.replace(word, Okay); + dict.tqreplace(word, Okay); mSpell->checkWord(word, false); return false; } @@ -275,7 +275,7 @@ void KBabelHighlighter::slotMisspelling(const TQString & originalword, const TQStringList & suggestions, unsigned int) { kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl; - dict.replace( originalword, NotOkay ); + dict.tqreplace( originalword, NotOkay ); // this is slow but since kspell is async this will have to do for now highlight(); diff --git a/kbabel/kbabel/kbhighlighting.h b/kbabel/kbabel/kbhighlighting.h index 3f202d99..f028e029 100644 --- a/kbabel/kbabel/kbhighlighting.h +++ b/kbabel/kbabel/kbhighlighting.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. @@ -47,9 +47,10 @@ class TQColor; class TQString; class TQTextEdit; -class KBabelHighlighter : public QObject +class KBabelHighlighter : public TQObject { Q_OBJECT + TQ_OBJECT public: enum HighlightType { diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 5758d563..5d771fdc 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.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. @@ -187,7 +187,7 @@ int KBabelApp::newInstance() widget->show(); for (int i=0; i < args->count(); i++) { - widget->open( args->url(i) , TQString::null, i != 0 ); + widget->open( args->url(i) , TQString(), i != 0 ); } kdDebug () << "Resuming DCOP" << endl; @@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && mw->winId() == window) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int { // here, we don't care about "open in new window", because // it's empty - KWin::setActiveWindow(kb->topLevelWidget()->winId()); + KWin::setActiveWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->open(u,TQString::fromUtf8(package),false); @@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb = new KBabelMW(project); kb->show(); } else kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u,TQString::fromUtf8(package),newWindow); } @@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow); } @@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam { kb = new KBabelMW(project); kb->show(); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->openTemplate(t,u,TQString::fromUtf8(package)); } } @@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } } @@ -555,7 +555,7 @@ int main(int argc, char **argv) about.addAuthor("Andrea Rizzi",I18N_NOOP("Wrote the dictionary plugin " "for searching in a database and some other code.") ,"rizzi@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("Marco Wegner",I18N_NOOP("Bug fixes, KFilePlugin for PO files, CVS support, mailing files") ,"dubbleu@web.de"); @@ -578,7 +578,7 @@ int main(int argc, char **argv) about.addCredit("SuSE GmbH" ,I18N_NOOP("Sponsored development of KBabel for a while.") ,"suse@suse.de","http://www.suse.de"); - 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("Eva Brucherseifer", I18N_NOOP("String distance algorithm implementation"), "eva@kde.org"); diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 9b7913d1..29a8da78 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -25,11 +25,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. @@ -49,7 +49,7 @@ #include <tqclipboard.h> #include <tqapplication.h> #include <tqdragobject.h> -//#include <private/qrichtext_p.h> +//#include <private/tqrichtext_p.h> #include <tqpopupmenu.h> #include <kdebug.h> @@ -62,8 +62,8 @@ using namespace KBabel; -MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) - :KTextEdit(parent,name), emitUndo(true), +MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* tqparent,const char* name) + :KTextEdit(tqparent,name), emitUndo(true), _firstChangedLine(0), _lastChangedLine(0), _lastParagraph(0), @@ -75,7 +75,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) { setUndoRedoEnabled(false); // we handle this ourselves setWordWrap( WidgetWidth ); - viewport()->setAcceptDrops( false ); // we need our parent to get drops + viewport()->setAcceptDrops( false ); // we need our tqparent to get drops connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); } @@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -141,7 +141,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) setCursorPosition( row, col ); _firstChangedLine=row; - if(delcmd->str.find("\n")>0 )_lastChangedLine=row+delcmd->str.contains("\n"); + if(delcmd->str.tqfind("\n")>0 )_lastChangedLine=row+delcmd->str.tqcontains("\n"); else _lastChangedLine=row; KTextEdit::insert( delcmd->str ); @@ -293,10 +293,10 @@ void MyMultiLineEdit::setText(const TQString& s) _lastParagraph=0; _lastParagraphOffset=0; // workaround, since insert does not interpret markup - setTextFormat( Qt::PlainText ); + setTextFormat( TQt::PlainText ); _firstChangedLine=_lastChangedLine=0; KTextEdit::setText(s); - setTextFormat( Qt::AutoText ); + setTextFormat( TQt::AutoText ); // now the number of lines is known, let's do highlight _lastChangedLine=paragraphs(); emit textChanged(); @@ -308,7 +308,7 @@ void MyMultiLineEdit::insertAt( const TQString & s, int line, int col, bool mark // it will invoke insert, don't need to send InsTextCmd KTextEdit::insertAt(s,line,col); - // code from QMultiLineEdit + // code from TQMultiLineEdit if( mark ) setSelection( line, col, line, col + s.length(), 0 ); // end of copied code @@ -355,14 +355,14 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL emit signalUndoCmd( new EndCommand(-1,UndefPart)); } - int n=text.find("\n"); + int n=text.tqfind("\n"); if( n > 0 ) _lastChangedLine+=n; // setup palettes TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -546,8 +546,8 @@ void MyMultiLineEdit::offset2Pos(int offset, int ¶graph, int &index) const int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) { - paragraph = QMAX( QMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check - index = QMAX( QMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check + paragraph = TQMAX( TQMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check + index = TQMAX( TQMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check { uint lastI; @@ -569,7 +569,7 @@ int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) _lastParagraphOffset=tmp; _lastParagraph=paragraph; - tmp += QMIN( lastI, index ); + tmp += TQMIN( lastI, index ); return tmp; } @@ -592,27 +592,27 @@ void MyMultiLineEdit::setOverwriteMode( bool b ) } /*******************************************************************************/ -MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const char* name) - :MyMultiLineEdit(ID, parent,name), +MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* tqparent,const char* name) + :MyMultiLineEdit(ID, tqparent,name), _quotes(false), _cleverEditing(false), _highlightBg(false), _spacePoints(false), - _bgColor(colorGroup().base().dark(110)), + _bgColor(tqcolorGroup().base().dark(110)), _textColor(KGlobalSettings::textColor()), - _errorColor(Qt::red), + _errorColor(TQt::red), _currentColor(KGlobalSettings::textColor()), _whitespace(0), _hlSyntax(true), - _quoteColor(Qt::darkGreen), - _unquoteColor(Qt::red), - _cformatColor(Qt::blue), - _accelColor(Qt::darkMagenta), + _quoteColor(TQt::darkGreen), + _unquoteColor(TQt::red), + _cformatColor(TQt::blue), + _accelColor(TQt::darkMagenta), _showDiff(false), _diffUnderlineAdd(true), _diffStrikeOutDel(true), - _diffAddColor(Qt::darkGreen), - _diffDelColor(Qt::darkRed), + _diffAddColor(TQt::darkGreen), + _diffDelColor(TQt::darkRed), _currentUnicodeNumber(0), highlighter(0), _tagStartPara(0), _tagStartIndex(0), _tagEndPara(0), _tagEndIndex(0) @@ -661,7 +661,7 @@ void MsgMultiLineEdit::setText(const TQString& s) if(_showDiff) { diffPos.clear(); - int lines = s.contains('\n'); + int lines = s.tqcontains('\n'); diffPos.resize(lines+1); TQStringList lineList = TQStringList::split('\n',s,true); @@ -689,7 +689,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - addPos = (*it).find("<KBABELADD>",lastPos); + addPos = (*it).tqfind("<KBABELADD>",lastPos); } if(haveDel && multiline) @@ -698,7 +698,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - delPos = (*it).find("<KBABELDEL>",lastPos); + delPos = (*it).tqfind("<KBABELDEL>",lastPos); } if(delPos >= 0 && addPos >= 0) @@ -741,7 +741,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(addPos,11); } - int endPos = (*it).find("</KBABELADD>",addPos); + int endPos = (*it).tqfind("</KBABELADD>",addPos); if(endPos < 0) { endPos = (*it).length(); @@ -768,7 +768,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(delPos,11); } - int endPos = (*it).find("</KBABELDEL>",delPos); + int endPos = (*it).tqfind("</KBABELDEL>",delPos); if(endPos < 0) { endPos = (*it).length(); @@ -805,9 +805,9 @@ void MsgMultiLineEdit::setText(const TQString& s) } TQRegExp reg("</?KBABELADD>"); - str.replace(reg,""); + str.tqreplace(reg,""); reg.setPattern("</?KBABELDEL>"); - str.replace(reg,""); + str.tqreplace(reg,""); } MyMultiLineEdit::setText(str); @@ -882,10 +882,10 @@ void MsgMultiLineEdit::setFont(const TQFont& font) // we don't need to calculate a special offset for non-breaking space, since // they are very similar in size TQFontMetrics fm(font); - _wsOffsetX = QMAX(fm.width(' ')/2-2,1); - _wsOffsetY = QMAX(fm.height()/2-1,0); + _wsOffsetX = TQMAX(fm.width(' ')/2-2,1); + _wsOffsetY = TQMAX(fm.height()/2-1,0); - repaint(); + tqrepaint(); } void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut) @@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor void MsgMultiLineEdit::setTextColor(const TQColor &color ) { TQPalette p( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::Text, color ); if( hasFocus() ) p.setActive( newcg ); else p.setInactive( newcg ); @@ -989,15 +989,15 @@ void MsgMultiLineEdit::paintSpacePoints() if ( paragraphRect( curpara ).top() > contentsY()+visibleHeight()) break; const TQString& s = text(curpara); - int i = s.find( " " ); + int i = s.tqfind( " " ); while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN { - TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws; + TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws; TQRect r = mapToView( curpara, i ); r.moveBy( r.width()/2, (r.height() - fm.descent())/2 ); r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 ); - bitBlt(viewport(), r.topLeft(), pm, pm->rect(), Qt::CopyROP); - i = s.find( " ", i+1 ); + bitBlt(viewport(), r.topLeft(), pm, pm->rect(), TQt::CopyROP); + i = s.tqfind( " ", i+1 ); } ++curpara; } @@ -1015,7 +1015,7 @@ void MsgMultiLineEdit::paintSpacePoints() painter.drawText( TQPoint( 0, mapToView( curpara, 0 ).top()) + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT - painter.drawText( mapToView( curpara, QMAX( 0, + painter.drawText( mapToView( curpara, TQMAX( 0, ((int)text( curpara ).length())-1)).topRight() + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT } @@ -1025,7 +1025,7 @@ void MsgMultiLineEdit::paintSpacePoints() { if( paragraphs() == (int)diffPos.size() ) // sanity check { - painter.setRasterOp( Qt::AndROP ); + painter.setRasterOp( TQt::AndROP ); for( int curpara = paranum; curpara < paragraphs() ; curpara++ ) { r = paragraphRect(curpara); @@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints() } } -void MsgMultiLineEdit::repaint() +void MsgMultiLineEdit::tqrepaint() { highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::forceUpdate() @@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate() _firstChangedLine=0; _lastChangedLine=paragraphs()-1; highlighter->highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::ensureCursorVisible() @@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight() TQColor bg; if( _highlightBg ) bg = _bgColor; - else bg = colorGroup().base(); + else bg = tqcolorGroup().base(); for( int i = 0 ; i < paragraphs() ; i++ ) setParagraphBackgroundColor( i, bg ); @@ -1188,7 +1188,7 @@ void MsgMultiLineEdit::highlight() TQRegExp markup("(\\\\)|(\")|(\\\\[abfnrtv'\"\?\\\\])|(\\\\\\d+)|(\\\\x[\\dabcdef]+)" "|(%[\\ddioxXucsfeEgGphln]+)|(&[^\\s])|(&[\\w-]+;)"); - for( i = QMAX(_firstChangedLine,0) ; i < QMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { + for( i = TQMAX(_firstChangedLine,0) ; i < TQMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { TQString line=text(i); @@ -1252,7 +1252,7 @@ void MsgMultiLineEdit::highlight() { TQColor c; TQFont f; - VerticalAlignment v; + Qt::VerticalAlignment v; getFormat(_firstChangedLine-1, paragraphLength(_firstChangedLine-1)-1, &f, &c, &v); TQString l = text(_firstChangedLine-1); if( c==_tagColor && !l.endsWith(">") ) // hope _tagColor will be different than other colors @@ -1522,7 +1522,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) { TQString spclChars="abfnrtv'\"?\\"; if(col < (int)str.length()-1 - && spclChars.contains(str.at(col+1))) + && spclChars.tqcontains(str.at(col+1))) { del(); } @@ -1548,7 +1548,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) TQString str=text(row); TQString spclChars="abfnrtv'\"?\\"; - if(!str.isEmpty() && col > 0 && spclChars.contains(str.at(col-1))) + if(!str.isEmpty() && col > 0 && spclChars.tqcontains(str.at(col-1))) { if(col > 1 && str.at(col-2)=='\\' && !isMasked(&str,col-2)) { diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 624e5e4c..10592b0c 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.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. @@ -50,8 +50,9 @@ class TQPixmap; class MyMultiLineEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - MyMultiLineEdit(int ID,TQWidget* parent,const char* name=0); + MyMultiLineEdit(int ID,TQWidget* tqparent,const char* name=0); /** applies cmd to the displayed text, but does not emit @@ -129,7 +130,7 @@ protected: virtual TQPopupMenu *createPopupMenu(); virtual TQPopupMenu *createPopupMenu(const TQPoint &pos); - /* the parent handles this */ + /* the tqparent handles this */ virtual void wheelEvent(TQWheelEvent*); bool emitUndo; @@ -173,10 +174,11 @@ private: class MsgMultiLineEdit : public MyMultiLineEdit { Q_OBJECT + TQ_OBJECT public: enum TextColor { NormalColor, ErrorColor }; - MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* parent=0,const char* name=0); + MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* tqparent=0,const char* name=0); virtual ~MsgMultiLineEdit(); /** is displaying surrounding quotes enabled? */ @@ -227,7 +229,7 @@ public slots: /** * reimplemented to call highlight() */ - void repaint(); + void tqrepaint(); void forceUpdate(); void emittedTextChanged(); @@ -251,7 +253,7 @@ private: TQRect mapToView( int para, int index ); /** - * tests if the character in string str at position col is masked with + * tests if the character in string str at position col is tqmasked with * '\' by counting the number of '\' backwards */ static bool isMasked(TQString *str,uint col); diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui index 5e002657..1581084d 100644 --- a/kbabel/kbabel/searchpreferences.ui +++ b/kbabel/kbabel/searchpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SearchPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SearchPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoSearch</cstring> </property> @@ -49,15 +49,15 @@ the popup menu that appears either when clicking in the toolbar pressed for a while.</p></qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ in the toolbar pressed for a while.</p></qt></string> <cstring>_kcfg_DefaultModule</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>_kcfg_DefaultModule</cstring> </property> @@ -96,7 +96,7 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>91</height> @@ -105,5 +105,5 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 00d8a3b2..bf61189f 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.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. @@ -45,14 +45,14 @@ using namespace KBabel; -SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +SourceView::SourceView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _contextView = new SourceContext (this, project); - layout->addWidget (_contextView); + tqlayout->addWidget (_contextView); connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); } diff --git a/kbabel/kbabel/sourceview.h b/kbabel/kbabel/sourceview.h index a12ca767..c17c49cc 100644 --- a/kbabel/kbabel/sourceview.h +++ b/kbabel/kbabel/sourceview.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,11 +40,12 @@ class SourceContext; class SourceView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - SourceView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + SourceView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index de9f2ce6..fc53b6e0 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.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. @@ -40,8 +40,8 @@ #include <kglobal.h> #include <klocale.h> -SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) - : KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling") +SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Spelling") , Ok|Cancel) { setButtonOK(KGuiItem(i18n("&Spell Check"),"spellcheck")); diff --git a/kbabel/kbabel/spelldlg.h b/kbabel/kbabel/spelldlg.h index e12fc515..be182d7e 100644 --- a/kbabel/kbabel/spelldlg.h +++ b/kbabel/kbabel/spelldlg.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,9 +41,10 @@ class SpellDlgWidget; class SpellDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SpellDlg(bool haveMarkedText, TQWidget* parent, const char *name=0); + SpellDlg(bool haveMarkedText, TQWidget* tqparent, const char *name=0); ~SpellDlg(); bool all() const; diff --git a/kbabel/kbabel/spelldlgwidget.ui b/kbabel/kbabel/spelldlgwidget.ui index fe5a5d0b..539b36e3 100644 --- a/kbabel/kbabel/spelldlgwidget.ui +++ b/kbabel/kbabel/spelldlgwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SpellDlgWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SpellDlgWidget</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="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>allBtn</cstring> </property> @@ -44,7 +44,7 @@ <string>Spell check all translated messages of this file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>currentBtn</cstring> </property> @@ -58,7 +58,7 @@ <string>Spell check only the current message.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginCurrentMsgBtn</cstring> </property> @@ -66,7 +66,7 @@ <string>Fro&m beginning of current message to end of file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginBtn</cstring> </property> @@ -77,7 +77,7 @@ <string>Spell check all text from the beginning of the file to the current cursor position.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>endBtn</cstring> </property> @@ -88,7 +88,7 @@ <string>Spell check all text from the current cursor position to the end of the file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>markedBtn</cstring> </property> @@ -101,7 +101,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>defaultBtn</cstring> </property> @@ -122,5 +122,5 @@ <tabstop>endBtn</tabstop> <tabstop>defaultBtn</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 476c2ed7..51a37d49 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.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,15 +44,15 @@ using namespace KBabel; -TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +TagListView::TagListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _tagBox = new KListBox (this, "taglist textview"); - layout->addWidget (_tagBox); + tqlayout->addWidget (_tagBox); connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) , this, TQT_SIGNAL(signalTagSelected(const TQString&))); diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h index d4361a23..d2d21308 100644 --- a/kbabel/kbabel/taglistview.h +++ b/kbabel/kbabel/taglistview.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,11 +40,12 @@ class KListBox; class TagListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - TagListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + TagListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp index 5de3f0fb..c4a5969e 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.cpp +++ b/kbabel/kbabeldict/aboutmoduledlg.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. @@ -35,8 +35,8 @@ #include <kbugreport.h> #include <klocale.h> -AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *parent) - : KAboutApplication(aboutData, parent) +AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *tqparent) + : KAboutApplication(aboutData, tqparent) , _aboutData(aboutData) { setHelpLinkText(i18n("Report Bug...")); diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h index 09f13f8f..a3b1656e 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.h +++ b/kbabel/kbabeldict/aboutmoduledlg.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,9 +41,10 @@ class AboutModuleDlg : public KAboutApplication { Q_OBJECT + TQ_OBJECT public: - AboutModuleDlg(const KAboutData *aboutData, TQWidget* parent=0); + AboutModuleDlg(const KAboutData *aboutData, TQWidget* tqparent=0); public slots: virtual void helpClickedSlot(const TQString&); diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index f99c3709..d60b1de6 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.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. @@ -45,25 +45,25 @@ #include <ktempfile.h> DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected - , TQWidget *parent, const char *name) - : TQWidget(parent,name), box(b) + , TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), box(b) { tempConfig.clear(); tempConfig.setAutoDelete(true); dictList = box->moduleInfos(); - TQGridLayout *layout = new TQGridLayout(this); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout = new TQGridLayout(this); + tqlayout->setSpacing(KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this); - layout->addWidget(label,0,0); + tqlayout->addWidget(label,0,0); label = new TQLabel(i18n("dictionary to use","Use:"),this); - layout->addWidget(label,0,2); + tqlayout->addWidget(label,0,2); unselectedBox = new KListBox(this,"unselectedBox"); - layout->addWidget(unselectedBox,1,0); + tqlayout->addWidget(unselectedBox,1,0); TQVBoxLayout *bLayout = new TQVBoxLayout(); @@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected unselectBtn->setEnabled(false); bLayout->addWidget(unselectBtn); bLayout->addStretch(); - layout->addLayout(bLayout,1,1); + tqlayout->addLayout(bLayout,1,1); selectedBox = new KListBox(this,"selectedBox"); - layout->addWidget(selectedBox,1,2); + tqlayout->addWidget(selectedBox,1,2); bLayout = new TQVBoxLayout(); @@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected configureBtn = new TQPushButton(i18n("Con&figure..."), this); bLayout->addWidget(configureBtn); bLayout->addStretch(); - layout->addLayout(bLayout,1,3); + tqlayout->addLayout(bLayout,1,3); dictList.setAutoDelete(true); @@ -109,7 +109,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected for(mi = dictList.first(); mi != 0; mi = dictList.next()) { - if(!selected.contains(mi->id)) + if(!selected.tqcontains(mi->id)) { unselectedBox->insertItem(mi->name); } @@ -320,7 +320,7 @@ void DictChooser::restoreConfig() { kdDebug( KBABEL_SEARCH ) << "Cleanup" << endl; // cleanup - TQDictIterator<KTempFile> it( tempConfig ); // See QDictIterator + TQDictIterator<KTempFile> it( tempConfig ); // See TQDictIterator for( ; it.current(); ++it ) { KConfig config( it.current()->name() ); diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h index 3cb8e9d9..e8ef1d71 100644 --- a/kbabel/kbabeldict/dictchooser.h +++ b/kbabel/kbabeldict/dictchooser.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. @@ -47,13 +47,14 @@ class TQPushButton; class TQListBoxItem; -class KDE_EXPORT DictChooser : public QWidget +class KDE_EXPORT DictChooser : public TQWidget { Q_OBJECT + TQ_OBJECT public: DictChooser(KBabelDictBox* box, TQStringList selected, - TQWidget *parent , const char *name=0); + TQWidget *tqparent , const char *name=0); TQStringList selectedDicts(); diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 5d648697..925c96eb 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.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. @@ -39,8 +39,8 @@ #include <tqsignalmapper.h> DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection - , TQObject *parent) - : TQObject(parent, "dictionarymenu") + , TQObject *tqparent) + : TQObject(tqparent, "dictionarymenu") , popup(popupMenu) , actionCollection(collection) , maxId(10) @@ -110,13 +110,13 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId TQString name=n; TQString keyString=key; - if(keyString.contains("%1")) + if(keyString.tqcontains("%1")) { - keyString=key.arg(accel2id.count()+1); + keyString=key.tqarg(accel2id.count()+1); } KShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h index a359be78..e32a7b09 100644 --- a/kbabel/kbabeldict/dictionarymenu.h +++ b/kbabel/kbabeldict/dictionarymenu.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. @@ -43,19 +43,20 @@ class TQSignalMapper; class KPopupMenu; class KActionCollection; -class KDE_EXPORT DictionaryMenu : public QObject +class KDE_EXPORT DictionaryMenu : public TQObject { Q_OBJECT + TQ_OBJECT public: - DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0); + DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *tqparent=0); ~DictionaryMenu(); void add(const TQString& name,const TQString& id); /** * Adds an item to this menu and to the keyboard accelerator. - * If key contains %1 it is replaced with a number 1-9 + * If key tqcontains %1 it is replaced with a number 1-9 */ void add(const TQString& name,const TQString& id, const TQString& key); diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index cae04d07..3ad967b2 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.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. diff --git a/kbabel/kbabeldict/kbabeldict.h b/kbabel/kbabeldict/kbabeldict.h index 3bfca817..8c2aef9f 100644 --- a/kbabel/kbabeldict/kbabeldict.h +++ b/kbabel/kbabeldict/kbabeldict.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. @@ -42,6 +42,7 @@ class KBabelDictView; class KBabelDict : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KBabelDict(); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 9580f2d9..4f1a4f7f 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.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. @@ -74,10 +74,10 @@ using namespace KBabel; -class ResultListItem : public QListViewItem +class ResultListItem : public TQListViewItem { public: - ResultListItem(TQListView *parent, const SearchResult& result,bool richText); + ResultListItem(TQListView *tqparent, const SearchResult& result,bool richText); virtual TQString key(int column, bool ascending) const; const SearchResult* result() const; @@ -88,9 +88,9 @@ private: bool _richText; }; -ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result +ResultListItem::ResultListItem(TQListView *tqparent, const SearchResult& result , bool richText) - : TQListViewItem(parent) + : TQListViewItem(tqparent) , _result(result) , _richText(richText) { @@ -109,7 +109,7 @@ ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result tmp=result.found.first(); bool cutted=false; - int index=tmp.find('\n'); + int index=tmp.tqfind('\n'); if(index > 0) { tmp=tmp.left(index); @@ -132,7 +132,7 @@ ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result tmp=result.translation; cutted=false; - index=tmp.find('\n'); + index=tmp.tqfind('\n'); if(index > 0) { tmp=tmp.left(index); @@ -179,11 +179,11 @@ const SearchResult *ResultListItem::result() const } /* - * Constructs a KBabelDictBox which is a child of 'parent', with the + * Constructs a KBabelDictBox which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) - : DCOPObject("KBabelDict"), TQWidget( parent, name, fl ) +KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl ) + : DCOPObject("KBabelDict"), TQWidget( tqparent, name, fl ) { active=-1; currentResult=0; @@ -251,12 +251,12 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) hbox = new TQHBoxLayout; hbox->addStretch(1); - listButton = new TQToolButton(Qt::UpArrow,this); + listButton = new TQToolButton(TQt::UpArrow,this); listButton->setFixedSize(20,15); listButton->setAutoRepeat(false); connect(listButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showListOnly())); hbox->addWidget(listButton); - detailButton = new TQToolButton(Qt::DownArrow,this); + detailButton = new TQToolButton(TQt::DownArrow,this); detailButton->setFixedSize(20,15); detailButton->setAutoRepeat(false); connect(detailButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showDetailsOnly())); @@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) mainLayout->addLayout(hbox); totalResultsLabel->setNum(100000); - totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint()); + totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint()); totalResultsLabel->setNum(0); currentLabel->setNum(100000); - currentLabel->setFixedSize(currentLabel->sizeHint()); + currentLabel->setFixedSize(currentLabel->tqsizeHint()); currentLabel->setNum(0); setRMBMenu(new TQPopupMenu(this)); @@ -347,7 +347,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) for ( TQStringList::Iterator fit = list.begin(); fit != list.end() ; ++fit ) { - if(!fileList.contains((*fit))) + if(!fileList.tqcontains((*fit))) { fileList.append((*fit)); } @@ -373,7 +373,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) TQStringList appList = rcConfig.readListEntry("Applications"); KInstance *inst = KGlobal::instance(); - if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName())) + if(inst && !appList.isEmpty() && !appList.tqcontains(inst->instanceName())) { continue; } @@ -759,7 +759,7 @@ TQString KBabelDictBox::translate(const TQString text) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -779,7 +779,7 @@ TQString KBabelDictBox::fuzzyTranslation(const TQString text, int &score) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -799,7 +799,7 @@ TQString KBabelDictBox::searchTranslation(const TQString text, int &score) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -929,7 +929,7 @@ TQPtrList<ModuleInfo> KBabelDictBox::moduleInfos() } -TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *parent) +TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *tqparent) { TQPtrList<PrefWidget> list; list.setAutoDelete(false); @@ -937,7 +937,7 @@ TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *parent) for(e = moduleList.first(); e != 0; e = moduleList.next()) { - list.append(e->preferencesWidget(parent)); + list.append(e->preferencesWidget(tqparent)); } return list; @@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item) if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").arg(info->location)); + ,i18n("Edit File %1").tqarg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo() if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").arg(info->location)); + ,i18n("Edit File %1").tqarg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1255,7 +1255,7 @@ void KBabelDictBox::about() if(aboutData->bugAddress() != "submit@bugs.kde.org") { text += "\n" + i18n("Send bugs to %1") - .arg(aboutData->bugAddress()) +"\n"; + .tqarg(aboutData->bugAddress()) +"\n"; } TQLabel *label = new TQLabel(text,0); @@ -1410,7 +1410,7 @@ void KBabelDictBox::copy() } else { - QClipboard *cb = KApplication::clipboard(); + TQClipboard *cb = KApplication::tqclipboard(); cb->setText(translation()); } } @@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal) { if(e->id() == id) { - TQString caption = i18n("Configure Dictionary %1").arg(e->name()); + TQString caption = i18n("Configure Dictionary %1").tqarg(e->name()); KDialogBase *dialog = new KDialogBase(this,"prefDialog" , modal, caption , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| @@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile() { KMessageBox::sorry(this ,i18n("There was an error starting KBabel:\n%1") - .arg(error)); + .tqarg(error)); return; } } diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h index e7bc86cd..0b850798 100644 --- a/kbabel/kbabeldict/kbabeldictbox.h +++ b/kbabel/kbabeldict/kbabeldictbox.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. @@ -63,9 +63,10 @@ struct ModuleInfo class KDE_EXPORT KBabelDictBox : public TQWidget, virtual public KBabelDictIFace { Q_OBJECT + TQ_OBJECT public: - KBabelDictBox( TQWidget* parent = 0, const char* name = 0 + KBabelDictBox( TQWidget* tqparent = 0, const char* name = 0 , WFlags fl = 0 ); ~KBabelDictBox(); @@ -82,7 +83,7 @@ public: TQPtrList<ModuleInfo> moduleInfos(); /** @returns preferencesWidgets of modules */ - TQPtrList<PrefWidget> modPrefWidgets(TQWidget* parent); + TQPtrList<PrefWidget> modPrefWidgets(TQWidget* tqparent); int activeModule(); bool activeModuleEditable(); diff --git a/kbabel/kbabeldict/kbabeldictiface.h b/kbabel/kbabeldict/kbabeldictiface.h index d576d4c5..c1250ad8 100644 --- a/kbabel/kbabeldict/kbabeldictiface.h +++ b/kbabel/kbabeldict/kbabeldictiface.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/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index b5be8399..5346e758 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.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. @@ -61,11 +61,11 @@ #include <kiconloader.h> /* - * Constructs a KBabelDictView which is a child of 'parent', with the + * Constructs a KBabelDictView which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) - : TQWidget( parent, name, fl ) +KBabelDictView::KBabelDictView( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { TQVBoxLayout *mainLayout = new TQVBoxLayout(this); mainLayout->setSpacing(KDialog::spacingHint()); @@ -184,7 +184,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) */ KBabelDictView::~KBabelDictView() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us KConfig *config = KGlobal::config(); dictBox->saveSettings(config); } diff --git a/kbabel/kbabeldict/kbabeldictview.h b/kbabel/kbabeldict/kbabeldictview.h index b45e8650..fbde9928 100644 --- a/kbabel/kbabeldict/kbabeldictview.h +++ b/kbabel/kbabeldict/kbabeldictview.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. @@ -51,9 +51,10 @@ class KBabelDictBox; class KBabelDictView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KBabelDictView( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KBabelDictView( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~KBabelDictView(); bool prefVisible(); diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp index 7b62f31e..eec450c6 100644 --- a/kbabel/kbabeldict/kbabelsplash.cpp +++ b/kbabel/kbabeldict/kbabelsplash.cpp @@ -15,11 +15,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,8 +40,8 @@ KBabelSplash* KBabelSplash::instance = 0; -KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) - : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) +KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) { setMargin( 0 ); setSpacing( 0 ); @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set geometry, with support for Xinerama systems + // Set tqgeometry, with support for Xinerama systems TQRect r; - r.setSize(sizeHint()); + r.setSize(tqsizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabeldict/kbabelsplash.h b/kbabel/kbabeldict/kbabelsplash.h index 208ea05c..22ed99d7 100644 --- a/kbabel/kbabeldict/kbabelsplash.h +++ b/kbabel/kbabeldict/kbabelsplash.h @@ -15,11 +15,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. @@ -38,12 +38,13 @@ class TQPaintEvent; class TQString; -class KBabelSplash : public QVBox +class KBabelSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBabelSplash( TQWidget* parent = 0, const char* name = 0 ); + KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~KBabelSplash() { instance = 0; } static KBabelSplash* instance; diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index c327196b..a436eae3 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.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. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 5c5c6a6d..3e658255 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -18,11 +18,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. * @@ -72,8 +72,8 @@ using namespace KBabel; -KDBSearchEngine::KDBSearchEngine (TQObject * parent, const char *name): -SearchEngine (parent, name) +KDBSearchEngine::KDBSearchEngine (TQObject * tqparent, const char *name): +SearchEngine (tqparent, name) { edited = "unknown"; dm = 0; //Database Manager @@ -124,7 +124,7 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) i18n ("Database folder does not exist:\n%1\n" "Do you want to create it now?"). - arg (database), TQString::null, i18n("Create Folder"), i18n("Do Not Create")) == + arg (database), TQString(), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { asked = true; @@ -255,7 +255,7 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) if (asked || KMessageBox::questionYesNo (0, i18n - ("Database files not found.\nDo you want to create them now?"), TQString::null, i18n("Create"), i18n("Do Not Create")) + ("Database files not found.\nDo you want to create them now?"), TQString(), i18n("Create"), i18n("Do Not Create")) == KMessageBox::Yes) { //fprintf(stderr,"SI\n"); @@ -559,7 +559,7 @@ KDBSearchEngine::repeat () bool ok = false; min = - QInputDialog::getInteger (i18n ("Minimum Repetition"), + TQInputDialog::getInteger (i18n ("Minimum Repetition"), i18n ("Insert the minimum number of repetitions for a string:"), 2, 1, 999999, 1, &ok); @@ -607,7 +607,7 @@ KDBSearchEngine::repeat () if (tot >= min && !inlibs) { id = item.key; - id = id.replace ("\n", "\"\n\""); + id = id.tqreplace ("\n", "\"\n\""); mle->append (txt.arg (tot).arg (ntra).arg (id)); } @@ -667,7 +667,7 @@ KDBSearchEngine::startSearchNow (int searchmode) bool allkey = (searchmode == MD_ALL_GOOD_KEYS); - bool equal, contains, contained, regexp, intra; + bool equal, tqcontains, contained, regexp, intra; intra = searchmode & MD_IN_TRANSLATION; @@ -700,12 +700,12 @@ KDBSearchEngine::startSearchNow (int searchmode) int pos; for (i = 0; i < len; i++) { - while ((pos = idMod->find (remchar.at (i))) != -1) + while ((pos = idMod->tqfind (remchar.at (i))) != -1) idMod->remove (pos, 1); } if (comm) - idMod->replace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) + idMod->tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) if (norm) @@ -773,7 +773,7 @@ KDBSearchEngine::startSearchNow (int searchmode) // Emit progress, process event and check stop now if (count % step == 0) { - emit progress (100 * count / /*QMAX( */ + emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); kapp->processEvents (100); @@ -802,12 +802,12 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) - while ((pos = msgId.find (remchar.at (i))) != -1) + while ((pos = msgId.tqfind (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) - msgId.replace (TQRegExp ("\\_\\:.*\\\\n"), ""); + msgId.tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); if (norm) @@ -838,14 +838,14 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) while ((pos = - msgId.find (remchar.at (i))) != + msgId.tqfind (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) msgId. - replace (TQRegExp ("\\_\\:.*\\\\n"), + tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); @@ -867,12 +867,12 @@ KDBSearchEngine::startSearchNow (int searchmode) equal = false; if (rules & Contains) - contains = idMod->contains (msgId); + tqcontains = idMod->tqcontains (msgId); else - contains = false; + tqcontains = false; if (rules & Contained) - contained = msgId.contains (*idMod); + contained = msgId.tqcontains (*idMod); else contained = false; @@ -887,7 +887,7 @@ KDBSearchEngine::startSearchNow (int searchmode) } while (intra && nn < item.numTra); - if (equal || contains || contained || regexp || allkey) + if (equal || tqcontains || contained || regexp || allkey) { if (equal) @@ -1034,7 +1034,7 @@ KDBSearchEngine::startSingleSearch (TQString searchString, in = reg.search (searchString, in + len); len = reg.matchedLength (); TQString regToAdd = searchString; - regToAdd.replace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); + regToAdd.tqreplace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); regToAdd.append ("$"); regToAdd.prepend ("^"); // fprintf(stderr,"%s",(const char *)regToAdd.local8Bit()); @@ -1203,10 +1203,10 @@ KDBSearchEngine::readSettings (KConfigBase * config) } PrefWidget * -KDBSearchEngine::preferencesWidget (TQWidget * parent) +KDBSearchEngine::preferencesWidget (TQWidget * tqparent) { - pw = new PreferencesWidget (parent); + pw = new PreferencesWidget (tqparent); setSettings (); connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ())); connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ())); @@ -1406,19 +1406,19 @@ KDBSearchEngine::about () const } -QString +TQString KDBSearchEngine::name () const { return i18n ("Translation Database"); } -QString +TQString KDBSearchEngine::id () const { return TQString ("KDBSearchEngine"); } -QString +TQString KDBSearchEngine::lastError () { return lasterror; @@ -1552,11 +1552,11 @@ KDBSearchEngine::setLastError (const TQString & er) lasterror = er; } -QString +TQString KDBSearchEngine::translate (const TQString & text, const uint pluralForm) { if (!openDb ()) - return TQString::null; + return TQString(); /* if(!dbOpened) @@ -1566,7 +1566,7 @@ if(!dbOpened) { //emit anerror hasError(i18n("Database not opened")); - return TQString::null; + return TQString(); } } */ @@ -1574,7 +1574,7 @@ if(!dbOpened) DataBaseItem dbit = dm->getItem (text); if (dbit.isNull ()) - return TQString::null; + return TQString(); if (dbit.numTra == 1) return dbit.translations[0].translation; @@ -1744,9 +1744,9 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, int in = 0, len = 0; - QString + TQString keyst = dm->getKey (min); - QRegExp + TQRegExp reg ("[a-zA-Z0-9_%" /*+remchar */ + regaddchar + "]+"); while ((in = reg.search (keyst, in + len)) != -1) { @@ -1798,7 +1798,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, for (int j = 0; j < nres; j++) { - QString + TQString strkey = dm->getKey (resloc[j]); int stdscore = KDBSearchEngine::score (phrase, strkey); @@ -1811,7 +1811,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, in = 0, len = 0, nword = 0; int remove = retnot ? common : 0; - QRegExp + TQRegExp reg ("[a-zA-Z0-9_%" /*+remchar */ + regaddchar + "]+"); while ((in = reg.search (strkey, in + len)) != -1) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h index d948bbd4..d884f233 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h @@ -15,11 +15,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. * @@ -67,7 +67,7 @@ class SearchEntry int rules; }; -class KeyAndScore : public QString +class KeyAndScore : public TQString { public: KeyAndScore(); @@ -94,11 +94,12 @@ class CatalogDescription class KDBSearchEngine : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - KDBSearchEngine(TQObject *parent=0,const char *name=0); + KDBSearchEngine(TQObject *tqparent=0,const char *name=0); ~KDBSearchEngine(); enum Rules {Equal = 1, Contains = 2, Contained = 4, RegExp = 8}; enum FormatRules { Dots = 1, Ampersand = 2, FirstWordUpper = 4, //Not yet used @@ -163,7 +164,7 @@ public: /* Sets the rules to decide when 2 string match (Uppercase and remove char are not set here) - 1 = EQUAL + 1 = ETQUAL 2 = SEARCH STRING IS CONTAINED IN DATABASE STRING (use with care, if you search nothing it will produce a dangerouse output) 4 = DATABASE STRING IS CONTAINED IN SEARCH STRING (it exclude msgid "") @@ -193,7 +194,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 0847d594..cb5ebae1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.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. * @@ -294,8 +294,8 @@ DataBaseItem::toRawData (char *_data) DataBaseManager::DataBaseManager (TQString directory, TQString lang, - TQObject * parent, const char *name): -TQObject (parent, name) + TQObject * tqparent, const char *name): +TQObject (tqparent, name) { TQString filename; @@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory, rename (filename.local8Bit (), filename.local8Bit () + ",old"); -//kdDebug(0) << TQString("Creating %1").arg(filename) << endl; +//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl; iAmOk = true; @@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n) return InfoItem (); } -// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; InfoItem it ((char *) data.data, language); //free(data.data); // Read docu for this!!!! @@ -1000,7 +1000,7 @@ DataBaseManager::loadInfo () TQValueList < TQString > DataBaseManager::wordsIn (TQString string) { - QString + TQString a; TQValueList < TQString > words; int @@ -1015,7 +1015,7 @@ TQValueList < TQString > DataBaseManager::wordsIn (TQString string) int c = 0; //words.setAutoDelete(true); //Not sure... check if it is en. - QString + TQString m; for (i = 0; i < l; i++) if (a[i].isLetterOrNumber ()) @@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key) else ret = *(uint32 *) key.data; -//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl; +//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl; free (data.data); @@ -1333,7 +1333,7 @@ DataBaseManager::appendKey (TQString _key) } -QString +TQString DataBaseManager::getKey (uint32 n) { @@ -1349,11 +1349,11 @@ DataBaseManager::getKey (uint32 n) //Check for errors int ret = indexDb->get (indexDb, 0, &key, &data, 0); //DB_SET_RECNO); if (ret) - return TQString::null; + return TQString(); return TQString::fromUtf8 ((char *) data.data); -// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; } @@ -1446,7 +1446,7 @@ DataBaseManager::putNewTranslation (TQString key, TQString tran, int catalog, isThisOne = (*ittr).translation == msgstr; // is there the catnum we are looking for? - if ((*ittr).infoRef.find (catnum) != (*ittr).infoRef.end ()) + if ((*ittr).infoRef.tqfind (catnum) != (*ittr).infoRef.end ()) { found_catalog_info = true; if (ow && !isThisOne) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.h b/kbabel/kbabeldict/modules/dbsearchengine/database.h index 3e68e01d..05a09955 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.h @@ -16,11 +16,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. * @@ -155,10 +155,11 @@ class DataBaseItem uint32 location; }; -class DataBaseManager : public QObject +class DataBaseManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /* @@ -175,7 +176,7 @@ class DataBaseManager : public QObject */ - DataBaseManager(TQString directory,TQString lang,TQObject *parent=0,const char *name=0); + DataBaseManager(TQString directory,TQString lang,TQObject *tqparent=0,const char *name=0); ~DataBaseManager(); /* Create a new databse structure. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 0ee1ba4b..fd3ed7f1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -18,11 +18,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 @@ using namespace KBabel; PoScanner::PoScanner(DataBaseManager *dbm, - TQObject *parent,const char *name):TQObject(parent,name) + TQObject *tqparent,const char *name):TQObject(tqparent,name) { dm=dbm; removeOldCatalogTranslation=false; //Check if this flag do something. @@ -57,7 +57,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl; +kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl; if(pb) {emit patternStarted(); @@ -65,7 +65,7 @@ emit patternProgress(0); } TQDir d(pathName,pattern); d.setMatchAllDirs(true); - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); tot=files->count(); TQPtrListIterator<TQFileInfo> it(*files); kdDebug(0) << tot << endl; @@ -120,7 +120,7 @@ InfoItem cinfo; Catalog * catalog=new Catalog(this,"ScanPoCatalog"); -TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); +TQString location=fileName.right(fileName.length()-fileName.tqfindRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); @@ -128,7 +128,7 @@ emit fileLoading(0); KURL u(fileName); -ConversionStatus rr=catalog->openURL(u); +ConversiontqStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; @@ -149,7 +149,7 @@ tot=catalog->numberOfEntries(); bool fuzzy; bool untra; -//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl; +//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl; for (i=0;i<tot;i++) //Skip header = ???? { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h index 2390c3d1..c6212fbd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h @@ -16,11 +16,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,13 +41,14 @@ #include <catalog.h> #include "database.h" -class PoScanner : public QObject +class PoScanner : public TQObject { Q_OBJECT + TQ_OBJECT public: - PoScanner(DataBaseManager *dbm,TQObject *parent=0,const char *name=0); + PoScanner(DataBaseManager *dbm,TQObject *tqparent=0,const char *name=0); /* Scan a single PO file. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 86975874..599ace4c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -21,8 +21,8 @@ KInstance *DbSeFactory::s_instance = 0; KAboutData *DbSeFactory::s_about = 0; -DbSeFactory::DbSeFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +DbSeFactory::DbSeFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -42,7 +42,7 @@ DbSeFactory::~DbSeFactory() } -TQObject *DbSeFactory::createObject( TQObject *parent, const char *name, +TQObject *DbSeFactory::createObject( TQObject *tqparent, const char *name, const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -51,7 +51,7 @@ TQObject *DbSeFactory::createObject( TQObject *parent, const char *name, return 0; } - KDBSearchEngine *se = new KDBSearchEngine(parent,name); + KDBSearchEngine *se = new KDBSearchEngine(tqparent,name); emit objectCreated(se); return se; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h index 7ae4f20b..b146b021 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h @@ -8,12 +8,13 @@ class KAboutData; class DbSeFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - DbSeFactory( TQObject *parent=0, const char *name=0); + DbSeFactory( TQObject *tqparent=0, const char *name=0); ~DbSeFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index d18ecaef..73e15117 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>DBSearchEnginePref</class> <author>Andrea Rizzi <rizzi@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DBSEPrefWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,14 +23,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget6</cstring> </property> <property name="whatsThis" stdset="0"> <string></string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget4</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -64,7 +64,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>allRB</cstring> </property> @@ -77,7 +77,7 @@ according to the rules defined in tabs <strong> Generic </strong> and <strong>Match</strong></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>slistRB</cstring> </property> @@ -92,7 +92,7 @@ and <strong>Match</strong></string> This is the best way to search because the <em>good keys</em> list probably contains all the keys that match with your query. However, it is smaller than the whole database.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rlistRB</cstring> </property> @@ -105,7 +105,7 @@ This is the best way to search because the <em>good keys</em> list p </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>caseSensitiveCB</cstring> </property> @@ -116,7 +116,7 @@ This is the best way to search because the <em>good keys</em> list p <string><qml>If it is checked the search will be case sensitive. It is ignored if you use <em>Return the list of "good keys"</em> search mode.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>normalizeCB</cstring> </property> @@ -131,7 +131,7 @@ This is the best way to search because the <em>good keys</em> list p It also substitutes groups of more than one space character with only one space character.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeContextCB</cstring> </property> @@ -145,7 +145,7 @@ It also substitutes groups of more than one space character with only one space <string>Remove, if exists, the _:comment</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -159,7 +159,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -201,7 +201,7 @@ It also substitutes groups of more than one space character with only one space </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -218,7 +218,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -262,14 +262,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>containedCB</cstring> </property> @@ -280,18 +280,18 @@ It also substitutes groups of more than one space character with only one space <string>Match if query is contained in database string</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query contains</string> + <string>Query tqcontains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>normalTextRB</cstring> </property> @@ -305,7 +305,7 @@ It also substitutes groups of more than one space character with only one space <string>Consider the search string as normal text.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>equalCB</cstring> </property> @@ -332,14 +332,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>RegExpRB</cstring> </property> @@ -352,7 +352,7 @@ It also substitutes groups of more than one space character with only one space </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -384,14 +384,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>oneWordSubCB</cstring> </property> @@ -415,14 +415,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -430,7 +430,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>twoWordSubSB</cstring> </property> @@ -444,7 +444,7 @@ If you search for <em>My name is Andrea</em> and you have activated <number>10</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>twoWordSubCB</cstring> </property> @@ -458,7 +458,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -466,7 +466,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -480,14 +480,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -498,7 +498,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>regExpLE</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -508,7 +508,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -516,7 +516,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Local characters for regular expressions:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>oneWordSubSB</cstring> </property> @@ -545,7 +545,7 @@ If you search for <em>My name is Andrea</em> and you have activated </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -562,7 +562,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -575,7 +575,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>dirInput</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>autoAddCB_2</cstring> </property> @@ -592,7 +592,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Automatically add an entry to the database if a new translation is notified by someone (may be kbabel)</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -606,7 +606,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -614,7 +614,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Auto added entry author:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>authorLE</cstring> </property> @@ -624,7 +624,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanFilePB</cstring> </property> @@ -632,7 +632,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Single PO File...</string> </property> </widget> - <widget class="QPushButton" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanPB_2</cstring> </property> @@ -640,7 +640,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder...</string> </property> </widget> - <widget class="QPushButton" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanrecPB</cstring> </property> @@ -648,7 +648,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder && Subfolders...</string> </property> </widget> - <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -662,7 +662,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>filenameLB</cstring> </property> @@ -670,7 +670,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scanning file:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>entriesLB</cstring> </property> @@ -680,7 +680,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -694,7 +694,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>processPB</cstring> </property> @@ -711,7 +711,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -719,7 +719,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Total progress:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -727,7 +727,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Processing file:</string> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>totalPB</cstring> </property> @@ -741,7 +741,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>loadingPB</cstring> </property> @@ -755,7 +755,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -765,7 +765,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QPushButton" row="10" column="2"> + <widget class="TQPushButton" row="10" column="2"> <property name="name"> <cstring>exportPB</cstring> </property> @@ -776,7 +776,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Export...</string> </property> </widget> - <widget class="QPushButton" row="10" column="0"> + <widget class="TQPushButton" row="10" column="0"> <property name="name"> <cstring>statPB</cstring> </property> @@ -787,7 +787,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Statistics</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>repeatPB</cstring> </property> @@ -797,7 +797,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -814,7 +814,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -838,7 +838,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -849,7 +849,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>RichText</enum> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>thresholdSL</cstring> </property> @@ -863,7 +863,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>SpinBox5</cstring> </property> @@ -877,7 +877,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -885,7 +885,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Minimum number of query words in the key (%):</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>maxSB</cstring> </property> @@ -896,7 +896,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>30</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>SpinBox6</cstring> </property> @@ -910,7 +910,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -918,7 +918,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Max list length:</string> </property> </widget> - <widget class="QSlider" row="3" column="0"> + <widget class="TQSlider" row="3" column="0"> <property name="name"> <cstring>thresholdOrigSL</cstring> </property> @@ -934,7 +934,7 @@ Finally you can set the maximum number of entries in the list.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3_2</cstring> </property> @@ -951,7 +951,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -959,7 +959,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Discard words more frequent than:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>freqSB</cstring> </property> @@ -976,7 +976,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>100</number> </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>nothingCB</cstring> </property> @@ -1032,5 +1032,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C index a83d947b..74a09037 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C +++ b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C @@ -116,9 +116,9 @@ nmax++; normalizestr(a); // printf("#%s#\n",a); -// while (st.find("#~")==0) +// while (st.tqfind("#~")==0) // st = st.right(st.length()-2); -// while (st.find(" ")==0) +// while (st.tqfind(" ")==0) // st = st.right(st.length()-1); if(isAMsgId) nextIsFuzzy=false; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index 562f0835..c81a8562 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -14,18 +14,18 @@ #include "dbseprefwidget.h" #include "preferenceswidget.h" -PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +PreferencesWidget::PreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this); -// layout->addWidget(label); +// tqlayout->addWidget(label); dbpw = new DBSearchEnginePref(this); dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly); - layout->addWidget(dbpw); - resize(TQSize(200,200).expandedTo(minimumSizeHint())); + tqlayout->addWidget(dbpw); + resize(TQSize(200,200).expandedTo(tqminimumSizeHint())); // connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); @@ -99,12 +99,12 @@ TQString defaultDir; void PreferencesWidget::setName(TQString n) { -dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n)); +dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n)); } void PreferencesWidget::setEntries(int i) { -dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i)); +dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i)); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h index 5cd1fed8..134c60bd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h @@ -7,9 +7,10 @@ class PreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - PreferencesWidget(TQWidget *parent=0, const char* name=0); + PreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~PreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 41f4319d..36f66fc1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -18,11 +18,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 <kdebug.h> #define i18n (const char *) -KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name) - : SearchEngine(parent,name) +KDBSearchEngine2::KDBSearchEngine2(TQObject *tqparent,const char*name) + : SearchEngine(tqparent,name) { pw=0; dbDirectory="."; @@ -250,15 +250,15 @@ void KDBSearchEngine2::stringChanged( TQString orig, TQString translated if(!init()) return; //if(translated.isEmpty()) return; InputInfo ii; - if(description.find("fuzzy",false)==-1) + if(description.tqfind("fuzzy",false)==-1) di->addEntry(orig,translated,&ii); } -PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) +PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *tqparent) { - pw = new KDB2PreferencesWidget(parent); + pw = new KDB2PreferencesWidget(tqparent); kdDebug(0) << "new KDB2 preferences widget" << endl; setSettings(); connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings())); @@ -499,7 +499,7 @@ void KDBSearchEngine2::scanNowPressed() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); if(!init()) return; - if(sources.contains(sourceName)) + if(sources.tqcontains(sourceName)) { TQValueList<KURL> urls=sources[sourceName].urls(); PoScanner ps(di); @@ -538,7 +538,7 @@ void KDBSearchEngine2::editSource() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); - if(sources.contains(sourceName)) + if(sources.tqcontains(sourceName)) { bool nameIsNew; TQString newName; @@ -554,7 +554,7 @@ void KDBSearchEngine2::editSource() { return; } - nameIsNew=sources.contains(newName); + nameIsNew=sources.tqcontains(newName); if(newName!=sourceName && !nameIsNew) { @@ -602,13 +602,13 @@ void KDBSearchEngine2::addSource() if(sd.exec()==TQDialog::Accepted) { newName= sd.sourceName->text(); - nameIsNew=!sources.contains(newName); + nameIsNew=!sources.tqcontains(newName); } else { return; } - // nameIsNew=sources.contains(newName); + // nameIsNew=sources.tqcontains(newName); if(!nameIsNew) { KMessageBox::error(0,i18n("The name you chose is already used.\nPlease change the source name."), diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h index fb9cff70..89a32571 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h @@ -22,10 +22,11 @@ Andrea Rizzi class KDBSearchEngine2 : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - KDBSearchEngine2(TQObject *parent=0, const char *name=0); + KDBSearchEngine2(TQObject *tqparent=0, const char *name=0); virtual ~KDBSearchEngine2(); //init if needed. @@ -77,9 +78,9 @@ class KDBSearchEngine2 : public SearchEngine * search engine. The returned widget should not be bigger than * 400x400. If you need more space, you maybe want to use * a tabbed widget. - * @param parent the parent of the returned widget + * @param tqparent the tqparent of the returned widget */ - virtual PrefWidget* preferencesWidget(TQWidget *parent); + virtual PrefWidget* preferencesWidget(TQWidget *tqparent); /** @returns information about this SearchEngine */ virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index 466b68e5..ab3d14b1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -145,7 +145,7 @@ DataBaseInterface::ResultList ChunkByChunkSearchAlgorithm::exec( const TQString for(ResultList::iterator it1=r.begin();it1!=r.end() &&!di->stopNow(); ++it1) { TQString chunkTranslation= (*it1).result(); - if(!translationUsed.contains(chunkTranslation)) + if(!translationUsed.tqcontains(chunkTranslation)) { translationUsed[chunkTranslation]=true; kdDebug(0) << "a translation is: " << chunkTranslation << endl; @@ -330,7 +330,7 @@ DataBaseInterface::ResultList FuzzyChunkSearchAlgorithm::exec( const TQString & TQString re=di->format(di->simple(*it,true),query); QueryResult r(re,ori,score); for(TQPtrListIterator<AbstractChunk> it(querychunks); it.current() && di->stopNow() ; ++it){ - ori=ori.replace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); + ori=ori.tqreplace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); } r.setRichOriginal(ori); if(!di->stopNow()) diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h index aa049f85..e2c5db67 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h @@ -16,9 +16,10 @@ #include "chunk.h" #include <tqobject.h> -class AbstractSearchAlgorithm : public QObject +class AbstractSearchAlgorithm : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<QueryResult> ResultList; @@ -47,6 +48,7 @@ class AbstractSearchAlgorithm : public QObject class ExactSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: ExactSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} @@ -56,6 +58,7 @@ class ExactSearchAlgorithm : public AbstractSearchAlgorithm class AlphaSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: AlphaSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} @@ -65,6 +68,7 @@ class AlphaSearchAlgorithm : public AbstractSearchAlgorithm class SentenceArchiveSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: SentenceArchiveSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) ; @@ -74,6 +78,7 @@ class SentenceArchiveSearchAlgorithm : public AbstractSearchAlgorithm class ChunkByChunkSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: ChunkByChunkSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); @@ -90,6 +95,7 @@ class ChunkByChunkSearchAlgorithm : public AbstractSearchAlgorithm class FuzzyChunkSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: FuzzyChunkSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); @@ -105,6 +111,7 @@ class FuzzyChunkSearchAlgorithm : public AbstractSearchAlgorithm class GenericSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: GenericSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) ; @@ -123,6 +130,7 @@ class GenericSearchAlgorithm : public AbstractSearchAlgorithm class CorrelationSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: CorrelationSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} virtual ResultList exec(const TQString& query); @@ -133,6 +141,7 @@ class CorrelationSearchAlgorithm : public AbstractSearchAlgorithm class SingleWordSearchAlgorithm : public GenericSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: SingleWordSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); virtual DataBaseInterface::ResultList exec(const TQString& query); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index 0631f7ad..e5250274 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -174,7 +174,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search // kdDebug(0) << "MAINDB->GET returned: " << r << endl; if(counter%5==0) kapp->processEvents(100); // kdDebug(0) << "events processed" << endl; - return qMakePair(k,d); + return tqMakePair(k,d); } @@ -282,7 +282,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.contains(*it)) + if(correlationDiff.tqcontains(*it)) correlationDiff[*it]--; else correlationDiff[*it]=-1; @@ -299,7 +299,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.contains(*it)) + if(correlationDiff.tqcontains(*it)) correlationDiff[*it]++; else correlationDiff[*it]=1; @@ -408,7 +408,7 @@ TQMap<TQString,float> DataBaseInterface::correlation(TQString word,SearchFilter MainEntry e=get(k->getString(),filter); TQStringList trad=e.second.getTranslations(); - nocck=words(k->getString()).contains(sword); + nocck=words(k->getString()).tqcontains(sword); for( TQStringList::iterator it2=trad.begin();it2!=trad.end();++it2) { @@ -465,7 +465,7 @@ TQStringList DataBaseInterface::words(TQString s) int pos; do { - pos=str.find(TQRegExp("\\s")); + pos=str.tqfind(TQRegExp("\\s")); // if(!simple(str.left(pos)).isEmpty()) // list.append(simple(str.left(pos))); if(!str.left(pos).isEmpty()) @@ -484,13 +484,13 @@ TQString DataBaseInterface::simple(TQString str,bool ck) else res=str.lower(); //lowercase //FIXME: uncoment the foll. line (check speed) - res=res.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags + res=res.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags //Try to get rid of regexps. - // res=res.replace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char - // res=res.replace(TQRegExp("(('|-|_)+)")," "); //strip non-word char - // res=res.replace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char + // res=res.tqreplace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char + // res=res.tqreplace(TQRegExp("(('|-|_)+)")," "); //strip non-word char + // res=res.tqreplace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char TQString r; TQChar c; @@ -607,16 +607,16 @@ TQString DataBaseInterface::format(TQString _s,TQString t) //FIXME use regexp TQString s=_s; - TQString noTagT=t.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); - TQChar first=noTagT[noTagT.find(TQRegExp("\\w"))]; + TQString noTagT=t.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); + TQChar first=noTagT[noTagT.tqfind(TQRegExp("\\w"))]; bool firstCapital=isUpper(first); /* -bool dotsAtEnd=(t.find("...")+3==t.length()); -bool gtgtAtEnd=(t.find(">>")+2==t.length()); -bool ltltAtEnd=(t.find("<<")==t.length()-2); +bool dotsAtEnd=(t.tqfind("...")+3==t.length()); +bool gtgtAtEnd=(t.tqfind(">>")+2==t.length()); +bool ltltAtEnd=(t.tqfind("<<")==t.length()-2); -bool columnAtEnd=(t.find(":")+1==t.length()); +bool columnAtEnd=(t.tqfind(":")+1==t.length()); */ bool allupper=(t.upper()==t); @@ -643,13 +643,13 @@ if(columnAtEnd) if(allupper) s=s.upper(); - int pos=t.find(TQRegExp("&")); + int pos=t.tqfind(TQRegExp("&")); if(pos>=0) { - TQChar accel=t[t.find(TQRegExp("&"))+1]; + TQChar accel=t[t.tqfind(TQRegExp("&"))+1]; if(accel!='&') { - pos=s.find(accel,false); + pos=s.tqfind(accel,false); if(pos<0) pos=0; s.insert(pos,"&"); @@ -685,8 +685,8 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T //kdDebug(0) << "phRegExp: " << phRegExp << endl; //kdDebug(0) << "cap[" << i << "]: "<< *capit<< endl; - stringReplace = stringReplace.replace(TQRegExp(phRegExp),*capit); - stringSearch = stringSearch.replace(TQRegExp(phRegExp),*capit); + stringReplace = stringReplace.tqreplace(TQRegExp(phRegExp),*capit); + stringSearch = stringSearch.tqreplace(TQRegExp(phRegExp),*capit); i++; } @@ -694,7 +694,7 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T // kdDebug(0) << "stringReplace " << stringReplace << endl; TQRegExp stringSearchRegExp = TQRegExp(stringSearch); // kdDebug(0) << "before: "<<s<<endl; - s = s.replace(stringSearchRegExp,stringReplace); + s = s.tqreplace(stringSearchRegExp,stringReplace); // kdDebug(0) << "after: "<<s<<endl; } @@ -727,7 +727,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu DBItemMainData d; sentence->get(&k,&d); if(counter%5==0) kapp->processEvents(100); - return qMakePair(k,d); + return tqMakePair(k,d); } @@ -748,5 +748,5 @@ DBItemMultiIndex::IndexList DataBaseInterface::getWordIndex( const TQString & qu -//#include "database.moc.cpp" +//#include "database.tqmoc.cpp" diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.h b/kbabel/kbabeldict/modules/dbsearchengine2/database.h index d6ed3482..113d7704 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.h @@ -153,13 +153,13 @@ class SearchFilter -class DataBaseInterface : public QObject +class DataBaseInterface : public TQObject { public: //move result list typedef to AbstractAlgorthm or somewhere else typedef TQValueList<QueryResult> ResultList; - typedef QPair<DBItemMainKey,DBItemMainData> MainEntry; + typedef TQPair<DBItemMainKey,DBItemMainData> MainEntry; DataBaseInterface( TQString dir, DBSESettings *sets); ~DataBaseInterface(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp index efa7e44d..0958b801 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp @@ -71,13 +71,13 @@ void DBItemMainData::read(TQDataStream *s) void DBItemMainData::write(TQDataStream *s) { - *s << (Q_UINT32)indexnumber << translations; + *s << (TQ_UINT32)indexnumber << translations; } void DBItemMainData::addTranslation(TQString str, unsigned int ref) { //get(); - if(translations[str].find(ref)==translations[str].end()) // If it do not exists + if(translations[str].tqfind(ref)==translations[str].end()) // If it do not exists translations[str].append(ref); //add a new reference. else { @@ -106,7 +106,7 @@ TQMapIterator<TQString,TQValueList<unsigned int> > it2; { //Dirty hack it2=it; it++; - if(it2.data().find(ref)!=it2.data().end()) + if(it2.data().tqfind(ref)!=it2.data().end()) removeTranslation(it2.key(),ref); } @@ -142,7 +142,7 @@ list.clear(); void DBItemMultiIndex::addEntry(unsigned int index) { // get(); - if(list.find(index)==list.end()) + if(list.tqfind(index)==list.end()) { list.append(index); qHeapSort(list); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 7c2d8564..b7e64c2b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -39,7 +39,7 @@ void MessagesSource::writeConfig(KConfigBase *config) config->writeEntry("LocationType",type); config->writeEntry("ProjectName",projectName); config->writeEntry("ProjectKeywords",projectKeywords); - config->writeEntry("Status",status); + config->writeEntry("tqStatus",status); } void MessagesSource::readConfig(KConfigBase *config) @@ -48,7 +48,7 @@ void MessagesSource::readConfig(KConfigBase *config) type=config->readNumEntry("LocationType",0); projectName=config->readEntry("ProjectName"); projectKeywords=config->readEntry("ProjectKeywords"); - status=config->readEntry("Status"); + status=config->readEntry("tqStatus"); } @@ -87,7 +87,7 @@ TQValueList<KURL> MessagesSource::filesInDir(KURL url,bool recursive) TQDir d(url.path()); d.setMatchAllDirs(true); kdDebug(0) << d.count() << " files in dir "<< url.path()<<endl; - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); kdDebug(0) << files << endl; // TQPtrListIterator<TQFileInfo> it(*files); @@ -120,7 +120,7 @@ TQValueList<KURL> MessagesSource::filesInDir(KURL url,bool recursive) //FIXME: clean this class PoScanner::PoScanner(DataBaseInterface *dbi, - TQObject *parent,const char *name):TQObject(parent,name) + TQObject *tqparent,const char *name):TQObject(tqparent,name) { di=dbi; removeOldCatalogTranslation=true; @@ -138,7 +138,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl; +kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl; if(pb) { @@ -147,7 +147,7 @@ emit patternProgress(0); } TQDir d(pathName,pattern); d.setMatchAllDirs(true); - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); tot=files->count(); TQPtrListIterator<TQFileInfo> it(*files); kdDebug(0) << tot << endl; @@ -203,7 +203,7 @@ emit fileStarted(); Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); -TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); +TQString location=pretty.right(pretty.length()-pretty.tqfindRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); @@ -212,7 +212,7 @@ emit fileLoading(0); bool error; -ConversionStatus rr=catalog->openURL(u); +ConversiontqStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h index e4cdf7da..3036f70c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h @@ -69,13 +69,13 @@ class MessagesSource }; -class PoScanner : public QObject +class PoScanner : public TQObject { - Q_OBJECT; + TQ_OBJECT; public: - PoScanner(DataBaseInterface *dbi,TQObject *parent=0,const char *name=0); + PoScanner(DataBaseInterface *dbi,TQObject *tqparent=0,const char *name=0); /* Scan a single PO file. diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index 327a9d9d..348900e5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DBSearchEnginePrefWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -55,7 +55,7 @@ <cstring>dbDirectory</cstring> </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>autoUpdate</cstring> </property> @@ -65,7 +65,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -84,7 +84,7 @@ <string>Author:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>checkBox2</cstring> </property> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -118,7 +118,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -129,7 +129,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -168,7 +168,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -179,7 +179,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -197,7 +197,7 @@ <cstring>scoreGlossary</cstring> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel3_2_2</cstring> </property> @@ -205,7 +205,7 @@ <string>Score:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>useSentence</cstring> </property> @@ -213,7 +213,7 @@ <string>Fuzzy sentence archive</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>useGlossary</cstring> </property> @@ -221,7 +221,7 @@ <string>Glossary</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>useExact</cstring> </property> @@ -244,7 +244,7 @@ <cstring>scoreSentence</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>useDivide</cstring> </property> @@ -252,7 +252,7 @@ <string>Sentence by sentence</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>useAlpha</cstring> </property> @@ -260,7 +260,7 @@ <string>Alphanumeric</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>textLabel3_2_3</cstring> </property> @@ -268,7 +268,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel3_2_4</cstring> </property> @@ -276,7 +276,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -289,7 +289,7 @@ <cstring>scoreAlpha</cstring> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>textLabel3_2_6</cstring> </property> @@ -297,7 +297,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel3_2_5</cstring> </property> @@ -305,7 +305,7 @@ <string>Score:</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>useWordByWord</cstring> </property> @@ -313,7 +313,7 @@ <string>Word by word</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>useDynamic</cstring> </property> @@ -328,7 +328,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -348,7 +348,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -359,7 +359,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -380,14 +380,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <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>firstCapital</cstring> </property> @@ -395,7 +395,7 @@ <string>First capital letter match</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>allCapital</cstring> </property> @@ -403,7 +403,7 @@ <string>All capital letter match</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>accelerator</cstring> </property> @@ -411,7 +411,7 @@ <string>Accelerator symbol (&&)</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>sameLetter</cstring> </property> @@ -421,7 +421,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -432,7 +432,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -445,7 +445,7 @@ <cstring>kLineEdit1_2</cstring> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="3" colspan="2"> + <widget class="TQListView" row="3" column="0" rowspan="3" colspan="2"> <column> <property name="text"> <string>Enabled</string> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -511,7 +511,7 @@ <string>Delete</string> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>addRule</cstring> </property> @@ -519,7 +519,7 @@ <string>Add</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -537,7 +537,7 @@ <cstring>kLineEdit2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -549,7 +549,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -560,18 +560,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> <property name="title"> <string>Options</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkLang</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>30</y> @@ -583,11 +583,11 @@ <string>Check language</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useFilters</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>60</y> @@ -599,11 +599,11 @@ <string>Use current filters</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dateToday</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>90</y> @@ -616,7 +616,7 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -627,7 +627,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>editSource</cstring> </property> @@ -669,7 +669,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -684,7 +684,7 @@ <string>Scan All</string> </property> </widget> - <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>sourceList</cstring> </property> @@ -693,7 +693,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -706,7 +706,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index 55f6a16f..0c65710c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -22,8 +22,8 @@ KInstance *DbSe2Factory::s_instance = 0; KAboutData *DbSe2Factory::s_about = 0; -DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +DbSe2Factory::DbSe2Factory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -43,7 +43,7 @@ DbSe2Factory::~DbSe2Factory() } -TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name, +TQObject *DbSe2Factory::createObject( TQObject *tqparent, const char *name, const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -52,7 +52,7 @@ TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name, return 0; } - KDBSearchEngine2 *se = new KDBSearchEngine2(parent,name); + KDBSearchEngine2 *se = new KDBSearchEngine2(tqparent,name); emit objectCreated(se); return se; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h index 2b70184a..2f1b98ca 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h @@ -8,12 +8,13 @@ class KAboutData; class DbSe2Factory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - DbSe2Factory( TQObject *parent=0, const char *name=0); + DbSe2Factory( TQObject *tqparent=0, const char *name=0); ~DbSe2Factory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index c233265f..a9820329 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>DBSearchEnginePref</class> <author>Andrea Rizzi <rizzi@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DBSEPrefWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,14 +26,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget6</cstring> </property> <property name="whatsThis" stdset="0"> <string></string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget4</cstring> </property> @@ -50,7 +50,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -67,7 +67,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>allRB</cstring> </property> @@ -80,7 +80,7 @@ according to the rules defined in tabs <strong> Generic </strong> and <strong>Match</strong></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>slistRB</cstring> </property> @@ -95,7 +95,7 @@ and <strong>Match</strong></string> This is the best way to search because the <em>good keys</em> list probably contains all the keys that match with your query. However, it is smaller than the whole database.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rlistRB</cstring> </property> @@ -108,7 +108,7 @@ This is the best way to search because the <em>good keys</em> list p </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>caseSensitiveCB</cstring> </property> @@ -119,7 +119,7 @@ This is the best way to search because the <em>good keys</em> list p <string><qml>If it is checked the search will be case sensitive. It is ignored if you use <em>Return the list of "good keys"</em> search mode.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>normalizeCB</cstring> </property> @@ -134,7 +134,7 @@ This is the best way to search because the <em>good keys</em> list p It also substitutes groups of more than one space character with only one space character.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeContextCB</cstring> </property> @@ -148,7 +148,7 @@ It also substitutes groups of more than one space character with only one space <string>Remove, if exists, the _:comment</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -162,7 +162,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -204,7 +204,7 @@ It also substitutes groups of more than one space character with only one space </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -221,7 +221,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -265,14 +265,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>containedCB</cstring> </property> @@ -283,18 +283,18 @@ It also substitutes groups of more than one space character with only one space <string>Match if query is contained in database string</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query contains</string> + <string>Query tqcontains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>normalTextRB</cstring> </property> @@ -308,7 +308,7 @@ It also substitutes groups of more than one space character with only one space <string>Consider the search string as normal text.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>equalCB</cstring> </property> @@ -335,14 +335,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>RegExpRB</cstring> </property> @@ -355,7 +355,7 @@ It also substitutes groups of more than one space character with only one space </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -387,14 +387,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>oneWordSubCB</cstring> </property> @@ -418,14 +418,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -433,7 +433,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>twoWordSubSB</cstring> </property> @@ -447,7 +447,7 @@ If you search for <em>My name is Andrea</em> and you have activated <number>10</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>twoWordSubCB</cstring> </property> @@ -461,7 +461,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -469,7 +469,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -483,14 +483,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -501,7 +501,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>regExpLE</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -511,7 +511,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -519,7 +519,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Local characters for regular expressions:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>oneWordSubSB</cstring> </property> @@ -548,7 +548,7 @@ If you search for <em>My name is Andrea</em> and you have activated </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -565,7 +565,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -578,7 +578,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>dirInput</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>autoAddCB_2</cstring> </property> @@ -595,7 +595,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Automatically add an entry to the database if a new translation is notified by someone (may be kbabel)</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -609,7 +609,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -617,7 +617,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Auto added entry author:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>authorLE</cstring> </property> @@ -627,7 +627,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanFilePB</cstring> </property> @@ -635,7 +635,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Single PO File</string> </property> </widget> - <widget class="QPushButton" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanPB_2</cstring> </property> @@ -643,7 +643,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder</string> </property> </widget> - <widget class="QPushButton" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanrecPB</cstring> </property> @@ -651,7 +651,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder && Subfolders</string> </property> </widget> - <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -665,7 +665,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>filenameLB</cstring> </property> @@ -673,7 +673,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scanning file:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>entriesLB</cstring> </property> @@ -683,7 +683,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -697,7 +697,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>processPB</cstring> </property> @@ -714,7 +714,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -722,7 +722,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Total progress:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -730,7 +730,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Processing file:</string> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>totalPB</cstring> </property> @@ -744,7 +744,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>loadingPB</cstring> </property> @@ -758,7 +758,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -768,7 +768,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QPushButton" row="10" column="2"> + <widget class="TQPushButton" row="10" column="2"> <property name="name"> <cstring>exportPB</cstring> </property> @@ -779,7 +779,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Export...</string> </property> </widget> - <widget class="QPushButton" row="10" column="0"> + <widget class="TQPushButton" row="10" column="0"> <property name="name"> <cstring>statPB</cstring> </property> @@ -790,7 +790,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Statistics</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>repeatPB</cstring> </property> @@ -800,7 +800,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -817,7 +817,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -841,7 +841,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -852,7 +852,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>RichText</enum> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>thresholdSL</cstring> </property> @@ -866,7 +866,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>SpinBox5</cstring> </property> @@ -880,7 +880,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -888,7 +888,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Minimum number of query words in the key (%):</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>maxSB</cstring> </property> @@ -899,7 +899,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>30</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>SpinBox6</cstring> </property> @@ -913,7 +913,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -921,7 +921,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Max list length:</string> </property> </widget> - <widget class="QSlider" row="3" column="0"> + <widget class="TQSlider" row="3" column="0"> <property name="name"> <cstring>thresholdOrigSL</cstring> </property> @@ -937,7 +937,7 @@ Finally you can set the maximum number of entries in the list.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3_2</cstring> </property> @@ -954,7 +954,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -962,7 +962,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Discard words more frequent than:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>freqSB</cstring> </property> @@ -979,7 +979,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>100</number> </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>nothingCB</cstring> </property> @@ -1035,5 +1035,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index 76aef878..ba16327c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -15,17 +15,17 @@ #include "dbse2.h" #include "preferenceswidget.h" -KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this); -// layout->addWidget(label); +// tqlayout->addWidget(label); dbpw = new DBSearchEnginePrefWidget(this); dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly); dbpw->show(); - layout->addWidget(dbpw); + tqlayout->addWidget(dbpw); setMinimumSize(300,300); standard(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h index 1f706902..68e283bd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h @@ -7,9 +7,10 @@ class KDB2PreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - KDB2PreferencesWidget(TQWidget *parent=0, const char* name=0); + KDB2PreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~KDB2PreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index 3f4030a0..9447f794 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SourceDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SourceDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -52,18 +52,18 @@ <string>&Cancel</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox1</cstring> </property> <property name="title"> <string>Additional Informations</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>76</y> @@ -72,14 +72,14 @@ </rect> </property> <property name="text"> - <string>Status: </string> + <string>tqStatus: </string> </property> </widget> <widget class="KLineEdit"> <property name="name"> <cstring>projectName</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>22</y> @@ -92,7 +92,7 @@ <property name="name"> <cstring>projectKeywords</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>49</y> @@ -105,7 +105,7 @@ <property name="name"> <cstring>status</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>76</y> @@ -117,11 +117,11 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>22</y> @@ -133,11 +133,11 @@ <string>Project name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>49</y> @@ -150,7 +150,7 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -186,7 +186,7 @@ <cstring>type</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -199,7 +199,7 @@ <cstring>sourceLocation</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -215,7 +215,7 @@ <string>Setup Filter...</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -223,7 +223,7 @@ <string>Location:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>useFilter</cstring> </property> @@ -251,7 +251,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index c8d8c1db..730424f1 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.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. @@ -54,8 +54,8 @@ KInstance *PaFactory::s_instance = 0; KAboutData *PaFactory::s_about = 0; -PaFactory::PaFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PaFactory::PaFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PaFactory::~PaFactory() } -TQObject *PaFactory::createObject( TQObject *parent, const char *name +TQObject *PaFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PaFactory::createObject( TQObject *parent, const char *name return 0; } - return new PoAuxiliary(parent,name); + return new PoAuxiliary(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h index 901351c7..7c92e008 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.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. @@ -42,12 +42,13 @@ class KAboutData; class PaFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PaFactory( TQObject *parent=0, const char *name=0); + PaFactory( TQObject *tqparent=0, const char *name=0); ~PaFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index eae86d65..cc726ad8 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.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. @@ -50,8 +50,8 @@ using namespace KBabel; -PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name) - : SearchEngine(parent, name) +PoAuxiliary::PoAuxiliary(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { catalog = new Catalog(this, "PoAuxiliary::catalog"); prefWidget=0; @@ -124,9 +124,9 @@ void PoAuxiliary::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) +PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *tqparent) { - prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget"); + prefWidget = new AuxiliaryPreferencesWidget(tqparent,"pocompendium_prefwidget"); connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) , this, TQT_SLOT(restoreSettings())); @@ -184,7 +184,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi kapp->processEvents(100); - text.replace("\n",""); + text.tqreplace("\n",""); Entry *entry = msgidDict[text]; if(entry) @@ -358,27 +358,27 @@ void PoAuxiliary::loadAuxiliary() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } - if(path.contains("@PACKAGE@")) + if(path.tqcontains("@PACKAGE@")) { - int pos=package.findRev("/"); + int pos=package.tqfindRev("/"); if( pos<0 ) pos=0; - path.replace("@PACKAGE@",package.mid(pos)); + path.tqreplace("@PACKAGE@",package.mid(pos)); } - if(path.contains("@PACKAGEDIR@")) + if(path.tqcontains("@PACKAGEDIR@")) { TQString packagedir; - int pos=package.findRev("/"); + int pos=package.tqfindRev("/"); if( pos > 0 ) packagedir=package.left(pos); else packagedir=""; - path.replace("@PACKAGEDIR@",packagedir); + path.tqreplace("@PACKAGEDIR@",packagedir); kdDebug(KBABEL_SEARCH) << "Packagedir found " << packagedir << endl; } TQRegExp reg("@DIR[0-9]+@"); - if(path.contains(reg)) + if(path.tqcontains(reg)) { int pos=reg.search(path); int len = reg.matchedLength(); @@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary() { TQString dir=directory(editedFile,number); TQString s("@DIR%1@"); - path.replace(s.arg(number),dir); + path.tqreplace(s.tqarg(number),dir); pos+=dir.length(); } @@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary() connect(catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); - ConversionStatus stat = catalog->openURL(u); + ConversiontqStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl; @@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary() { error = true; errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1") - .arg(u.prettyURL()); + .tqarg(u.prettyURL()); emit hasError(errorMsg); } } @@ -461,7 +461,7 @@ void PoAuxiliary::loadAuxiliary() Entry *e = new Entry; // FIXME: should care about plural forms e->orig = catalog->msgid(i).first(); - e->orig.replace("\n",""); + e->orig.tqreplace("\n",""); kdWarning() << "PoAuxialiary does not support plural forms" << endl; e->translation = catalog->msgstr(i).first(); e->comment = catalog->comment(i); @@ -491,7 +491,7 @@ void PoAuxiliary::loadAuxiliary() void PoAuxiliary::setEditedFile(const TQString& file) { - if(initialized && (url.contains("@DIR") || KURL::isRelativeURL(url)) + if(initialized && (url.tqcontains("@DIR") || KURL::isRelativeURL(url)) && file!=editedFile && !loadTimer->isActive() ) { initialized=false; @@ -503,7 +503,7 @@ void PoAuxiliary::setEditedFile(const TQString& file) void PoAuxiliary::setEditedPackage(const TQString& pack) { - if(initialized && url.contains("@PACKAGE@") && pack!=package + if(initialized && url.tqcontains("@PACKAGE@") && pack!=package && !loadTimer->isActive() ) { initialized=false; @@ -515,7 +515,7 @@ void PoAuxiliary::setEditedPackage(const TQString& pack) void PoAuxiliary::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -538,7 +538,7 @@ TQString PoAuxiliary::translate(const TQString& text, uint pluralForm) if(error) { - return TQString::null; + return TQString(); } Entry *entry = msgidDict[text]; @@ -547,7 +547,7 @@ TQString PoAuxiliary::translate(const TQString& text, uint pluralForm) return entry->translation; } - return TQString::null; + return TQString(); } diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h index 7ada1d52..0ad4c635 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.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. @@ -50,9 +50,10 @@ class AuxiliaryPreferencesWidget; class PoAuxiliary : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - PoAuxiliary(TQObject *parent=0, const char *name=0); + PoAuxiliary(TQObject *tqparent=0, const char *name=0); virtual ~PoAuxiliary(); virtual bool isReady() const; @@ -64,7 +65,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 5a534ecf..2c984c46 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.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. @@ -43,14 +43,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new PWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h index 3f0862b2..e967d958 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.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. @@ -42,9 +42,10 @@ class PWidget; class AuxiliaryPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - AuxiliaryPreferencesWidget(TQWidget *parent=0, const char* name=0); + AuxiliaryPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~AuxiliaryPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui index 8179caed..aa9e6710 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui +++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui @@ -7,7 +7,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -92,14 +92,14 @@ The following variables will be replaced in the path if available: <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 9eb816bd..f5c37dd5 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.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. @@ -42,8 +42,8 @@ using namespace KBabel; -CompendiumData::CompendiumData(TQObject *parent) - : TQObject(parent) +CompendiumData::CompendiumData(TQObject *tqparent) + : TQObject(tqparent) , _active(false) , _error(false) , _initialized(false) @@ -53,7 +53,7 @@ CompendiumData::CompendiumData(TQObject *parent) , _wordDict(9887) , _textonlyDict(9887) { - _catalog = new Catalog(this, "CompendiumData::catalog", TQString::null); + _catalog = new Catalog(this, "CompendiumData::catalog", TQString()); _exactDict.setAutoDelete(true); _allDict.setAutoDelete(true); _wordDict.setAutoDelete(true); @@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); - ConversionStatus stat=_catalog->openURL(url); + ConversiontqStatus stat=_catalog->openURL(url); disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); @@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url) _error = true; _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1") - .arg(url.prettyURL()); + .tqarg(url.prettyURL()); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h index d5668b4a..6d229d74 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.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. @@ -46,12 +46,13 @@ namespace KBabel class Catalog; } -class CompendiumData : public QObject +class CompendiumData : public TQObject { Q_OBJECT + TQ_OBJECT public: - CompendiumData(TQObject *parent=0); + CompendiumData(TQObject *tqparent=0); bool load(KURL url); diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 37ae63a4..0d3d2d24 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.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. @@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0; KAboutData *PcFactory::s_about = 0; -PcFactory::PcFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PcFactory::PcFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PcFactory::~PcFactory() } -TQObject *PcFactory::createObject( TQObject *parent, const char *name +TQObject *PcFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name return 0; } - return new PoCompendium(parent,name); + return new PoCompendium(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h index 1b0b8820..b92cfcb0 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.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. @@ -42,12 +42,13 @@ class KAboutData; class PcFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PcFactory( TQObject *parent=0, const char *name=0); + PcFactory( TQObject *tqparent=0, const char *name=0); ~PcFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 5220f88a..1911be72 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.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. @@ -63,8 +63,8 @@ using namespace KBabel; static KStaticDeleter< TQDict<CompendiumData> > compDataDeleter; TQDict<CompendiumData> *PoCompendium::_compDict = 0; -PoCompendium::PoCompendium(TQObject *parent, const char *name) - : SearchEngine(parent, name) +PoCompendium::PoCompendium(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { prefWidget=0; data=0; @@ -160,9 +160,9 @@ void PoCompendium::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) +PrefWidget *PoCompendium::preferencesWidget(TQWidget *tqparent) { - prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget"); + prefWidget = new CompendiumPreferencesWidget(tqparent,"pocompendium_prefwidget"); kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl; connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) @@ -232,7 +232,7 @@ bool PoCompendium::searchCaseInsensitive(const TQString& text, uint pluralForm, TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -288,7 +288,7 @@ bool PoCompendium::searchTextOnly(const TQString& text, uint pluralForm, TQPtrLi TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -346,12 +346,12 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(stop) break; - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } - if(checkedIndices.contains(*it)) + if(checkedIndices.tqcontains(*it)) { continue; } @@ -397,7 +397,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.contains(s)) + if(o.tqcontains(s)) { found=true; } @@ -421,7 +421,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchContains && !wholeWords) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -430,7 +430,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained && !wholeWords) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -445,7 +445,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -491,7 +491,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr TQRegExp searchReg; if(matchContains) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); searchReg.setPattern(s); } @@ -519,7 +519,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr emit progress( 50+(50*(checkCounter+1))/catalogInfo.total); } - if(checkedIndices.contains(i)) + if(checkedIndices.tqcontains(i)) { continue; } @@ -532,7 +532,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - if(foundIndices.contains(i)) + if(foundIndices.tqcontains(i)) { continue; } @@ -564,7 +564,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -580,7 +580,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); if(wholeWords) { @@ -689,7 +689,7 @@ bool PoCompendium::startSearch(const TQString& text, uint pluralForm, const Sear // search without whitespace searchTextOnly(searchStr, pluralForm, results, foundIndices, checkedIndices); - // now, search based on words (contains, is contained, etc) + // now, search based on words (tqcontains, is contained, etc) searchWords(searchStr, pluralForm, results, foundIndices, checkedIndices); @@ -797,9 +797,9 @@ void PoCompendium::slotLoadCompendium() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -864,21 +864,21 @@ void PoCompendium::recheckData() loading=false; } -TQString PoCompendium::maskString(TQString s) +TQString PoCompendium::tqmaskString(TQString s) { - s.replace("\\","\\\\"); - s.replace("\?","\\?"); - s.replace("[","\\["); - s.replace(".","\\."); - s.replace("*","\\*"); - s.replace("+","\\+"); - s.replace("^","\\^"); - s.replace("$","\\$"); - s.replace("(","\\("); - s.replace(")","\\)"); - s.replace("{","\\{"); - s.replace("}","\\}"); - s.replace("|","\\|"); + s.tqreplace("\\","\\\\"); + s.tqreplace("\?","\\?"); + s.tqreplace("[","\\["); + s.tqreplace(".","\\."); + s.tqreplace("*","\\*"); + s.tqreplace("+","\\+"); + s.tqreplace("^","\\^"); + s.tqreplace("$","\\$"); + s.tqreplace("(","\\("); + s.tqreplace(")","\\)"); + s.tqreplace("{","\\{"); + s.tqreplace("}","\\}"); + s.tqreplace("|","\\|"); return s; } @@ -917,7 +917,7 @@ void PoCompendium::addResult(SearchResult *result, TQPtrList<SearchResult>& res) void PoCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -938,7 +938,7 @@ TQString PoCompendium::translate(const TQString& text, uint pluralForm) if(error || !data || data->active()) { - return TQString::null; + return TQString(); } @@ -950,7 +950,7 @@ TQString PoCompendium::translate(const TQString& text, uint pluralForm) return data->catalog()->msgstr(*index).first(); } - return TQString::null; + return TQString(); } TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const uint pluralForm) @@ -965,7 +965,7 @@ TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const if(error || !data || data->active()) { - return TQString::null; + return TQString(); } // try to find fuzzy string @@ -1029,7 +1029,7 @@ TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const return data->catalog()->msgstr(best_matching).first(); } - return TQString::null; + return TQString(); } @@ -1041,7 +1041,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui } if(isSearching()) - return TQString::null; + return TQString(); clearResults(); stop = false; @@ -1058,13 +1058,13 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui if(error || !data) { active = false; - return TQString::null; + return TQString(); } if(data->active()) { active = false; - return TQString::null; + return TQString(); } emit started(); @@ -1120,7 +1120,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui return res.first()->translation; } - // now, search based on words (contains, is contained, etc) + // now, search based on words (tqcontains, is contained, etc) searchWords(searchStr, pluralForm, res, foundIndices, checkedIndices); if( matchNGram || @@ -1145,7 +1145,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui sc = 0; - return TQString::null; + return TQString(); } @@ -1181,7 +1181,7 @@ void PoCompendium::unregisterData() void PoCompendium::registerData() { - data = compendiumDict()->find(realURL); + data = compendiumDict()->tqfind(realURL); if(!data) { data = new CompendiumData; diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index 50ef9428..70386572 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.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. @@ -51,9 +51,10 @@ class TQTimer; class PoCompendium : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - PoCompendium(TQObject *parent=0, const char *name=0); + PoCompendium(TQObject *tqparent=0, const char *name=0); virtual ~PoCompendium(); virtual bool isReady() const; @@ -67,7 +68,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; @@ -98,7 +99,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *, TQPtrList<SearchResult>& allResults); - TQString maskString(TQString string); + TQString tqmaskString(TQString string); void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 1f3a8b37..9cbeb381 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.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,14 +44,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new CompendiumPWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h index 3a22bc31..e67a00d9 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.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. @@ -42,9 +42,10 @@ class CompendiumPWidget; class CompendiumPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - CompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0); + CompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~CompendiumPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui index 8f54b087..f1883a88 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui +++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui @@ -8,7 +8,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -236,14 +236,14 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index eaea5194..772eae41 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.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. @@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0; KAboutData *PcFactory::s_about = 0; -PcFactory::PcFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PcFactory::PcFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PcFactory::~PcFactory() } -TQObject *PcFactory::createObject( TQObject *parent, const char *name +TQObject *PcFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name return 0; } - return new TmxCompendium(parent,name); + return new TmxCompendium(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h index 74739e0a..f4337116 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.h +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.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. @@ -44,12 +44,13 @@ class KAboutData; class PcFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PcFactory( TQObject *parent=0, const char *name=0); + PcFactory( TQObject *tqparent=0, const char *name=0); ~PcFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 85d38294..16200985 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.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. @@ -46,14 +46,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new TmxCompendiumPWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h index e2a4b900..a91aff42 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.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. @@ -44,9 +44,10 @@ class TmxCompendiumPWidget; class TmxCompendiumPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - TmxCompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0); + TmxCompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~TmxCompendiumPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index ef6c9967..15600c7d 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>TmxCompendiumPWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TMXPWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -46,7 +46,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -77,7 +77,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>wholeBtn</cstring> </property> @@ -85,7 +85,7 @@ <string>Onl&y whole words</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>caseBtn</cstring> </property> @@ -95,7 +95,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -103,7 +103,7 @@ <string>A text matches if:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -117,7 +117,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>equalBtn</cstring> </property> @@ -125,7 +125,7 @@ <string>E&qual to searched text</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>hasWordBtn</cstring> </property> @@ -133,7 +133,7 @@ <string>Contains a &word of searched text</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>isContainedBtn</cstring> </property> @@ -141,7 +141,7 @@ <string>Co&ntained in searched text</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>ngramBtn</cstring> </property> @@ -149,7 +149,7 @@ <string>&Similar to searched text</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>containsBtn</cstring> </property> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -209,7 +209,7 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> </includehints> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 415992bf..fd5fcd29 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.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. @@ -58,8 +58,8 @@ static KStaticDeleter< TQDict<TmxCompendiumData> > compDataDeleter; TQDict<TmxCompendiumData> *TmxCompendium::_compDict = 0; -TmxCompendium::TmxCompendium(TQObject *parent, const char *name) - : SearchEngine(parent, name) +TmxCompendium::TmxCompendium(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { prefWidget=0; data=0; @@ -152,9 +152,9 @@ void TmxCompendium::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) +PrefWidget *TmxCompendium::preferencesWidget(TQWidget *tqparent) { - prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget"); + prefWidget = new TmxCompendiumPreferencesWidget(tqparent,"tmxcompendium_prefwidget"); connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) , this, TQT_SLOT(restoreSettings())); @@ -240,8 +240,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); results.append(result); @@ -267,7 +267,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -294,8 +294,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -319,12 +319,12 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(stop) break; - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } - if(checkedIndices.contains(*it)) + if(checkedIndices.tqcontains(*it)) { continue; } @@ -365,7 +365,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.contains(s)) + if(o.tqcontains(s)) { found=true; } @@ -389,7 +389,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchContains && !wholeWords) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -398,7 +398,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained && !wholeWords) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -413,7 +413,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -436,8 +436,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -454,7 +454,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQRegExp searchReg; if(matchContains) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); searchReg.setPattern(s); } @@ -471,7 +471,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea i++; - if(checkedIndices.contains(i)) + if(checkedIndices.tqcontains(i)) { continue; } @@ -479,7 +479,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea checkedIndices.append(i); checkCounter++; - if(foundIndices.contains(i)) + if(foundIndices.tqcontains(i)) { continue; } @@ -523,7 +523,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -538,7 +538,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); if(wholeWords) { @@ -577,8 +577,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -687,9 +687,9 @@ void TmxCompendium::slotLoadCompendium() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -746,21 +746,21 @@ void TmxCompendium::recheckData() loading=false; } -TQString TmxCompendium::maskString(TQString s) const +TQString TmxCompendium::tqmaskString(TQString s) const { - s.replace('\\',"\\\\"); - s.replace('?',"\\?"); - s.replace('[',"\\["); - s.replace('.',"\\."); - s.replace('*',"\\*"); - s.replace('+',"\\+"); - s.replace('^',"\\^"); - s.replace('$',"\\$"); - s.replace('(',"\\("); - s.replace(')',"\\)"); - s.replace('{',"\\{"); - s.replace('}',"\\}"); - s.replace('|',"\\|"); + s.tqreplace('\\',"\\\\"); + s.tqreplace('?',"\\?"); + s.tqreplace('[',"\\["); + s.tqreplace('.',"\\."); + s.tqreplace('*',"\\*"); + s.tqreplace('+',"\\+"); + s.tqreplace('^',"\\^"); + s.tqreplace('$',"\\$"); + s.tqreplace('(',"\\("); + s.tqreplace(')',"\\)"); + s.tqreplace('{',"\\{"); + s.tqreplace('}',"\\}"); + s.tqreplace('|',"\\|"); return s; } @@ -797,7 +797,7 @@ void TmxCompendium::addResult(SearchResult *result) void TmxCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -818,7 +818,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm) if(error || !data || data->active()) { - return TQString::null; + return TQString(); } @@ -829,7 +829,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm) return data->msgstr(*index); } - return TQString::null; + return TQString(); } TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint pluralForm) @@ -844,7 +844,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint if(error || !data || data->active()) { - return TQString::null; + return TQString(); } // try to find fuzzy string @@ -907,7 +907,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint return data->msgstr(best_matching); } - return TQString::null; + return TQString(); } @@ -943,7 +943,7 @@ void TmxCompendium::unregisterData() void TmxCompendium::registerData() { - data = compendiumDict()->find(realURL); + data = compendiumDict()->tqfind(realURL); if(!data) { data = new TmxCompendiumData; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index d09e81c9..e6b76f53 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.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. @@ -50,9 +50,10 @@ class TQTimer; class TmxCompendium : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - TmxCompendium(TQObject *parent=0, const char *name=0); + TmxCompendium(TQObject *tqparent=0, const char *name=0); virtual ~TmxCompendium(); virtual bool isReady() const; @@ -65,7 +66,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; @@ -96,7 +97,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *); - TQString maskString(TQString string) const; + TQString tqmaskString(TQString string) const; void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 7893e837..739379e1 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.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. @@ -47,8 +47,8 @@ using namespace KBabel; -TmxCompendiumData::TmxCompendiumData(TQObject *parent) - : TQObject(parent) +TmxCompendiumData::TmxCompendiumData(TQObject *tqparent) + : TQObject(tqparent) , _active(false) , _error(false) , _initialized(false) @@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n" "%1\n" "Reason: %2") - .arg(url.prettyURL()).arg(_errorMsg); + .tqarg(url.prettyURL()).tqarg(_errorMsg); kdDebug(KBABEL_SEARCH) << "Error: " << _errorMsg << endl; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h index ce2692a1..325fb9b5 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.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. @@ -44,12 +44,13 @@ #include <tqvaluevector.h> #include <tqptrlist.h> -class TmxCompendiumData : public QObject +class TmxCompendiumData : public TQObject { Q_OBJECT + TQ_OBJECT public: - TmxCompendiumData(TQObject *parent=0); + TmxCompendiumData(TQObject *tqparent=0); bool load(const KURL& url, const TQString& language); diff --git a/kbabel/kbabeldict/searchengine.cpp b/kbabel/kbabeldict/searchengine.cpp index 19112fe7..ac45c8b3 100644 --- a/kbabel/kbabeldict/searchengine.cpp +++ b/kbabel/kbabeldict/searchengine.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. @@ -62,8 +62,8 @@ SearchResult::SearchResult(const SearchResult& r) } -PrefWidget::PrefWidget(TQWidget *parent, const char *name) - : TQWidget(parent,name) +PrefWidget::PrefWidget(TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name) { } @@ -72,8 +72,8 @@ PrefWidget::~PrefWidget() } -SearchEngine::SearchEngine(TQObject *parent, const char *name) - : TQObject(parent, name) +SearchEngine::SearchEngine(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { autoUpdate=false; results.setAutoDelete(true); @@ -202,9 +202,9 @@ void SearchEngine::stringChanged(const TQStringList&,const TQString&,unsigned in TQString SearchEngine::directory(const TQString& path, int n) { if(n<0) - return TQString::null; + return TQString(); - int begin=path.findRev('/'); + int begin=path.tqfindRev('/'); int end=path.length(); if(begin < 0) @@ -213,22 +213,22 @@ TQString SearchEngine::directory(const TQString& path, int n) if(n==0) return path; else - return TQString::null; + return TQString(); } for(int i=0; i < n; i++) { if(begin==0) { - return TQString::null; + return TQString(); } end = begin; - begin = path.findRev('/', end-1); + begin = path.tqfindRev('/', end-1); if(begin < 0) { - return TQString::null; + return TQString(); } } @@ -244,14 +244,14 @@ uint SearchEngine::score(const TQString& orig, const TQString& found) uint scoreA = ngramMatch(found, orig); uint scoreB = ngramMatch(orig,found); - uint score = QMIN(scoreA, scoreB); + uint score = TQMIN(scoreA, scoreB); TQString f = found.lower(); TQString o = orig.lower(); scoreA = ngramMatch(f, o); scoreB = ngramMatch(o, f); - score = (QMIN(scoreA, scoreB)+score)/2; + score = (TQMIN(scoreA, scoreB)+score)/2; return score; } @@ -266,7 +266,7 @@ uint SearchEngine::ngramMatch (const TQString& text1, const TQString& text2, uint ngram_cnt = text1.length() - ngram_len + 1; for (uint i = 0; i < ngram_cnt; i++) { - if (text2.find(text1.mid(i,ngram_len)) >= 0) + if (text2.tqfind(text1.mid(i,ngram_len)) >= 0) cnt++; } diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index a10e6193..f14baa1e 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.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. @@ -91,7 +91,7 @@ public: TQString projectContext; /** - * Status of the translation, for example "approved", "spellchecked", "unknown" + * tqStatus of the translation, for example "approved", "spellchecked", "unknown" */ TQString status; @@ -167,13 +167,13 @@ class KDE_EXPORT SearchFilter public: SearchFilter() : _projects() - , _location( TQString::null ) - , _languageCode( TQString::null ) - , _origLanguageCode( TQString::null ) + , _location( TQString() ) + , _languageCode( TQString() ) + , _origLanguageCode( TQString() ) , _translators() , _projectKeywords() , _projectContexts() - , _translationStatus() + , _translationtqStatus() {} virtual ~SearchFilter() {} @@ -213,10 +213,10 @@ public: void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; } /** - * Status of the translation, for example "approved", "spellchecked", "unknown" + * tqStatus of the translation, for example "approved", "spellchecked", "unknown" */ - void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; } - void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; } + void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; } + void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; } /** * The key method of the class - check, if the argument @@ -232,7 +232,7 @@ private: TQStringList _translators; TQStringList _projectKeywords ; TQStringList _projectContexts; - TQStringList _translationStatus; + TQStringList _translationtqStatus; }; /** @@ -241,12 +241,13 @@ private: * necessary function. The widget should not be bigger than 400x400. * If you need more space, you maybe want to use a tabbed widget. */ -class KDE_EXPORT PrefWidget : public QWidget +class KDE_EXPORT PrefWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PrefWidget(TQWidget *parent, const char* name=0); + PrefWidget(TQWidget *tqparent, const char* name=0); virtual ~PrefWidget(); public slots: @@ -265,12 +266,13 @@ public slots: }; -class KDE_EXPORT SearchEngine : public QObject +class KDE_EXPORT SearchEngine : public TQObject { Q_OBJECT + TQ_OBJECT public: - SearchEngine(TQObject *parent=0, const char *name=0); + SearchEngine(TQObject *tqparent=0, const char *name=0); virtual ~SearchEngine(); @@ -306,7 +308,7 @@ public: virtual TQString searchTranslation(const TQString&, int &score, const uint pluralForm = 0) { Q_UNUSED(pluralForm); - score = 0; return TQString::null; + score = 0; return TQString(); } /** @@ -316,7 +318,7 @@ public: virtual TQString fuzzyTranslation(const TQString& /*text*/, int &score, const uint pluralForm = 0) { Q_UNUSED(pluralForm); - score = 0; return TQString::null; }; + score = 0; return TQString(); }; /** @@ -352,9 +354,9 @@ public: * search engine. The returned widget should not be bigger than * 400x400. If you need more space, you maybe want to use * a tabbed widget. - * @param parent the parent of the returned widget + * @param tqparent the tqparent of the returned widget */ - virtual PrefWidget* preferencesWidget(TQWidget *parent)=0; + virtual PrefWidget* preferencesWidget(TQWidget *tqparent)=0; /** @returns information about this SearchEngine */ virtual const KAboutData *about() const= 0; |