diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
commit | 98d15d90b6a83e2df32d678013847e18b8a8c7e8 (patch) | |
tree | 02a588c0979fe1a40ae6216d1f831bb24de91a9f /katapult/plugins/catalogs/googlecatalog | |
parent | e0974f69b7603e3d8f2d936301e05535af25346e (diff) | |
download | katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.tar.gz katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.zip |
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
Diffstat (limited to 'katapult/plugins/catalogs/googlecatalog')
7 files changed, 47 insertions, 45 deletions
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp index b9af97e..9f2718a 100644 --- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp +++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp @@ -45,12 +45,12 @@ ActionSearch::~ActionSearch() { } -QString ActionSearch::text() const +TQString ActionSearch::text() const { return i18n("Search Google"); } -QPixmap ActionSearch::icon(int size) const +TQPixmap ActionSearch::icon(int size) const { return KGlobal::iconLoader()->loadIcon("viewmag", KIcon::NoGroup, size); } diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.h b/katapult/plugins/catalogs/googlecatalog/actionsearch.h index c35b394..f3a4382 100644 --- a/katapult/plugins/catalogs/googlecatalog/actionsearch.h +++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.h @@ -39,8 +39,8 @@ class ActionSearch : 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/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index a180a30..050d135 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -29,8 +29,8 @@ #include <ksycocatype.h> #include <kapplication.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "settings.h" #include "googlecatalog.h" @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog, KGenericFactory<GoogleCatalog>( "katapult_googlecatalog" ) ) -GoogleCatalog::GoogleCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null) +GoogleCatalog::GoogleCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString()) { ActionRegistry::self()->registerAction(new ActionSearch()); } @@ -52,8 +52,8 @@ GoogleCatalog::~GoogleCatalog() void GoogleCatalog::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 GoogleCatalog::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 GoogleCatalog::accepts(const QString& str) const +bool GoogleCatalog::accepts(const TQString& str) const { //accept if we begin with the triggerWord int length = _triggerWord.length(); @@ -92,21 +92,21 @@ void GoogleCatalog::writeSettings(KConfigBase* config) config->writeEntry("TriggerWord", _triggerWord); } -QWidget * GoogleCatalog::configure() +TQWidget * GoogleCatalog::configure() { GoogleCatalogSettings* settings = new GoogleCatalogSettings(); 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 search query\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 search query\"").tqarg(_triggerWord)); return settings; } -void GoogleCatalog::triggerWordChanged(const QString& triggerWord) +void GoogleCatalog::triggerWordChanged(const TQString& triggerWord) { - _triggerWord = QString(triggerWord); + _triggerWord = TQString(triggerWord); } int GoogleCatalog::triggerWordLength() @@ -116,7 +116,7 @@ int GoogleCatalog::triggerWordLength() void GoogleCatalog::reset() { - _result.setText(QString::null); + _result.setText(TQString()); } #include "googlecatalog.moc" diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h index 3dfd342..4e13025 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h @@ -31,12 +31,12 @@ #include <kgenericfactory.h> -#include <qstring.h> +#include <tqstring.h> #include "query.h" #include "katapultcatalog.h" -class QWidget; +class TQWidget; /** @author Jonathan Riddell @@ -44,15 +44,16 @@ class QWidget; class GoogleCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: - GoogleCatalog(QObject*, const char*, const QStringList&); + GoogleCatalog(TQObject*, const char*, const TQStringList&); virtual ~GoogleCatalog(); virtual void readSettings(KConfigBase*); virtual void writeSettings(KConfigBase*); - virtual QWidget* configure(); + virtual TQWidget* configure(); int triggerWordLength(); protected: @@ -60,16 +61,16 @@ class GoogleCatalog : public KatapultCatalog virtual void queryChanged(); private: - bool accepts(const QString&) const; + bool accepts(const TQString&) const; - QString _triggerWord; + TQString _triggerWord; SearchQuery _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/googlecatalog/query.cpp b/katapult/plugins/catalogs/googlecatalog/query.cpp index c97f00e..96c7aa6 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.cpp +++ b/katapult/plugins/catalogs/googlecatalog/query.cpp @@ -29,30 +29,30 @@ #include <kiconloader.h> #include <kapplication.h> -#include <qclipboard.h> +#include <tqclipboard.h> #include "googlecatalog.h" #include "query.h" -SearchQuery::SearchQuery(GoogleCatalog* catalog, const QString& text): KatapultItem(), _catalog(catalog), _text(text) +SearchQuery::SearchQuery(GoogleCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { } SearchQuery::~SearchQuery() { } -QPixmap SearchQuery::icon(int size) const +TQPixmap SearchQuery::icon(int size) const { return KGlobal::iconLoader()->loadIcon("help", KIcon::NoGroup, size); } -QString SearchQuery::text() const +TQString SearchQuery::text() const { return _text; } -void SearchQuery::setText(const QString& text) +void SearchQuery::setText(const TQString& text) { _text = text; } diff --git a/katapult/plugins/catalogs/googlecatalog/query.h b/katapult/plugins/catalogs/googlecatalog/query.h index 6759f13..ab502fd 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.h +++ b/katapult/plugins/catalogs/googlecatalog/query.h @@ -23,8 +23,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QUERY_H -#define QUERY_H +#ifndef TQUERY_H +#define TQUERY_H #include <kspell.h> @@ -38,20 +38,21 @@ class GoogleCatalog; class SearchQuery : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - SearchQuery(GoogleCatalog*, const QString&); + SearchQuery(GoogleCatalog*, const TQString&); ~SearchQuery(); - 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&); GoogleCatalog* catalog() const; private: GoogleCatalog* const _catalog; - QString _text; + TQString _text; }; diff --git a/katapult/plugins/catalogs/googlecatalog/settings.ui b/katapult/plugins/catalogs/googlecatalog/settings.ui index 5549c3b..dad796c 100644 --- a/katapult/plugins/catalogs/googlecatalog/settings.ui +++ b/katapult/plugins/catalogs/googlecatalog/settings.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GoogleCatalogSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GoogleCatalogSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,12 +19,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>triggerWordLE</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>triggerWordLabel</cstring> </property> @@ -32,7 +32,7 @@ <string>Trigger Word:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>introLabel</cstring> </property> @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>150</height> @@ -61,5 +61,5 @@ </widget> <tabstops> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |