From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kexi/plugins/macros/lib/macro.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kexi/plugins/macros/lib/macro.cpp') diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp index 688cc7b07..6bcdc21d2 100644 --- a/kexi/plugins/macros/lib/macro.cpp +++ b/kexi/plugins/macros/lib/macro.cpp @@ -23,7 +23,7 @@ #include "context.h" #include "variable.h" -#include +#include #include using namespace KoMacro; @@ -41,20 +41,20 @@ namespace KoMacro { /** * A list of @a MacroItem instances. */ - QValueList > itemlist; + TQValueList > itemlist; /** * The name the @a Macro has. */ - QString name; + TQString name; }; } //constructor, initalize internal (d-pointer) name -Macro::Macro(const QString& name) - : QObject() +Macro::Macro(const TQString& name) + : TQObject() , KShared() , XMLHandler(this) , d( new Private() ) // create the private d-pointer instance. @@ -70,25 +70,25 @@ Macro::~Macro() } //get internal (d-pointer) name -const QString Macro::name() const +const TQString Macro::name() const { return d->name; } //set internal (d-pointer) name -void Macro::setName(const QString& name) +void Macro::setName(const TQString& name) { d->name = name; } //get an "extended" name -const QString Macro::toString() const +const TQString Macro::toString() const { - return QString("Macro:%1").arg(name()); + return TQString("Macro:%1").tqarg(name()); } //get (d-pointer) itemlist -QValueList >& Macro::items() const +TQValueList >& Macro::items() const { return d->itemlist; } @@ -105,17 +105,17 @@ void Macro::clearItems() } //run our macro -KSharedPtr Macro::execute(QObject* sender) +KSharedPtr Macro::execute(TQObject* sender) { kdDebug() << "Macro::execute(KSharedPtr)" << endl; //create context in which macro can/should run KSharedPtr c = KSharedPtr( new Context(this) ); if(sender) { - // set the sender-variable if we got a sender QObject. + // set the sender-variable if we got a sender TQObject. c->setVariable("[sender]", KSharedPtr( new Variable(sender) )); } - //connect(context, SIGNAL(activated()), this, SIGNAL(activated())); + //connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated())); //call activate in the context of the macro c->activate( c ); -- cgit v1.2.3