diff options
Diffstat (limited to 'katapult/katapult')
-rw-r--r-- | katapult/katapult/confcatalogs.ui | 6 | ||||
-rw-r--r-- | katapult/katapult/confdisplay.ui | 10 | ||||
-rw-r--r-- | katapult/katapult/confgeneral.ui | 36 | ||||
-rw-r--r-- | katapult/katapult/katapult.cpp | 106 | ||||
-rw-r--r-- | katapult/katapult/katapult.h | 31 | ||||
-rw-r--r-- | katapult/katapult/katapultconfigdlg.cpp | 64 | ||||
-rw-r--r-- | katapult/katapult/katapultconfigdlg.h | 17 | ||||
-rw-r--r-- | katapult/katapult/katapultiface.h | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultsettings.cpp | 68 | ||||
-rw-r--r-- | katapult/katapult/katapultsettings.h | 47 | ||||
-rw-r--r-- | katapult/katapult/main.cpp | 2 | ||||
-rw-r--r-- | katapult/katapult/settings.cpp | 64 |
12 files changed, 228 insertions, 225 deletions
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 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfCatalogs</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfCatalogs</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactionselector.h</includehint> </includehints> 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 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfDisplay</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfDisplay</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,7 +27,7 @@ <bool>false</bool> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>displaySettings</cstring> </property> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -57,7 +57,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> 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 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfGeneral</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfGeneral</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>HideDelayLabel</cstring> </property> @@ -57,7 +57,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>hideDelay</cstring> </property> @@ -80,7 +80,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <number>1000</number> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoExec</cstring> </property> @@ -96,7 +96,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>noResultOptions</cstring> </property> @@ -118,7 +118,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -126,7 +126,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <string>When there are no results:</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>nrClearQuery</cstring> </property> @@ -134,7 +134,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <string>&Clear the query after a delay</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>nrHideDisplay</cstring> </property> @@ -142,7 +142,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <string>&Hide the display after a delay</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>nrDoNothing</cstring> </property> @@ -150,7 +150,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <string>Do &nothing</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -161,7 +161,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <cstring>noResultsDelay</cstring> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>noResultsDelay</cstring> </property> @@ -186,7 +186,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -201,11 +201,11 @@ This sets how long Katapult will wait before hiding the launcher.</string> <property name="title"> <string>System Tray</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>systrayIcon</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>30</y> @@ -237,7 +237,7 @@ This sets how long Katapult will wait before hiding the launcher.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>62</height> @@ -246,5 +246,5 @@ This sets how long Katapult will wait before hiding the launcher.</string> </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> 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 <kaboutapplication.h> #include <dcopclient.h> -#include <qpopupmenu.h> -#include <qmenudata.h> -#include <qcursor.h> +#include <tqpopupmenu.h> +#include <tqmenudata.h> +#include <tqcursor.h> #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<KatapultCatalog> it(catalogs); + TQDictIterator<KatapultCatalog> 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<KatapultCatalog> it(catalogs); + TQDictIterator<KatapultCatalog> 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<KatapultAction> itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); + TQPtrList<KatapultAction> 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 <kactioncollection.h> #include <dcopobject.h> -#include <qstring.h> -#include <qptrlist.h> -#include <qevent.h> -#include <qtimer.h> -#include <qdict.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqevent.h> +#include <tqtimer.h> +#include <tqdict.h> #include <match.h> @@ -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<KatapultCatalog> catalogs; - QTimer *hideTimer; - QTimer *clearTimer; + TQString _query; + TQDict<KatapultCatalog> 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 <kcombobox.h> #include <klocale.h> -#include <qframe.h> -#include <qlayout.h> -#include <qslider.h> -#include <qcheckbox.h> -#include <qstringlist.h> -#include <qradiobutton.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqcheckbox.h> +#include <tqstringlist.h> +#include <tqradiobutton.h> #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<KatapultCatalog> catalogs; + TQDict<KatapultCatalog> catalogs; catalogs = settings->activeCatalogs(); - QDictIterator<KatapultCatalog> it(catalogs); + TQDictIterator<KatapultCatalog> 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 <kdialogbase.h> -#include <qdict.h> +#include <tqdict.h> 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<QFrame> catalogPages; + TQWidget *displayConfig; + TQDict<TQFrame> 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 <kparts/componentfactory.h> #include <klocale.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #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<KatapultCatalog> it(_activeCatalogs); + TQDictIterator<KatapultCatalog> 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<KatapultCatalog> KatapultSettings::activeCatalogs() const +TQDict<KatapultCatalog> 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<KatapultCatalog> - (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<KatapultDisplay> - (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 <qobject.h> -#include <qptrlist.h> -#include <qdict.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqdict.h> 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<KatapultCatalog> 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<KatapultCatalog> 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<KatapultCatalog> _activeCatalogs; + TQStringList _catalogNames, _catalogIds, _activeCatalogNames; + TQDict<KatapultCatalog> _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 <qvariant.h> -#include <qlistbox.h> -#include <qtabwidget.h> -#include <qwidget.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqvariant.h> +#include <tqlistbox.h> +#include <tqtabwidget.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* - * 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" |