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

diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index eb521de5..a45c5ae9 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -11,12 +11,12 @@
 #include "keximainwindow.h"
 #include "kexiuseraction.h"
 
-KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *parent, const QString &name, const QString &text, const QString &pixmap)
- : KAction(text, pixmap, KShortcut::null(), this, SLOT(execute()), parent, name.latin1())
+KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *tqparent, const TQString &name, const TQString &text, const TQString &pixmap)
+ : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), tqparent, name.latin1())
 {
 	m_win = win;
 	m_method = 0;
-	connect(this, SIGNAL(activated()), this, SLOT(execute()));
+	connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(execute()));
 }
 
 void
@@ -59,17 +59,17 @@ KexiUserAction::execute()
 }
 
 KexiUserAction *
-KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c)
+KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *tqparent, KexiDB::Cursor *c)
 {
 	if(!c || c->bof() || c->eof())
 		return 0;
 
-	KexiUserAction *a = new KexiUserAction(context, parent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
-	QString args = c->value(5).toString();
+	KexiUserAction *a = new KexiUserAction(context, tqparent, c->value(1).toString(), c->value(2).toString(), c->value(3).toString());
+	TQString args = c->value(5).toString();
 	bool quote = false;
 
 	Arguments arg;
-	QString tmp;
+	TQString tmp;
 	const int len = args.length();
 	for(int i=0; i < len; i++)
 	{
@@ -82,7 +82,7 @@ KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *pa
 			if(tmp.left(1)=="\"" && tmp.right(1)=="\"")
 				tmp = tmp.mid(1, tmp.length()-2);
 
-			arg.append(QVariant(tmp));
+			arg.append(TQVariant(tmp));
 			tmp = "";
 		}
 		else //else simply add char to tmp
@@ -94,7 +94,7 @@ KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *pa
 	if(tmp.left(1)=="\"" && tmp.right(1)=="\"")
 		tmp = tmp.mid(1, tmp.length()-2);
 
-	arg.append(QVariant(tmp));
+	arg.append(TQVariant(tmp));
 
 	a->setMethod(c->value(4).toInt(), arg);
 	return a;