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 /kdoctools | |
| 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 'kdoctools')
| -rw-r--r-- | kdoctools/kio_help.cpp | 18 | ||||
| -rw-r--r-- | kdoctools/kio_help.h | 2 | ||||
| -rw-r--r-- | kdoctools/meinproc.cpp | 2 | ||||
| -rw-r--r-- | kdoctools/xslt.cpp | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 78873af72..9da16d83e 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -19,9 +19,9 @@ #include <tqvaluelist.h> #include <tqfileinfo.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kdebug.h> #include <kurl.h> @@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname, } else { - unicodeError( i18n("There is no documentation available for %1." ).arg(path) ); + tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) ); finished(); return TQString::null; } @@ -123,7 +123,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname, } -void HelpProtocol::unicodeError( const TQString &t ) +void HelpProtocol::tqunicodeError( const TQString &t ) { data(fromUnicode( TQString( "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n" @@ -148,10 +148,10 @@ void HelpProtocol::get( const KURL& url ) doc = url.path(); if ( !mGhelp ) { - if (doc.at(0) != '/') + if (doc.tqat(0) != '/') doc = doc.prepend('/'); - if (doc.at(doc.length() - 1) == '/') + if (doc.tqat(doc.length() - 1) == '/') doc += "index.html"; } @@ -215,7 +215,7 @@ void HelpProtocol::get( const KURL& url ) kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); } else { int pos1 = mParsed.find( "charset=" ); if ( pos1 > 0 ) { @@ -248,7 +248,7 @@ void HelpProtocol::get( const KURL& url ) kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); } else { TQString query = url.query(), anchor; @@ -316,7 +316,7 @@ void HelpProtocol::emitFile( const KURL& url ) return; } - unicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) ); + tqunicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) ); return; } diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 13c198af1..c442e7c61 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -37,7 +37,7 @@ private: TQString lookupFile(const TQString &fname, const TQString &query, bool &redirect); - void unicodeError( const TQString &t ); + void tqunicodeError( const TQString &t ); TQString mParsed; bool mGhelp; diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 5c51457ce..8f20c2001 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -23,7 +23,7 @@ #include <kaboutdata.h> #include <stdlib.h> #include <kdebug.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqfileinfo.h> #include <kprocess.h> #include <tqvaluevector.h> diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index e4f57e103..5a40d6e60 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -16,7 +16,7 @@ #include <assert.h> #include <kfilterbase.h> #include <kfilterdev.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <stdlib.h> #include <config.h> #include <stdarg.h> @@ -133,7 +133,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID, TQString splitOut(const TQString &parsed, int index) { int start_index = index + 1; - while (parsed.at(start_index - 1) != '>') start_index++; + while (parsed.tqat(start_index - 1) != '>') start_index++; int inside = 0; @@ -170,7 +170,7 @@ TQString splitOut(const TQString &parsed, int index) if (index > 0) { int endindex = filedata.findRev("</FILENAME>"); - while (filedata.at(endindex) != '>') endindex++; + while (filedata.tqat(endindex) != '>') endindex++; endindex++; filedata = filedata.left(index) + filedata.mid(endindex); } @@ -279,7 +279,7 @@ TQString lookForCache( const TQString &filename ) { kdDebug() << "lookForCache " << filename << endl; assert( filename.endsWith( ".docbook" ) ); - assert( filename.at( 0 ) == '/' ); + assert( filename.tqat( 0 ) == '/' ); TQString cache = filename.left( filename.length() - 7 ); TQString output; @@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data ) buffer_len += test.length(); } else { TQString res; - res.sprintf( "&#%d;", TQChar(part.at( i )).unicode() ); + res.sprintf( "&#%d;", TQChar(part.tqat( i )).tqunicode() ); test = locale->fromUnicode( res ); if (buffer_len + test.length() + 1 > sizeof(buffer)) break; |