TQt conversion fixes

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

6 files changed, 38 insertions, 38 deletions

diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 176dbf8e9..2bbe69ed9 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -61,7 +61,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqsocketnotifier.h>
 #include <tqregexp.h>
 
-#include <private/qucomextra_p.h>
+#include <tqucomextra_p.h>
 
 #include <dcopglobal.h>
 #include <dcopclient.h>
@@ -780,7 +780,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                 emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
                 return false;
             }
-            int size = QMIN( 1024, f.size() ); // protection against a huge file
+            int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
             TQCString contents( size+1 );
             if ( f.readBlock( contents.data(), size ) != size )
             {
@@ -1339,7 +1339,7 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
              if ( n == "unnamed" || n.isEmpty() )
              {
                  n.sprintf("%p", (void *) obj);
-                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(n).latin1();
+                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
              }
              TQCString fn = path + n;
              l.append( fn );
@@ -1376,7 +1376,7 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
             if ( n == "unnamed" || n.isEmpty() )
              {
                  n.sprintf("%p", (void *) obj);
-                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(n).latin1();
+                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
              }
             TQCString fn = path + n;
             l.append( O( fn, obj ) );
@@ -1785,8 +1785,8 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId,
     TQByteArray replyData;
 
     ReplyStruct *replyStruct = new ReplyStruct;
-    replyStruct->replyType = new QCString;
-    replyStruct->replyData = new QByteArray;
+    replyStruct->replyType = new TQCString;
+    replyStruct->replyData = new TQByteArray;
     replyStruct->replyObject = callBackObj;
     replyStruct->replySlot = callBackSlot;
     replyStruct->replyId = ++d->transactionId;
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc
index 92c08583f..e91b21d68 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cc
@@ -839,7 +839,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 #include <ctype.h>
 
-class QString;
+class TQString;
 
 #ifndef KDE_USE_FINAL
 #include "yacc.cc.h"
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index 380bebf5a..92cb921bb 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdatastream.h> // needed for proper bool marshalling
 #include "kdelibs_export.h"
 
-class QDataStream;
+class TQDataStream;
 class DCOPObject;
 class DCOPClient;
 
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index e6c60c74f..41a639b2e 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -1614,7 +1614,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
     if (::access(fName.data(), R_OK) == 0) {
 	TQFile f(fName);
 	f.open(IO_ReadOnly);
-	int size = QMIN( 1024, f.size() ); // protection against a huge file
+	int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
 	TQCString contents( size+1 );
 	bool ok = f.readBlock( contents.data(), size ) == size;
 	contents[size] = '\0';
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index 343a2bc34..7b649ccf2 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -50,15 +50,15 @@ class DCOPConnection;
 class DCOPListener;
 class DCOPSignalConnectionList;
 class DCOPSignals;
-class QTimer;
+class TQTimer;
 
 // If you enable the following define DCOP will create
 // $HOME/.dcop.log file which will list all signals passing
 // through it.
 //#define DCOP_LOG
 #ifdef DCOP_LOG
-class QTextStream;
-class QFile;
+class TQTextStream;
+class TQFile;
 #endif
 
 typedef TQValueList<TQCString> QCStringList;
diff --git a/dcop/dcoptypes.h b/dcop/dcoptypes.h
index 62e3a4e0f..5c9d13745 100644
--- a/dcop/dcoptypes.h
+++ b/dcop/dcoptypes.h
@@ -40,32 +40,32 @@ inline const char* dcopTypeName( const char* ) { return "TQCString"; }
 class DCOPRef; inline const char* dcopTypeName( const DCOPRef& ) { return "DCOPRef"; }
 
 // Qt variant types
-class QString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
-class QCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; }
-class QFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; }
-class QPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; }
-class QBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; }
-class QRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; }
-class QPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; }
-class QImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; }
-class QSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; }
-class QColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; }
-class QPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; }
-class QColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; }
-class QIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; }
-class QDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; }
-class QPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; }
-class QRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; }
-class QBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; }
-class QCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; }
-class QStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; }
-class QSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; }
-class QDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; }
-class QTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; }
-class QDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; }
-class QBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; }
-class QKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; }
-class QVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; }
+class TQString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
+class TQCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; }
+class TQFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; }
+class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; }
+class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; }
+class TQRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; }
+class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; }
+class TQImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; }
+class TQSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; }
+class TQColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; }
+class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; }
+class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; }
+class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; }
+class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; }
+class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; }
+class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; }
+class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; }
+class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; }
+class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; }
+class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; }
+class TQDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; }
+class TQTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; }
+class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; }
+class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; }
+class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; }
+class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; }
 
 // And some KDE types
 class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }