From b6edfe41c9395f2e20784cbf0e630af6426950a3 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/kotext/KoVariable.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/kotext/KoVariable.cpp') diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index bd03ecf9..0f8edaf8 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -245,8 +245,8 @@ TQString KoVariableDateFormat::convert( const TQVariant& data ) const TQString tmp ( dateTime.toString(m_strFormat) ); const int month = dateTime.date().month(); - tmp.tqreplace("PPPP", KGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name - tmp.tqreplace("PPP", KGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name + tmp.replace("PPPP", KGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name + tmp.replace("PPP", KGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name return tmp; } @@ -508,7 +508,7 @@ void KoVariableCollection::registerVariable( KoVariable *var ) void KoVariableCollection::unregisterVariable( KoVariable *var ) { - variables.take( variables.tqfindRef( var ) ); + variables.take( variables.findRef( var ) ); } TQValueList KoVariableCollection::recalcVariables(int type) @@ -554,14 +554,14 @@ void KoVariableCollection::setVariableValue( const TQString &name, const TQStrin TQString KoVariableCollection::getVariableValue( const TQString &name ) const { - if ( !varValues.tqcontains( name ) ) + if ( !varValues.contains( name ) ) return i18n( "No value" ); return varValues[ name ]; } bool KoVariableCollection::customVariableExist(const TQString &varname) const { - return varValues.tqcontains( varname ); + return varValues.contains( varname ); } void KoVariableCollection::setVariableSelected(KoVariable * var) @@ -757,7 +757,7 @@ KoVariable* KoVariableCollection::loadOasisField( KoTextDocument* textdoc, const TQString dataStyleName = tag.attributeNS( KoXmlNS::style, "data-style-name", TQString() ); TQString dateFormat = "locale"; const KoOasisStyles::DataFormatsMap& map = context.oasisStyles().dataFormats(); - KoOasisStyles::DataFormatsMap::const_iterator it = map.tqfind( dataStyleName ); + KoOasisStyles::DataFormatsMap::const_iterator it = map.find( dataStyleName ); if ( it != map.end() ) dateFormat = (*it).formatStr; @@ -1402,7 +1402,7 @@ TQCString KoDateVariable::formatStr(int & correct) const TQString tmpString(config->readEntry("Last Used"+num)); if(tmpString.startsWith("locale")) continue; - else if(stringList.tqcontains(tmpString)) + else if(stringList.contains(tmpString)) continue; else if(!tmpString.isEmpty()) { @@ -1614,7 +1614,7 @@ TQCString KoTimeVariable::formatStr(int & _correct) TQString tmpString(config->readEntry("Last Used"+num)); if(tmpString.startsWith("locale")) continue; - else if(stringList.tqcontains(tmpString)) + else if(stringList.contains(tmpString)) continue; else if(!tmpString.isEmpty()) { @@ -2225,7 +2225,7 @@ void KoFieldVariable::recalc() case VST_FILENAMEWITHOUTEXTENSION: { TQString file=m_doc->url().fileName(); - int pos=file.tqfindRev("."); + int pos=file.findRev("."); if(pos !=-1) value=file.mid(0,pos); else -- cgit v1.2.1