diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
commit | 56160bf4dfe503631ef6373367b281f081bab2b4 (patch) | |
tree | 7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdecore/kconfigbase.cpp | |
parent | 13281e2856a2ef43bbab78c5528470309c23aa77 (diff) | |
download | tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdecore/kconfigbase.cpp')
-rw-r--r-- | tdecore/kconfigbase.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index b9a89a70c..20d3f023c 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kapplication.h> #include <kglobal.h> @@ -969,7 +969,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.at(0) == (QChar)'#' ) + if ( aValue.tqat(0) == (QChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey, return readDateTimeEntry(pKey.utf8().data(), pDefault); } -// ### currentDateTime() as fallback ? (Harri) +// ### tqcurrentDateTime() as fallback ? (Harri) TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, const TQDateTime* pDefault ) const { @@ -1034,21 +1034,21 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, if( pDefault ) return *pDefault; else - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } TQStrList list; int count = readListEntry( pKey, list, ',' ); if( count == 6 ) { - TQDate date( atoi( list.at( 0 ) ), atoi( list.at( 1 ) ), - atoi( list.at( 2 ) ) ); - TQTime time( atoi( list.at( 3 ) ), atoi( list.at( 4 ) ), - atoi( list.at( 5 ) ) ); + TQDate date( atoi( list.tqat( 0 ) ), atoi( list.tqat( 1 ) ), + atoi( list.tqat( 2 ) ) ); + TQTime time( atoi( list.tqat( 3 ) ), atoi( list.tqat( 4 ) ), + atoi( list.tqat( 5 ) ) ); return TQDateTime( date, time ); } - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } void KConfigBase::writeEntry( const TQString& pKey, const TQString& value, @@ -1121,7 +1121,7 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir ) unsigned int len = homeDir.length(); // replace by "$HOME" if possible if (len && (path.length() == len || path[len] == '/')) { - path.replace(0, len, TQString::fromLatin1("$HOME")); + path.replace(0, len, TQString::tqfromLatin1("$HOME")); return true; } else return false; @@ -1135,7 +1135,7 @@ static TQString translatePath( TQString path ) // only "our" $HOME should be interpreted path.replace('$', "$$"); - bool startsWithFile = path.startsWith("file:", false); + bool startsWithFile = path.tqstartsWith("file:", false); // return original path, if it refers to another type of URL (e.g. http:/), or // if the path is already relative to another directory @@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQStringList new_list; @@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1424,7 +1424,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1468,7 +1468,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } |