Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 7 insertions, 6 deletions

diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 5f57c3fe8..7af02aa58 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -71,7 +71,8 @@ static TQCString extractQCString( const TQByteArray &ba, uint start, uint len =
   if ( ( ba.size() - start ) < len )
     realLen = ba.size() - start;
 
-  return TQCString( &ba[ start ], realLen + 1 );
+//   return TQCString( &ba[ start ], realLen + 1 );
+  return TQCString( ba ).mid(start, realLen + 1);
 }
 
 /**
@@ -80,7 +81,7 @@ static TQCString extractQCString( const TQByteArray &ba, uint start, uint len =
  */
 static int qByteArrayFindStr( const TQByteArray &ba, const char *str )
 {
-  int strLen = qstrlen( str );
+  int strLen = tqstrlen( str );
   int searchLen = ba.size() - strLen;
 
   for ( int i = 0; i <= searchLen; ++i ) {
@@ -116,7 +117,7 @@ void CgiProtocol::get( const KURL& url )
 
   TQString file;
 
-  int pos = path.findRev('/');
+  int pos = path.tqfindRev('/');
   if ( pos >= 0 ) file = path.mid( pos + 1 );
   else file = path;
 
@@ -189,8 +190,8 @@ void CgiProtocol::get( const KURL& url )
       // Access the buffer in-place by using setRawData()
       output.setRawData( buffer, n );
 
-      int colon = output.find( ':' );
-      int newline = output.find( '\n' );
+      int colon = output.tqfind( ':' );
+      int newline = output.tqfind( '\n' );
       int semicolon = qByteArrayFindRev( output, ';', newline );
       int end;
       if ( semicolon < 0 ) end = newline;
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index 521c0fd95..d1a798aa2 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
 
   TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-  TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Paths to Local CGI Programs"), this );
+  TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this );
   topLayout->addWidget( topBox );
 
   mListBox = new TQListBox( topBox );