Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

8 files changed, 19 insertions, 19 deletions

diff --git a/kode/enum.cpp b/kode/enum.cpp
index 64bf8f790..8a41f58b6 100644
--- a/kode/enum.cpp
+++ b/kode/enum.cpp
@@ -41,9 +41,9 @@ TQString Enum::declaration() const
   for ( it = mEnums.begin(); it != mEnums.end(); ++it, ++value ) {
     if ( mCombinable ) {
       if ( it == mEnums.begin() )
-        retval += TQString( " %1 = %2" ).arg( *it ).arg( 1 << value );
+        retval += TQString( " %1 = %2" ).tqarg( *it ).tqarg( 1 << value );
       else
-        retval += TQString( ", %1 = %2" ).arg( *it ).arg( 1 << value );
+        retval += TQString( ", %1 = %2" ).tqarg( *it ).tqarg( 1 << value );
     } else {
       if ( it == mEnums.begin() )
         retval += " " + *it;
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 5d01cefa6..dcc073edc 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -140,7 +140,7 @@ int addProperty( KCmdLineArgs *args )
   
   TQFile headerFile( headerFileName );
   if ( !headerFile.open( IO_ReadOnly ) ) {
-    std::cerr << "Unable to open file '" << headerFileName.utf8() << "'" <<
+    std::cerr << "Unable to open file '" << headerFileName.utf8().data() << "'" <<
       std::endl;
     return 1;
   }
@@ -185,7 +185,7 @@ int addProperty( KCmdLineArgs *args )
         {
           TQRegExp re( "(\\w+)\\s*\\(" );
           if ( re.search( line ) >= 0 ) {
-            TQString function = re.cap( 1 ).lower();
+            TQString function = TQString(re.cap( 1 )).lower();
             if ( !function.isEmpty() ) {
               kdDebug() << "Function: " << function << endl;
               if ( function == className || function == "~" + className ) {
@@ -269,8 +269,8 @@ int addProperty( KCmdLineArgs *args )
     TQString headerFileNameOut = headerFileName + ".kodeorig" ;
 
     KProcess proc;
-    proc << "cp" << TQFile::encodeName( headerFileName ) <<
-      TQFile::encodeName( headerFileNameOut );
+    proc << "cp" << TQFile::encodeName( headerFileName ).data() <<
+      TQFile::encodeName( headerFileNameOut ).data();
     
     if ( !proc.start( KProcess::Block ) ) {
       kdError() << "Copy failed" << endl;
@@ -285,7 +285,7 @@ int addProperty( KCmdLineArgs *args )
       o << out << endl;
     }
   } else {
-    std::cout << out.utf8() << std::endl;
+    std::cout << out.utf8().data() << std::endl;
   }
 
   return 0;
@@ -313,7 +313,7 @@ int codify( KCmdLineArgs *args )
       line.tqreplace( "\"", "\\\"" );
       line = "code += \"" + line;
       line.append( "\";" );
-      std::cout << line.local8Bit() << std::endl;
+      std::cout << line.local8Bit().data() << std::endl;
     }
   }
 
diff --git a/kode/kwsdl/compiler.cpp b/kode/kwsdl/compiler.cpp
index e3ccf4f8c..507e8bd52 100644
--- a/kode/kwsdl/compiler.cpp
+++ b/kode/kwsdl/compiler.cpp
@@ -39,7 +39,7 @@ Compiler::Compiler()
 void Compiler::setWSDLUrl( const TQString &wsdlUrl )
 {
   mWSDLUrl = wsdlUrl;
-  mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.findRev( '/' ) );
+  mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.tqfindRev( '/' ) );
 
   mParser.setSchemaBaseUrl( mWSDLBaseUrl );
 }
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index f517c7af8..ef7988125 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -131,7 +131,7 @@ void BinaryWidget::setData( const TQByteArray &data )
       part->openURL( KURL( file.name() ) );
       mMainWidget = part->widget();
     } else {
-      mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).arg( mimetype ), this );
+      mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).tqarg( mimetype ), this );
     }
 
     mData = data;
@@ -154,7 +154,7 @@ void BinaryWidget::load()
   if ( KIO::NetAccess::download( url, tempFile, this ) ) {
     TQFile file( tempFile );
     if ( !file.open( IO_ReadOnly ) ) {
-      KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) );
+      KMessageBox::error( this, i18n( "Unable to open file %1" ).tqarg( url.url() ) );
       return;
     }
 
diff --git a/kode/kwsdl/kung/inputfield.cpp b/kode/kwsdl/kung/inputfield.cpp
index 7bdd4cdeb..a8a1c66f3 100644
--- a/kode/kwsdl/kung/inputfield.cpp
+++ b/kode/kwsdl/kung/inputfield.cpp
@@ -25,7 +25,7 @@
 #include "inputfield.h"
 
 InputField::InputField( const TQString &name )
-  : TQObject( 0, TQString( "InputField( %1 )" ).arg( name ).latin1() ),
+  : TQObject( 0, TQString( "InputField( %1 )" ).tqarg( name ).latin1() ),
     mName( name )
 {
 }
diff --git a/kode/kwsdl/kung/loader.cpp b/kode/kwsdl/kung/loader.cpp
index 8b0281ac8..41f965bc2 100644
--- a/kode/kwsdl/kung/loader.cpp
+++ b/kode/kwsdl/kung/loader.cpp
@@ -35,7 +35,7 @@ Loader::Loader()
 void Loader::setWSDLUrl( const TQString &wsdlUrl )
 {
   mWSDLUrl = wsdlUrl;
-  mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.findRev( '/' ) );
+  mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.tqfindRev( '/' ) );
 
   mParser.setSchemaBaseUrl( mWSDLBaseUrl );
 }
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index e2e529e22..a4f8178b3 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -83,7 +83,7 @@ int main( int argc, char **argv )
   TQString dtdFilename = args->url( 0 ).path();
 
   TQString baseName = args->url( 0 ).fileName();
-  int pos = baseName.findRev( '.' );
+  int pos = baseName.tqfindRev( '.' );
   if ( pos > 0 ) baseName = baseName.left( pos );
 
 
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 0d5ddf154..3a0c7c3f7 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -229,7 +229,7 @@ void Parser::doIndent( int cols )
 
 void Parser::dumpPattern( Pattern pattern )
 {
-  std::cout << pattern.asString().utf8();
+  std::cout << pattern.asString().utf8().data();
 }
 
 void Parser::dumpReferences( const Reference::List &references, int indent )
@@ -238,7 +238,7 @@ void Parser::dumpReferences( const Reference::List &references, int indent )
   for( it = references.begin(); it != references.end(); ++it ) {
     Reference *r = *it;
     doIndent( indent );
-    std::cout << "REFERENCE " << r->name.utf8();
+    std::cout << "REFERENCE " << r->name.utf8().data();
     dumpPattern( r->pattern );
     std::cout << std::endl;
   }
@@ -250,7 +250,7 @@ void Parser::dumpAttributes( const Attribute::List &attributes, int indent )
   for( it = attributes.begin(); it != attributes.end(); ++it ) {
     Attribute *a = *it;
     doIndent( indent );
-    std::cout << "ATTRIBUTE " << a->name.utf8();
+    std::cout << "ATTRIBUTE " << a->name.utf8().data();
     dumpPattern( a->pattern );
     std::cout << std::endl;
   }
@@ -268,7 +268,7 @@ void Parser::dumpElements( const Element::List &elements, int indent )
 void Parser::dumpElement( Element *e, int indent )
 {
   doIndent( indent );
-  std::cout << "ELEMENT " << e->name.utf8();
+  std::cout << "ELEMENT " << e->name.utf8().data();
   dumpPattern( e->pattern );
   std::cout << std::endl;
 
@@ -284,7 +284,7 @@ void Parser::dumpElement( Element *e, int indent )
 
 void Parser::dumpTree( Element *s )
 {
-  std::cout << "START " << s->name.utf8() << std::endl;
+  std::cout << "START " << s->name.utf8().data() << std::endl;
   dumpElements( s->elements, 2 );
   dumpReferences( s->references, 2 );
 }