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 --- katapult/common/actionregistry.cpp | 6 +- katapult/common/actionregistry.h | 6 +- katapult/common/cachedcatalog.cpp | 40 ++++++------- katapult/common/cachedcatalog.h | 9 +-- katapult/common/imagedisplay.cpp | 100 ++++++++++++++++---------------- katapult/common/imagedisplay.h | 39 +++++++------ katapult/common/imagedisplaysettings.ui | 42 +++++++------- katapult/common/katapultaction.cpp | 10 ++-- katapult/common/katapultaction.h | 10 ++-- katapult/common/katapultcatalog.cpp | 8 +-- katapult/common/katapultcatalog.h | 21 +++---- katapult/common/katapultdisplay.cpp | 16 ++--- katapult/common/katapultdisplay.h | 27 ++++----- katapult/common/katapultitem.cpp | 12 ++-- katapult/common/katapultitem.h | 13 +++-- katapult/common/match.cpp | 2 +- 16 files changed, 183 insertions(+), 178 deletions(-) (limited to 'katapult/common') diff --git a/katapult/common/actionregistry.cpp b/katapult/common/actionregistry.cpp index 82f10f5..30f66ef 100644 --- a/katapult/common/actionregistry.cpp +++ b/katapult/common/actionregistry.cpp @@ -45,10 +45,10 @@ void ActionRegistry::registerAction(const KatapultAction *action) actions.append(action); } -QPtrList ActionRegistry::actionsForItem(const KatapultItem *item) const +TQPtrList ActionRegistry::actionsForItem(const KatapultItem *item) const { - QPtrList result; - QPtrListIterator it(actions); + TQPtrList result; + TQPtrListIterator it(actions); KatapultAction *action; while((action = it.current()) != 0) { ++it; diff --git a/katapult/common/actionregistry.h b/katapult/common/actionregistry.h index 479837d..6cf1fa3 100644 --- a/katapult/common/actionregistry.h +++ b/katapult/common/actionregistry.h @@ -20,7 +20,7 @@ #ifndef ACTIONREGISTRY_H #define ACTIONREGISTRY_H -#include +#include class KatapultItem; class KatapultAction; @@ -33,7 +33,7 @@ public: ~ActionRegistry(); void registerAction(const KatapultAction *); - QPtrList actionsForItem(const KatapultItem *) const; + TQPtrList actionsForItem(const KatapultItem *) const; void clear(); static ActionRegistry * self(); @@ -41,7 +41,7 @@ public: private: ActionRegistry(); - QPtrList actions; + TQPtrList actions; }; diff --git a/katapult/common/cachedcatalog.cpp b/katapult/common/cachedcatalog.cpp index bf34b87..19c15a9 100644 --- a/katapult/common/cachedcatalog.cpp +++ b/katapult/common/cachedcatalog.cpp @@ -20,8 +20,8 @@ #include "cachedcatalog.moc" -#include -#include +#include +#include #include "cachedcatalog.h" #include "katapultitem.h" @@ -46,7 +46,7 @@ unsigned int CachedCatalog::minQueryLen() const void CachedCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; if(query() == "") { results.clear(); @@ -58,7 +58,7 @@ void CachedCatalog::queryChanged() if(status() & S_Active) { - QPtrListIterator it(results); + TQPtrListIterator it(results); KatapultItem *item; while((item = it.current())!=0) @@ -73,7 +73,7 @@ void CachedCatalog::queryChanged() } else { results.clear(); - QPtrListIterator it(cache); + TQPtrListIterator it(cache); KatapultItem *item; while((item=it.current())!=0) { @@ -87,36 +87,36 @@ void CachedCatalog::queryChanged() } } - newStatus |= S_Active; + newtqStatus |= S_Active; if(results.count() > 0) { - newStatus |= S_HasResults; + newtqStatus |= S_HasResults; if(results.count() > 1) - newStatus |= S_Multiple; + newtqStatus |= S_Multiple; } else - newStatus |= S_NoResults; + newtqStatus |= S_NoResults; setBestMatch(newBestMatch); } } - setStatus(newStatus); + settqStatus(newtqStatus); } -Match CachedCatalog::queryItem(const KatapultItem *item, QString query) const +Match CachedCatalog::queryItem(const KatapultItem *item, TQString query) const { int wordNo = 0; int _rank = 0; unsigned int _matched = 0; - QString text = item->text().lower(); - QStringList queryWords = QStringList::split(" ", query.lower()); + TQString text = item->text().lower(); + TQStringList queryWords = TQStringList::split(" ", query.lower()); int wordMax = queryWords.count()-1; - QStringList words = QStringList::split(" ", text); - QStringList::Iterator wit = words.begin(); - for(QStringList::Iterator qit = queryWords.begin(); qit != queryWords.end(); ++qit) { - QString queryWord = *qit; + TQStringList words = TQStringList::split(" ", text); + TQStringList::Iterator wit = words.begin(); + for(TQStringList::Iterator qit = queryWords.begin(); qit != queryWords.end(); ++qit) { + TQString queryWord = *qit; bool didMatch = FALSE; for(; wit != words.end(); ++wit) { - QString word = *wit; + TQString word = *wit; if(word.startsWith(queryWord)) { if(_matched != 0) _matched++; @@ -151,11 +151,11 @@ Match CachedCatalog::queryItem(const KatapultItem *item, QString query) const return Match(item, _rank, _matched); } -const KatapultItem * CachedCatalog::findExact(QString text) const +const KatapultItem * CachedCatalog::findExact(TQString text) const { text = text.lower(); KatapultItem *item; - QPtrListIterator it(cache); + TQPtrListIterator it(cache); while((item=it.current())!=0) { ++it; diff --git a/katapult/common/cachedcatalog.h b/katapult/common/cachedcatalog.h index 0653c5d..a0e53d5 100644 --- a/katapult/common/cachedcatalog.h +++ b/katapult/common/cachedcatalog.h @@ -20,7 +20,7 @@ #ifndef CACHEDCATALOG_H #define CACHEDCATALOG_H -#include +#include #include "katapultcatalog.h" @@ -33,11 +33,12 @@ class KatapultItem; class CachedCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: CachedCatalog(); virtual ~CachedCatalog(); - const KatapultItem * findExact(QString text) const; + const KatapultItem * findExact(TQString text) const; protected: virtual void queryChanged(); @@ -46,9 +47,9 @@ protected: void addItem(KatapultItem *); private: - Match queryItem(const KatapultItem *, QString) const; + Match queryItem(const KatapultItem *, TQString) const; - QPtrList cache, results; + TQPtrList cache, results; }; diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index 7832198..370598f 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -30,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -46,12 +46,12 @@ #define FADEINTERVAL 20 #define FADECONST 2000 -ImageDisplay::ImageDisplay(QObject *, const char *name, const QStringList&) +ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) : KatapultDisplay(name, WType_TopLevel | WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WNoAutoErase | WDestructiveClose) { KWin::setType(winId(), NET::Dock); setBackgroundMode(NoBackground); - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); singlebg = 0; doublebg = 0; @@ -73,10 +73,10 @@ ImageDisplay::ImageDisplay(QObject *, const char *name, const QStringList&) fadeImg = 0; alpha = 0; - fadeTimer = new QTimer(this); - connect(fadeTimer, SIGNAL(timeout()), this, SLOT(continueFade())); + fadeTimer = new TQTimer(this); + connect(fadeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(continueFade())); - desktopSize = qApp->desktop()->availableGeometry(QCursor::pos()); + desktopSize = tqApp->desktop()->availableGeometry(TQCursor::pos()); fadeTime = 250; updateFadeStep(); @@ -129,7 +129,7 @@ void ImageDisplay::continueFade() update(); } -void ImageDisplay::showEvent(QShowEvent *) +void ImageDisplay::showEvent(TQShowEvent *) { // set back the display-size, because if it wouldn't be done this could be a problem-source. displaySize = 0; @@ -139,8 +139,8 @@ void ImageDisplay::showEvent(QShowEvent *) if(bgDbl != 0) delete bgDbl; - bgSngl = new QPixmap(QPixmap::grabWindow(qt_xrootwin(), (desktopSize.width() - singlesize[0])/2 + desktopSize.left(), (desktopSize.height() - singlesize[1])/2 + desktopSize.top(), singlesize[0], singlesize[1])); - bgDbl = new QPixmap(QPixmap::grabWindow(qt_xrootwin(), (desktopSize.width() - doublesize[0])/2 + desktopSize.left(), (desktopSize.height() - doublesize[1])/2 + desktopSize.top(), doublesize[0], doublesize[1])); + bgSngl = new TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), (desktopSize.width() - singlesize[0])/2 + desktopSize.left(), (desktopSize.height() - singlesize[1])/2 + desktopSize.top(), singlesize[0], singlesize[1])); + bgDbl = new TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), (desktopSize.width() - doublesize[0])/2 + desktopSize.left(), (desktopSize.height() - doublesize[1])/2 + desktopSize.top(), doublesize[0], doublesize[1])); if(fadeImg != 0) delete fadeImg; @@ -151,7 +151,7 @@ void ImageDisplay::showEvent(QShowEvent *) } else { fadeOut = false; alpha = 0; - fadeImg = new QImage(getDisplay().convertToImage()); + fadeImg = new TQImage(getDisplay().convertToImage()); fadeTimer->start(FADEINTERVAL, FALSE); } } @@ -169,23 +169,23 @@ void ImageDisplay::hide() } else { if(fadeImg != 0) delete fadeImg; - fadeImg = new QImage(getDisplay().convertToImage()); + fadeImg = new TQImage(getDisplay().convertToImage()); fadeOut = TRUE; if(!fadeTimer->isActive()) fadeTimer->start(FADEINTERVAL, FALSE); } } -void ImageDisplay::drawText(QPixmap & pixmap, int x, int width, QString text, int hilight) const +void ImageDisplay::drawText(TQPixmap & pixmap, int x, int width, TQString text, int hilight) const { int fontSize = maxFontSize; - QFont font(fontFace, fontSize); - QFontMetrics metrics(font); + TQFont font(fontFace, fontSize); + TQFontMetrics metrics(font); while(fontSize > minFontSize && metrics.width(text) > width) { fontSize--; font.setPointSize(fontSize); - metrics = QFontMetrics(font); + metrics = TQFontMetrics(font); } while(hilight > 1 && metrics.width(text) > width) { @@ -200,33 +200,33 @@ void ImageDisplay::drawText(QPixmap & pixmap, int x, int width, QString text, in } text = text.left(useChars); - QString hilighted = text.left(hilight); - QString remaining = text.right(text.length() - hilighted.length()); + TQString hilighted = text.left(hilight); + TQString remaining = text.right(text.length() - hilighted.length()); x += (width-metrics.width(text))/2; - QPainter painter(&pixmap); + TQPainter painter(&pixmap); painter.setFont(font); - painter.setPen(colorGroup().color(QColorGroup::Link)); + painter.setPen(tqcolorGroup().color(TQColorGroup::Link)); painter.drawText(x, singlesize[1]-offset[3], hilighted); - painter.setPen(QColor(255, 255, 255)); + painter.setPen(TQColor(255, 255, 255)); painter.drawText(x+metrics.width(hilighted), singlesize[1]-offset[3], remaining); } -QPixmap ImageDisplay::getDisplay() +TQPixmap ImageDisplay::getDisplay() { if(status() & S_HasResults) { // show best match - QPixmap pixmap(*bgDbl); - QPainter painter(&pixmap); + TQPixmap pixmap(*bgDbl); + TQPainter painter(&pixmap); painter.drawPixmap(0, 0, *doublebg); - QFontMetrics metrics = painter.fontMetrics(); - QRect bounds; - QPixmap icon; + TQFontMetrics metrics = painter.fontMetrics(); + TQRect bounds; + TQPixmap icon; int itemSpace = (doublesize[0]-offset[0]-offset[2]-padding)/2; @@ -257,13 +257,13 @@ QPixmap ImageDisplay::getDisplay() return pixmap; } else { // show splash or error - QPixmap pixmap(*bgSngl); - QPainter painter(&pixmap); + TQPixmap pixmap(*bgSngl); + TQPainter painter(&pixmap); painter.drawPixmap(0, 0, *singlebg); - QString label; - QPixmap icon; + TQString label; + TQPixmap icon; if(status() & S_Active) { @@ -278,7 +278,7 @@ QPixmap ImageDisplay::getDisplay() label = "Katapult"; else { label = query(); - painter.setPen(QColor(16, 48, 254)); + painter.setPen(TQColor(16, 48, 254)); } } @@ -287,7 +287,7 @@ QPixmap ImageDisplay::getDisplay() drawText(pixmap, offset[0], singlesize[0]-offset[0]-offset[2], label, 0); /* painter.drawText(offset[0], singlesize[1]-offset[3]-30, singlesize[0]-offset[0]-offset[2], 30, - Qt::AlignHCenter | Qt::AlignBottom | Qt::SingleLine, label);*/ + TQt::AlignHCenter | TQt::AlignBottom | TQt::SingleLine, label);*/ painter.end(); if(displaySize != 1) @@ -311,7 +311,7 @@ void ImageDisplay::placeWindow(int size) } } -void ImageDisplay::paintEvent(QPaintEvent *) +void ImageDisplay::paintEvent(TQPaintEvent *) { if(alpha == 0) { @@ -320,7 +320,7 @@ void ImageDisplay::paintEvent(QPaintEvent *) else bitBlt(this, 0, 0, bgSngl); } else if(fadeImg != 0) { - QImage buffer; + TQImage buffer; if(displaySize == 2) buffer = bgDbl->convertToImage(); else @@ -329,17 +329,17 @@ void ImageDisplay::paintEvent(QPaintEvent *) KImageEffect::blend(*fadeImg, buffer, (float)alpha/100); bitBlt(this, 0, 0, &buffer); } else { - QPixmap pixmap = getDisplay(); + TQPixmap pixmap = getDisplay(); bitBlt(this, 0, 0, &pixmap); } } -void ImageDisplay::setSingleBG(QPixmap *singlebg) +void ImageDisplay::setSingleBG(TQPixmap *singlebg) { this->singlebg = singlebg; } -void ImageDisplay::setDoubleBG(QPixmap *doublebg) +void ImageDisplay::setDoubleBG(TQPixmap *doublebg) { this->doublebg = doublebg; } @@ -389,7 +389,7 @@ void ImageDisplay::readSettings(KConfigBase *config) fadeTime = config->readUnsignedNumEntry("FadeTime", 250); updateFadeStep(); // fadeStep = fadeTime/FADEINTERVAL; - QFont defaultFont = KGlobalSettings::generalFont(); + TQFont defaultFont = KGlobalSettings::generalFont(); fontFace = config->readEntry("FontFace", defaultFont.family()); minFontSize = config->readUnsignedNumEntry("MinFontSize", 7); maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14); @@ -403,26 +403,26 @@ void ImageDisplay::writeSettings(KConfigBase *config) config->writeEntry("MaxFontSize", maxFontSize); } -QWidget * ImageDisplay::configure() +TQWidget * ImageDisplay::configure() { ImageDisplaySettings *settings = new ImageDisplaySettings(); settings->fadeTime->setValue(fadeTime); - connect(settings->fadeTime, SIGNAL(valueChanged(int)), this, SLOT(setFadeOut(int))); + connect(settings->fadeTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setFadeOut(int))); settings->displayFont->setCurrentFont(fontFace); - connect(settings->displayFont, SIGNAL(textChanged(const QString &)), this, SLOT(setFont(const QString &))); + connect(settings->displayFont, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setFont(const TQString &))); settings->minFontSize->setValue(minFontSize); - connect(settings->minFontSize, SIGNAL(valueChanged(int)), this, SLOT(setMinFontSize(int))); + connect(settings->minFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinFontSize(int))); settings->maxFontSize->setValue(maxFontSize); - connect(settings->maxFontSize, SIGNAL(valueChanged(int)), this, SLOT(setMaxFontSize(int))); + connect(settings->maxFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMaxFontSize(int))); return settings; } -void ImageDisplay::setFont(const QString &font) +void ImageDisplay::setFont(const TQString &font) { fontFace = font; } diff --git a/katapult/common/imagedisplay.h b/katapult/common/imagedisplay.h index e0d4fc7..e7114e1 100644 --- a/katapult/common/imagedisplay.h +++ b/katapult/common/imagedisplay.h @@ -20,15 +20,15 @@ #ifndef IMAGEDISPLAY_H #define IMAGEDISPLAY_H -#include -#include -#include -#include +#include +#include +#include +#include #include "katapultdisplay.h" class Katapult; -class QFont; +class TQFont; /** @author Joe Ferris, Bastian Holst @@ -36,8 +36,9 @@ class QFont; class ImageDisplay : public KatapultDisplay { Q_OBJECT + TQ_OBJECT public: - ImageDisplay(QObject *, const char *, const QStringList&); + ImageDisplay(TQObject *, const char *, const TQStringList&); virtual ~ImageDisplay(); public slots: @@ -46,38 +47,38 @@ public slots: virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); - virtual QWidget * configure(); + virtual TQWidget * configure(); - void setFont(const QString &); + void setFont(const TQString &); void setMinFontSize(int); void setMaxFontSize(int); void setFadeOut(int); void updateFadeStep(); protected: - virtual void showEvent(QShowEvent *); - virtual void paintEvent(QPaintEvent *); + virtual void showEvent(TQShowEvent *); + virtual void paintEvent(TQPaintEvent *); - void setSingleBG(QPixmap *); - void setDoubleBG(QPixmap *); + void setSingleBG(TQPixmap *); + void setDoubleBG(TQPixmap *); void setSingleSize(int width, int height); void setDoubleSize(int width, int heught); void setMargin(int left, int top, int right, int bottom); void setPadding(int); void setIconSize(int); - QPixmap getDisplay(); - void drawText(QPixmap &, int, int, QString, int) const; + TQPixmap getDisplay(); + void drawText(TQPixmap &, int, int, TQString, int) const; void placeWindow(int); private: void updateOffset(); - QPixmap *bgSngl, *bgDbl, *singlebg, *doublebg; - QRect desktopSize; - QImage *fadeImg; - QTimer *fadeTimer; - QString fontFace; + TQPixmap *bgSngl, *bgDbl, *singlebg, *doublebg; + TQRect desktopSize; + TQImage *fadeImg; + TQTimer *fadeTimer; + TQString fontFace; int minFontSize, maxFontSize; int alpha; bool fadeOut; diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui index c78d2a4..53cba32 100644 --- a/katapult/common/imagedisplaysettings.ui +++ b/katapult/common/imagedisplaysettings.ui @@ -1,10 +1,10 @@ ImageDisplaySettings - + ImageDisplaySettings - + 0 0 @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -27,7 +27,7 @@ Length of fade-in/fade-out: - + fadeTime @@ -50,7 +50,7 @@ 1000 - + autoFontSize @@ -64,15 +64,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + textLabel2 @@ -90,7 +90,7 @@ Expanding - + 91 20 @@ -104,15 +104,15 @@ - + - layout7 + tqlayout7 unnamed - + textLabel1_2 @@ -130,29 +130,29 @@ Expanding - + 181 20 - + minFontSize - + - layout8 + tqlayout8 unnamed - + textLabel1_2_2 @@ -170,14 +170,14 @@ Expanding - + 191 20 - + maxFontSize @@ -196,7 +196,7 @@ Expanding - + 20 160 @@ -205,7 +205,7 @@ - + kfontcombo.h klineedit.h diff --git a/katapult/common/katapultaction.cpp b/katapult/common/katapultaction.cpp index d0dd13f..90ccd66 100644 --- a/katapult/common/katapultaction.cpp +++ b/katapult/common/katapultaction.cpp @@ -18,20 +18,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include "katapultaction.h" KatapultAction::~KatapultAction(){} -QString KatapultAction::text() const +TQString KatapultAction::text() const { - return QString::null; + return TQString(); } -QPixmap KatapultAction::icon(int size) const +TQPixmap KatapultAction::icon(int size) const { - return QPixmap(size, size); + return TQPixmap(size, size); } void KatapultAction::execute(const KatapultItem *) const diff --git a/katapult/common/katapultaction.h b/katapult/common/katapultaction.h index 9198920..7949a77 100644 --- a/katapult/common/katapultaction.h +++ b/katapult/common/katapultaction.h @@ -20,10 +20,10 @@ #ifndef KATAPULTACTION_H #define KATAPULTACTION_H -#include -#include +#include +#include -class QPixmap; +class TQPixmap; class KatapultItem; /** @@ -36,8 +36,8 @@ public: 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; }; diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp index f90420a..4fb0eeb 100644 --- a/katapult/common/katapultcatalog.cpp +++ b/katapult/common/katapultcatalog.cpp @@ -42,7 +42,7 @@ void KatapultCatalog::initialize() { } -void KatapultCatalog::setQuery(QString _query) +void KatapultCatalog::setQuery(TQString _query) { if(this->_query != _query) { this->_query = _query; @@ -50,7 +50,7 @@ void KatapultCatalog::setQuery(QString _query) } } -void KatapultCatalog::setStatus(int _status) +void KatapultCatalog::settqStatus(int _status) { this->_status = _status; } @@ -60,7 +60,7 @@ void KatapultCatalog::setBestMatch(Match _bestMatch) this->_bestMatch = _bestMatch; } -QString KatapultCatalog::query() const +TQString KatapultCatalog::query() const { return _query; } @@ -83,7 +83,7 @@ void KatapultCatalog::writeSettings(KConfigBase *) { } -QWidget * KatapultCatalog::configure() +TQWidget * KatapultCatalog::configure() { return 0; } diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h index 9576a8a..cc861b5 100644 --- a/katapult/common/katapultcatalog.h +++ b/katapult/common/katapultcatalog.h @@ -20,26 +20,27 @@ #ifndef KATAPULTCATALOG_H #define KATAPULTCATALOG_H -#include -#include -#include +#include +#include +#include #include "match.h" -class QWidget; +class TQWidget; class KConfigBase; /** @author Joe Ferris */ -class KatapultCatalog : public QObject { +class KatapultCatalog : public TQObject { Q_OBJECT + TQ_OBJECT public: KatapultCatalog(); virtual ~KatapultCatalog(); - void setQuery(QString); + void setQuery(TQString); int status() const; Match bestMatch() const; @@ -47,18 +48,18 @@ public: virtual void initialize(); virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); - virtual QWidget * configure(); + virtual TQWidget * configure(); protected: - QString query() const; + TQString query() const; - void setStatus(int); + void settqStatus(int); void setBestMatch(Match); virtual void queryChanged(); private: - QString _query; + TQString _query; int _status; Match _bestMatch; diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp index 2dbe460..fdb02a5 100644 --- a/katapult/common/katapultdisplay.cpp +++ b/katapult/common/katapultdisplay.cpp @@ -23,7 +23,7 @@ #include "katapultdisplay.h" KatapultDisplay::KatapultDisplay(const char *name, WFlags f) - : QWidget(0, name, f) + : TQWidget(0, name, f) { _query = ""; _item = 0; @@ -36,22 +36,22 @@ KatapultDisplay::~KatapultDisplay() { } -void KatapultDisplay::focusOutEvent(QFocusEvent *) +void KatapultDisplay::focusOutEvent(TQFocusEvent *) { emit focusOut(); } -void KatapultDisplay::keyPressEvent(QKeyEvent *e) +void KatapultDisplay::keyPressEvent(TQKeyEvent *e) { emit keyReleased(e); } // Deprecated - added for backwards compatibility -void KatapultDisplay::keyReleaseEvent(QKeyEvent *e) +void KatapultDisplay::keyReleaseEvent(TQKeyEvent *e) { } -void KatapultDisplay::setQuery(QString _query) +void KatapultDisplay::setQuery(TQString _query) { this->_query = _query; } @@ -76,12 +76,12 @@ void KatapultDisplay::setAction(const KatapultAction *_action) this->_action = _action; } -void KatapultDisplay::setStatus(int _status) +void KatapultDisplay::settqStatus(int _status) { this->_status = _status; } -QString KatapultDisplay::query() const +TQString KatapultDisplay::query() const { return _query; } @@ -109,7 +109,7 @@ void KatapultDisplay::writeSettings(KConfigBase *) { } -QWidget * KatapultDisplay::configure() +TQWidget * KatapultDisplay::configure() { return 0; } diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h index 286238c..bea1702 100644 --- a/katapult/common/katapultdisplay.h +++ b/katapult/common/katapultdisplay.h @@ -20,9 +20,9 @@ #ifndef KATAPULTDISPLAY_H #define KATAPULTDISPLAY_H -#include -#include -#include +#include +#include +#include #include "katapultitem.h" #include "katapultaction.h" @@ -33,41 +33,42 @@ class KConfigBase; /** @author Joe Ferris */ -class KatapultDisplay : public QWidget +class KatapultDisplay : public TQWidget { Q_OBJECT + TQ_OBJECT public: KatapultDisplay(const char *, WFlags); virtual ~KatapultDisplay(); - void setQuery(QString); + void setQuery(TQString); void setSelected(unsigned int); void setItem(const KatapultItem *); void setAction(const KatapultAction *); - void setStatus(int); + void settqStatus(int); virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); - virtual QWidget * configure(); + virtual TQWidget * configure(); signals: - void keyReleased(QKeyEvent *); + void keyReleased(TQKeyEvent *); void focusOut(); protected: - virtual void keyPressEvent(QKeyEvent *); - virtual void keyReleaseEvent(QKeyEvent *); - virtual void focusOutEvent(QFocusEvent *); + virtual void keyPressEvent(TQKeyEvent *); + virtual void keyReleaseEvent(TQKeyEvent *); + virtual void focusOutEvent(TQFocusEvent *); - QString query() const; + TQString query() const; unsigned int selected() const; const KatapultItem * item() const; const KatapultAction * action() const; int status() const; private: - QString _query; + TQString _query; unsigned int _selectionLength; const KatapultItem *_item; const KatapultAction *_action; diff --git a/katapult/common/katapultitem.cpp b/katapult/common/katapultitem.cpp index 7ac00f1..be8fbe9 100644 --- a/katapult/common/katapultitem.cpp +++ b/katapult/common/katapultitem.cpp @@ -20,8 +20,8 @@ #include "katapultitem.moc" -#include -#include +#include +#include #include "katapultitem.h" @@ -33,12 +33,12 @@ KatapultItem::~KatapultItem() { } -QString KatapultItem::text() const +TQString KatapultItem::text() const { - return QString::null; + return TQString(); } -QPixmap KatapultItem::icon(int) const +TQPixmap KatapultItem::icon(int) const { - return QSize(0, 0); + return TQSize(0, 0); } diff --git a/katapult/common/katapultitem.h b/katapult/common/katapultitem.h index f38422d..b599349 100644 --- a/katapult/common/katapultitem.h +++ b/katapult/common/katapultitem.h @@ -20,25 +20,26 @@ #ifndef KATAPULTITEM_H #define KATAPULTITEM_H -#include +#include #include "katapultaction.h" -class QPixmap; -class QString; +class TQPixmap; +class TQString; /** @author Joe Ferris */ -class KatapultItem : public QObject { +class KatapultItem : public TQObject { Q_OBJECT + TQ_OBJECT public: KatapultItem(); virtual ~KatapultItem(); - virtual QString text() const; - virtual QPixmap icon(int) const; + virtual TQString text() const; + virtual TQPixmap icon(int) const; signals: void itemChanged(); diff --git a/katapult/common/match.cpp b/katapult/common/match.cpp index 5a346b3..9ce4602 100644 --- a/katapult/common/match.cpp +++ b/katapult/common/match.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include "match.h" -- cgit v1.2.1