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

diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index eeaabe041..e9ffa9497 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -42,14 +42,14 @@ namespace KexiMacro {
 	class ObjectNameVariable : public KexiVariable<ACTIONIMPL>
 	{
 		public:
-			ObjectNameVariable(ACTIONIMPL* actionimpl, const QString& objectname = QString::null, const QString& name = QString::null)
+			ObjectNameVariable(ACTIONIMPL* actionimpl, const TQString& objectname = TQString(), const TQString& name = TQString())
 				: KexiVariable<ACTIONIMPL>(actionimpl, "name", i18n("Name"))
 			{
 				if(! actionimpl->mainWin()->project())
 					return;
 
-				QStringList namelist;
-				KexiPart::Info* info = Kexi::partManager().infoForMimeType( QString("kexi/%1").arg(objectname) );
+				TQStringList namelist;
+				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(objectname) );
 				if(info) {
 					KexiPart::ItemDict* items = actionimpl->mainWin()->project()->items(info);
 					if(items)
@@ -60,12 +60,12 @@ namespace KexiMacro {
 				if(namelist.count() <= 0)
 					namelist << "";
 
-				for(QStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
+				for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
 					this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
 
-				this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );
+				this->setVariant( (name.isNull() || ! namelist.tqcontains(name)) ? namelist[0] : name );
 
-				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" children="<<namelist<<endl;
+				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl;
 			}
 
 			virtual ~ObjectNameVariable() {}