diff options
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 9da16d83e..78873af72 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 <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <kurl.h> @@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname, } else { - tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) ); + unicodeError( 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::tqunicodeError( const TQString &t ) +void HelpProtocol::unicodeError( 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.tqat(0) != '/') + if (doc.at(0) != '/') doc = doc.prepend('/'); - if (doc.tqat(doc.length() - 1) == '/') + if (doc.at(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()) { - tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + unicodeError( 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()) { - tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + unicodeError( 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; } - tqunicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) ); + unicodeError( 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 c442e7c61..13c198af1 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 tqunicodeError( const TQString &t ); + void unicodeError( const TQString &t ); TQString mParsed; bool mGhelp; diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 8f20c2001..5c51457ce 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -23,7 +23,7 @@ #include <kaboutdata.h> #include <stdlib.h> #include <kdebug.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfileinfo.h> #include <kprocess.h> #include <tqvaluevector.h> diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 5a40d6e60..e4f57e103 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -16,7 +16,7 @@ #include <assert.h> #include <kfilterbase.h> #include <kfilterdev.h> -#include <tqtextcodec.h> +#include <textcodec.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.tqat(start_index - 1) != '>') start_index++; + while (parsed.at(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.tqat(endindex) != '>') endindex++; + while (filedata.at(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.tqat( 0 ) == '/' ); + assert( filename.at( 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.tqat( i )).tqunicode() ); + res.sprintf( "&#%d;", TQChar(part.at( i )).unicode() ); test = locale->fromUnicode( res ); if (buffer_len + test.length() + 1 > sizeof(buffer)) break; |