diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:59:13 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:59:13 -0600 |
commit | 56160bf4dfe503631ef6373367b281f081bab2b4 (patch) | |
tree | 7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeui/kxmlguiclient.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 'tdeui/kxmlguiclient.cpp')
-rw-r--r-- | tdeui/kxmlguiclient.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index 8ca9fd97a..dd7458ede 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -24,7 +24,7 @@ #include <tqdir.h> #include <tqfile.h> #include <tqdom.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <tqguardedptr.h> @@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const if ( !TQDir::isRelativePath(d->m_xmlFile) ) return TQString::null; // can't save anything here - return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); + return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); } @@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo { TQString doc; - TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file; + TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file; TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file ); @@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri else { TQString f = (*local).file; - TQString backup = f + TQString::fromLatin1( ".backup" ); + TQString backup = f + TQString::tqfromLatin1( ".backup" ); TQDir dir; dir.rename( f, backup ); } @@ -760,9 +760,9 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) unsigned int endpos; for (endpos = pos; endpos < xml.length(); endpos++) { - if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9') + if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9') continue; //Number.. - if (xml[endpos].unicode() == '"') //End of parameter + if (xml[endpos].tqunicode() == '"') //End of parameter break; else //This shouldn't be here.. { |