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

1 files changed, 11 insertions, 11 deletions

diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 6914deb93..91da2dd52 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -130,7 +130,7 @@ void deletePluginMimeTypes()
     }
 
     for ( unsigned int i=0; i<dirs.count(); i++ ) {
-        if ( !dirs[i].contains(".") ) {
+        if ( !dirs[i].tqcontains(".") ) {
 
             // check all mime types for X-KDE-nsplugin flag
             kdDebug(1433) << " - Looking in " << dirs[i] << endl;
@@ -162,7 +162,7 @@ void generateMimeType( TQString mime, TQString extensions, TQString pluginName,
     // get directory from mime string
     TQString dir;
     TQString name;
-    int pos = mime.findRev('/');
+    int pos = mime.tqfindRev('/');
     if ( pos<0 ) {
         kdDebug(1433) << "Invalid MIME type " << mime << endl;
         kdDebug(1433) << "<- generateMimeType" << endl;
@@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile)
         NPError err = func_GetValue( 0, NPPVpluginNameString,
                                      (void*)&buf );
         if ( err==NPERR_NO_ERROR )
-            name = TQString::fromLatin1( buf );
+            name = TQString::tqfromLatin1( buf );
         kdDebug() << "name = " << name << endl;
 
         // get name
         NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString,
                                      (void*)&buf );
         if ( nperr==NPERR_NO_ERROR )
-            description = TQString::fromLatin1( buf );
+            description = TQString::tqfromLatin1( buf );
         kdDebug() << "description = " << description << endl;
     }
     else
@@ -283,7 +283,7 @@ int tryCheck(int write_fd, const TQString &absFile)
 
     // remove version info, as it is not used at the moment
     TQRegExp versionRegExp(";version=[^:]*:");
-    mimeInfo.replace( versionRegExp, ":");
+    mimeInfo.tqreplace( versionRegExp, ":");
 
     // unload plugin lib
     kdDebug(1433) << " - unloading plugin" << endl;
@@ -318,7 +318,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
 
     for (unsigned int i=0; i<files.count(); i++) {
         TQString extension;
-        int j = files[i].findRev('.');
+        int j = files[i].tqfindRev('.');
         if (j > 0)
            extension = files[i].mid(j+1);
 
@@ -346,7 +346,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
         // open the library and ask for the mimetype
         kdDebug(1433) << " - opening " << absFile << endl;
 
-        cache.device()->flush();
+        cache.tqdevice()->flush();
         // fork, so that a crash in the plugin won't stop the scanning of other plugins
         int pipes[2];
         if (pipe(pipes) != 0) continue;
@@ -404,10 +404,10 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
            for ( type=types.begin(); type!=types.end(); ++type ) {
 
               kdDebug(1433) << " - type=" << *type << endl;
-              name = name.replace( ':', "%3A" );
+              name = name.tqreplace( ':', "%3A" );
 
               TQString entry = name + ":" + *type;
-              if ( !mimeInfoList.contains( entry ) ) {
+              if ( !mimeInfoList.tqcontains( entry ) ) {
                   if (!actuallyUsing) {
                       // note the plugin name
                       cache << "[" << absFile << "]" << endl;
@@ -444,7 +444,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
     static int depth = 0; // avoid recursion because of symlink circles
     depth++;
     for ( unsigned int i=0; i<dirs.count(); i++ ) {
-        if ( depth<8 && !dirs[i].contains(".") )
+        if ( depth<8 && !dirs[i].tqcontains(".") )
             scanDirectory( dirs.absFilePath(dirs[i]), mimeInfoList, cache );
     }
     depth--;
@@ -620,7 +620,7 @@ int main( int argc, char **argv )
           TQString desc = info[3];
 
           // append to global mime type list
-          if ( !mimeTypes.contains(type) ) {
+          if ( !mimeTypes.tqcontains(type) ) {
               kdDebug(1433) << " - mimeType=" << type << endl;
               mimeTypes.append( type );