summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/catalogmanager')
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp14
-rw-r--r--kbabel/catalogmanager/catalogmanager.h4
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp42
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h2
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp2
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.cpp2
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp2
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp12
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp4
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp10
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp6
11 files changed, 50 insertions, 50 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index d8b5168c..906437c6 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -235,10 +235,10 @@ void CatalogManager::setupActions()
// the edit menu
action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
- TQT_SLOT(tqfind()), actionCollection(), "find_in_files");
+ TQT_SLOT(find()), actionCollection(), "find_in_files");
action->setEnabled(false);
action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
- TQT_SLOT(tqreplace()), actionCollection(), "replace_in_files");
+ TQT_SLOT(replace()), actionCollection(), "replace_in_files");
action->setEnabled(false);
action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this),
TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
@@ -928,7 +928,7 @@ void CatalogManager::slotHelp()
kapp->invokeHelp("CATALOGMANAGER","kbabel");
}
-void CatalogManager::tqfind()
+void CatalogManager::find()
{
if( !_findDialog ) _findDialog = new FindInFilesDialog(false,this);
@@ -950,8 +950,8 @@ void CatalogManager::tqfind()
_findOptions.accelMarker = _project->miscSettings().accelMarker;
_foundFilesList.clear();
- kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::tqfind" << endl;
- TQString url = _catalogManager->tqfind(_findOptions, _toBeSearched );
+ kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::find" << endl;
+ TQString url = _catalogManager->find(_findOptions, _toBeSearched );
if( _catalogManager->isStopped() ) return;
if( !url.isEmpty() )
@@ -1011,7 +1011,7 @@ void CatalogManager::tqfind()
}
}
-void CatalogManager::tqreplace()
+void CatalogManager::replace()
{
if( !_replaceDialog ) _replaceDialog = new FindInFilesDialog(true,this);
@@ -1036,7 +1036,7 @@ void CatalogManager::tqreplace()
options.accelMarker = _project->miscSettings().accelMarker;
_foundFilesList.clear();
- TQString url = _catalogManager->tqfind(options, _toBeSearched );
+ TQString url = _catalogManager->find(options, _toBeSearched );
if( _catalogManager->isStopped() ) return;
if( !url.isEmpty() )
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 89fdef13..bb4e2e58 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -100,8 +100,8 @@ public slots:
void selectedChanged(uint actionValue);
virtual void slotHelp();
- virtual void tqfind();
- virtual void tqreplace();
+ virtual void find();
+ virtual void replace();
virtual void stopSearching();
virtual void optionsPreferences();
virtual void optionsShowStatusbar(bool on);
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 54d177b4..63f2a077 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog()
_logWindow->show();
}
-TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest )
+TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
{
CatManListItem* i=(CatManListItem*) currentItem();
@@ -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).tqcontains(*it2)
- || (*it2).tqcontains(*it1) ) return true;
+ || (*it1).contains(*it2)
+ || (*it2).contains(*it1) ) return true;
return false;
}
@@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index)
if(index>=0 && item && item->isDir())
{
TQString cmd=*(_settings.dirCommands).at(index);
- 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(" "));
+ 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(" "));
kdDebug(KBABEL_CATMAN) << cmd << endl;
@@ -1641,12 +1641,12 @@ void CatalogManagerView::slotFileCommand(int index)
CatManListItem* tqparent = (CatManListItem*)item->tqparent();
TQString cmd=*(_settings.fileCommands).at(index);
- 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));
+ cmd.replace("@PACKAGE@",item->name());
+ cmd.replace("@POFILE@",item->poFile());
+ cmd.replace("@POTFILE@",item->potFile());
+ cmd.replace("@PODIR@",tqparent->poFile());
+ cmd.replace("@POTDIR@",tqparent->potFile());
+ cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR));
kdDebug(KBABEL_CATMAN) << cmd << endl;
@@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir
_fileList.insert(file,item);
_readInfoFileList.prepend(file);
- if(_markerList.tqcontains(file))
+ if(_markerList.contains(file))
{
item->setMarked(true);
}
@@ -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.tqcontains(file))
+ if(_markerList.contains(file))
{
item->setMarked(true);
}
@@ -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.tqcontains(file))
+ if(_markerList.contains(file))
{
item->setMarked(true);
}
@@ -2207,7 +2207,7 @@ void CatalogManagerView::updateDir(TQString relDir)
// if this directory has to be removed, check, if
// the tqparent directory has to be removed too
- const int index=relDir.tqfindRev("/",relDir.length()-2);
+ const int index=relDir.findRev("/",relDir.length()-2);
if(index<0)
{
relDir="/";
@@ -2271,7 +2271,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
do
{
prevRelDir=relDir;
- const int index=relDir.tqfindRev("/",relDir.length()-2);
+ const int index=relDir.findRev("/",relDir.length()-2);
if(index<0)
{
relDir="/";
@@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir)
void CatalogManagerView::fileInfoRead( TQString filename )
{
- if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) {
+ if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) {
emit progress( ++_readInfoCount);
_readInfoFileList.remove( filename );
}
@@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show )
}
#include "catalogmanagerview.moc"
-// kate: space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 26a05d9f..8a405430 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -185,7 +185,7 @@ public slots:
void svnInfo();
void svnInfoMarked();
- TQString tqfind(KBabel::FindOptions &options, TQStringList &rest);
+ TQString find(KBabel::FindOptions &options, TQStringList &rest);
void showLog();
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index 8d1496d4..aa52237f 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -804,7 +804,7 @@ TQString CatManListItem::packageDir( ) const
TQString CatManListItem::name() const
{
- int index = _package.tqfindRev("/");
+ int index = _package.findRev("/");
return _package.right(_package.length()-index-1);
}
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 587d7f75..5f10678b 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -57,7 +57,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent)
_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 tqfind:"
+ "<p>Here you can finetune where to find:"
"<ul><li><b>In all files</b>: search in all files, otherwise searched "
"is the selected file or files in the selected folder</li>"
"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next file</li>"
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1a71cf94..afc299b9 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( )
}
// Change the command line to have the real name of the temporary file
- _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
+ _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
// Update the list of log messages
if ( !msg.isEmpty() ) {
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index af58ead9..6ab70423 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -138,7 +138,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
bool isInRepository = false;
while ( !stream.atEnd() ) {
temp = stream.readLine( );
- if ( temp.tqfind( rx ) == 0 ) {
+ if ( temp.find( rx ) == 0 ) {
isInRepository = true;
break;
}
@@ -162,7 +162,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
return LOCALLY_REMOVED;
// check for conflicts
- if ( timestamp.tqfind( '+' ) >= 0 )
+ if ( timestamp.find( '+' ) >= 0 )
return CONFLICT;
// calculate the UTC time from the file's last modified date
@@ -314,7 +314,7 @@ void CVSHandler::checkToAdd( const TQStringList& files )
temp = TQFileInfo( *it ).dirPath( true );
}
// check recursivlely if tqparent dirs have to be added as well
- while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.tqfindIndex( temp ) == -1 ) {
+ 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.tqfind( rx );
+ int pos = entr.find( 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.tqreplace( file, entr );
+ map.replace( file, entr );
}
}
void CVSHandler::processDiff( TQString output )
{
output.remove( TQRegExp( "\\[ .* \\]$" ));
- output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]")));
+ output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]")));
KTempFile tmpFile;
*(tmpFile.textStream()) << output;
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index e6cb76e5..01a4bccd 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -261,7 +261,7 @@ void SVNDialog::slotExecuteCommand( )
}
// Change the command line to have the real name of the temporary file
- _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
+ _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
// Update the list of log messages
if ( !msg.isEmpty() ) {
@@ -397,4 +397,4 @@ void SVNDialog::saveSettings( )
#include "svndialog.moc"
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 6bd00ad3..71907fb8 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -416,7 +416,7 @@ void SVNHandler::checkToAdd( const TQStringList& files )
// ### TODO: does SVN really needs this or does it do it automatically?
// check recursivlely if tqparent dirs have to be added as well
- while ( ! isInSvn( temp ) && toBeAdded.tqfindIndex( temp ) == -1 ) {
+ 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.tqfind( rx );
+ int pos = entr.find( 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.tqreplace( file, entr );
+ map.replace( 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 ]" ).tqreplace("[","\\[").tqreplace("]","\\]")));
+ output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]")));
KTempFile tmpFile;
*(tmpFile.textStream()) << output;
@@ -541,4 +541,4 @@ void SVNOutputCollector::slotGatherStdout( KProcess*, char* data, int len )
#include "svnhandler.moc"
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index acfc36da..a5440a6f 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -168,7 +168,7 @@ void ValidateProgressDialog::validate_internal()
}
TQString errortext=TQString::number(item.index+1)+": " + item.msgid.first().left(50);
- errortext.tqreplace("\n"," ");
+ errortext.replace("\n"," ");
if( item.msgid.first().length() > 50 ) errortext+="...";
_mainWidget->_errorList->insertItem( errortext);
@@ -205,7 +205,7 @@ void ValidateProgressDialog::errorItemDoubleClicked(TQListBoxItem * item)
TQString it = item->text();
bool ok =false;
- int offset = it.tqfind(":");
+ int offset = it.find(":");
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.tqfind(item->text()).data();
+ IgnoreItem it = _errors.find(item->text()).data();
// if there is no pixmap, it's the whole file
if( !item->pixmap() )
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 04:04:53 +0000