From 5e49bbb1e8d7761d1c8cdff83184035f59dd5abe Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 10 Aug 2010 01:35:50 +0000
Subject: [PATCH] Additional fixes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1161223 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdecore/kbufferedio.h      | 10 ++++++++
 kdecore/kconfigbackend.cpp |  2 +-
 kdecore/kconfigbase.cpp    | 48 ++++++++++++++++++++++++++++++++++++++
 kdecore/kextsock.h         | 15 ++++++++++++
 kdecore/kiconloader.cpp    |  2 +-
 5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/kdecore/kbufferedio.h b/kdecore/kbufferedio.h
index b020663eb..234034d87 100644
--- a/kdecore/kbufferedio.h
+++ b/kdecore/kbufferedio.h
@@ -117,7 +117,12 @@ public:
    * Returns the number of bytes available for reading in the read buffer
    * @return the number of bytes available for reading
    */
+#ifdef USE_QT3
   virtual int bytesAvailable() const;
+#endif // USE_QT3
+#ifdef USE_QT4
+  virtual qint64 bytesAvailable() const;
+#endif // USE_QT4
 
   /**
    * Waits for more data to be available and returns the amount of available data then.
@@ -131,7 +136,12 @@ public:
    * Returns the number of bytes yet to write, still in the write buffer
    * @return the number of unwritten bytes in the write buffer
    */
+#ifdef USE_QT3
   virtual int bytesToWrite() const;
+#endif // USE_QT3
+#ifdef USE_QT4
+  virtual qint64 bytesToWrite() const;
+#endif // USE_QT4
 
   /**
    * Checks whether there is enough data in the buffer to read a line
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
index 09d3a65c1..ef1c5bb96 100644
--- a/kdecore/kconfigbackend.cpp
+++ b/kdecore/kconfigbackend.cpp
@@ -1178,7 +1178,7 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser)
     if (!cmdToExec.isEmpty() && app)
     {
       KProcess lprocess;
-      lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << errorMsg.local8Bit();
+      lprocess << cmdToExec << TQString("--title") << (TQString)app->instanceName() << TQString("--msgbox") << (TQString)errorMsg.local8Bit();
       lprocess.start( KProcess::Block );
     }
   }
diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
index 771e9b643..56f5292ae 100644
--- a/kdecore/kconfigbase.cpp
+++ b/kdecore/kconfigbase.cpp
@@ -421,10 +421,34 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey,
       case TQVariant::Cursor:
       case TQVariant::SizePolicy:
       case TQVariant::Time:
+#ifdef USE_QT3
       case TQVariant::ByteArray:
+#endif // USE_QT3
       case TQVariant::BitArray:
       case TQVariant::KeySequence:
       case TQVariant::Pen:
+#ifdef USE_QT4
+      case TQVariant::Char:
+      case TQVariant::Url:
+      case TQVariant::Locale:
+      case TQVariant::RectF:
+      case TQVariant::SizeF:
+      case TQVariant::Line:
+      case TQVariant::LineF:
+      case TQVariant::PointF:
+      case TQVariant::RegExp:
+      case TQVariant::Hash:
+      case TQVariant::TextLength:
+      case TQVariant::TextFormat:
+      case TQVariant::Matrix:
+      case TQVariant::Transform:
+      case TQVariant::Matrix4x4:
+      case TQVariant::Vector2D:
+      case TQVariant::Vector3D:
+      case TQVariant::Vector4D:
+      case TQVariant::Quaternion:
+      case TQVariant::UserType:
+#endif // USE_QT4
           break;
   }
 
@@ -1313,10 +1337,34 @@ void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
     case TQVariant::Cursor:
     case TQVariant::SizePolicy:
     case TQVariant::Time:
+#ifdef USE_QT3
     case TQVariant::ByteArray:
+#endif // USE_QT3
     case TQVariant::BitArray:
     case TQVariant::KeySequence:
     case TQVariant::Pen:
+#ifdef USE_QT4
+    case TQVariant::Char:
+    case TQVariant::Url:
+    case TQVariant::Locale:
+    case TQVariant::RectF:
+    case TQVariant::SizeF:
+    case TQVariant::Line:
+    case TQVariant::LineF:
+    case TQVariant::PointF:
+    case TQVariant::RegExp:
+    case TQVariant::Hash:
+    case TQVariant::TextLength:
+    case TQVariant::TextFormat:
+    case TQVariant::Matrix:
+    case TQVariant::Transform:
+    case TQVariant::Matrix4x4:
+    case TQVariant::Vector2D:
+    case TQVariant::Vector3D:
+    case TQVariant::Vector4D:
+    case TQVariant::Quaternion:
+    case TQVariant::UserType:
+#endif // USE_QT4
         break;
     }
 
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index 7bc93618c..2bfb22bfe 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -206,7 +206,12 @@ public:
    * freeing any related resources still being kept.
    * @since 3.1
    */
+#ifdef USE_QT3
   void reset();
+#endif // USE_QT3
+#ifdef USE_QT4
+  bool reset();
+#endif // USE_QT4
 
   /*
    * --- status, flags and internal variables --- *
@@ -675,7 +680,12 @@ public:
    * Returns length of this socket. This call is not supported on sockets.
    * @return the length of this socket, or 0 if unsupported
    */
+#ifdef USE_QT3
   virtual inline Q_ULONG size() const
+#endif // USE_QT3
+#ifdef USE_QT4
+  virtual inline qint64 size() const
+#endif // USE_QT4
   { return 0; }
 
   /**
@@ -790,7 +800,12 @@ public:
    * @return The number of available bytes, or -1 on error or -2 if this call is invalid
    * in the current state.
    */
+#ifdef USE_QT3
   virtual int bytesAvailable() const;
+#endif // USE_QT3
+#ifdef USE_QT4
+  virtual qint64 bytesAvailable() const;
+#endif // USE_QT4
 
   /**
    * Waits @p msec milliseconds for more data to be available (use 0 to
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index 6ff13f879..ff9243ebe 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -1143,7 +1143,7 @@ TQIconSet KIconLoader::loadIconSet(const TQString& name, KIcon::Group group, int
 /*** class for delayed icon loading for TQIconSet ***/
 
 class KIconFactory
-    : public QIconFactory
+    : public TQIconFactory
     {
     public:
         KIconFactory( const TQString& iconName_P, KIcon::Group group_P,