TQt4 port kdiff3

This enables compilation under both Qt3 and Qt4


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

1 files changed, 33 insertions, 33 deletions

diff --git a/src/common.h b/src/common.h
index b78d5bc..c5b27d3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -66,48 +66,48 @@ T minMaxLimiter( T d, T minimum, T maximum )
 }
 
 #include <map>
-#include <qstring.h>
-class QFont;
-class QColor;
-class QSize;
-class QPoint;
-class QStringList;
-class QTextStream;
+#include <tqstring.h>
+class TQFont;
+class TQColor;
+class TQSize;
+class TQPoint;
+class TQStringList;
+class TQTextStream;
 
 class ValueMap
 {
 private:
-   std::map<QString,QString> m_map;
+   std::map<TQString,TQString> m_map;
 public:
    ValueMap();
    virtual ~ValueMap();
 
-   void save( QTextStream& ts );
-   void load( QTextStream& ts );
-   QString getAsString();
-   // void load( const QString& s );
-
-   virtual void writeEntry(const QString&, const QFont& );
-   virtual void writeEntry(const QString&, const QColor& );
-   virtual void writeEntry(const QString&, const QSize& );
-   virtual void writeEntry(const QString&, const QPoint& );
-   virtual void writeEntry(const QString&, int );
-   virtual void writeEntry(const QString&, bool );
-   virtual void writeEntry(const QString&, const QStringList&, char separator );
-   virtual void writeEntry(const QString&, const QString& );
-   virtual void writeEntry(const QString&, const char* );
-
-   virtual QFont       readFontEntry (const QString&, QFont* defaultVal );
-   virtual QColor      readColorEntry(const QString&, QColor* defaultVal );
-   virtual QSize       readSizeEntry (const QString&, QSize* defaultVal );
-   virtual QPoint      readPointEntry(const QString&, QPoint* defaultVal );
-   virtual bool        readBoolEntry (const QString&, bool bDefault );
-   virtual int         readNumEntry  (const QString&, int iDefault );
-   virtual QStringList readListEntry (const QString&, const QStringList& defaultVal, char separator );
-   virtual QString     readEntry     (const QString&, const QString& );
+   void save( TQTextStream& ts );
+   void load( TQTextStream& ts );
+   TQString getAsString();
+   // void load( const TQString& s );
+
+   virtual void writeEntry(const TQString&, const TQFont& );
+   virtual void writeEntry(const TQString&, const TQColor& );
+   virtual void writeEntry(const TQString&, const TQSize& );
+   virtual void writeEntry(const TQString&, const TQPoint& );
+   virtual void writeEntry(const TQString&, int );
+   virtual void writeEntry(const TQString&, bool );
+   virtual void writeEntry(const TQString&, const TQStringList&, char separator );
+   virtual void writeEntry(const TQString&, const TQString& );
+   virtual void writeEntry(const TQString&, const char* );
+
+   virtual TQFont       readFontEntry (const TQString&, TQFont* defaultVal );
+   virtual TQColor      readColorEntry(const TQString&, TQColor* defaultVal );
+   virtual TQSize       readSizeEntry (const TQString&, TQSize* defaultVal );
+   virtual TQPoint      readPointEntry(const TQString&, TQPoint* defaultVal );
+   virtual bool        readBoolEntry (const TQString&, bool bDefault );
+   virtual int         readNumEntry  (const TQString&, int iDefault );
+   virtual TQStringList readListEntry (const TQString&, const TQStringList& defaultVal, char separator );
+   virtual TQString     readEntry     (const TQString&, const TQString& );
 };
 
-QStringList safeStringSplit(const QString& s, char sepChar=',', char metaChar='\\' );
-QString safeStringJoin(const QStringList& sl, char sepChar=',', char metaChar='\\' );
+TQStringList safeStringSplit(const TQString& s, char sepChar=',', char metaChar='\\' );
+TQString safeStringJoin(const TQStringList& sl, char sepChar=',', char metaChar='\\' );
 
 #endif