summaryrefslogtreecommitdiffstats
path: root/kbabel/commonui
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit0813b39aed2cf4c84157a22c4c9594336d93d412 (patch)
tree0f6157f9c9ecc6ed26cb98f058219a8021d3f4a6 /kbabel/commonui
parent35dc58791106d7a1864264063df5f3ee3f1f0f15 (diff)
downloadtdesdk-0813b39aed2cf4c84157a22c4c9594336d93d412.tar.gz
tdesdk-0813b39aed2cf4c84157a22c4c9594336d93d412.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kbabel/commonui')
-rw-r--r--kbabel/commonui/context.cpp18
-rw-r--r--kbabel/commonui/finddialog.cpp6
-rw-r--r--kbabel/commonui/finddialog.h2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp4
-rw-r--r--kbabel/commonui/projectwizard.cpp4
-rw-r--r--kbabel/commonui/roughtransdlg.cpp44
-rw-r--r--kbabel/commonui/toolaction.cpp4
-rw-r--r--kbabel/commonui/toolselectionwidget.cpp8
8 files changed, 45 insertions, 45 deletions
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 4c91d1ad..0700b895 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -160,14 +160,14 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir,
if ( !poDir.isEmpty() )
{
- pref.tqreplace( "@POFILEDIR@", poDir );
+ pref.replace( "@POFILEDIR@", poDir );
}
- else if ( pref.tqfind( "@POFILEDIR@ " ) != -1 )
+ else if ( pref.find( "@POFILEDIR@ " ) != -1 )
continue; // No need to keep this path pattern, as we have no PO file dir
- pref.tqreplace( "@PACKAGEDIR@", packageDir);
- pref.tqreplace( "@PACKAGE@", packageName);
- pref.tqreplace( "@CODEROOT@", _project->settings()->codeRoot());
+ pref.replace( "@PACKAGEDIR@", packageDir);
+ pref.replace( "@PACKAGE@", packageName);
+ pref.replace( "@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.tqreplace( TQChar( '\\' ), TQChar( '/' ) );
+ ref.path.replace( 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.tqreplace( TQChar( '\\' ), TQChar( '/' ) );
+ ref.path.replace( 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.tqreplace( "@COMMENTPATH@", fileName);
+ path.replace( "@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; tqreplace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 18dcd721..cd752396 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -99,7 +99,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* tqparent)
}
else {
setCaption(i18n("Find"));
- setButtonOK(KGuiItem(i18n("&Find"),"tqfind"));
+ setButtonOK(KGuiItem(i18n("&Find"),"find"));
_replaceLabel=0;
_replaceCombo=0;
@@ -502,7 +502,7 @@ void FindDialog::saveSettings()
void FindDialog::inButtonsClicked(int id)
{
// check if at least one button is checked
- if(! _buttonGrp->tqfind(id)->isOn() ) {
+ if(! _buttonGrp->find(id)->isOn() ) {
if(!_inMsgstr->isOn() && !_inComment->isOn() ) {
if(_inMsgid->isEnabled()) {
if( !_inMsgid->isOn() ) {
@@ -541,7 +541,7 @@ ReplaceDialog::ReplaceDialog(TQWidget* tqparent)
TQLabel *label = new TQLabel(i18n("Replace this string?"),page);
tqlayout->addWidget(label);
- connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(tqreplace()));
+ connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace()));
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 174d8b81..83badefa 100644
--- a/kbabel/commonui/finddialog.h
+++ b/kbabel/commonui/finddialog.h
@@ -129,7 +129,7 @@ public:
~ReplaceDialog();
signals:
- void tqreplace();
+ void replace();
void replaceAll();
void next();
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 7ec3381a..2fe24188 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -770,7 +770,7 @@ TQString MiscPreferences::contextInfo() const
void MiscPreferences::setContextInfo(TQString reg)
{
- reg.tqreplace("\n","\\n");
+ reg.replace("\n","\\n");
contextInfoEdit->setText(reg);
}
@@ -939,7 +939,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* tqparent)
_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 tqfind/replace functions.</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>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" );
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 5858195b..dc147c32 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -60,8 +60,8 @@ ProjectWizard::ProjectWizard(TQWidget *tqparent,const char *name)
{
// we need untranslated entries here, because of Translation Robot!
TQString entry = (*it);
- const int i = entry.tqfind('_');
- entry.tqreplace(0, i, entry.left(i).lower());
+ const int i = entry.find('_');
+ entry.replace(0, i, entry.left(i).lower());
all_languages.setGroup(entry);
entry = all_languages.readEntryUntranslated("Name");
if( ! entry.isEmpty() )
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 046ad2de..135b2794 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -292,7 +292,7 @@ void RoughTransDlg::translate()
if( catalog->pluralForm(i) == NoPluralForm )
{
TQString origTrans = catalog->msgstr(i).first();
- if(msg.tqfind("_: NAME OF TRANSLATORS\\n")==0)
+ if(msg.find("_: 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).tqcontains(authorName) )
+ if( !TQStringList::split(',', origTrans).contains(authorName) )
{
if(origTrans.isEmpty() ) translation=authorName;
else translation+=origTrans+","+authorName;
}
}
- else if(msg.tqfind("_: EMAIL OF TRANSLATORS\\n")==0)
+ else if(msg.find("_: EMAIL OF TRANSLATORS\\n")==0)
{
// skip, if email is not specified in settings
if( catalog->identitySettings().authorEmail.isEmpty() ) continue;
- if( !TQStringList::split(',', origTrans).tqcontains(catalog->identitySettings().authorEmail) )
+ if( !TQStringList::split(',', origTrans).contains(catalog->identitySettings().authorEmail) )
{
if(origTrans.isEmpty() ) translation=catalog->identitySettings().authorEmail;
else translation=origTrans+","+catalog->identitySettings().authorEmail;
}
}
- else if (msg.tqfind("ROLES_OF_TRANSLATORS") == 0)
+ else if (msg.find("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.tqfind(catalog->identitySettings( ).authorEmail) < 0)
+ else if (origTrans.find(catalog->identitySettings( ).authorEmail) < 0)
translation = origTrans + "\n" + temp;
}
- else if (msg.tqfind("CREDIT_FOR_TRANSLATORS") == 0)
+ else if (msg.find("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.tqfind(authorName) < 0 &&
- origTrans.tqfind(catalog->identitySettings( ).authorEmail) < 0)
+ else if (origTrans.find(authorName) < 0 &&
+ origTrans.find(catalog->identitySettings( ).authorEmail) < 0)
translation = origTrans + "\n" + temp;
}
}
@@ -350,8 +350,8 @@ void RoughTransDlg::translate()
else // not kdeSpecific
{
// skip KDE specific texts
- 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)
+ 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)
continue;
}
@@ -364,9 +364,9 @@ void RoughTransDlg::translate()
totalTried++;
- if(msg.tqcontains(contextReg))
+ if(msg.contains(contextReg))
{
- msg.tqreplace(contextReg,"");
+ msg.replace(contextReg,"");
}
// try exact translation
@@ -442,7 +442,7 @@ void RoughTransDlg::translate()
TQStringList wordList;
TQChar accel;
TQString endingPunctuation;
- int pos = msg.tqfindRev(endPunctReg);
+ int pos = msg.findRev(endPunctReg);
if(pos >= 0)
{
endingPunctuation = msg.right(msg.length()-pos);
@@ -475,7 +475,7 @@ void RoughTransDlg::translate()
}
else if(!word.isEmpty() )
{
- if(!word.tqcontains(digitReg))
+ if(!word.contains(digitReg))
wordList.append(word);
word=TQString();
@@ -483,7 +483,7 @@ void RoughTransDlg::translate()
}
else if(!word.isEmpty())
{
- if(!word.tqcontains(digitReg))
+ if(!word.contains(digitReg))
wordList.append(word);
word=TQString();
@@ -500,7 +500,7 @@ void RoughTransDlg::translate()
{
if(msg[index+1]=='n' && msg[index+2].isSpace())
{
- if(!word.isEmpty() && !word.tqcontains(digitReg))
+ if(!word.isEmpty() && !word.contains(digitReg))
wordList.append(word);
word=TQString();
@@ -510,7 +510,7 @@ void RoughTransDlg::translate()
}
else if(!word.isEmpty() )
{
- if(!word.tqcontains(digitReg))
+ if(!word.contains(digitReg))
wordList.append(word);
word=TQString();
@@ -518,7 +518,7 @@ void RoughTransDlg::translate()
}
else if(!word.isEmpty())
{
- if(!word.tqcontains(digitReg))
+ if(!word.contains(digitReg))
wordList.append(word);
word=TQString();
@@ -526,7 +526,7 @@ void RoughTransDlg::translate()
}
else if(!word.isEmpty())
{
- if(!word.tqcontains(digitReg)) {
+ if(!word.contains(digitReg)) {
wordList.append(word);
}
@@ -582,7 +582,7 @@ void RoughTransDlg::translate()
// try to set the correct keyboard accelerator
if(!accel.isNull())
{
- int index = translation.tqfind(accel,0,false);
+ int index = translation.find(accel,0,false);
if(index >= 0)
{
translation.insert(index,accelMarker);
@@ -717,7 +717,7 @@ void RoughTransDlg::msgButtonClicked(int id)
if(!transButton->isChecked() && !untransButton->isChecked()
&& !fuzzyButton->isChecked())
{
- TQButton *button = whatBox->tqfind(id);
+ TQButton *button = whatBox->find(id);
if(button == transButton)
{
transButton->setChecked(true);
diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp
index ebb52bb4..9be27a69 100644
--- a/kbabel/commonui/toolaction.cpp
+++ b/kbabel/commonui/toolaction.cpp
@@ -69,7 +69,7 @@ TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolIn
TQStringList::ConstIterator sit = shortcuts.begin();
for (; uit != userCommands.end() && cit != commands.end(); ++uit, ++cit)
{
- if( !excludeCommand == command.tqcontains(*cit) )
+ if( !excludeCommand == command.contains(*cit) )
{
TQString sc=*sit;
@@ -96,7 +96,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools()
for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry )
{
- if( (*entry).commands().tqcontains("validate") )
+ if( (*entry).commands().contains("validate") )
{
result.append( *entry );
}
diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp
index 78a3c0a4..3b10f09d 100644
--- a/kbabel/commonui/toolselectionwidget.cpp
+++ b/kbabel/commonui/toolselectionwidget.cpp
@@ -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.tqcontains(*cit) )
+ if( commands.contains(*cit) )
{
availableListBox()->insertItem( *uit );
}
@@ -78,8 +78,8 @@ void ToolSelectionWidget::setSelectedTools( const TQStringList& tools )
TQValueList<KDataToolInfo>::ConstIterator entry = _allTools.begin();
for( ; entry != _allTools.end(); ++entry )
{
- TQString uic=*(*entry).userCommands().at((*entry).commands().tqfindIndex("validate"));
- if( tools.tqcontains((*entry).service()->library()) )
+ TQString uic=*(*entry).userCommands().at((*entry).commands().findIndex("validate"));
+ if( tools.contains((*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.tqcontains(*((*entry).userCommands().at((*entry).commands().tqfindIndex("validate")))) )
+ if( usedNames.contains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) )
result += (*entry).service()->library();
}
return result;