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, 18 insertions, 18 deletions

diff --git a/kexi/plugins/macros/lib/metaparameter.cpp b/kexi/plugins/macros/lib/metaparameter.cpp
index 7f072b2b..ed921cfe 100644
--- a/kexi/plugins/macros/lib/metaparameter.cpp
+++ b/kexi/plugins/macros/lib/metaparameter.cpp
@@ -37,10 +37,10 @@ namespace KoMacro {
 
 			/**
 			* The signatures argument that represents this MetaParameter.
-			* This could be something like "const QString&", "int" or 
-			* "QMap < QString, QVariant > ".
+			* This could be something like "const TQString&", "int" or 
+			* "TQMap < TQString, TQVariant > ".
 			*/
-			QString signatureargument;
+			TQString signatureargument;
 
 			/**
 			* The type of the @a Variable .
@@ -48,16 +48,16 @@ namespace KoMacro {
 			MetaParameter::Type type;
 
 			/**
-			* If the @a MetaParameter::Type is a Variant this QVariant::Type
+			* If the @a MetaParameter::Type is a Variant this TQVariant::Type
 			* is used to defined what kind of Variant it is.
 			*/
-			QVariant::Type varianttype;
+			TQVariant::Type varianttype;
 
 	};
 
 }
 
-MetaParameter::MetaParameter(const QString& signatureargument)
+MetaParameter::MetaParameter(const TQString& signatureargument)
 	: KShared()
 	, d( new Private() ) // create the private d-pointer instance.
 {
@@ -78,7 +78,7 @@ MetaParameter::Type MetaParameter::type() const
 	return d->type;
 }
 
-const QString MetaParameter::typeName() const
+const TQString MetaParameter::typeName() const
 {
 	switch( d->type ) {
 		case TypeNone:
@@ -88,31 +88,31 @@ const QString MetaParameter::typeName() const
 		case TypeObject:
 			return "Object";
 	}
-	return QString::null;
+	return TQString();
 }
 
 void MetaParameter::setType(MetaParameter::Type type)
 {
 	d->type = type;
-	d->varianttype = QVariant::Invalid;
+	d->varianttype = TQVariant::Invalid;
 }
 
-QVariant::Type MetaParameter::variantType() const
+TQVariant::Type MetaParameter::variantType() const
 {
 	return d->varianttype;
 }
 
-void MetaParameter::setVariantType(QVariant::Type varianttype)
+void MetaParameter::setVariantType(TQVariant::Type varianttype)
 {
 	d->type = TypeVariant;
 	d->varianttype = varianttype;
 }
 
-void MetaParameter::setSignatureArgument(const QString& signatureargument)
+void MetaParameter::setSignatureArgument(const TQString& signatureargument)
 {
 	d->signatureargument = signatureargument;
 
-	QString argument = signatureargument;
+	TQString argument = signatureargument;
 	if(argument.startsWith("const")) {
 		argument = argument.mid(5).stripWhiteSpace();
 	}
@@ -122,14 +122,14 @@ void MetaParameter::setSignatureArgument(const QString& signatureargument)
 	}
 
 	if(argument.isEmpty()) {
-		throw Exception(QString("Empty signature argument passed."));
+		throw Exception(TQString("Empty signature argument passed."));
 	}
-	if(argument == "QVariant") {
-		setVariantType( QVariant::Invalid );
+	if(argument == "TQVariant") {
+		setVariantType( TQVariant::Invalid );
 	}
 	
-	QVariant::Type type = argument.isNull() ? QVariant::Invalid : QVariant::nameToType(argument.latin1());
-	if (type != QVariant::Invalid) {
+	TQVariant::Type type = argument.isNull() ? TQVariant::Invalid : TQVariant::nameToType(argument.latin1());
+	if (type != TQVariant::Invalid) {
 		setVariantType( type );
 	}
 	else {