diff options
Diffstat (limited to 'src/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 6 |
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); |