diff options
| -rw-r--r-- | katapult/katapult/katapult.cpp | 36 | ||||
| -rw-r--r-- | katapult/plugins/display/glassdisplay/glassdisplay.cpp | 2 | ||||
| -rw-r--r-- | katapult/plugins/display/o2display/o2display.cpp | 2 | ||||
| -rw-r--r-- | katapult/plugins/display/puredisplay/puredisplay.cpp | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 7934eeb..9898fd6 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -65,13 +65,13 @@ Katapult::Katapult() connect(helpmenu, TQT_SIGNAL(showAboutApplication()),this, TQT_SLOT(showAboutDialog())); hideTimer = new TQTimer(this); - connect(hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(hideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideLauncher())); clearTimer = new TQTimer(this); - connect(clearTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(clearQuery())); + connect(clearTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearQuery())); - 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())); + connect(settings, TQT_SIGNAL(catalogsChanged()), this, TQT_SLOT(loadCatalogPlugins())); + connect(settings, TQT_SIGNAL(displayChanged()), this, TQT_SLOT(initDisplay())); + connect(settings, TQT_SIGNAL(systrayChanged()), this, TQT_SLOT(updateSystray())); loadCatalogPlugins(); initDisplay(); @@ -111,16 +111,16 @@ void Katapult::initDisplay() } else { initAccel(display); setQuery(""); - connect(display, TQT_SIGNAL(keyReleased(TQKeyEvent *)), TQT_TQOBJECT(this), TQT_SLOT(keyReleased(TQKeyEvent *))); - connect(display, TQT_SIGNAL(focusOut()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(display, TQT_SIGNAL(keyReleased(TQKeyEvent *)), this, TQT_SLOT(keyReleased(TQKeyEvent *))); + connect(display, TQT_SIGNAL(focusOut()), this, TQT_SLOT(hideLauncher())); } } void Katapult::initAccel(TQWidget *parent) { - globalAccel = new TDEGlobalAccel(TQT_TQOBJECT(parent)); + globalAccel = new TDEGlobalAccel(parent); globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); + this, TQT_SLOT(showLauncher())); globalAccel->readSettings(); globalAccel->updateConnections(); @@ -129,23 +129,23 @@ void Katapult::initAccel(TQWidget *parent) contextMenu()->clear(); - new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute"); - new TDEAction(i18n("Clear"), "edit-clear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear"); - new TDEAction(i18n("Close"), "window-close", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close"); - new TDEAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query"); - new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu"); + new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, this, TQT_SLOT(execute()), actions, "execute"); + new TDEAction(i18n("Clear"), "edit-clear", Key_Left, this, TQT_SLOT(clearQuery()), actions, "clear"); + new TDEAction(i18n("Close"), "window-close", Key_Escape, this, TQT_SLOT(hideLauncher()), actions, "close"); + new TDEAction(i18n("Complete Query"), "next", Key_Right, this, TQT_SLOT(completeQuery()), actions, "complete_query"); + new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, this, TQT_SLOT(showContextMenu()), actions, "show_menu"); - TDEAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions); + TDEAction *actGlobAccel = KStdAction::keyBindings(this, TQT_SLOT(showGlobalShortcutsDialog()), actions); actGlobAccel->setText(i18n("Configure &Global Shortcuts...")); actGlobAccel->plug((TQWidget *) contextMenu()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::keyBindings(this, TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); KStdAction::preferences(settings, TQT_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); contextMenu()->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu()->insertSeparator(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::quit(this, TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); actions->readShortcutSettings(); } @@ -218,7 +218,7 @@ void Katapult::setQuery(TQString _query) if(!bestMatch.isNull()) { TQPtrList<KatapultAction> itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); action = itemActions.at(0); - connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay())); + connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), this, TQT_SLOT(updateDisplay())); } } if(!(allStatus & S_HasResults) && allStatus & S_Active) { diff --git a/katapult/plugins/display/glassdisplay/glassdisplay.cpp b/katapult/plugins/display/glassdisplay/glassdisplay.cpp index 0848a27..e89fbb8 100644 --- a/katapult/plugins/display/glassdisplay/glassdisplay.cpp +++ b/katapult/plugins/display/glassdisplay/glassdisplay.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_glassdisplay, #define BOTTOMMARGIN 8 GlassDisplay::GlassDisplay(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); diff --git a/katapult/plugins/display/o2display/o2display.cpp b/katapult/plugins/display/o2display/o2display.cpp index d041298..ce88a73 100644 --- a/katapult/plugins/display/o2display/o2display.cpp +++ b/katapult/plugins/display/o2display/o2display.cpp @@ -42,7 +42,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_o2display, #define BOTTOMMARGIN 40 o2Display::o2Display(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); diff --git a/katapult/plugins/display/puredisplay/puredisplay.cpp b/katapult/plugins/display/puredisplay/puredisplay.cpp index 02ca858..43c576f 100644 --- a/katapult/plugins/display/puredisplay/puredisplay.cpp +++ b/katapult/plugins/display/puredisplay/puredisplay.cpp @@ -42,7 +42,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_puredisplay, #define BOTTOMMARGIN 40 PureDisplay::PureDisplay(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); |