1 files changed, 31 insertions, 31 deletions

diff --git a/src/kvilib/file/kvi_packagefile.h b/src/kvilib/file/kvi_packagefile.h
index 3e330554..c32329f1 100644
--- a/src/kvilib/file/kvi_packagefile.h
+++ b/src/kvilib/file/kvi_packagefile.h
@@ -27,14 +27,14 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_pointerhashtable.h"
-#include "kvi_qcstring.h" // QByteArray anyway
-#include <qobject.h>
+#include "kvi_qcstring.h" // TQByteArray anyway
+#include <tqobject.h>
 #include "kvi_pointerlist.h"
 
 class KviFile;
-class QProgressDialog;
-class QLabel;
-class QFileInfo;
+class TQProgressDialog;
+class TQLabel;
+class TQFileInfo;
 
 //
 // This class is used for creating KVIrc package files.
@@ -47,20 +47,20 @@ public:
 	KviPackageIOEngine();
 	virtual ~KviPackageIOEngine();
 protected:
-	QString m_szLastError;
-	KviPointerHashTable<QString,QString> * m_pStringInfoFields;
-	KviPointerHashTable<QString,QByteArray> * m_pBinaryInfoFields;
-	QProgressDialog * m_pProgressDialog;
-	QLabel * m_pProgressDialogLabel;
+	TQString m_szLastError;
+	KviPointerHashTable<TQString,TQString> * m_pStringInfoFields;
+	KviPointerHashTable<TQString,TQByteArray> * m_pBinaryInfoFields;
+	TQProgressDialog * m_pProgressDialog;
+	TQLabel * m_pProgressDialogLabel;
 public:
-	const QString & lastError(){ return m_szLastError; };
-	void setLastError(const QString &szLastError){ m_szLastError = szLastError; };
-	KviPointerHashTable<QString,QString> * stringInfoFields(){ return m_pStringInfoFields; };
-	KviPointerHashTable<QString,QByteArray> * binaryInfoFields(){ return m_pBinaryInfoFields; };
+	const TQString & lastError(){ return m_szLastError; };
+	void setLastError(const TQString &szLastError){ m_szLastError = szLastError; };
+	KviPointerHashTable<TQString,TQString> * stringInfoFields(){ return m_pStringInfoFields; };
+	KviPointerHashTable<TQString,TQByteArray> * binaryInfoFields(){ return m_pBinaryInfoFields; };
 protected:
-	void showProgressDialog(const QString &szCaption,int iTotalSteps);
+	void showProgressDialog(const TQString &szCaption,int iTotalSteps);
 	void hideProgressDialog();
-	bool updateProgress(int iProgress,const QString &szLabel);
+	bool updateProgress(int iProgress,const TQString &szLabel);
 	bool writeError();
 	bool readError();
 };
@@ -87,8 +87,8 @@ protected:
 		kvi_u32_t m_uWrittenFieldLength;
 		// data fields for the File DataFieldType
 		bool m_bFileAllowCompression;
-		QString m_szFileLocalName;
-		QString m_szFileTargetName;
+		TQString m_szFileLocalName;
+		TQString m_szFileTargetName;
 	};
 
 	KviPointerList<DataField> * m_pDataFields;
@@ -101,22 +101,22 @@ public:
 		NoCompression = 1,
 		FollowSymLinks = 2
 	};
-	bool addFile(const QString &szLocalFileName,const QString &szTargetFileName,kvi_u32_t uAddFileFlags = 0);
-	bool addDirectory(const QString &szLocalDirectoryName,const QString &szTargetDirectoryPrefix,kvi_u32_t uAddFileFlags = 0);
+	bool addFile(const TQString &szLocalFileName,const TQString &szTargetFileName,kvi_u32_t uAddFileFlags = 0);
+	bool addDirectory(const TQString &szLocalDirectoryName,const TQString &szTargetDirectoryPrefix,kvi_u32_t uAddFileFlags = 0);
 	// Adds an info field as a name=value pair
-	void addInfoField(const QString &szName,const QString &szValue);
-	void addInfoField(const QString &szName,QByteArray * pArray);
+	void addInfoField(const TQString &szName,const TQString &szValue);
+	void addInfoField(const TQString &szName,TQByteArray * pArray);
 	// Attempts to pack everything and store it as the specified file.
 	// There is no mandatory extension but you *should* use KVI_FILEEXTENSION_THEMEPACKAGE for themes
 	// and KVI_FILEEXTENSION_ADDONPACKAGE for addons. See kvi_fileextension.h
 	enum PackFlags {
 		NoProgressDialog = 1
 	};
-	bool pack(const QString &szFileName,kvi_u32_t uPackFlags = 0);
+	bool pack(const TQString &szFileName,kvi_u32_t uPackFlags = 0);
 private:
-	bool packInternal(const QString &szFileName,kvi_u32_t uPackFlags = 0);
+	bool packInternal(const TQString &szFileName,kvi_u32_t uPackFlags = 0);
 	bool packFile(KviFile * pFile,DataField * pDataField);
-	bool addFileInternal(const QFileInfo * fi,const QString &szLocalFileName,const QString &szTargetFileName,kvi_u32_t uAddFileFlags = 0);
+	bool addFileInternal(const TQFileInfo * fi,const TQString &szLocalFileName,const TQString &szTargetFileName,kvi_u32_t uAddFileFlags = 0);
 };
 
 class KVILIB_API KviPackageReader : public KviPackageIOEngine
@@ -125,16 +125,16 @@ public:
 	KviPackageReader();
 	virtual ~KviPackageReader();
 public:
-	bool readHeader(const QString &szLocalFileName);
+	bool readHeader(const TQString &szLocalFileName);
 	enum UnpackFlags {
 		NoProgressDialog = 1
 	};
-	bool getStringInfoField(const QString &szName,QString &szBuffer);
-	bool unpack(const QString &szLocalFileName,const QString &szUnpackPath,kvi_u32_t uUnpackFlags = 0);
+	bool getStringInfoField(const TQString &szName,TQString &szBuffer);
+	bool unpack(const TQString &szLocalFileName,const TQString &szUnpackPath,kvi_u32_t uUnpackFlags = 0);
 private:
-	bool unpackInternal(const QString &szLocalFileName,const QString &szUnpackPath,kvi_u32_t uUnpackFlags = 0);
-	bool unpackFile(KviFile * pFile,const QString &szUnpackPath);
-	bool readHeaderInternal(KviFile * pFile,const QString &szLocalFileName);
+	bool unpackInternal(const TQString &szLocalFileName,const TQString &szUnpackPath,kvi_u32_t uUnpackFlags = 0);
+	bool unpackFile(KviFile * pFile,const TQString &szUnpackPath);
+	bool readHeaderInternal(KviFile * pFile,const TQString &szLocalFileName);
 };