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 +- katapult/katapult/confcatalogs.ui | 6 +- katapult/katapult/confdisplay.ui | 10 +- katapult/katapult/confgeneral.ui | 36 ++--- katapult/katapult/katapult.cpp | 106 ++++++------- katapult/katapult/katapult.h | 31 ++-- katapult/katapult/katapultconfigdlg.cpp | 64 ++++---- katapult/katapult/katapultconfigdlg.h | 17 ++- katapult/katapult/katapultiface.h | 2 +- katapult/katapult/katapultsettings.cpp | 68 ++++----- katapult/katapult/katapultsettings.h | 47 +++--- katapult/katapult/main.cpp | 2 +- katapult/katapult/settings.cpp | 64 ++++---- .../catalogs/amarokcatalog/actionplaysong.cpp | 16 +- .../catalogs/amarokcatalog/actionplaysong.h | 8 +- .../catalogs/amarokcatalog/amarokcatalog.cpp | 166 ++++++++++----------- .../plugins/catalogs/amarokcatalog/amarokcatalog.h | 11 +- .../plugins/catalogs/amarokcatalog/coverimage.cpp | 48 +++--- .../plugins/catalogs/amarokcatalog/coverimage.h | 30 ++-- .../plugins/catalogs/amarokcatalog/settings.ui | 14 +- katapult/plugins/catalogs/amarokcatalog/song.cpp | 34 ++--- katapult/plugins/catalogs/amarokcatalog/song.h | 23 +-- .../bookmarkcatalog/actionopenbookmark.cpp | 8 +- .../catalogs/bookmarkcatalog/actionopenbookmark.h | 8 +- .../plugins/catalogs/bookmarkcatalog/bookmark.cpp | 4 +- .../plugins/catalogs/bookmarkcatalog/bookmark.h | 5 +- .../catalogs/bookmarkcatalog/bookmarkcatalog.cpp | 62 ++++---- .../catalogs/bookmarkcatalog/bookmarkcatalog.h | 19 +-- .../catalogs/bookmarkcatalog/mozillabookmark.cpp | 10 +- .../catalogs/bookmarkcatalog/mozillabookmark.h | 15 +- .../plugins/catalogs/bookmarkcatalog/settings.ui | 20 +-- .../catalogs/calculatorcatalog/actionevalexpr.cpp | 46 +++--- .../catalogs/calculatorcatalog/actionevalexpr.h | 4 +- .../calculatorcatalog/calculatorcatalog.cpp | 52 +++---- .../catalogs/calculatorcatalog/calculatorcatalog.h | 29 ++-- .../catalogs/calculatorcatalog/expression.cpp | 12 +- .../catalogs/calculatorcatalog/expression.h | 11 +- .../plugins/catalogs/calculatorcatalog/settings.ui | 42 +++--- .../documentcatalog/actionopendocument.cpp | 6 +- .../catalogs/documentcatalog/actionopendocument.h | 4 +- .../plugins/catalogs/documentcatalog/directory.cpp | 4 +- .../plugins/catalogs/documentcatalog/directory.h | 5 +- .../plugins/catalogs/documentcatalog/document.cpp | 20 +-- .../plugins/catalogs/documentcatalog/document.h | 17 ++- .../catalogs/documentcatalog/documentcatalog.cpp | 58 +++---- .../catalogs/documentcatalog/documentcatalog.h | 23 +-- .../plugins/catalogs/documentcatalog/settings.ui | 16 +- .../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 +- .../catalogs/googlecatalog/actionsearch.cpp | 4 +- .../plugins/catalogs/googlecatalog/actionsearch.h | 4 +- .../catalogs/googlecatalog/googlecatalog.cpp | 30 ++-- .../plugins/catalogs/googlecatalog/googlecatalog.h | 15 +- katapult/plugins/catalogs/googlecatalog/query.cpp | 10 +- katapult/plugins/catalogs/googlecatalog/query.h | 15 +- .../plugins/catalogs/googlecatalog/settings.ui | 14 +- .../catalogs/programcatalog/actionrunprogram.cpp | 4 +- .../catalogs/programcatalog/actionrunprogram.h | 4 +- .../plugins/catalogs/programcatalog/program.cpp | 4 +- katapult/plugins/catalogs/programcatalog/program.h | 7 +- .../catalogs/programcatalog/programcatalog.cpp | 18 +-- .../catalogs/programcatalog/programcatalog.h | 13 +- .../plugins/catalogs/programcatalog/settings.ui | 20 +-- .../catalogs/spellcatalog/actioncopyspelling.cpp | 6 +- .../catalogs/spellcatalog/actioncopyspelling.h | 4 +- katapult/plugins/catalogs/spellcatalog/settings.ui | 14 +- .../plugins/catalogs/spellcatalog/spellcatalog.cpp | 30 ++-- .../plugins/catalogs/spellcatalog/spellcatalog.h | 15 +- .../plugins/catalogs/spellcatalog/spelling.cpp | 34 ++--- katapult/plugins/catalogs/spellcatalog/spelling.h | 21 +-- .../plugins/display/glassdisplay/glassdisplay.cpp | 10 +- .../plugins/display/glassdisplay/glassdisplay.h | 3 +- .../plugins/display/glassdisplay/qembed_images.h | 28 ++-- katapult/plugins/display/o2display/o2display.cpp | 10 +- katapult/plugins/display/o2display/o2display.h | 3 +- katapult/plugins/display/o2display/qembed_images.h | 28 ++-- .../plugins/display/puredisplay/puredisplay.cpp | 10 +- katapult/plugins/display/puredisplay/puredisplay.h | 3 +- .../plugins/display/puredisplay/qembed_images.h | 28 ++-- 99 files changed, 1095 insertions(+), 1066 deletions(-) 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" diff --git a/katapult/katapult/confcatalogs.ui b/katapult/katapult/confcatalogs.ui index a62e070..8194743 100644 --- a/katapult/katapult/confcatalogs.ui +++ b/katapult/katapult/confcatalogs.ui @@ -1,10 +1,10 @@ ConfCatalogs - + ConfCatalogs - + 0 0 @@ -32,7 +32,7 @@ - + kactionselector.h diff --git a/katapult/katapult/confdisplay.ui b/katapult/katapult/confdisplay.ui index 164fefc..8606520 100644 --- a/katapult/katapult/confdisplay.ui +++ b/katapult/katapult/confdisplay.ui @@ -1,10 +1,10 @@ ConfDisplay - + ConfDisplay - + 0 0 @@ -27,7 +27,7 @@ false - + displaySettings @@ -48,7 +48,7 @@ Expanding - + 20 80 @@ -57,7 +57,7 @@ - + kcombobox.h diff --git a/katapult/katapult/confgeneral.ui b/katapult/katapult/confgeneral.ui index 2c4d839..1980921 100644 --- a/katapult/katapult/confgeneral.ui +++ b/katapult/katapult/confgeneral.ui @@ -1,10 +1,10 @@ ConfGeneral - + ConfGeneral - + 0 0 @@ -19,7 +19,7 @@ unnamed - + buttonGroup2 @@ -38,7 +38,7 @@ unnamed - + HideDelayLabel @@ -57,7 +57,7 @@ This sets how long Katapult will wait before hiding the launcher. - + hideDelay @@ -80,7 +80,7 @@ This sets how long Katapult will wait before hiding the launcher. 1000 - + autoExec @@ -96,7 +96,7 @@ This sets how long Katapult will wait before hiding the launcher. - + noResultOptions @@ -118,7 +118,7 @@ This sets how long Katapult will wait before hiding the launcher. unnamed - + textLabel1 @@ -126,7 +126,7 @@ This sets how long Katapult will wait before hiding the launcher. When there are no results: - + nrClearQuery @@ -134,7 +134,7 @@ This sets how long Katapult will wait before hiding the launcher. &Clear the query after a delay - + nrHideDisplay @@ -142,7 +142,7 @@ This sets how long Katapult will wait before hiding the launcher. &Hide the display after a delay - + nrDoNothing @@ -150,7 +150,7 @@ This sets how long Katapult will wait before hiding the launcher. Do &nothing - + textLabel2 @@ -161,7 +161,7 @@ This sets how long Katapult will wait before hiding the launcher. noResultsDelay - + noResultsDelay @@ -186,7 +186,7 @@ This sets how long Katapult will wait before hiding the launcher. - + buttonGroup3 @@ -201,11 +201,11 @@ This sets how long Katapult will wait before hiding the launcher. System Tray - + systrayIcon - + 10 30 @@ -237,7 +237,7 @@ This sets how long Katapult will wait before hiding the launcher. Expanding - + 20 62 @@ -246,5 +246,5 @@ This sets how long Katapult will wait before hiding the launcher. - + diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index b0d2756..c053d3d 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "katapult.h" #include "actionregistry.h" @@ -61,14 +61,14 @@ Katapult::Katapult() settings = new KatapultSettings(); - hideTimer = new QTimer(this); - connect(hideTimer, SIGNAL(timeout()), this, SLOT(hideLauncher())); - clearTimer = new QTimer(this); - connect(clearTimer, SIGNAL(timeout()), this, SLOT(clearQuery())); + hideTimer = new TQTimer(this); + connect(hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + clearTimer = new TQTimer(this); + connect(clearTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(clearQuery())); - connect(settings, SIGNAL(catalogsChanged()), this, SLOT(loadCatalogPlugins())); - connect(settings, SIGNAL(displayChanged()), this, SLOT(initDisplay())); - connect(settings, SIGNAL(systrayChanged()), this, SLOT(updateSystray())); + connect(settings, TQT_SIGNAL(catalogsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadCatalogPlugins())); + connect(settings, TQT_SIGNAL(displayChanged()), TQT_TQOBJECT(this), TQT_SLOT(initDisplay())); + connect(settings, TQT_SIGNAL(systrayChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSystray())); loadCatalogPlugins(); initDisplay(); @@ -80,8 +80,8 @@ Katapult::Katapult() //show popup (unless we're session restored) if (!settings->hideNotification()) { - QString msg = i18n("Application successfully started !\nPress %1 to use it...") - .arg(globalAccel->shortcut("show_katapult").toString()); + TQString msg = i18n("Application successfully started !\nPress %1 to use it...") + .tqarg(globalAccel->shortcut("show_katapult").toString()); KPassivePopup::message(i18n("Katapult Notification"), msg, kapp->miniIcon(), this, 0, settings->notificationTimeout()); } } @@ -108,42 +108,42 @@ void Katapult::initDisplay() } else { initAccel(display); setQuery(""); - connect(display, SIGNAL(keyReleased(QKeyEvent *)), this, SLOT(keyReleased(QKeyEvent *))); - connect(display, SIGNAL(focusOut()), this, SLOT(hideLauncher())); + connect(display, TQT_SIGNAL(keyReleased(TQKeyEvent *)), TQT_TQOBJECT(this), TQT_SLOT(keyReleased(TQKeyEvent *))); + connect(display, TQT_SIGNAL(focusOut()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); } } -void Katapult::initAccel(QWidget *parent) +void Katapult::initAccel(TQWidget *tqparent) { - globalAccel = new KGlobalAccel(parent); + globalAccel = new KGlobalAccel(TQT_TQOBJECT(tqparent)); globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space, - this, SLOT(showLauncher())); + TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); globalAccel->readSettings(); globalAccel->updateConnections(); - actions = new KActionCollection(parent); + actions = new KActionCollection(tqparent); actionCollection()->clear(); contextMenu()->clear(); - new KAction(i18n("Execute"), "exec", Key_Return, this, SLOT(execute()), actions, "execute"); - new KAction(i18n("Clear"), "editclear", Key_Left, this, SLOT(clearQuery()), actions, "clear"); - new KAction(i18n("Close"), "fileclose", Key_Escape, this, SLOT(hideLauncher()), actions, "close"); - new KAction(i18n("Complete Query"), "next", Key_Right, this, SLOT(completeQuery()), actions, "complete_query"); - new KAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, this, SLOT(showContextMenu()), actions, "show_menu"); + new KAction(i18n("Execute"), "exec", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute"); + new KAction(i18n("Clear"), "editclear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear"); + new KAction(i18n("Close"), "fileclose", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close"); + new KAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query"); + new KAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu"); - KAction *actGlobAccel = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsDialog()), actions); + KAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions); actGlobAccel->setText(i18n("Configure &Global Shortcuts...")); - actGlobAccel->plug((QWidget *) contextMenu()); + actGlobAccel->plug((TQWidget *) contextMenu()); - KStdAction::keyBindings(this, SLOT(showShortcutsDialog()), actions)->plug((QWidget *) contextMenu()); - KStdAction::preferences(settings, SLOT(configure()), actions)->plug((QWidget *) contextMenu()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::preferences(settings, TQT_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); contextMenu()->insertSeparator(); - KStdAction::aboutApp(this, SLOT(showAboutDialog()), actions)->plug((QWidget *) contextMenu()); + KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(showAboutDialog()), actions)->plug((TQWidget *) contextMenu()); contextMenu()->insertSeparator(); - KStdAction::quit(this, SLOT(close()), actions)->plug((QWidget *) contextMenu()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); actions->readShortcutSettings(); } @@ -151,7 +151,7 @@ void Katapult::initAccel(QWidget *parent) void Katapult::completeQuery() { if(!bestMatch.isNull()) { - QString newQuery = bestMatch.item()->text(); + TQString newQuery = bestMatch.item()->text(); setQuery(""); setQuery(newQuery); } @@ -162,9 +162,9 @@ void Katapult::clearQuery() setQuery(""); } -void Katapult::setQuery(QString _query) +void Katapult::setQuery(TQString _query) { - allStatus=0; + alltqStatus=0; bestMatch = Match(); this->_query = _query; @@ -172,7 +172,7 @@ void Katapult::setQuery(QString _query) display->setQuery(_query); if(_query == "") { - QDictIterator it(catalogs); + TQDictIterator it(catalogs); KatapultCatalog *catalog; while((catalog = it.current()) != 0) { @@ -181,14 +181,14 @@ void Katapult::setQuery(QString _query) } display->setItem(0); display->setAction(0); - display->setStatus(0); + display->settqStatus(0); display->setSelected(0); action = 0; } else if(catalogs.count() == 0) { - allStatus = S_Active | S_NoResults; - display->setStatus(allStatus); + alltqStatus = S_Active | S_NoResults; + display->settqStatus(alltqStatus); } else { - QDictIterator it(catalogs); + TQDictIterator it(catalogs); KatapultCatalog *catalog; int status; @@ -200,8 +200,8 @@ void Katapult::setQuery(QString _query) status = catalog->status(); if(status & S_HasResults) { - if(allStatus & S_HasResults) - allStatus |= S_Multiple; + if(alltqStatus & S_HasResults) + alltqStatus |= S_Multiple; Match match = catalog->bestMatch(); if(!match.isNull()) { @@ -209,17 +209,17 @@ void Katapult::setQuery(QString _query) bestMatch = match; } } - allStatus |= status; + alltqStatus |= status; } if(bestMatch.isNull() || bestMatch.rank() == 0) bestMatch = Match(); if(!bestMatch.isNull()) { - QPtrList itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); + TQPtrList itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); action = itemActions.at(0); - connect(bestMatch.item(), SIGNAL(itemChanged()), this, SLOT(updateDisplay())); + connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay())); } } - if(!(allStatus & S_HasResults) && allStatus & S_Active) { + if(!(alltqStatus & S_HasResults) && alltqStatus & S_Active) { // no results switch(settings->noResultsAction()) { case KatapultSettings::NR_HideDisplay: @@ -240,7 +240,7 @@ void Katapult::setQuery(QString _query) clearTimer->stop(); } - if(!executing && settings->isAutoExecute() && allStatus & S_HasResults && !(allStatus & S_Multiple)) { + if(!executing && settings->isAutoExecute() && alltqStatus & S_HasResults && !(alltqStatus & S_Multiple)) { execute(); } @@ -266,7 +266,7 @@ void Katapult::updateDisplay() display->setAction(action); display->setSelected(bestMatch.matched()); } - display->setStatus(allStatus); + display->settqStatus(alltqStatus); display->update(); } } @@ -276,7 +276,7 @@ void Katapult::showLauncher() if(!settings->isConfiguring() && display != 0) { setQuery(""); - display->setStatus(0); + display->settqStatus(0); display->setQuery(""); display->show(); display->update(); @@ -306,7 +306,7 @@ void Katapult::execute() executing = TRUE; if(action == 0) { - display->setStatus(S_Active | S_NoResults); + display->settqStatus(S_Active | S_NoResults); display->update(); hideTimer->start(settings->hideDelay(), TRUE); } else { @@ -328,30 +328,30 @@ void Katapult::updateSystray() void Katapult::showContextMenu() { - contextMenu()->popup(QCursor::pos()); + contextMenu()->popup(TQCursor::pos()); } -void Katapult::keyReleased(QKeyEvent *e) +void Katapult::keyReleased(TQKeyEvent *e) { if(e->key() == Key_BackSpace) { if(hideTimer->isActive()) hideTimer->stop(); if(clearTimer->isActive()) clearTimer->stop(); - QString newQuery = _query.left(_query.length()-1); + TQString newQuery = _query.left(_query.length()-1); setQuery(""); setQuery(newQuery); } else { - QString t = e->text(); + TQString t = e->text(); if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) && e->key() != Key_Delete) setQuery(_query + t); } } -void Katapult::mousePressEvent(QMouseEvent *e) +void Katapult::mousePressEvent(TQMouseEvent *e) { - if(e->button() == LeftButton) + if(e->button() == Qt::LeftButton) showLauncher(); else KSystemTray::mousePressEvent(e); diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h index 6ba20d6..b34f34f 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -30,11 +30,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -48,12 +48,13 @@ class KatapultSettings; class Katapult : public KSystemTray, virtual public KatapultIface { Q_OBJECT + TQ_OBJECT public: Katapult(); ~Katapult(); - void setQuery(QString); - QString query() const; + void setQuery(TQString); + TQString query() const; public slots: void updateDisplay(); @@ -66,29 +67,29 @@ public slots: void showAboutDialog(); void loadCatalogPlugins(); void initDisplay(); - virtual void keyReleased(QKeyEvent *); + virtual void keyReleased(TQKeyEvent *); void execute(); void updateSystray(); void showContextMenu(); protected: - virtual void mousePressEvent(QMouseEvent *); + virtual void mousePressEvent(TQMouseEvent *); private: - void initAccel(QWidget *); + void initAccel(TQWidget *); bool executing; - int allStatus; + int alltqStatus; KatapultDisplay *display; KGlobalAccel *globalAccel; KActionCollection *actions; KatapultSettings *settings; Match bestMatch; const KatapultAction *action; - QString _query; - QDict catalogs; - QTimer *hideTimer; - QTimer *clearTimer; + TQString _query; + TQDict catalogs; + TQTimer *hideTimer; + TQTimer *clearTimer; }; #endif // _KATAPULT_H_ diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 26b275e..97a7d24 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -24,12 +24,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "katapultconfigdlg.h" #include "katapultsettings.h" @@ -47,9 +47,9 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) setTreeListAutoResize(TRUE); // general settings - QFrame *fConfGeneral = addPage(QString("Katapult"), i18n("General Settings")); + TQFrame *fConfGeneral = addPage(TQString("Katapult"), i18n("General Settings")); general = new ConfGeneral(fConfGeneral); - (new QVBoxLayout(fConfGeneral, 0, KDialog::spacingHint()))->addWidget(general); + (new TQVBoxLayout(fConfGeneral, 0, KDialog::spacingHint()))->addWidget(general); general->hideDelay->setValue(settings->hideDelay()); general->autoExec->setChecked(settings->isAutoExecute()); @@ -60,36 +60,36 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) case KatapultSettings::NR_HideDisplay: general->nrHideDisplay->setChecked(TRUE); break; default: general->nrClearQuery->setChecked(TRUE); break; } - connect(general->nrDoNothing, SIGNAL(toggled(bool)), this, SLOT(nrDoNothingToggled(bool))); + connect(general->nrDoNothing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nrDoNothingToggled(bool))); general->noResultsDelay->setEnabled(!general->nrDoNothing->isChecked()); // catalog settings - QFrame *fConfCatalogs = addPage(i18n("Catalogs"), i18n("Enabled Catalogs")); + TQFrame *fConfCatalogs = addPage(i18n("Catalogs"), i18n("Enabled Catalogs")); catalogConf = new ConfCatalogs(fConfCatalogs); - (new QVBoxLayout(fConfCatalogs, 0, KDialog::spacingHint()))->addWidget(catalogConf); + (new TQVBoxLayout(fConfCatalogs, 0, KDialog::spacingHint()))->addWidget(catalogConf); catalogConf->catalogs->selectedListBox()->insertStringList(settings->activeCatalogNames()); catalogConf->catalogs->availableListBox()->insertStringList(settings->inactiveCatalogNames()); catalogPages.setAutoDelete(TRUE); - QDict catalogs; + TQDict catalogs; catalogs = settings->activeCatalogs(); - QDictIterator it(catalogs); + TQDictIterator it(catalogs); KatapultCatalog *catalog; while((catalog = it.current()) != 0) { - QString catalogName = it.currentKey(); + TQString catalogName = it.currentKey(); addCatalogPage(catalogName, catalog); ++it; } // display settings - QFrame *fConfDisplay = addPage(i18n("Display"), i18n("Display")); + TQFrame *fConfDisplay = addPage(i18n("Display"), i18n("Display")); display = new ConfDisplay(fConfDisplay); - (new QVBoxLayout(fConfDisplay, 0, KDialog::spacingHint()))->addWidget(display); - new QVBoxLayout((QWidget *) display->displaySettings, 0, KDialog::spacingHint()); + (new TQVBoxLayout(fConfDisplay, 0, KDialog::spacingHint()))->addWidget(display); + new TQVBoxLayout((TQWidget *) display->displaySettings, 0, KDialog::spacingHint()); - QStringList displays = settings->displayNames(); + TQStringList displays = settings->displayNames(); display->displayName->insertStringList(displays); display->displayName->setCurrentItem(settings->displayNumber()); displayConfig = 0; @@ -98,10 +98,10 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) unfoldTreeList(TRUE); // connect signals - connect(catalogConf->catalogs, SIGNAL(added(QListBoxItem *)), this, SLOT(activateCatalog(QListBoxItem* ))); - connect(catalogConf->catalogs, SIGNAL(removed(QListBoxItem *)), this, SLOT(deactivateCatalog(QListBoxItem* ))); - connect(display->displayName, SIGNAL(activated(int)), this, SLOT(activateDisplay(int))); - connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings())); + connect(catalogConf->catalogs, TQT_SIGNAL(added(TQListBoxItem *)), this, TQT_SLOT(activateCatalog(TQListBoxItem* ))); + connect(catalogConf->catalogs, TQT_SIGNAL(removed(TQListBoxItem *)), this, TQT_SLOT(deactivateCatalog(TQListBoxItem* ))); + connect(display->displayName, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activateDisplay(int))); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveSettings())); } KatapultConfigDlg::~KatapultConfigDlg() @@ -128,7 +128,7 @@ void KatapultConfigDlg::saveSettings() } } -void KatapultConfigDlg::activateCatalog(QListBoxItem *i) +void KatapultConfigDlg::activateCatalog(TQListBoxItem *i) { settings->activateCatalog(i->text()); KatapultCatalog *catalog = settings->catalog(i->text()); @@ -136,7 +136,7 @@ void KatapultConfigDlg::activateCatalog(QListBoxItem *i) addCatalogPage(i->text(), catalog); } -void KatapultConfigDlg::deactivateCatalog(QListBoxItem *i) +void KatapultConfigDlg::deactivateCatalog(TQListBoxItem *i) { catalogPages.remove(i->text()); settings->deactivateCatalog(i->text()); @@ -148,16 +148,16 @@ void KatapultConfigDlg::activateDisplay(int index) addDisplaySettings(); } -void KatapultConfigDlg::addCatalogPage(QString name, KatapultCatalog *catalog) +void KatapultConfigDlg::addCatalogPage(TQString name, KatapultCatalog *catalog) { - QWidget *catalogConfig = catalog->configure(); + TQWidget *catalogConfig = catalog->configure(); if(catalogConfig != 0) { - QStringList path; + TQStringList path; path << i18n("Catalogs") << name; - QFrame *fCatalog = addPage(path, name); - catalogConfig->reparent(fCatalog, QPoint(0, 0)); - (new QVBoxLayout(fCatalog, 0, KDialog::spacingHint()))->addWidget(catalogConfig); + TQFrame *fCatalog = addPage(path, name); + catalogConfig->reparent(fCatalog, TQPoint(0, 0)); + (new TQVBoxLayout(fCatalog, 0, KDialog::spacingHint()))->addWidget(catalogConfig); catalogPages.insert(name, fCatalog); } } @@ -172,8 +172,8 @@ void KatapultConfigDlg::addDisplaySettings() displayConfig = settings->display()->configure(); if(displayConfig != 0) { - displayConfig->reparent((QWidget *) display->displaySettings, QPoint(0, 0)); - display->displaySettings->layout()->add(displayConfig); + displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0)); + display->displaySettings->tqlayout()->add(displayConfig); displayConfig->show(); } } diff --git a/katapult/katapult/katapultconfigdlg.h b/katapult/katapult/katapultconfigdlg.h index 6b164ab..7c8cdd4 100644 --- a/katapult/katapult/katapultconfigdlg.h +++ b/katapult/katapult/katapultconfigdlg.h @@ -22,15 +22,15 @@ #include -#include +#include class KatapultSettings; class KatapultCatalog; class ConfGeneral; class ConfCatalogs; class ConfDisplay; -class QListBoxItem; -class QFrame; +class TQListBoxItem; +class TQFrame; /** @author Joe Ferris @@ -38,27 +38,28 @@ class QFrame; class KatapultConfigDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KatapultConfigDlg(KatapultSettings *settings); ~KatapultConfigDlg(); public slots: void saveSettings(); - void activateCatalog(QListBoxItem *); - void deactivateCatalog(QListBoxItem *); + void activateCatalog(TQListBoxItem *); + void deactivateCatalog(TQListBoxItem *); void activateDisplay(int); void nrDoNothingToggled(bool); private: - void addCatalogPage(QString name, KatapultCatalog *catalog); + void addCatalogPage(TQString name, KatapultCatalog *catalog); void addDisplaySettings(); KatapultSettings *settings; ConfGeneral *general; ConfCatalogs *catalogConf; ConfDisplay *display; - QWidget *displayConfig; - QDict catalogPages; + TQWidget *displayConfig; + TQDict catalogPages; }; #endif diff --git a/katapult/katapult/katapultiface.h b/katapult/katapult/katapultiface.h index 9595246..9a49702 100644 --- a/katapult/katapult/katapultiface.h +++ b/katapult/katapult/katapultiface.h @@ -31,7 +31,7 @@ class KatapultIface : virtual public DCOPObject virtual void showLauncher() = 0; virtual void hideLauncher() = 0; - virtual void setQuery(QString) = 0; + virtual void setQuery(TQString) = 0; virtual void execute() = 0; }; diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index ae316f5..aaa4172 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "katapultsettings.h" #include "katapultcatalog.h" @@ -70,7 +70,7 @@ void KatapultSettings::readSettings() _autoExec = config->readBoolEntry("AutoExec", FALSE); _displayName = config->readEntry("Display", "Pure Display"); - QStringList defCatalogs; + TQStringList defCatalogs; defCatalogs << "Program Catalog" << "Bookmark Catalog" << "Document Catalog" << "Calculator Catalog" << "Amarok Catalog" << "Spell Catalog" << "Google Catalog" << "Execution Catalog"; _activeCatalogNames = config->readListEntry("Catalogs", defCatalogs); @@ -105,18 +105,18 @@ void KatapultSettings::writeSettings() config->writeEntry("Catalogs", _activeCatalogNames); config->writeEntry("Display", _displayName); - QDictIterator it(_activeCatalogs); + TQDictIterator it(_activeCatalogs); KatapultCatalog *catalog; while((catalog = it.current()) != 0) { - KConfigGroup group(config, QString("Catalogs/%1").arg(it.currentKey())); + KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey())); catalog->writeSettings(&group); ++it; } if(_display != 0) { - KConfigGroup group(config, QString("Displays/%1").arg(_displayName)); + KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName)); _display->writeSettings(&group); } @@ -130,7 +130,7 @@ void KatapultSettings::configure() _isConfiguring = TRUE; KatapultConfigDlg *dlg = new KatapultConfigDlg(this); - if(dlg->exec() == QDialog::Accepted) { + if(dlg->exec() == TQDialog::Accepted) { writeSettings(); emit systrayChanged(); loadCatalogPlugins(); @@ -215,24 +215,24 @@ int KatapultSettings::notificationTimeout() const return _notificationTimeout; } -QString KatapultSettings::displayName() const +TQString KatapultSettings::displayName() const { return _displayName; } -QStringList KatapultSettings::displayNames() const +TQStringList KatapultSettings::displayNames() const { return _displayNames; } -QStringList KatapultSettings::displayIds() const +TQStringList KatapultSettings::displayIds() const { return _displayIds; } int KatapultSettings::displayNumber() const { - return _displayIds.findIndex(_displayName); + return _displayIds.tqfindIndex(_displayName); } KatapultDisplay * KatapultSettings::display() const @@ -240,52 +240,52 @@ KatapultDisplay * KatapultSettings::display() const return _display; } -void KatapultSettings::setDisplayName(QString name) +void KatapultSettings::setDisplayName(TQString name) { _displayName = name; loadDisplayPlugins(); emit displayChanged(); } -QStringList KatapultSettings::catalogNames() const +TQStringList KatapultSettings::catalogNames() const { return _catalogNames; } -QStringList KatapultSettings::catalogIds() const +TQStringList KatapultSettings::catalogIds() const { return _catalogIds; } -QStringList KatapultSettings::activeCatalogNames() const +TQStringList KatapultSettings::activeCatalogNames() const { return _activeCatalogNames; } -QStringList KatapultSettings::inactiveCatalogNames() const +TQStringList KatapultSettings::inactiveCatalogNames() const { - QStringList inactiveCatalogs, catalogs = _catalogIds; - for(QStringList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it) + TQStringList inactiveCatalogs, catalogs = _catalogIds; + for(TQStringList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it) { - if(!_activeCatalogNames.contains(*it)) + if(!_activeCatalogNames.tqcontains(*it)) inactiveCatalogs.append(*it); } return inactiveCatalogs; } -QDict KatapultSettings::activeCatalogs() const +TQDict KatapultSettings::activeCatalogs() const { return _activeCatalogs; } -void KatapultSettings::activateCatalog(QString catalogName) +void KatapultSettings::activateCatalog(TQString catalogName) { _activeCatalogNames.append(catalogName); loadCatalogPlugins(); emit catalogsChanged(); } -void KatapultSettings::deactivateCatalog(QString catalogName) +void KatapultSettings::deactivateCatalog(TQString catalogName) { _activeCatalogNames.remove(catalogName); loadCatalogPlugins(); @@ -303,27 +303,27 @@ void KatapultSettings::loadCatalogPlugins() KTrader::OfferList::ConstIterator it; for(it = offers.begin(); it != offers.end(); ++it) { - QString id; + TQString id; KService::Ptr service = *it; KatapultCatalog *catalog; - if(!service->property("X-Katapult-ID", QVariant::String).toString().isEmpty()) - id = service->property("X-Katapult-ID", QVariant::String).toString(); + if(!service->property("X-Katapult-ID", TQVariant::String).toString().isEmpty()) + id = service->property("X-Katapult-ID", TQVariant::String).toString(); else id = service->name(); _catalogNames.append(service->name()); _catalogIds.append(id); - if(_activeCatalogNames.contains(id)) + if(_activeCatalogNames.tqcontains(id)) { int errCode = 0; catalog = KParts::ComponentFactory::createInstanceFromService - (service, 0, 0, QStringList(), &errCode); + (service, 0, 0, TQStringList(), &errCode); if(catalog != 0) { - KConfigGroup group(kapp->config(), QString("Catalogs/%1").arg(id)); + KConfigGroup group(kapp->config(), TQString("Catalogs/%1").tqarg(id)); catalog->readSettings(&group); catalog->initialize(); _activeCatalogs.insert(id, catalog); @@ -350,8 +350,8 @@ void KatapultSettings::loadDisplayPlugins() KService::Ptr service = *it; _displayNames.append(service->name()); - if(!service->property("X-Katapult-ID", QVariant::String).toString().isEmpty()) - _displayIds.append(service->property("X-Katapult-ID", QVariant::String).toString()); + if(!service->property("X-Katapult-ID", TQVariant::String).toString().isEmpty()) + _displayIds.append(service->property("X-Katapult-ID", TQVariant::String).toString()); else _displayIds.append(service->name()); @@ -359,19 +359,19 @@ void KatapultSettings::loadDisplayPlugins() { int errCode = 0; _display = KParts::ComponentFactory::createInstanceFromService - (service, 0, 0, QStringList(), &errCode); + (service, 0, 0, TQStringList(), &errCode); } } if(_display != 0) { - KConfigGroup group(kapp->config(), QString("Displays/%1").arg(_displayName)); + KConfigGroup group(kapp->config(), TQString("Displays/%1").tqarg(_displayName)); _display->readSettings(&group); } } -KatapultCatalog * KatapultSettings::catalog(QString catalogName) const +KatapultCatalog * KatapultSettings::catalog(TQString catalogName) const { - return _activeCatalogs.find(catalogName); + return _activeCatalogs.tqfind(catalogName); } #include "katapultsettings.moc" diff --git a/katapult/katapult/katapultsettings.h b/katapult/katapult/katapultsettings.h index 079ea2b..79f134a 100644 --- a/katapult/katapult/katapultsettings.h +++ b/katapult/katapult/katapultsettings.h @@ -20,21 +20,22 @@ #ifndef KATAPULTSETTINGS_H #define KATAPULTSETTINGS_H -#include -#include -#include +#include +#include +#include class KatapultCatalog; class KatapultDisplay; -class QStringList; -class QString; +class TQStringList; +class TQString; /** @author Joe Ferris */ -class KatapultSettings : public QObject +class KatapultSettings : public TQObject { Q_OBJECT + TQ_OBJECT public: enum NRAction { NR_DoNothing = 0, @@ -62,22 +63,22 @@ public: int notificationTimeout() const; // display settings - QString displayName() const; - QStringList displayNames() const; - QStringList displayIds() const; + TQString displayName() const; + TQStringList displayNames() const; + TQStringList displayIds() const; int displayNumber() const; KatapultDisplay * display() const; - void setDisplayName(QString name); + void setDisplayName(TQString name); // catalog settings - QStringList catalogNames() const; - QStringList catalogIds() const; - QStringList activeCatalogNames() const; - QStringList inactiveCatalogNames() const; - QDict activeCatalogs() const; - void activateCatalog(QString catalogName); - void deactivateCatalog(QString catalogName); - KatapultCatalog * catalog(QString catalogName) const; + TQStringList catalogNames() const; + TQStringList catalogIds() const; + TQStringList activeCatalogNames() const; + TQStringList inactiveCatalogNames() const; + TQDict activeCatalogs() const; + void activateCatalog(TQString catalogName); + void deactivateCatalog(TQString catalogName); + KatapultCatalog * catalog(TQString catalogName) const; public slots: void readSettings(); @@ -107,14 +108,14 @@ private: bool _systrayIcon; // display settings - QString _displayName; - QStringList _displayNames; - QStringList _displayIds; + TQString _displayName; + TQStringList _displayNames; + TQStringList _displayIds; KatapultDisplay *_display; // catalog settings - QStringList _catalogNames, _catalogIds, _activeCatalogNames; - QDict _activeCatalogs; + TQStringList _catalogNames, _catalogIds, _activeCatalogNames; + TQDict _activeCatalogs; }; #endif diff --git a/katapult/katapult/main.cpp b/katapult/katapult/main.cpp index 0fc993d..f183c49 100644 --- a/katapult/katapult/main.cpp +++ b/katapult/katapult/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) KApplication app; if(kapp->dcopClient()->isApplicationRegistered("katapult")) { - kapp->dcopClient()->send("katapult", "Katapult", "showLauncher()", QByteArray()); + kapp->dcopClient()->send("katapult", "Katapult", "showLauncher()", TQByteArray()); app.setStartupId(""); return(0); } diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index a659e42..45d481f 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -10,70 +10,70 @@ #include "settings.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /* - * Constructs a MyDialog1 as a child of 'parent', with the + * Constructs a MyDialog1 as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -MyDialog1::MyDialog1( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +MyDialog1::MyDialog1( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : TQDialog( tqparent, name, modal, fl ) { if ( !name ) setName( "MyDialog1" ); setSizeGripEnabled( TRUE ); - MyDialog1Layout = new QGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); + MyDialog1Layout = new TQGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); - listBox = new QListBox( this, "listBox" ); - listBox->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) ); + listBox = new TQListBox( this, "listBox" ); + listBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) ); MyDialog1Layout->addWidget( listBox, 0, 0 ); - tabWidget = new QTabWidget( this, "tabWidget" ); + tabWidget = new TQTabWidget( this, "tabWidget" ); - Widget2 = new QWidget( tabWidget, "Widget2" ); - tabWidget->insertTab( Widget2, QString("") ); + Widget2 = new TQWidget( tabWidget, "Widget2" ); + tabWidget->insertTab( Widget2, TQString("") ); - Widget3 = new QWidget( tabWidget, "Widget3" ); - tabWidget->insertTab( Widget3, QString("") ); + Widget3 = new TQWidget( tabWidget, "Widget3" ); + tabWidget->insertTab( Widget3, TQString("") ); MyDialog1Layout->addWidget( tabWidget, 0, 1 ); - Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); - buttonHelp = new QPushButton( this, "buttonHelp" ); + buttonHelp = new TQPushButton( this, "buttonHelp" ); buttonHelp->setAutoDefault( TRUE ); Layout1->addWidget( buttonHelp ); - Horizontal_Spacing2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout1->addItem( Horizontal_Spacing2 ); + Qt::Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + Layout1->addItem(Qt::Horizontal_Spacing2 ); - buttonOk = new QPushButton( this, "buttonOk" ); + buttonOk = new TQPushButton( this, "buttonOk" ); buttonOk->setAutoDefault( TRUE ); buttonOk->setDefault( TRUE ); Layout1->addWidget( buttonOk ); - buttonCancel = new QPushButton( this, "buttonCancel" ); + buttonCancel = new TQPushButton( this, "buttonCancel" ); buttonCancel->setAutoDefault( TRUE ); Layout1->addWidget( buttonCancel ); MyDialog1Layout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); languageChange(); - resize( QSize(597, 364).expandedTo(minimumSizeHint()) ); + resize( TQSize(597, 364).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); } /* @@ -81,7 +81,7 @@ MyDialog1::MyDialog1( QWidget* parent, const char* name, bool modal, WFlags fl ) */ MyDialog1::~MyDialog1() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -96,11 +96,11 @@ void MyDialog1::languageChange() tabWidget->changeTab( Widget2, tr2i18n( "Tab" ) ); tabWidget->changeTab( Widget3, tr2i18n( "Tab" ) ); buttonHelp->setText( tr2i18n( "&Help" ) ); - buttonHelp->setAccel( QKeySequence( tr2i18n( "F1" ) ) ); + buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) ); buttonOk->setText( tr2i18n( "&OK" ) ); - buttonOk->setAccel( QKeySequence( QString::null ) ); + buttonOk->setAccel( TQKeySequence( TQString() ) ); buttonCancel->setText( tr2i18n( "&Cancel" ) ); - buttonCancel->setAccel( QKeySequence( QString::null ) ); + buttonCancel->setAccel( TQKeySequence( TQString() ) ); } #include "settings.moc" diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp index 43fdc2b..9847bcb 100644 --- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -33,12 +33,12 @@ #include "actionplaysong.h" #include "song.h" -QPixmap ActionPlaySong::icon(int size) const +TQPixmap ActionPlaySong::icon(int size) const { return KGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size); } -QString ActionPlaySong::text() const +TQString ActionPlaySong::text() const { return i18n("Play Song"); } @@ -51,8 +51,8 @@ bool ActionPlaySong::accepts(const KatapultItem *item) const void ActionPlaySong::execute(const KatapultItem *item) const { const Song *song = (const Song *) item; - QByteArray buffer; - QDataStream stream(buffer, IO_WriteOnly); + TQByteArray buffer; + TQDataStream stream(buffer, IO_WriteOnly); stream << song->url(); kapp->dcopClient()->send("amarok", "playlist", "playMedia(KURL)", buffer); } diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h index bd2f0af..255d1b1 100644 --- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h +++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h @@ -24,8 +24,8 @@ #include "katapultaction.h" class KatapultItem; -class QPixmap; -class QString; +class TQPixmap; +class TQString; /** @author Bastian Holst @@ -33,8 +33,8 @@ class QString; class ActionPlaySong : public KatapultAction { public: - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; virtual bool accepts(const KatapultItem *) const; virtual void execute(const KatapultItem *) const; }; diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index f924c6d..a4cbd91 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -26,12 +26,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include "actionplaysong.h" #include "song.h" @@ -43,11 +43,11 @@ K_EXPORT_COMPONENT_FACTORY( katapult_amarokcatalog, KGenericFactory( "katapult_amarokcatalog" ) ) -AmarokCatalog::AmarokCatalog(QObject*, const char*, const QStringList&): _result(QString::null) +AmarokCatalog::AmarokCatalog(TQObject*, const char*, const TQStringList&): _result(TQString()) { _minQueryLen = 3; ActionRegistry::self()->registerAction(new ActionPlaySong()); - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; _dynamicCollection = false; checkCollectionType(); @@ -58,16 +58,16 @@ AmarokCatalog::~AmarokCatalog() void AmarokCatalog::queryChanged() { - int newStatus = 0; - QString queryString = query(); + int newtqStatus = 0; + TQString queryString = query(); - if((QString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) { + if((TQString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) { reset(); setBestMatch(Match()); - setStatus(0); + settqStatus(0); } else { - if ( _gotCollectionStatus) + if ( _gotCollectiontqStatus) { if (!_dynamicCollection) @@ -75,9 +75,9 @@ void AmarokCatalog::queryChanged() // Stuff for Amarok < 1.4.2 - QStringList queryList; - //prepares SQL-queryQRegExp - QString sqlQuery( + TQStringList queryList; + //prepares SQL-queryTQRegExp + TQString sqlQuery( "SELECT artist.name, tags.title, tags.url, images.path, album.name " "FROM tags" "INNER JOIN album ON (tags.album = album.id) " @@ -87,29 +87,29 @@ void AmarokCatalog::queryChanged() "WHERE 1=1 " );// AND - queryList = QStringList::split ( QString(" "), QString(queryString).replace(QChar(':')," ").replace(QChar('\''), " ").replace(QChar('\''), "%") ); - for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - sqlQuery.append(QString(" AND (t.title LIKE '\%%1\%'").arg(*it)); - sqlQuery.append(QString(" OR a.name LIKE '\%%1\%')").arg(*it)); + queryList = TQStringList::split ( TQString(" "), TQString(queryString).tqreplace(TQChar(':')," ").tqreplace(TQChar('\''), " ").tqreplace(TQChar('\''), "%") ); + for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { + sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").tqarg(*it)); + sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it)); } sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); //sending SQL-query to ararok via dcop - QByteArray sqlQueryData, replyData; - QCString replyType; - QDataStream arg(sqlQueryData, IO_WriteOnly); + TQByteArray sqlQueryData, replyData; + TQCString replyType; + TQDataStream arg(sqlQueryData, IO_WriteOnly); arg << sqlQuery; - if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)", + if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - newStatus = 0; + newtqStatus = 0; } else { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QStringList") { - QStringList sqlResult; + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + TQStringList sqlResult; reply >> sqlResult; if(sqlResult.isEmpty()) { - newStatus = 0; + newtqStatus = 0; } else { reset(); //Reads information from SQL-Query @@ -118,35 +118,35 @@ void AmarokCatalog::queryChanged() _result.setURL(KURL(sqlResult[2])); _result.setAlbum(sqlResult[4]); - //_result.setIcon(QString()); + //_result.setIcon(TQString()); if ( !sqlResult[3].isEmpty() ) { _result.setIcon(sqlResult[3]); } //counts the matched charecters - int i = queryString.find( ':' ); + int i = queryString.tqfind( ':' ); if ( i != -1 ) { if ( queryString[i+1] != ' ' ) queryString.insert(i+1, ' '); if ( queryString[i-1] != ' ' ) queryString.insert(i, ' '); } - queryList = QStringList::split ( " ", queryString ); + queryList = TQStringList::split ( " ", queryString ); unsigned int matched = 0; - for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - if(matched < (_result.text().find(*it, matched, false) + (*it).length())) - matched = _result.text().find(*it, matched, false) + (*it).length(); + for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { + if(matched < (_result.text().tqfind(*it, matched, false) + (*it).length())) + matched = _result.text().tqfind(*it, matched, false) + (*it).length(); } setBestMatch(Match(&_result, 100*queryString.length()/_result.text().length(), matched)); //Checks if there are multiple results if( !sqlResult[5].isEmpty() ) - newStatus = S_HasResults | S_Multiple; + newtqStatus = S_HasResults | S_Multiple; else - newStatus = S_HasResults; + newtqStatus = S_HasResults; } } else { - newStatus = 0; + newtqStatus = 0; } } @@ -154,37 +154,37 @@ void AmarokCatalog::queryChanged() // Do same as above here again but with dyn collection stuff - QStringList queryList; - //prepares SQL-queryQRegExp - QString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t LEFT JOIN statistics s ON (t.url = s.url AND t.deviceid = s.deviceid) LEFT JOIN artist a ON (t.artist = a.id) LEFT JOIN album ON (t.album = album.id) LEFT JOIN images i ON ( a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON (t.deviceid = d.id) WHERE "); - queryList = QStringList::split ( QString(" "), QString(queryString).replace(QChar(':')," ").replace(QChar('\''), " ").replace(QChar('\''), "%") ); + TQStringList queryList; + //prepares SQL-queryTQRegExp + TQString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t LEFT JOIN statistics s ON (t.url = s.url AND t.deviceid = s.deviceid) LEFT JOIN artist a ON (t.artist = a.id) LEFT JOIN album ON (t.album = album.id) LEFT JOIN images i ON ( a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON (t.deviceid = d.id) WHERE "); + queryList = TQStringList::split ( TQString(" "), TQString(queryString).tqreplace(TQChar(':')," ").tqreplace(TQChar('\''), " ").tqreplace(TQChar('\''), "%") ); // Let's build each of these clauses - QStringList clauses; - for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { + TQStringList clauses; + for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - clauses += QString(" (t.title LIKE '\%%1\%'").arg(*it) + - QString(" OR a.name LIKE '\%%1\%')").arg(*it); + clauses += TQString(" (t.title LIKE '\%%1\%'").tqarg(*it) + + TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it); } - sqlQuery.append(clauses.join(QString(" AND "))); + sqlQuery.append(clauses.join(TQString(" AND "))); sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); //sending SQL-query to ararok via dcop - QByteArray sqlQueryData, replyData; - QCString replyType; - QDataStream arg(sqlQueryData, IO_WriteOnly); + TQByteArray sqlQueryData, replyData; + TQCString replyType; + TQDataStream arg(sqlQueryData, IO_WriteOnly); arg << sqlQuery; - if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)", + if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - newStatus = 0; + newtqStatus = 0; } else { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QStringList") { - QStringList sqlResult; + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + TQStringList sqlResult; reply >> sqlResult; if(sqlResult.isEmpty()) { - newStatus = 0; + newtqStatus = 0; } else { reset(); //Reads information from SQL-Query @@ -208,48 +208,48 @@ void AmarokCatalog::queryChanged() _result.setAlbum(sqlResult[6]); - //_result.setIcon(QString()); + //_result.setIcon(TQString()); if ( !sqlResult[3].isEmpty() ) { _result.setIcon(sqlResult[5]); } //counts the matched charecters - int i = queryString.find( ':' ); + int i = queryString.tqfind( ':' ); if ( i != -1 ) { if ( queryString[i+1] != ' ' ) queryString.insert(i+1, ' '); if ( queryString[i-1] != ' ' ) queryString.insert(i, ' '); } - queryList = QStringList::split ( " ", queryString ); + queryList = TQStringList::split ( " ", queryString ); unsigned int matched = 0; - for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - if(matched < (_result.text().find(*it, matched, false) + (*it).length())) - matched = _result.text().find(*it, matched, false) + (*it).length(); + for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { + if(matched < (_result.text().tqfind(*it, matched, false) + (*it).length())) + matched = _result.text().tqfind(*it, matched, false) + (*it).length(); } setBestMatch(Match(&_result, 100*queryString.length()/_result.text().length(), matched)); //Checks if there are multiple results if( !sqlResult[7].isEmpty() ) - newStatus = S_HasResults | S_Multiple; + newtqStatus = S_HasResults | S_Multiple; else - newStatus = S_HasResults; + newtqStatus = S_HasResults; } } else { - newStatus = 0; + newtqStatus = 0; } } } //end of >1.4.2 section - setStatus(newStatus); + settqStatus(newtqStatus); } else { //We haven't got the collection status checkCollectionType(); reset(); setBestMatch(Match()); - setStatus(0); + settqStatus(0); } @@ -259,31 +259,31 @@ void AmarokCatalog::queryChanged() void AmarokCatalog::reset() { - _result.setName(QString::null); - _result.setArtist(QString::null); - _result.setAlbum(QString::null); - _result.setIcon(QString::null); + _result.setName(TQString()); + _result.setArtist(TQString()); + _result.setAlbum(TQString()); + _result.setIcon(TQString()); } void AmarokCatalog::checkCollectionType() { - QString sqlQuery("SELECT COUNT(*) FROM admin WHERE noption = 'Database Devices Version'"); + TQString sqlQuery("SELECT COUNT(*) FROM admin WHERE noption = 'Database Devices Version'"); - QByteArray sqlQueryData, replyData; - QCString replyType; - QDataStream arg(sqlQueryData, IO_WriteOnly); + TQByteArray sqlQueryData, replyData; + TQCString replyType; + TQDataStream arg(sqlQueryData, IO_WriteOnly); arg << sqlQuery; - if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)", sqlQueryData, replyType, replyData)) + if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; } else { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QStringList") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { - QStringList sqlResult; + TQStringList sqlResult; reply >> sqlResult; if (sqlResult[0] == "1") @@ -296,11 +296,11 @@ void AmarokCatalog::checkCollectionType() _dynamicCollection = false; } - _gotCollectionStatus = true; + _gotCollectiontqStatus = true; } else { - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; } } } @@ -317,12 +317,12 @@ unsigned int AmarokCatalog::minQueryLen() const return _minQueryLen; } -QWidget * AmarokCatalog::configure() +TQWidget * AmarokCatalog::configure() { AmarokCatalogSettings *settings = new AmarokCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, SIGNAL(valueChanged(int)), this, SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); return settings; } diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h index bd735a3..aaff457 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h @@ -25,8 +25,8 @@ #include #include "song.h" -class QWidget; -class QString; +class TQWidget; +class TQString; /** @author Bastian Holst @@ -34,14 +34,15 @@ class QString; class AmarokCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: - AmarokCatalog(QObject*, const char*, const QStringList&); + AmarokCatalog(TQObject*, const char*, const TQStringList&); virtual ~AmarokCatalog(); unsigned int minQueryLen() const; void readSettings(KConfigBase *); void writeSettings(KConfigBase *); - QWidget * configure(); + TQWidget * configure(); //virtual void initialize(); public slots: @@ -55,7 +56,7 @@ protected: private: unsigned int _minQueryLen; bool _dynamicCollection; - bool _gotCollectionStatus; + bool _gotCollectiontqStatus; Song _result; }; diff --git a/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp b/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp index 4ea3f24..3324fee 100644 --- a/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp @@ -19,23 +19,23 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include "coverimage.h" CoverImage::CoverImage() { - setArtist(QString()); - setAlbum(QString()); - setURL(QString()); + setArtist(TQString()); + setAlbum(TQString()); + setURL(TQString()); - _coverfolder = QDir::homeDirPath(); + _coverfolder = TQDir::homeDirPath(); _coverfolder.append("/.kde/share/apps/amarok/albumcovers/"); - _largefolder = QString(_coverfolder).append("large/"); - _cachefolder = QString(_coverfolder).append("cache/"); + _largefolder = TQString(_coverfolder).append("large/"); + _cachefolder = TQString(_coverfolder).append("cache/"); - QDir foldertest; + TQDir foldertest; foldertest.setPath(_coverfolder); if ( !foldertest.exists() ) foldertest.mkdir(_coverfolder); @@ -45,12 +45,12 @@ CoverImage::CoverImage() foldertest.mkdir(_cachefolder); } -QImage CoverImage::load(int size) const +TQImage CoverImage::load(int size) const { - QString imagepath(_cachefolder); + TQString imagepath(_cachefolder); KMD5 md5sum(artist().lower().utf8()+album().lower().utf8()); - imagepath.append(QString::number ( size )).append("@").append(md5sum.hexDigest()); - QImage image( imagepath ); + imagepath.append(TQString::number ( size )).append("@").append(md5sum.hexDigest()); + TQImage image( imagepath ); if ( image.isNull() ) { if ( !url().isEmpty() ) { @@ -62,45 +62,45 @@ QImage CoverImage::load(int size) const } if ( !image.isNull() ) { - QString savepath(_cachefolder); - savepath.append(QString::number ( size )).append("@").append(md5sum.hexDigest()); - image = image.smoothScale(size, size, QImage::ScaleMin); + TQString savepath(_cachefolder); + savepath.append(TQString::number ( size )).append("@").append(md5sum.hexDigest()); + image = image.smoothScale(size, size, TQ_ScaleMin); if ( !url().isEmpty() ) { - image.save( savepath, QImage::imageFormat ( url() )); + image.save( savepath, TQImage::imageFormat ( url() )); } else { - image.save( savepath, QImage::imageFormat ( imagepath )); + image.save( savepath, TQImage::imageFormat ( imagepath )); } } } return image; } -QString CoverImage::artist() const +TQString CoverImage::artist() const { return _artist; } -QString CoverImage::album() const +TQString CoverImage::album() const { return _album; } -QString CoverImage::url() const +TQString CoverImage::url() const { return _url; } -void CoverImage::setArtist(const QString& artist) +void CoverImage::setArtist(const TQString& artist) { _artist = artist; } -void CoverImage::setAlbum(const QString& album) +void CoverImage::setAlbum(const TQString& album) { _album = album; } -void CoverImage::setURL(const QString& url) +void CoverImage::setURL(const TQString& url) { _url = url; } diff --git a/katapult/plugins/catalogs/amarokcatalog/coverimage.h b/katapult/plugins/catalogs/amarokcatalog/coverimage.h index c7982c3..95be477 100644 --- a/katapult/plugins/catalogs/amarokcatalog/coverimage.h +++ b/katapult/plugins/catalogs/amarokcatalog/coverimage.h @@ -20,8 +20,8 @@ #ifndef COVERIMAGE_H #define COVERIMAGE_H -#include -#include +#include +#include /** @author Bastian Holst @@ -31,23 +31,23 @@ class CoverImage public: CoverImage(); - QImage load(int) const; + TQImage load(int) const; - virtual QString artist() const; - virtual QString album() const; - virtual QString url() const; + virtual TQString artist() const; + virtual TQString album() const; + virtual TQString url() const; - void setArtist(const QString&); - void setAlbum(const QString&); - void setURL(const QString&); + void setArtist(const TQString&); + void setAlbum(const TQString&); + void setURL(const TQString&); private: - QString _artist; - QString _album; - QString _url; + TQString _artist; + TQString _album; + TQString _url; - QString _coverfolder; - QString _largefolder; - QString _cachefolder; + TQString _coverfolder; + TQString _largefolder; + TQString _cachefolder; }; #endif // COVERIMAGE_H diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui index 70bb3ab..a3f9c22 100644 --- a/katapult/plugins/catalogs/amarokcatalog/settings.ui +++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui @@ -1,10 +1,10 @@ AmarokCatalogSettings - + AmarokCatalogSettings - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -64,7 +64,7 @@ Expanding - + 20 370 @@ -73,7 +73,7 @@ - + knuminput.h diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp index 78b69fb..ebad14a 100644 --- a/katapult/plugins/catalogs/amarokcatalog/song.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp @@ -21,35 +21,35 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "song.h" -Song::Song(const QString&) +Song::Song(const TQString&) : KatapultItem() { - setName(QString()); - setArtist(QString()); + setName(TQString()); + setArtist(TQString()); setURL(KURL()); - setIcon(QString()); - setAlbum(QString::null); + setIcon(TQString()); + setAlbum(TQString()); } -void Song::setArtist(const QString& artist) +void Song::setArtist(const TQString& artist) { _artist = artist; cover.setArtist(artist); } -void Song::setName(const QString& name) +void Song::setName(const TQString& name) { _name = name; } -void Song::setAlbum(const QString& album) +void Song::setAlbum(const TQString& album) { cover.setAlbum(album); } @@ -59,22 +59,22 @@ void Song::setURL(const KURL url) _url = url; } -void Song::setIcon(const QString icon) +void Song::setIcon(const TQString icon) { cover.setURL(icon); } -QPixmap Song::icon(int size) const +TQPixmap Song::icon(int size) const { - QImage image = cover.load(size); + TQImage image = cover.load(size); if ( image.isNull() ) return KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size); - return QPixmap(image); + return TQPixmap(image); } -QString Song::text() const +TQString Song::text() const { - QString text; + TQString text; if( !_artist.isEmpty() ) { text.append(_artist); text.append(": "); diff --git a/katapult/plugins/catalogs/amarokcatalog/song.h b/katapult/plugins/catalogs/amarokcatalog/song.h index 90e4819..12c796f 100644 --- a/katapult/plugins/catalogs/amarokcatalog/song.h +++ b/katapult/plugins/catalogs/amarokcatalog/song.h @@ -23,8 +23,8 @@ #include "katapultitem.h" #include "coverimage.h" #include -#include -#include +#include +#include /** @author Bastian Holst @@ -32,22 +32,23 @@ class Song : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - Song(const QString&); + Song(const TQString&); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; virtual KURL url() const; - void setArtist(const QString&); - void setName(const QString&); + void setArtist(const TQString&); + void setName(const TQString&); void setURL(const KURL); - void setIcon(const QString); - void setAlbum(const QString&); + void setIcon(const TQString); + void setAlbum(const TQString&); protected: - QString _artist; - QString _name; + TQString _artist; + TQString _name; KURL _url; CoverImage cover; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp index bd31782..4eda633 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp @@ -25,20 +25,20 @@ #include #include -#include -#include +#include +#include #include "actionopenbookmark.h" #include "katapultitem.h" #include "bookmark.h" #include "mozillabookmark.h" -QPixmap ActionOpenBookmark::icon(int size) const +TQPixmap ActionOpenBookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); } -QString ActionOpenBookmark::text() const +TQString ActionOpenBookmark::text() const { return i18n("Open Bookmark"); } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h index 9068753..61dc33e 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h @@ -23,8 +23,8 @@ #include class KatapultItem; -class QPixmap; -class QString; +class TQPixmap; +class TQString; /** @author Joe Ferris @@ -33,8 +33,8 @@ class ActionOpenBookmark : public KatapultAction { public: - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; virtual void execute(const KatapultItem *) const; virtual bool accepts(const KatapultItem *) const; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp index e5d65db..ae098f3 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp @@ -30,7 +30,7 @@ Bookmark::Bookmark(KBookmark _bookmark) this->_bookmark = _bookmark; } -QPixmap Bookmark::icon(int size) const +TQPixmap Bookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size); } @@ -40,7 +40,7 @@ KBookmark Bookmark::bookmark() const return _bookmark; } -QString Bookmark::text() const +TQString Bookmark::text() const { return _bookmark.text(); } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h index fba7fec..f86b341 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h @@ -30,11 +30,12 @@ class Bookmark : public KatapultItem { Q_OBJECT + TQ_OBJECT public: Bookmark(KBookmark); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; KBookmark bookmark() const; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index e70d65f..0fae37d 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -27,12 +27,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "bookmarkcatalog.h" #include "bookmark.h" @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_bookmarkcatalog, KGenericFactory( "katapult_bookmarkcatalog" ) ) -BookmarkCatalog::BookmarkCatalog(QObject *, const char *, const QStringList&) +BookmarkCatalog::BookmarkCatalog(TQObject *, const char *, const TQStringList&) : CachedCatalog() { manager = KBookmarkManager::userBookmarksManager(); @@ -86,34 +86,34 @@ void BookmarkCatalog::cacheMozillaBookmarks() if(_mozFile.isEmpty()) return; - QFile bmFile(_mozFile); + TQFile bmFile(_mozFile); if(!bmFile.open(IO_ReadOnly)) return; - QString contents = bmFile.readAll(); - QRegExp rx("]+>([^<]+)"); + TQString contents = bmFile.readAll(); + TQRegExp rx("]+>([^<]+)"); int pos = 0; while(pos > -1) { pos = rx.search(contents, pos); if(pos > -1) { - addItem(new MozillaBookmark(rx.cap(1), rx.cap(2), QPixmap())); + addItem(new MozillaBookmark(rx.cap(1), rx.cap(2), TQPixmap())); pos += rx.matchedLength(); } } } -QString BookmarkCatalog::detectMozillaFile() +TQString BookmarkCatalog::detectMozillaFile() { - QStringList testDirs; + TQStringList testDirs; testDirs << ".firefox" << ".mozilla" << ".phoenix" << ".netscape"; - QDir home = QDir::home(); - for(QStringList::Iterator it = testDirs.begin(); it != testDirs.end(); ++it) { - QString testDir = *it; + TQDir home = TQDir::home(); + for(TQStringList::Iterator it = testDirs.begin(); it != testDirs.end(); ++it) { + TQString testDir = *it; if(home.exists(testDir)) { - QDir mozDir = QDir(home.path()+"/"+testDir).canonicalPath(); - if(mozDir.dirName() != testDir && testDirs.contains(mozDir.dirName())) + TQDir mozDir = TQDir(home.path()+"/"+testDir).canonicalPath(); + if(mozDir.dirName() != testDir && testDirs.tqcontains(mozDir.dirName())) continue; - QString path = searchMozDir(mozDir.path()); + TQString path = searchMozDir(mozDir.path()); if(!path.isEmpty()) return path; } @@ -122,21 +122,21 @@ QString BookmarkCatalog::detectMozillaFile() return ""; } -QString BookmarkCatalog::searchMozDir(QString path) +TQString BookmarkCatalog::searchMozDir(TQString path) { - QDir dir(path); + TQDir dir(path); if(dir.exists("bookmarks.html")) { return path+"/bookmarks.html"; } - QStringList entries = dir.entryList(QDir::Dirs | QDir::NoSymLinks); - for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { + TQStringList entries = dir.entryList(TQDir::Dirs | TQDir::NoSymLinks); + for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(*it != "." && *it != ".."){ - QString result = searchMozDir(path + "/" + *it); + TQString result = searchMozDir(path + "/" + *it); if(!result.isEmpty()) return result; } } - return QString::null; + return TQString(); } unsigned int BookmarkCatalog::minQueryLen() const @@ -160,23 +160,23 @@ void BookmarkCatalog::writeSettings(KConfigBase *config) config->writeEntry("MozFile", _mozFile); } -QWidget * BookmarkCatalog::configure() +TQWidget * BookmarkCatalog::configure() { settings = new BookmarkCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, SIGNAL(valueChanged(int)), this, SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); settings->mozEnabled->setChecked(_mozEnabled); - connect(settings->mozEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleMozEnabled(bool))); + connect(settings->mozEnabled, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozEnabled(bool))); settings->mozAuto->setChecked(_mozAuto); - connect(settings->mozAuto, SIGNAL(toggled(bool)), this, SLOT(toggleMozAuto(bool))); + connect(settings->mozAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozAuto(bool))); settings->mozManual->setChecked(!_mozAuto); settings->mozFile->setURL(_mozFile); - connect(settings->mozFile, SIGNAL(urlSelected(const QString &)), this, SLOT(changeMozFile(const QString &))); + connect(settings->mozFile, TQT_SIGNAL(urlSelected(const TQString &)), this, TQT_SLOT(changeMozFile(const TQString &))); settings->mozAuto->setEnabled(_mozEnabled); settings->mozManual->setEnabled(_mozEnabled); @@ -204,7 +204,7 @@ void BookmarkCatalog::toggleMozAuto(bool _mozAuto) settings->mozFile->setEnabled(!_mozAuto); } -void BookmarkCatalog::changeMozFile(const QString & _mozFile) +void BookmarkCatalog::changeMozFile(const TQString & _mozFile) { this->_mozFile = _mozFile; } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h index b0e5736..190a866 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h @@ -22,12 +22,12 @@ #include -#include +#include #include "cachedcatalog.h" -class QWidget; -class QString; +class TQWidget; +class TQString; class KBookmarkManager; class KBookmarkGroup; class BookmarkCatalogSettings; @@ -38,33 +38,34 @@ class BookmarkCatalogSettings; class BookmarkCatalog : public CachedCatalog { Q_OBJECT + TQ_OBJECT public: - BookmarkCatalog(QObject *, const char *, const QStringList&); + BookmarkCatalog(TQObject *, const char *, const TQStringList&); virtual ~BookmarkCatalog(); virtual void initialize(); virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); virtual unsigned int minQueryLen() const; - virtual QWidget * configure(); + virtual TQWidget * configure(); public slots: void minQueryLenChanged(int); void toggleMozEnabled(bool); void toggleMozAuto(bool); - void changeMozFile(const QString &); - QString searchMozDir(QString); + void changeMozFile(const TQString &); + TQString searchMozDir(TQString); private: void cacheBookmarkList(KBookmarkGroup); void cacheMozillaBookmarks(); - QString detectMozillaFile(); + TQString detectMozillaFile(); KBookmarkManager *manager; int _minQueryLen; bool _mozEnabled; bool _mozAuto; - QString _mozFile; + TQString _mozFile; BookmarkCatalogSettings *settings; }; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp index eb55751..4a67681 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp @@ -21,11 +21,11 @@ #include #include -#include +#include #include "mozillabookmark.h" -MozillaBookmark::MozillaBookmark(QString _url, QString _title, QPixmap _icon) +MozillaBookmark::MozillaBookmark(TQString _url, TQString _title, TQPixmap _icon) : KatapultItem() { this->_url = _url; @@ -33,17 +33,17 @@ MozillaBookmark::MozillaBookmark(QString _url, QString _title, QPixmap _icon) this->_title = _title; } -QPixmap MozillaBookmark::icon(int size) const +TQPixmap MozillaBookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size); } -QString MozillaBookmark::url() const +TQString MozillaBookmark::url() const { return _url; } -QString MozillaBookmark::text() const +TQString MozillaBookmark::text() const { return _title; } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h index f1e25fb..07dc034 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h @@ -20,7 +20,7 @@ #ifndef MOZILLABOOKMARK_H #define MOZILLABOOKMARK_H -#include +#include #include "katapultitem.h" @@ -30,17 +30,18 @@ class MozillaBookmark : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - MozillaBookmark(QString, QString, QPixmap); + MozillaBookmark(TQString, TQString, TQPixmap); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; - QString url() const; + TQString url() const; private: - QString _url, _title; - QPixmap _icon; + TQString _url, _title; + TQPixmap _icon; }; #endif diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui index 7a8121d..6f35eae 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui +++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui @@ -1,10 +1,10 @@ BookmarkCatalogSettings - + BookmarkCatalogSettings - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -51,7 +51,7 @@ - + mozEnabled @@ -65,7 +65,7 @@ unnamed - + mozAuto @@ -73,7 +73,7 @@ Automatically detect bookmark file - + mozManual @@ -98,7 +98,7 @@ Expanding - + 20 100 @@ -107,7 +107,7 @@ - + knuminput.h kurlrequester.h diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 2a786f9..ff47f92 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include "calculatorcatalog.h" #include "expression.h" @@ -45,34 +45,34 @@ // Copied some code from KDE 3.5 to make it compile on 3.4. // insert (thousands)-"separator"s into the non-fractional part of str -static void _insertSeparator(QString &str, const QString &separator, const QString &decimalSymbol) +static void _insertSeparator(TQString &str, const TQString &separator, const TQString &decimalSymbol) { // leave fractional part untouched - QString mainPart = str.section(decimalSymbol, 0, 0); - QString fracPart = str.section(decimalSymbol, 1, 1, QString::SectionIncludeLeadingSep); - if (fracPart==decimalSymbol) fracPart=QString(); + TQString mainPart = str.section(decimalSymbol, 0, 0); + TQString fracPart = str.section(decimalSymbol, 1, 1, TQString::SectionIncludeLeadingSep); + if (fracPart==decimalSymbol) fracPart=TQString(); for (int pos = mainPart.length() - 3; pos > 0; pos -= 3) mainPart.insert(pos, separator); str = mainPart + fracPart; } -// This was KLocale::formatNumber(const QString&, bool, int) +// This was KLocale::formatNumber(const TQString&, bool, int) -static QString formatNumber(const QString &numStr) +static TQString formatNumber(const TQString &numStr) { - QString tmpString = numStr; + TQString tmpString = numStr; // Skip the sign (for now) bool neg = (tmpString[0] == '-'); if (neg || tmpString[0] == '+') tmpString.remove(0, 1); // Split off exponential part (including 'e'-symbol) - QString mantString = tmpString.section('e', 0, 0, QString::SectionCaseInsensitiveSeps); - QString expString = tmpString.section('e', 1, 1, QString::SectionCaseInsensitiveSeps | QString::SectionIncludeLeadingSep); - if (expString.length()==1) expString=QString(); + TQString mantString = tmpString.section('e', 0, 0, TQString::SectionCaseInsensitiveSeps); + TQString expString = tmpString.section('e', 1, 1, TQString::SectionCaseInsensitiveSeps | TQString::SectionIncludeLeadingSep); + if (expString.length()==1) expString=TQString(); // Replace dot with locale decimal separator - mantString.replace(QChar('.'), KGlobal::locale()->decimalSymbol()); + mantString.tqreplace(TQChar('.'), KGlobal::locale()->decimalSymbol()); // Insert the thousand separators _insertSeparator(mantString, KGlobal::locale()->thousandsSeparator(), KGlobal::locale()->decimalSymbol()); @@ -86,7 +86,7 @@ static QString formatNumber(const QString &numStr) #else // KDE_VERSION >= 3.5.0 -static QString formatNumber(const QString& numStr) +static TQString formatNumber(const TQString& numStr) { return KGlobal::locale()->formatNumber(numStr, false, 0); } @@ -103,15 +103,15 @@ ActionEvaluateExpression::~ActionEvaluateExpression() { } -QString ActionEvaluateExpression::text() const +TQString ActionEvaluateExpression::text() const { if (_expr->parseError()) { return i18n("Evaluate Expression"); } else { // Format result. int digits = _expr->catalog()->fracDigits(); - QChar f = _expr->catalog()->scientific() ? 'g' : 'f'; - QString num = QString::number(_expr->result(), f, digits); + TQChar f = _expr->catalog()->scientific() ? 'g' : 'f'; + TQString num = TQString::number(_expr->result(), f, digits); // Strip trailing zeroes. if (f == 'f' && digits != 0) { while (num.endsWith("0")) { @@ -126,7 +126,7 @@ QString ActionEvaluateExpression::text() const } } -QPixmap ActionEvaluateExpression::icon(int size) const +TQPixmap ActionEvaluateExpression::icon(int size) const { return KGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size); } @@ -150,12 +150,12 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const // Copy calculation and result into clipboard (unless there's a parse error). if (!_expr->parseError()) { - QClipboard *cb = QApplication::clipboard(); - QString s = _expr->catalog()->formatString(); - s.replace("%1", _expr->text()); - s.replace("%2", text()); - cb->setText(s, QClipboard::Clipboard); - cb->setText(s, QClipboard::Selection); + TQClipboard *cb = TQApplication::tqclipboard(); + TQString s = _expr->catalog()->formatString(); + s.tqreplace("%1", _expr->text()); + s.tqreplace("%2", text()); + cb->setText(s, TQClipboard::Clipboard); + cb->setText(s, TQClipboard::Selection); } } } diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h index 6cf23bf..f04e65b 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h @@ -39,8 +39,8 @@ class ActionEvaluateExpression : 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/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index c3c5f6d..2781cd2 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -127,7 +127,7 @@ const CalculatorCatalog::Function CalculatorCatalog::degreesFunctionTable[] = K_EXPORT_COMPONENT_FACTORY( katapult_calculatorcatalog, KGenericFactory( "katapult_calculatorcatalog" ) ) -CalculatorCatalog::CalculatorCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null) +CalculatorCatalog::CalculatorCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString()) { ActionRegistry::self()->registerAction(new ActionEvaluateExpression()); @@ -141,8 +141,8 @@ CalculatorCatalog::~CalculatorCatalog() void CalculatorCatalog::queryChanged() { - int newStatus = 0; - QString cmd = query(); + int newtqStatus = 0; + TQString cmd = query(); if (cmd.isEmpty()) { reset(); @@ -154,10 +154,10 @@ void CalculatorCatalog::queryChanged() cmd = cmd.lower(); for (i = length - 1; i >= 0 && cmd[i].isLetter(); --i) { } if (i != length - 1) { - QString start = cmd.mid(i + 1); + TQString start = cmd.mid(i + 1); int lengthOfShortest = 9999, shortest = -1; for (int j = 0; radiansFunctionTable[j].name; ++j) { - if (QString(radiansFunctionTable[j].name).startsWith(start)) { + if (TQString(radiansFunctionTable[j].name).startsWith(start)) { if (radiansFunctionTable[j].length < lengthOfShortest) { lengthOfShortest = radiansFunctionTable[j].length; shortest = j; @@ -170,7 +170,7 @@ void CalculatorCatalog::queryChanged() } } //fix parse errors at end of expression, - //ie. close open parentheses, convert operators into NOPs + //ie. close open tqparentheses, convert operators into NOPs for (i = length - 1; i >= 0 && (cmd[i] == '(' || cmd[i] == ' '); --i) { } if (i < 0 || cmd[i] == '+' || cmd[i] == '-') { cmd.append("0"); @@ -203,31 +203,31 @@ void CalculatorCatalog::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); } void CalculatorCatalog::reset() { - _result.setText(QString::null); + _result.setText(TQString()); } -bool CalculatorCatalog::accepts(const QString& str) const +bool CalculatorCatalog::accepts(const TQString& str) const { //Heuristic to determine whether the string is an expression or not. //Accept anything containing [()+\\-/*^=.,0-9]. - return QRegExp("[()+\\-/*^=.,0-9]").search(str) >= 0; + return TQRegExp("[()+\\-/*^=.,0-9]").search(str) >= 0; } int CalculatorCatalog::getVarID(const char* name) { - VarNameToIdMap::iterator it = varNameToId.find(QString(name)); + VarNameToIdMap::iterator it = varNameToId.tqfind(TQString(name)); if (it == varNameToId.end()) { - _pendingVarName = QString(name); + _pendingVarName = TQString(name); return -1; } return *it; @@ -274,26 +274,26 @@ void CalculatorCatalog::writeSettings(KConfigBase* config) config->writeEntry("FormatString", formatString()); } -QWidget * CalculatorCatalog::configure() +TQWidget * CalculatorCatalog::configure() { CalculatorCatalogSettings* settings = new CalculatorCatalogSettings(); settings->fracDigits->setValue(_fracDigits); - connect(settings->fracDigits, SIGNAL(valueChanged(int)), this, SLOT(fracDigitsChanged(int))); + connect(settings->fracDigits, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fracDigitsChanged(int))); settings->normal->setChecked(!scientific()); settings->scientific->setChecked(scientific()); - connect(settings->scientific, SIGNAL(toggled(bool)), this, SLOT(scientificChanged(bool))); + connect(settings->scientific, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(scientificChanged(bool))); settings->radians->setChecked(!degrees()); settings->degrees->setChecked(degrees()); - connect(settings->degrees, SIGNAL(toggled(bool)), this, SLOT(degreesChanged(bool))); + connect(settings->degrees, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(degreesChanged(bool))); settings->clipboard->setChecked(clipboard()); - connect(settings->clipboard, SIGNAL(toggled(bool)), this, SLOT(clipboardChanged(bool))); + connect(settings->clipboard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clipboardChanged(bool))); settings->formatString->setText(formatString()); - connect(settings->formatString, SIGNAL(textChanged(const QString&)), this, SLOT(formatStringChanged(const QString&))); + connect(settings->formatString, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(formatStringChanged(const TQString&))); return settings; } @@ -328,12 +328,12 @@ bool CalculatorCatalog::degrees() const return _bDegrees; } -void CalculatorCatalog::formatStringChanged(const QString& fmt) +void CalculatorCatalog::formatStringChanged(const TQString& fmt) { _formatString = fmt; } -QString CalculatorCatalog::formatString() const +TQString CalculatorCatalog::formatString() const { return _formatString; } diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h index 88f03cc..e5f7d00 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h @@ -25,15 +25,15 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "expression.h" #include "katapultcatalog.h" -class QWidget; +class TQWidget; typedef double (*FunPtr)(double); @@ -43,6 +43,7 @@ typedef double (*FunPtr)(double); class CalculatorCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: @@ -59,13 +60,13 @@ class CalculatorCatalog : public KatapultCatalog FunPtr fptr; }; - CalculatorCatalog(QObject*, const char*, const QStringList&); + CalculatorCatalog(TQObject*, const char*, const TQStringList&); virtual ~CalculatorCatalog(); //virtual void initialize(); virtual void readSettings(KConfigBase*); virtual void writeSettings(KConfigBase*); - virtual QWidget* configure(); + virtual TQWidget* configure(); int getVarID(const char*); double getVar(int) const; @@ -75,7 +76,7 @@ class CalculatorCatalog : public KatapultCatalog bool scientific() const; bool degrees() const; bool clipboard() const; - QString formatString() const; + TQString formatString() const; const Function* functionTable() const; protected: @@ -84,26 +85,26 @@ class CalculatorCatalog : public KatapultCatalog private: - typedef QMap VarNameToIdMap; - typedef QValueVector VarIdToValueVector; + typedef TQMap VarNameToIdMap; + typedef TQValueVector VarIdToValueVector; static const Function radiansFunctionTable[]; static const Function degreesFunctionTable[]; void reset(); - bool accepts(const QString&) const; + bool accepts(const TQString&) const; Expression _result; // The one result (there's always one). VarNameToIdMap varNameToId; // Maps strings to IDs. VarIdToValueVector varIdToValue; // Maps IDs to values. - QString _pendingVarName; // Pending while rest of assignment is parsed. + TQString _pendingVarName; // Pending while rest of assignment is parsed. int _fracDigits; // Number of fractional digits. bool _bScientific; // Normal or scientific mode? bool _bDegrees; // Radians or degrees? bool _bClipboard; // Copy to clipboard? - QString _formatString; // for clipboard copy + TQString _formatString; // for clipboard copy private slots: @@ -111,7 +112,7 @@ class CalculatorCatalog : public KatapultCatalog void scientificChanged(bool); void degreesChanged(bool); void clipboardChanged(bool); - void formatStringChanged(const QString&); + void formatStringChanged(const TQString&); }; diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp index 37e80bc..dfa4543 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp @@ -29,12 +29,12 @@ #include "expression.h" -Expression::Expression(CalculatorCatalog* catalog, const QString& text): KatapultItem(), _catalog(catalog), _text(text) +Expression::Expression(CalculatorCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { evaluate(); } -QPixmap Expression::icon(int size) const +TQPixmap Expression::icon(int size) const { const char* icon = "checkmark"; if (_parseError) { @@ -43,12 +43,12 @@ QPixmap Expression::icon(int size) const return KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } -QString Expression::text() const +TQString Expression::text() const { return _text; } -void Expression::setText(const QString& text) +void Expression::setText(const TQString& text) { _text = text; evaluate(); @@ -72,9 +72,9 @@ CalculatorCatalog* Expression::catalog() const void Expression::evaluate(bool assignments) const { if (!_text.isEmpty()) { - QString t = _text; + TQString t = _text; CalculatorCatalog::ParserControl cntrl; - cntrl.expression = t.replace(',', '.').ascii(); + cntrl.expression = t.tqreplace(',', '.').ascii(); cntrl.catalog = _catalog; cntrl.assignments = assignments; if (yyparse(&cntrl) == 0) { diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.h b/katapult/plugins/catalogs/calculatorcatalog/expression.h index 6d736f9..f7703c6 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.h +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.h @@ -33,13 +33,14 @@ class CalculatorCatalog; class Expression : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - Expression(CalculatorCatalog*, const QString&); + Expression(CalculatorCatalog*, const TQString&); - 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&); double result() const; bool parseError() const; @@ -52,7 +53,7 @@ class Expression : public KatapultItem private: CalculatorCatalog* const _catalog; - QString _text; + TQString _text; mutable double _result; mutable bool _parseError; }; diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui index 67c0faa..7ef86b9 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui +++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui @@ -1,10 +1,10 @@ CalculatorCatalogSettings - + CalculatorCatalogSettings - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -57,15 +57,15 @@ - + - layout6 + tqlayout6 unnamed - + buttonGroup2 @@ -76,7 +76,7 @@ unnamed - + normal @@ -87,7 +87,7 @@ In normal mode, katapult will never show an exponent on a number. - + scientific @@ -100,7 +100,7 @@ - + buttonGroup3 @@ -111,7 +111,7 @@ unnamed - + radians @@ -122,7 +122,7 @@ Trigonometric functions expect and return angles in radians (2 pi radians is a full circle). - + degrees @@ -137,7 +137,7 @@ - + clipboard @@ -154,15 +154,15 @@ unnamed - + - layout8 + tqlayout8 unnamed - + textLabel1_2 @@ -173,14 +173,14 @@ formatString - + formatString - + textLabel1_3 @@ -200,7 +200,7 @@ Expanding - + 20 40 @@ -212,7 +212,7 @@ fracDigits - + knuminput.h diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp index 70f91a7..3de6f5a 100644 --- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp +++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp @@ -37,12 +37,12 @@ bool ActionOpenDocument::accepts(const KatapultItem* item) const return strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0; } -QPixmap ActionOpenDocument::icon(int size) const +TQPixmap ActionOpenDocument::icon(int size) const { return KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); } -QString ActionOpenDocument::text() const +TQString ActionOpenDocument::text() const { return i18n("Open"); } @@ -51,7 +51,7 @@ void ActionOpenDocument::execute(const KatapultItem* item) const { if(strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0) { const Document *document = (const Document *) item; - qDebug("%s", QString("Running: %1").arg(document->path()).latin1()); + qDebug("%s", TQString("Running: %1").tqarg(document->path()).latin1()); new KRun(document->path()); } } diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.h b/katapult/plugins/catalogs/documentcatalog/actionopendocument.h index c6a8bf7..5846241 100644 --- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.h +++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.h @@ -32,8 +32,8 @@ public: ActionOpenDocument(); virtual bool accepts(const KatapultItem*) const; - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; virtual void execute(const KatapultItem*) const; }; diff --git a/katapult/plugins/catalogs/documentcatalog/directory.cpp b/katapult/plugins/catalogs/documentcatalog/directory.cpp index 3d3bc54..09ffa72 100644 --- a/katapult/plugins/catalogs/documentcatalog/directory.cpp +++ b/katapult/plugins/catalogs/documentcatalog/directory.cpp @@ -23,12 +23,12 @@ #include "directory.h" -Directory::Directory(QString _path, QString _absPath) +Directory::Directory(TQString _path, TQString _absPath) : Document(_path, _absPath, false) { } -QPixmap Directory::icon(int size) const +TQPixmap Directory::icon(int size) const { return KGlobal::iconLoader()->loadIcon("folder", KIcon::NoGroup, size); } diff --git a/katapult/plugins/catalogs/documentcatalog/directory.h b/katapult/plugins/catalogs/documentcatalog/directory.h index 2f37f20..503b5ad 100644 --- a/katapult/plugins/catalogs/documentcatalog/directory.h +++ b/katapult/plugins/catalogs/documentcatalog/directory.h @@ -28,10 +28,11 @@ class Directory : public Document { Q_OBJECT + TQ_OBJECT public: - Directory(QString, QString); + Directory(TQString, TQString); - virtual QPixmap icon(int) const; + virtual TQPixmap icon(int) const; }; diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp index 96024cc..d91f05d 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.cpp +++ b/katapult/plugins/catalogs/documentcatalog/document.cpp @@ -18,14 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include #include "document.h" -Document::Document(QString _path, QString _absPath, bool _showPreview) +Document::Document(TQString _path, TQString _absPath, bool _showPreview) : KatapultItem() { this->_path = _path; @@ -33,7 +33,7 @@ Document::Document(QString _path, QString _absPath, bool _showPreview) this->_gotpix = false; this->_showPreview=_showPreview; - QFileInfo file(_absPath); + TQFileInfo file(_absPath); _name = file.fileName(); } @@ -41,7 +41,7 @@ Document::~Document() { } -QPixmap Document::icon(int size) const +TQPixmap Document::icon(int size) const { KURL u; KIO::PreviewJob *doc; @@ -50,8 +50,8 @@ QPixmap Document::icon(int size) const { doc=KIO::filePreview(u,size); - connect(doc, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), - SLOT(gotPreview(const KFileItem*, const QPixmap&))); + connect(doc, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); if(this->_gotpix)return this->_pix; return KMimeType::pixmapForURL(u,0, KIcon::NoGroup, size, KIcon::DefaultState, 0L); @@ -62,23 +62,23 @@ QPixmap Document::icon(int size) const } } -void Document::gotPreview(const KFileItem *item, const QPixmap& pixmap ) +void Document::gotPreview(const KFileItem *item, const TQPixmap& pixmap ) { this->_pix = pixmap; this->_gotpix=true; emit itemChanged(); } -QString Document::text() const +TQString Document::text() const { return _path; } -QString Document::path() const +TQString Document::path() const { return _absPath; } -QString Document::name() const +TQString Document::name() const { return _name; } diff --git a/katapult/plugins/catalogs/documentcatalog/document.h b/katapult/plugins/catalogs/documentcatalog/document.h index 6d09d99..b3ac606 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.h +++ b/katapult/plugins/catalogs/documentcatalog/document.h @@ -29,22 +29,23 @@ class Document : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - Document(QString, QString, bool); + Document(TQString, TQString, bool); virtual ~Document(); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; - QString path() const; - QString name() const; + TQString path() const; + TQString name() const; public slots: - void gotPreview(const KFileItem*,const QPixmap& ); + void gotPreview(const KFileItem*,const TQPixmap& ); private: - QString _path, _absPath, _name; - QPixmap _pix; + TQString _path, _absPath, _name; + TQPixmap _pix; bool _gotpix; bool _showPreview; }; diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index 883ac23..38acba3 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_documentcatalog, KGenericFactory( "katapult_documentcatalog" ) ) -DocumentCatalog::DocumentCatalog(QObject *, const char *, const QStringList&) +DocumentCatalog::DocumentCatalog(TQObject *, const char *, const TQStringList&) : KatapultCatalog() { _minQueryLen = 1; @@ -58,7 +58,7 @@ DocumentCatalog::~DocumentCatalog() void DocumentCatalog::initialize() { - dir = QDir::home(); + dir = TQDir::home(); refreshFolders(); refreshFiles(); } @@ -69,9 +69,9 @@ void DocumentCatalog::refreshFolders() files.clear(); currentDirDoc = 0; filesListed = FALSE; - QStringList folderNames = dir.entryList(QDir::Dirs); - for(QStringList::Iterator it = folderNames.begin(); it != folderNames.end(); ++it) { - QString dirname = *it; + TQStringList folderNames = dir.entryList(TQDir::Dirs); + for(TQStringList::Iterator it = folderNames.begin(); it != folderNames.end(); ++it) { + TQString dirname = *it; if(!dirname.startsWith(".")) folders.append(dirname); } @@ -79,13 +79,13 @@ void DocumentCatalog::refreshFolders() void DocumentCatalog::refreshFiles() { - const QFileInfoList *fileList = dir.entryInfoList(); + const TQFileInfoList *fileList = dir.entryInfoList(); Directory *item = new Directory(currentPath, dir.absPath()); currentDirDoc = item; files.append(item); - for(QPtrListStdIterator it = fileList->begin(); it != fileList->end(); ++it) { - const QFileInfo *file = *it; + for(TQPtrListStdIterator it = fileList->begin(); it != fileList->end(); ++it) { + const TQFileInfo *file = *it; if(!file->fileName().startsWith(".")) { if(file->isDir()) files.append(new Directory(currentPath+file->fileName(), file->absFilePath())); @@ -98,37 +98,37 @@ void DocumentCatalog::refreshFiles() void DocumentCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; if(query() == "") { // reset query - dir = QDir::home(); + dir = TQDir::home(); currentPath = ""; queryMatched = 0; refreshFolders(); } else { if(query().length() >= minQueryLen()) { - QString path = query().lower().remove(0, queryMatched); + TQString path = query().lower().remove(0, queryMatched); int index; - while((index = path.find('/')) != -1) { - QString folderQuery = path.left(index); - QString guess = QString::null; + while((index = path.tqfind('/')) != -1) { + TQString folderQuery = path.left(index); + TQString guess = TQString(); - for(QStringList::Iterator it = folders.begin(); it != folders.end(); ++it) { - QString folderName = *it; + for(TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it) { + TQString folderName = *it; if(folderName.lower().startsWith(folderQuery) && (guess.isNull() || folderName.length() < guess.length())) guess = folderName; } - if(guess == QString::null) { - path = QString::null; + if(guess == TQString()) { + path = TQString(); break; } if(!dir.cd(guess)) { - path = QString::null; + path = TQString(); break; } refreshFolders(); @@ -151,7 +151,7 @@ void DocumentCatalog::queryChanged() files.removeRef(currentDirDoc); currentDirDoc = 0; } - QPtrListIterator it(files); + TQPtrListIterator it(files); Document *document; while((document = it.current()) != 0) { ++it; @@ -169,21 +169,21 @@ void DocumentCatalog::queryChanged() if(currentDirDoc != 0 && path.isEmpty()) newBestMatch = Match(currentDirDoc, 100, currentPath.length()); - newStatus |= S_Active; + newtqStatus |= S_Active; if(files.count() > 0) { - newStatus |= S_HasResults; + newtqStatus |= S_HasResults; if(files.count() > 1 || files.at(0)->className() == "Directory") - newStatus |= S_Multiple; + newtqStatus |= S_Multiple; } else - newStatus |= S_NoResults; + newtqStatus |= S_NoResults; setBestMatch(newBestMatch); } else { setBestMatch(Match()); } } - setStatus(newStatus); + settqStatus(newtqStatus); } unsigned int DocumentCatalog::minQueryLen() const @@ -203,15 +203,15 @@ void DocumentCatalog::writeSettings(KConfigBase *config) config->writeEntry("showPreview", _showPreview); } -QWidget * DocumentCatalog::configure() +TQWidget * DocumentCatalog::configure() { DocumentCatalogSettings *settings = new DocumentCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, SIGNAL(valueChanged(int)), this, SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); settings->showPreview->setChecked(_showPreview); - connect(settings->showPreview, SIGNAL(toggled(bool)), this, SLOT(toggleshowPreview(bool))); + connect(settings->showPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleshowPreview(bool))); return settings; } diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h index e153729..e9bf8c3 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h @@ -22,14 +22,14 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "katapultcatalog.h" -class QWidget; +class TQWidget; class Document; /** @@ -38,8 +38,9 @@ class Document; class DocumentCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: - DocumentCatalog(QObject *, const char *, const QStringList&); + DocumentCatalog(TQObject *, const char *, const TQStringList&); virtual ~DocumentCatalog(); virtual void initialize(); @@ -47,7 +48,7 @@ public: virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); virtual unsigned int minQueryLen() const; - virtual QWidget * configure(); + virtual TQWidget * configure(); public slots: void minQueryLenChanged(int); @@ -57,11 +58,11 @@ private: void refreshFolders(); void refreshFiles(); - QPtrList files; + TQPtrList files; Document *currentDirDoc; - QStringList folders; - QString currentPath; - QDir dir; + TQStringList folders; + TQString currentPath; + TQDir dir; bool filesListed; int _minQueryLen; int queryMatched; diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui index 9f11cb9..fa2de9a 100644 --- a/katapult/plugins/catalogs/documentcatalog/settings.ui +++ b/katapult/plugins/catalogs/documentcatalog/settings.ui @@ -1,10 +1,10 @@ DocumentCatalogSettings - + DocumentCatalogSettings - + 0 0 @@ -16,15 +16,15 @@ Settings - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -48,7 +48,7 @@ - + showPreview @@ -66,7 +66,7 @@ Expanding - + 20 410 @@ -75,7 +75,7 @@ - + knuminput.h 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 @@ - + 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 #include -#include -#include +#include +#include #include "settings.h" #include "googlecatalog.h" @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog, KGenericFactory( "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 -#include +#include #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 #include -#include +#include #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 @@ -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 @@ GoogleCatalogSettings - + GoogleCatalogSettings - + 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 @@ - + diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp index 97ca084..ff1c6c1 100644 --- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp +++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp @@ -38,12 +38,12 @@ ActionRunProgram::~ActionRunProgram() { } -QString ActionRunProgram::text() const +TQString ActionRunProgram::text() const { return i18n("Run Program"); } -QPixmap ActionRunProgram::icon(int size) const +TQPixmap ActionRunProgram::icon(int size) const { return KGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size); } diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h index 1ee2e30..f182afa 100644 --- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h +++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h @@ -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/plugins/catalogs/programcatalog/program.cpp b/katapult/plugins/catalogs/programcatalog/program.cpp index dad529d..a9bb1b9 100644 --- a/katapult/plugins/catalogs/programcatalog/program.cpp +++ b/katapult/plugins/catalogs/programcatalog/program.cpp @@ -37,12 +37,12 @@ Program::Program(KService::Ptr s, bool useExecName) _service = s; } -QPixmap Program::icon(int size) const +TQPixmap Program::icon(int size) const { return KGlobal::iconLoader()->loadIcon(_icon, KIcon::NoGroup, size); } -QString Program::text() const +TQString Program::text() const { return _name; } diff --git a/katapult/plugins/catalogs/programcatalog/program.h b/katapult/plugins/catalogs/programcatalog/program.h index f316042..4b80c7f 100644 --- a/katapult/plugins/catalogs/programcatalog/program.h +++ b/katapult/plugins/catalogs/programcatalog/program.h @@ -30,18 +30,19 @@ class Program : public KatapultItem { Q_OBJECT + TQ_OBJECT public: Program(KService::Ptr, bool); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; KService * service() const; protected: KService::Ptr _service; - QString _icon, _name; + TQString _icon, _name; }; diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp index 1c83394..54a0fa3 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "settings.h" #include "programcatalog.h" @@ -36,7 +36,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_programcatalog, KGenericFactory( "katapult_programcatalog" ) ) -ProgramCatalog::ProgramCatalog(QObject *, const char *, const QStringList&) +ProgramCatalog::ProgramCatalog(TQObject *, const char *, const TQStringList&) : CachedCatalog() { _minQueryLen = 1; @@ -52,10 +52,10 @@ ProgramCatalog::~ProgramCatalog() void ProgramCatalog::initialize() { - cacheProgramList(QString::null); + cacheProgramList(TQString()); } -void ProgramCatalog::cacheProgramList(QString relPath) +void ProgramCatalog::cacheProgramList(TQString relPath) { KServiceGroup::Ptr group = KServiceGroup::group(relPath); if(!group || !group->isValid()) @@ -111,21 +111,21 @@ void ProgramCatalog::writeSettings(KConfigBase *config) config->writeEntry("IgnoreTerminal", _ignoreTerminal); } -QWidget * ProgramCatalog::configure() +TQWidget * ProgramCatalog::configure() { ProgramCatalogSettings *settings = new ProgramCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, SIGNAL(valueChanged(int)), this, SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); settings->ignoreIconless->setChecked(_ignoreIconless); - connect(settings->ignoreIconless, SIGNAL(toggled(bool)), this, SLOT(toggleIgnoreIconless(bool))); + connect(settings->ignoreIconless, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleIgnoreIconless(bool))); settings->useExecName->setChecked(_useExecName); - connect(settings->useExecName, SIGNAL(toggled(bool)), this, SLOT(toggleUseExecName(bool))); + connect(settings->useExecName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleUseExecName(bool))); settings->ignoreTerminal->setChecked(_ignoreTerminal); - connect(settings->ignoreTerminal, SIGNAL(toggled(bool)), this, SLOT(toggleIgnoreTerminal(bool))); + connect(settings->ignoreTerminal, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleIgnoreTerminal(bool))); return settings; } diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.h b/katapult/plugins/catalogs/programcatalog/programcatalog.h index ed00536..1fdabc0 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.h +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.h @@ -22,12 +22,12 @@ #include -#include -#include +#include +#include #include "cachedcatalog.h" -class QWidget; +class TQWidget; /** @author Joe Ferris @@ -35,15 +35,16 @@ class QWidget; class ProgramCatalog : public CachedCatalog { Q_OBJECT + TQ_OBJECT public: - ProgramCatalog(QObject *, const char *, const QStringList&); + ProgramCatalog(TQObject *, const char *, const TQStringList&); virtual ~ProgramCatalog(); virtual void initialize(); virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); virtual unsigned int minQueryLen() const; - virtual QWidget * configure(); + virtual TQWidget * configure(); public slots: void minQueryLenChanged(int); @@ -52,7 +53,7 @@ public slots: void toggleIgnoreTerminal(bool); private: - void cacheProgramList(QString); + void cacheProgramList(TQString); int _minQueryLen; bool _ignoreIconless; bool _useExecName; diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui index 9e963f6..8e3aba0 100644 --- a/katapult/plugins/catalogs/programcatalog/settings.ui +++ b/katapult/plugins/catalogs/programcatalog/settings.ui @@ -1,10 +1,10 @@ ProgramCatalogSettings - + ProgramCatalogSettings - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -51,7 +51,7 @@ - + ignoreIconless @@ -59,7 +59,7 @@ Ignore applications without icons - + ignoreTerminal @@ -67,7 +67,7 @@ Ignore terminal applications - + useExecName @@ -85,7 +85,7 @@ Expanding - + 20 370 @@ -94,7 +94,7 @@ - + knuminput.h diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp index 87857d3..51f2068 100644 --- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "spellcatalog.h" #include "spelling.h" @@ -42,7 +42,7 @@ ActionCopySpelling::~ActionCopySpelling() { } -QString ActionCopySpelling::text() const +TQString ActionCopySpelling::text() const { if (_spelling->parseError()) { return i18n("Parse Error"); @@ -51,7 +51,7 @@ QString ActionCopySpelling::text() const } } -QPixmap ActionCopySpelling::icon(int size) const +TQPixmap ActionCopySpelling::icon(int size) const { return KGlobal::iconLoader()->loadIcon("katapultspellcheck", KIcon::NoGroup, size); } diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h index e15c3d9..669ba49 100644 --- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h +++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h @@ -39,8 +39,8 @@ class ActionCopySpelling : 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/spellcatalog/settings.ui b/katapult/plugins/catalogs/spellcatalog/settings.ui index 402b416..055491d 100644 --- a/katapult/plugins/catalogs/spellcatalog/settings.ui +++ b/katapult/plugins/catalogs/spellcatalog/settings.ui @@ -1,10 +1,10 @@ SpellCatalogSettings - + SpellCatalogSettings - + 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 @@ - + diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index 5cbdbed..cbc3b8b 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include "settings.h" #include "spellcatalog.h" @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_spellcatalog, KGenericFactory( "katapult_spellcatalog" ) ) -SpellCatalog::SpellCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null) +SpellCatalog::SpellCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString()) { ActionRegistry::self()->registerAction(new ActionCopySpelling()); } @@ -52,8 +52,8 @@ SpellCatalog::~SpellCatalog() void SpellCatalog::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 SpellCatalog::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 SpellCatalog::accepts(const QString& str) const +bool SpellCatalog::accepts(const TQString& str) const { //accept if we begin with the triggerWord int length = _triggerWord.length(); @@ -92,21 +92,21 @@ void SpellCatalog::writeSettings(KConfigBase* config) config->writeEntry("TriggerWord", _triggerWord); } -QWidget * SpellCatalog::configure() +TQWidget * SpellCatalog::configure() { SpellCatalogSettings* settings = new SpellCatalogSettings(); 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 myword\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 myword\"").tqarg(_triggerWord)); return settings; } -void SpellCatalog::triggerWordChanged(const QString& triggerWord) +void SpellCatalog::triggerWordChanged(const TQString& triggerWord) { - _triggerWord = QString(triggerWord); + _triggerWord = TQString(triggerWord); } int SpellCatalog::triggerWordLength() @@ -116,7 +116,7 @@ int SpellCatalog::triggerWordLength() void SpellCatalog::reset() { - _result.setText(QString::null); + _result.setText(TQString()); } #include "spellcatalog.moc" diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h index 86181dc..cfd0e36 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h @@ -28,12 +28,12 @@ #include -#include +#include #include "spelling.h" #include "katapultcatalog.h" -class QWidget; +class TQWidget; /** @author Jonathan Riddell @@ -41,15 +41,16 @@ class QWidget; class SpellCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: - SpellCatalog(QObject*, const char*, const QStringList&); + SpellCatalog(TQObject*, const char*, const TQStringList&); virtual ~SpellCatalog(); virtual void readSettings(KConfigBase*); virtual void writeSettings(KConfigBase*); - virtual QWidget* configure(); + virtual TQWidget* configure(); int triggerWordLength(); protected: @@ -57,16 +58,16 @@ class SpellCatalog : public KatapultCatalog virtual void queryChanged(); private: - bool accepts(const QString&) const; + bool accepts(const TQString&) const; - QString _triggerWord; + TQString _triggerWord; Spelling _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/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp index fe08355..edadc18 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp @@ -26,21 +26,21 @@ #include #include -#include +#include #include "spellcatalog.h" #include "spelling.h" -Spelling::Spelling(SpellCatalog* catalog, const QString& text): KatapultItem(), _catalog(catalog), _text(text) +Spelling::Spelling(SpellCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { - spellChecker = new KSpell( 0, "caption", this, SLOT(spellCheckerReady()) ); + spellChecker = new KSpell( 0, "caption", this, TQT_SLOT(spellCheckerReady()) ); - connect( spellChecker, SIGNAL(misspelling(const QString&, const QStringList&, unsigned int)), - this, SLOT(spellCheckerMisspelling(const QString&, const QStringList&, unsigned int)) ); + connect( spellChecker, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + this, TQT_SLOT(spellCheckerMisspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( spellChecker, SIGNAL(corrected(const QString&, const QString&, unsigned int)), - this, SLOT(spellCheckerCorrected(const QString&, const QString&, unsigned int)) ); + connect( spellChecker, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + this, TQT_SLOT(spellCheckerCorrected(const TQString&, const TQString&, unsigned int)) ); evaluate(); } @@ -52,16 +52,16 @@ Spelling::~Spelling() { void Spelling::spellCheckerReady() { } -void Spelling::spellCheckerCorrected(const QString& /*originalword*/, const QString& /*newword*/, unsigned int /*pos*/) { +void Spelling::spellCheckerCorrected(const TQString& /*originalword*/, const TQString& /*newword*/, unsigned int /*pos*/) { corrected = true; } -void Spelling::spellCheckerMisspelling(const QString& /*originalword*/, const QStringList& suggestions, unsigned int /*pos*/) { +void Spelling::spellCheckerMisspelling(const TQString& /*originalword*/, const TQStringList& suggestions, unsigned int /*pos*/) { misspelt = true; suggestedWords = suggestions.join(","); } -QPixmap Spelling::icon(int size) const +TQPixmap Spelling::icon(int size) const { const char* icon = "checkmark"; if (_parseError || misspelt) { @@ -70,18 +70,18 @@ QPixmap Spelling::icon(int size) const return KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } -QString Spelling::text() const +TQString Spelling::text() const { return _text; } -void Spelling::setText(const QString& text) +void Spelling::setText(const TQString& text) { _text = text; evaluate(); } -QString Spelling::result() const +TQString Spelling::result() const { return _result; } @@ -100,7 +100,7 @@ void Spelling::evaluate() const { int length = catalog()->triggerWordLength(); - QString text = _text.mid(length + 1); // + 1 for space + TQString text = _text.mid(length + 1); // + 1 for space misspelt = false; corrected = false; @@ -125,9 +125,9 @@ void Spelling::evaluate() const } void Spelling::copyToClipboard() const { - QClipboard* clipBoard = QApplication::clipboard(); - clipBoard->setText(suggestedWords, QClipboard::Clipboard); - clipBoard->setText(suggestedWords, QClipboard::Selection); + TQClipboard* clipBoard = TQApplication::tqclipboard(); + clipBoard->setText(suggestedWords, TQClipboard::Clipboard); + clipBoard->setText(suggestedWords, TQClipboard::Selection); } #include "spelling.moc" diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.h b/katapult/plugins/catalogs/spellcatalog/spelling.h index ea4b846..1f8dc97 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.h +++ b/katapult/plugins/catalogs/spellcatalog/spelling.h @@ -35,15 +35,16 @@ class SpellCatalog; class Spelling : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - Spelling(SpellCatalog*, const QString&); + Spelling(SpellCatalog*, const TQString&); ~Spelling(); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; - void setText(const QString&); - QString result() const; + void setText(const TQString&); + TQString result() const; bool parseError() const; //evaluate() must be const, or ActionEvaluateSpelling::execute() can't call it. @@ -57,18 +58,18 @@ class Spelling : public KatapultItem private: SpellCatalog* const _catalog; - QString _text; - mutable QString _result; + TQString _text; + mutable TQString _result; mutable bool _parseError; KSpell* spellChecker; mutable bool misspelt; mutable bool corrected; - QString suggestedWords; + TQString suggestedWords; protected slots: void spellCheckerReady(); - void spellCheckerCorrected(const QString& originalword, const QString& newword, unsigned int pos); - void spellCheckerMisspelling(const QString& originalword, const QStringList& suggestions, unsigned int pos); + void spellCheckerCorrected(const TQString& originalword, const TQString& newword, unsigned int pos); + void spellCheckerMisspelling(const TQString& originalword, const TQStringList& suggestions, unsigned int pos); }; #endif diff --git a/katapult/plugins/display/glassdisplay/glassdisplay.cpp b/katapult/plugins/display/glassdisplay/glassdisplay.cpp index 278d67f..67d6858 100644 --- a/katapult/plugins/display/glassdisplay/glassdisplay.cpp +++ b/katapult/plugins/display/glassdisplay/glassdisplay.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "glassdisplay.h" #include "qembed_images.h" @@ -38,11 +38,11 @@ K_EXPORT_COMPONENT_FACTORY( katapult_glassdisplay, #define RIGHTMARGIN 8 #define BOTTOMMARGIN 8 -GlassDisplay::GlassDisplay(QObject *parent, const char *name, const QStringList& list) - : ImageDisplay(parent, name, list) +GlassDisplay::GlassDisplay(TQWidget *tqparent, const char *name, const TQStringList& list) + : ImageDisplay(TQT_TQOBJECT(tqparent), name, list) { - setSingleBG(new QPixmap(qembed_findImage("singlebg"))); - setDoubleBG(new QPixmap(qembed_findImage("doublebg"))); + setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); + setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); setSingleSize(WIDTH, HEIGHT); setDoubleSize(WIDTH, HEIGHT); diff --git a/katapult/plugins/display/glassdisplay/glassdisplay.h b/katapult/plugins/display/glassdisplay/glassdisplay.h index 166ed99..02236be 100644 --- a/katapult/plugins/display/glassdisplay/glassdisplay.h +++ b/katapult/plugins/display/glassdisplay/glassdisplay.h @@ -28,8 +28,9 @@ class GlassDisplay : public ImageDisplay { Q_OBJECT + TQ_OBJECT public: - GlassDisplay(QObject *, const char *, const QStringList&); + GlassDisplay(TQWidget *, const char *, const TQStringList&); virtual ~GlassDisplay(); }; diff --git a/katapult/plugins/display/glassdisplay/qembed_images.h b/katapult/plugins/display/glassdisplay/qembed_images.h index a8e5b3a..5a97c32 100644 --- a/katapult/plugins/display/glassdisplay/qembed_images.h +++ b/katapult/plugins/display/glassdisplay/qembed_images.h @@ -1,8 +1,8 @@ -#ifndef _QEMBED_1804289383 -#define _QEMBED_1804289383 -#include -#include -static const QRgb singlebg_data[] = { +#ifndef _TQEMBED_1804289383 +#define _TQEMBED_1804289383 +#include +#include +static const TQRgb singlebg_data[] = { 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, @@ -3989,7 +3989,7 @@ static const QRgb singlebg_data[] = { }; /* Generated by qembed */ -static const QRgb doublebg_data[] = { +static const TQRgb doublebg_data[] = { 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff, @@ -7979,7 +7979,7 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -7988,20 +7988,20 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -static const QImage& qembed_findImage( const QString& name ) +static const TQImage& qembed_findImage( const TQString& name ) { - static QDict dict; - QImage* img = dict.find( name ); + static TQDict dict; + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { - img = new QImage((uchar*)embed_image_vec[i].data, + img = new TQImage((uchar*)embed_image_vec[i].data, embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, - QImage::BigEndian ); + TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) img->setAlphaBuffer( TRUE ); dict.insert( name, img ); @@ -8009,7 +8009,7 @@ static const QImage& qembed_findImage( const QString& name ) } } if ( !img ) { - static QImage dummy; + static TQImage dummy; return dummy; } } diff --git a/katapult/plugins/display/o2display/o2display.cpp b/katapult/plugins/display/o2display/o2display.cpp index 823dfb9..c2104d3 100644 --- a/katapult/plugins/display/o2display/o2display.cpp +++ b/katapult/plugins/display/o2display/o2display.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "o2display.h" #include "qembed_images.h" @@ -41,11 +41,11 @@ K_EXPORT_COMPONENT_FACTORY( katapult_o2display, #define RIGHTMARGIN 25 #define BOTTOMMARGIN 40 -o2Display::o2Display(QObject *parent, const char *name, const QStringList& list) - : ImageDisplay(parent, name, list) +o2Display::o2Display(TQWidget *tqparent, const char *name, const TQStringList& list) + : ImageDisplay(TQT_TQOBJECT(tqparent), name, list) { - setSingleBG(new QPixmap(qembed_findImage("singlebg"))); - setDoubleBG(new QPixmap(qembed_findImage("doublebg"))); + setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); + setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); setSingleSize(WIDTH_SINGLE, HEIGHT_SINGLE); setDoubleSize(WIDTH_DOUBLE, HEIGHT_DOUBLE); diff --git a/katapult/plugins/display/o2display/o2display.h b/katapult/plugins/display/o2display/o2display.h index bd3c293..db26a1c 100644 --- a/katapult/plugins/display/o2display/o2display.h +++ b/katapult/plugins/display/o2display/o2display.h @@ -28,8 +28,9 @@ class o2Display : public ImageDisplay { Q_OBJECT + TQ_OBJECT public: - o2Display(QObject *, const char *, const QStringList&); + o2Display(TQWidget *, const char *, const TQStringList&); virtual ~o2Display(); }; diff --git a/katapult/plugins/display/o2display/qembed_images.h b/katapult/plugins/display/o2display/qembed_images.h index d953c11..db3b3cf 100644 --- a/katapult/plugins/display/o2display/qembed_images.h +++ b/katapult/plugins/display/o2display/qembed_images.h @@ -1,8 +1,8 @@ -#ifndef _QEMBED_1804289383 -#define _QEMBED_1804289383 -#include -#include -static const QRgb singlebg_data[] = { +#ifndef _TQEMBED_1804289383 +#define _TQEMBED_1804289383 +#include +#include +static const TQRgb singlebg_data[] = { 0xffffff,0xffffff,0xffffff,0x9000000,0x45000000,0x8d010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002, 0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002, 0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002, @@ -3589,7 +3589,7 @@ static const QRgb singlebg_data[] = { }; /* Generated by qembed */ -static const QRgb doublebg_data[] = { +static const TQRgb doublebg_data[] = { 0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x3000000,0x3a000000,0x62000000,0x8a000000,0xb6010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001, 0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001, 0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001, @@ -9756,7 +9756,7 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -9765,20 +9765,20 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -static const QImage& qembed_findImage( const QString& name ) +static const TQImage& qembed_findImage( const TQString& name ) { - static QDict dict; - QImage* img = dict.find( name ); + static TQDict dict; + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { - img = new QImage((uchar*)embed_image_vec[i].data, + img = new TQImage((uchar*)embed_image_vec[i].data, embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, - QImage::BigEndian ); + TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) img->setAlphaBuffer( TRUE ); dict.insert( name, img ); @@ -9786,7 +9786,7 @@ static const QImage& qembed_findImage( const QString& name ) } } if ( !img ) { - static QImage dummy; + static TQImage dummy; return dummy; } } diff --git a/katapult/plugins/display/puredisplay/puredisplay.cpp b/katapult/plugins/display/puredisplay/puredisplay.cpp index 7deb78d..92dcaaa 100644 --- a/katapult/plugins/display/puredisplay/puredisplay.cpp +++ b/katapult/plugins/display/puredisplay/puredisplay.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "puredisplay.h" #include "qembed_images.h" @@ -41,11 +41,11 @@ K_EXPORT_COMPONENT_FACTORY( katapult_puredisplay, #define RIGHTMARGIN 25 #define BOTTOMMARGIN 40 -PureDisplay::PureDisplay(QObject *parent, const char *name, const QStringList& list) - : ImageDisplay(parent, name, list) +PureDisplay::PureDisplay(TQWidget *tqparent, const char *name, const TQStringList& list) + : ImageDisplay(TQT_TQOBJECT(tqparent), name, list) { - setSingleBG(new QPixmap(qembed_findImage("singlebg"))); - setDoubleBG(new QPixmap(qembed_findImage("doublebg"))); + setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); + setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); setSingleSize(WIDTH_SINGLE, HEIGHT_SINGLE); setDoubleSize(WIDTH_DOUBLE, HEIGHT_DOUBLE); diff --git a/katapult/plugins/display/puredisplay/puredisplay.h b/katapult/plugins/display/puredisplay/puredisplay.h index 02ae356..344c91a 100644 --- a/katapult/plugins/display/puredisplay/puredisplay.h +++ b/katapult/plugins/display/puredisplay/puredisplay.h @@ -28,8 +28,9 @@ class PureDisplay : public ImageDisplay { Q_OBJECT + TQ_OBJECT public: - PureDisplay(QObject *, const char *, const QStringList&); + PureDisplay(TQWidget *, const char *, const TQStringList&); virtual ~PureDisplay(); }; diff --git a/katapult/plugins/display/puredisplay/qembed_images.h b/katapult/plugins/display/puredisplay/qembed_images.h index 5f809df..79c8b67 100644 --- a/katapult/plugins/display/puredisplay/qembed_images.h +++ b/katapult/plugins/display/puredisplay/qembed_images.h @@ -1,8 +1,8 @@ -#ifndef _QEMBED_1804289383 -#define _QEMBED_1804289383 -#include -#include -static const QRgb doublebg_data[] = { +#ifndef _TQEMBED_1804289383 +#define _TQEMBED_1804289383 +#include +#include +static const TQRgb doublebg_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,0x3000000, 0x3000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000, @@ -6166,7 +6166,7 @@ static const QRgb doublebg_data[] = { }; /* Generated by qembed */ -static const QRgb singlebg_data[] = { +static const TQRgb singlebg_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,0x3000000, 0x3000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000, @@ -9756,7 +9756,7 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -9765,20 +9765,20 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -static const QImage& qembed_findImage( const QString& name ) +static const TQImage& qembed_findImage( const TQString& name ) { - static QDict dict; - QImage* img = dict.find( name ); + static TQDict dict; + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { - img = new QImage((uchar*)embed_image_vec[i].data, + img = new TQImage((uchar*)embed_image_vec[i].data, embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, - QImage::BigEndian ); + TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) img->setAlphaBuffer( TRUE ); dict.insert( name, img ); @@ -9786,7 +9786,7 @@ static const QImage& qembed_findImage( const QString& name ) } } if ( !img ) { - static QImage dummy; + static TQImage dummy; return dummy; } } -- cgit v1.2.3