From 98d15d90b6a83e2df32d678013847e18b8a8c7e8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 28 May 2011 18:03:09 +0000 Subject: TQt4 port Katapult This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../plugins/catalogs/execcatalog/actionrun.cpp | 4 +-- katapult/plugins/catalogs/execcatalog/actionrun.h | 4 +-- katapult/plugins/catalogs/execcatalog/command.cpp | 10 ++++---- katapult/plugins/catalogs/execcatalog/command.h | 11 ++++---- .../plugins/catalogs/execcatalog/execcatalog.cpp | 30 +++++++++++----------- .../plugins/catalogs/execcatalog/execcatalog.h | 15 ++++++----- katapult/plugins/catalogs/execcatalog/settings.ui | 14 +++++----- 7 files changed, 45 insertions(+), 43 deletions(-) (limited to 'katapult/plugins/catalogs/execcatalog') diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp index a1e5e7b..e9680fd 100644 --- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp +++ b/katapult/plugins/catalogs/execcatalog/actionrun.cpp @@ -44,12 +44,12 @@ ActionRun::~ActionRun() { } -QString ActionRun::text() const +TQString ActionRun::text() const { return i18n("Execute"); } -QPixmap ActionRun::icon(int size) const +TQPixmap ActionRun::icon(int size) const { return KGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size); } diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.h b/katapult/plugins/catalogs/execcatalog/actionrun.h index d81f103..2e13996 100644 --- a/katapult/plugins/catalogs/execcatalog/actionrun.h +++ b/katapult/plugins/catalogs/execcatalog/actionrun.h @@ -39,8 +39,8 @@ class ActionRun : public KatapultAction virtual void execute(const KatapultItem*) const; virtual bool accepts(const KatapultItem*) const; - virtual QString text() const; - virtual QPixmap icon(int) const; + virtual TQString text() const; + virtual TQPixmap icon(int) const; private: //_expr needs to be mutable because accepts() is const. diff --git a/katapult/plugins/catalogs/execcatalog/command.cpp b/katapult/plugins/catalogs/execcatalog/command.cpp index 0057bf8..5954405 100644 --- a/katapult/plugins/catalogs/execcatalog/command.cpp +++ b/katapult/plugins/catalogs/execcatalog/command.cpp @@ -29,30 +29,30 @@ #include #include -#include +#include #include "execcatalog.h" #include "command.h" -Command::Command(ExecCatalog* catalog, const QString& text): KatapultItem(), _catalog(catalog), _text(text) +Command::Command(ExecCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { } Command::~Command() { } -QPixmap Command::icon(int size) const +TQPixmap Command::icon(int size) const { return KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, size); } -QString Command::text() const +TQString Command::text() const { return _text; } -void Command::setText(const QString& text) +void Command::setText(const TQString& text) { _text = text; } diff --git a/katapult/plugins/catalogs/execcatalog/command.h b/katapult/plugins/catalogs/execcatalog/command.h index 7e649bf..3f9d453 100644 --- a/katapult/plugins/catalogs/execcatalog/command.h +++ b/katapult/plugins/catalogs/execcatalog/command.h @@ -38,20 +38,21 @@ class ExecCatalog; class Command : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - Command(ExecCatalog*, const QString&); + Command(ExecCatalog*, const TQString&); ~Command(); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; - void setText(const QString&); + void setText(const TQString&); ExecCatalog* catalog() const; private: ExecCatalog* const _catalog; - QString _text; + TQString _text; }; diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 177df77..78ef7af 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include "settings.h" #include "execcatalog.h" @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_execcatalog, KGenericFactory( "katapult_execcatalog" ) ) -ExecCatalog::ExecCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null) +ExecCatalog::ExecCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString()) { ActionRegistry::self()->registerAction(new ActionRun()); } @@ -52,8 +52,8 @@ ExecCatalog::~ExecCatalog() void ExecCatalog::queryChanged() { - int newStatus = 0; - QString cmd = query(); + int newtqStatus = 0; + TQString cmd = query(); int origLength = cmd.length(); if (cmd.isEmpty()) { @@ -67,15 +67,15 @@ void ExecCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } -bool ExecCatalog::accepts(const QString& str) const +bool ExecCatalog::accepts(const TQString& str) const { //accept if we begin with the triggerWord int length = _triggerWord.length(); @@ -92,21 +92,21 @@ void ExecCatalog::writeSettings(KConfigBase* config) config->writeEntry("TriggerWord", _triggerWord); } -QWidget * ExecCatalog::configure() +TQWidget * ExecCatalog::configure() { ExecCatalogSettings* settings = new ExecCatalogSettings(); settings->triggerWordLE->setText(_triggerWord); - connect(settings->triggerWordLE, SIGNAL(textChanged(const QString&)), this, SLOT(triggerWordChanged(const QString&))); + connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 exec query\"").tqarg(_triggerWord)); return settings; } -void ExecCatalog::triggerWordChanged(const QString& triggerWord) +void ExecCatalog::triggerWordChanged(const TQString& triggerWord) { - _triggerWord = QString(triggerWord); + _triggerWord = TQString(triggerWord); } int ExecCatalog::triggerWordLength() @@ -116,7 +116,7 @@ int ExecCatalog::triggerWordLength() void ExecCatalog::reset() { - _result.setText(QString::null); + _result.setText(TQString()); } #include "execcatalog.moc" diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.h b/katapult/plugins/catalogs/execcatalog/execcatalog.h index df550ee..cc1ac08 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.h +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.h @@ -31,12 +31,12 @@ #include -#include +#include #include "command.h" #include "katapultcatalog.h" -class QWidget; +class TQWidget; /** @author Jonathan Riddell @@ -44,15 +44,16 @@ class QWidget; class ExecCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: - ExecCatalog(QObject*, const char*, const QStringList&); + ExecCatalog(TQObject*, const char*, const TQStringList&); virtual ~ExecCatalog(); virtual void readSettings(KConfigBase*); virtual void writeSettings(KConfigBase*); - virtual QWidget* configure(); + virtual TQWidget* configure(); int triggerWordLength(); protected: @@ -60,16 +61,16 @@ class ExecCatalog : public KatapultCatalog virtual void queryChanged(); private: - bool accepts(const QString&) const; + bool accepts(const TQString&) const; - QString _triggerWord; + TQString _triggerWord; Command _result; // The one result (there's always one). void reset(); protected slots: - void triggerWordChanged(const QString& triggerWord); + void triggerWordChanged(const TQString& triggerWord); }; diff --git a/katapult/plugins/catalogs/execcatalog/settings.ui b/katapult/plugins/catalogs/execcatalog/settings.ui index 6186013..ff830cd 100644 --- a/katapult/plugins/catalogs/execcatalog/settings.ui +++ b/katapult/plugins/catalogs/execcatalog/settings.ui @@ -1,10 +1,10 @@ ExecCatalogSettings - + ExecCatalogSettings - + 0 0 @@ -19,12 +19,12 @@ unnamed - + triggerWordLE - + triggerWordLabel @@ -32,7 +32,7 @@ Trigger Word: - + introLabel @@ -50,7 +50,7 @@ Expanding - + 20 150 @@ -61,5 +61,5 @@ - + -- cgit v1.2.3