TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 34 insertions, 34 deletions

diff --git a/kexi/core/kexidragobjects.cpp b/kexi/core/kexidragobjects.cpp
index 5cddbca0b..f69b5a6ac 100644
--- a/kexi/core/kexidragobjects.cpp
+++ b/kexi/core/kexidragobjects.cpp
@@ -20,32 +20,32 @@
 
 #include "kexidragobjects.h"
 
-#include <qcstring.h>
-#include <qdatastream.h>
+#include <tqcstring.h>
+#include <tqdatastream.h>
 #include <kdebug.h>
 
 /// implementation of KexiFieldDrag
 
-KexiFieldDrag::KexiFieldDrag(const QString& sourceMimeType, const QString& sourceName, 
-	const QString& field, QWidget *parent, const char *name)
- : QStoredDrag("kexi/field", parent, name)
+KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
+	const TQString& field, TQWidget *tqparent, const char *name)
+ : TQStoredDrag("kexi/field", tqparent, name)
 {
-	QByteArray data;
-	QDataStream stream1(data,IO_WriteOnly);
+	TQByteArray data;
+	TQDataStream stream1(data,IO_WriteOnly);
 	stream1 << sourceMimeType << sourceName << field;
 	setEncodedData(data);
 }
 
-KexiFieldDrag::KexiFieldDrag(const QString& sourceMimeType, const QString& sourceName, 
-	const QStringList& fields, QWidget *parent, const char *name)
- : QStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", parent, name)
+KexiFieldDrag::KexiFieldDrag(const TQString& sourceMimeType, const TQString& sourceName, 
+	const TQStringList& fields, TQWidget *tqparent, const char *name)
+ : TQStoredDrag((fields.count() > 1) ? "kexi/fields" : "kexi/field", tqparent, name)
 {
-	QByteArray data;
-	QDataStream stream1(data,IO_WriteOnly);
+	TQByteArray data;
+	TQDataStream stream1(data,IO_WriteOnly);
 	if (fields.count() > 1)
 		stream1 << sourceMimeType << sourceName << fields;
 	else {
-		QString field;
+		TQString field;
 		if (fields.count() == 1)
 			field = fields.first();
 		else
@@ -60,26 +60,26 @@ KexiFieldDrag::~KexiFieldDrag()
 }
 
 bool
-KexiFieldDrag::canDecodeSingle(QMimeSource *e)
+KexiFieldDrag::canDecodeSingle(TQMimeSource *e)
 {
 	return e->provides("kexi/field");
 }
 
 bool
-KexiFieldDrag::canDecodeMultiple(QMimeSource *e)
+KexiFieldDrag::canDecodeMultiple(TQMimeSource *e)
 {
 	return e->provides("kexi/field") || e->provides("kexi/fields");
 }
 
 bool
-KexiFieldDrag::decodeSingle( QDropEvent* e, QString& sourceMimeType, 
-	QString& sourceName, QString& field )
+KexiFieldDrag::decodeSingle( TQDropEvent* e, TQString& sourceMimeType, 
+	TQString& sourceName, TQString& field )
 {
-	QByteArray payload( e->data("kexi/field") );
+	TQByteArray payload( e->data("kexi/field") );
 	if (payload.isEmpty())
 		return false;
 	e->accept();
-	QDataStream stream1(payload, IO_ReadOnly);
+	TQDataStream stream1(payload, IO_ReadOnly);
 	stream1 >> sourceMimeType;
 	stream1 >> sourceName;
 	stream1 >> field;
@@ -88,12 +88,12 @@ KexiFieldDrag::decodeSingle( QDropEvent* e, QString& sourceMimeType,
 }
 
 bool
-KexiFieldDrag::decodeMultiple( QDropEvent* e, QString& sourceMimeType, 
-	QString& sourceName, QStringList& fields )
+KexiFieldDrag::decodeMultiple( TQDropEvent* e, TQString& sourceMimeType, 
+	TQString& sourceName, TQStringList& fields )
 {
-	QByteArray payload( e->data("kexi/fields") );
+	TQByteArray payload( e->data("kexi/fields") );
 	if (payload.isEmpty()) {//try single
-		QString field;
+		TQString field;
 		bool res = KexiFieldDrag::decodeSingle( e, sourceMimeType, sourceName, field );
 		if (!res)
 			return false;
@@ -101,7 +101,7 @@ KexiFieldDrag::decodeMultiple( QDropEvent* e, QString& sourceMimeType,
 		return true;
 	}
 	e->accept();
-	QDataStream stream1(payload, IO_ReadOnly);
+	TQDataStream stream1(payload, IO_ReadOnly);
 	stream1 >> sourceMimeType;
 	stream1 >> sourceName;
 	stream1 >> fields;
@@ -111,32 +111,32 @@ KexiFieldDrag::decodeMultiple( QDropEvent* e, QString& sourceMimeType,
 
 /// implementation of KexiDataProviderDrag
 
-KexiDataProviderDrag::KexiDataProviderDrag(const QString& sourceMimeType, const QString& sourceName,
-	QWidget *parent, const char *name)
- : QStoredDrag("kexi/dataprovider", parent, name)
+KexiDataProviderDrag::KexiDataProviderDrag(const TQString& sourceMimeType, const TQString& sourceName,
+	TQWidget *tqparent, const char *name)
+ : TQStoredDrag("kexi/dataprovider", tqparent, name)
 {
-	QByteArray data;
-	QDataStream stream1(data,IO_WriteOnly);
+	TQByteArray data;
+	TQDataStream stream1(data,IO_WriteOnly);
 	stream1 << sourceMimeType << sourceName;
 	setEncodedData(data);
 }
 
 
 bool
-KexiDataProviderDrag::canDecode(QDragMoveEvent *e)
+KexiDataProviderDrag::canDecode(TQDragMoveEvent *e)
 {
 	return e->provides("kexi/dataprovider");
 }
 
 bool
-KexiDataProviderDrag::decode( QDropEvent* e, QString& sourceMimeType, QString& sourceName)
+KexiDataProviderDrag::decode( TQDropEvent* e, TQString& sourceMimeType, TQString& sourceName)
 {
-	QCString tmp;
-	QByteArray payload = e->data("kexidataprovider");
+	TQCString tmp;
+	TQByteArray payload = e->data("kexidataprovider");
 	if(payload.size())
 	{
 		e->accept();
-		QDataStream stream1(payload, IO_ReadOnly);
+		TQDataStream stream1(payload, IO_ReadOnly);
 		stream1 >> sourceMimeType;
 		stream1 >> sourceName;
 //		kdDebug() << "KexiDataProviderDrag::decode() decoded: " << sourceMimeType <<"/"<<sourceName<< endl;