diff options
Diffstat (limited to 'kompare/interfaces')
| -rw-r--r-- | kompare/interfaces/kompareinterface.cpp | 2 | ||||
| -rw-r--r-- | kompare/interfaces/kompareinterface.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kompare/interfaces/kompareinterface.cpp b/kompare/interfaces/kompareinterface.cpp index 1522bad0..c8ff71bf 100644 --- a/kompare/interfaces/kompareinterface.cpp +++ b/kompare/interfaces/kompareinterface.cpp @@ -53,7 +53,7 @@ KompareInterface& KompareInterface::operator=( const KompareInterface& ki ) return *this; } -void KompareInterface::setEncoding( const QString& encoding ) +void KompareInterface::setEncoding( const TQString& encoding ) { m_encoding = encoding; } diff --git a/kompare/interfaces/kompareinterface.h b/kompare/interfaces/kompareinterface.h index b9c0fcda..37fabe9f 100644 --- a/kompare/interfaces/kompareinterface.h +++ b/kompare/interfaces/kompareinterface.h @@ -4,8 +4,8 @@ #ifndef _KOMPARE_INTERFACE_H #define _KOMPARE_INTERFACE_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdemacros.h> class KConfig; @@ -32,7 +32,7 @@ public: /** * Open and parse the supplied diff output */ - virtual bool openDiff( const QString& diffOutput ) = 0; + virtual bool openDiff( const TQString& diffOutput ) = 0; /** * Open and parse the diff3 file at url. @@ -42,7 +42,7 @@ public: /** * Open and parse the supplied diff3 output */ - virtual bool openDiff3( const QString& diff3Output ) = 0; + virtual bool openDiff3( const TQString& diff3Output ) = 0; /** * Compare, with diff, source with destination, can also be used if you dont @@ -80,7 +80,7 @@ public: /** * This will set the encoding to use for all files that are read or for the diffoutput */ - virtual void setEncoding( const QString& encoding ); + virtual void setEncoding( const TQString& encoding ); public: /** @@ -99,7 +99,7 @@ public: protected: // Add all variables to the KompareInterfacePrivate class and access them through the kip pointer KompareInterfacePrivate* kip; - QString m_encoding; + TQString m_encoding; }; #endif /* _KOMPARE_INTERFACE_H */ |