summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.cpp
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
commit5173e6fcb16310e130fba4143e334563b4f8460e (patch)
tree52333f9eb0c94f760d4dddc8714671fb50f7b625 /src/optiondialog.cpp
parent7b4db4f16d44d4e9aeee241211827558acd64f17 (diff)
downloadkdiff3-5173e6fcb16310e130fba4143e334563b4f8460e.tar.gz
kdiff3-5173e6fcb16310e130fba4143e334563b4f8460e.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/optiondialog.cpp')
-rw-r--r--src/optiondialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 9fc20ff..ac6b03e 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -918,7 +918,7 @@ void OptionDialog::setupMergePage( void )
++line;
//TQString branch = newHistoryEntry.cap(1);
//int day = newHistoryEntry.cap(2).toInt();
- //int month = TQString("Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec").tqfind(newHistoryEntry.cap(3))/4 + 1;
+ //int month = TQString("Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec").find(newHistoryEntry.cap(3))/4 + 1;
//int year = newHistoryEntry.cap(4).toInt();
//TQString time = newHistoryEntry.cap(5);
//TQString name = newHistoryEntry.cap(6);
@@ -1584,7 +1584,7 @@ void OptionDialog::slotApply( void )
TQString locale = m_language;
if ( locale == "Auto" || locale.isEmpty() )
locale = locale = TQTextCodec::locale();
- int spacePos = locale.tqfind(' ');
+ int spacePos = locale.find(' ');
if (spacePos>0) locale = locale.left(spacePos);
TQSettings settings;
settings.setPath("KDiff3", "diff-ext", TQSettings::User );
@@ -1694,7 +1694,7 @@ TQString OptionDialog::parseOptions( const QCStringList& optionList )
{
TQString s = *i;
- int pos = s.tqfind('=');
+ int pos = s.find('=');
if( pos > 0 ) // seems not to have a tag
{
TQString key = s.left(pos);