diff options
Diffstat (limited to 'noatun/library')
-rw-r--r-- | noatun/library/app.cpp | 8 | ||||
-rw-r--r-- | noatun/library/effectview.cpp | 10 | ||||
-rw-r--r-- | noatun/library/noatunstdaction.cpp | 34 | ||||
-rw-r--r-- | noatun/library/pref.cpp | 4 |
4 files changed, 28 insertions, 28 deletions
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 1bd1fb6b..d135658e 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -88,9 +88,9 @@ NoatunApp::NoatunApp() mLibraryLoader->add("dcopiface.plugin"); - new General(TQT_TQOBJECT(this)); // 25 - new Plugins(TQT_TQOBJECT(this)); // 149 -// new Types(TQT_TQOBJECT(this)); + new General(this); // 25 + new Plugins(this); // 149 +// new Types(this); mPlayer=new Player; // 139 d->effects=new Effects; // 1 @@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id) NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu() { if (!mPluginActionMenu) - mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions"); + mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions"); return mPluginActionMenu; } diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 72391b8d..3fc17983 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -116,7 +116,7 @@ void EffectView::init(void) TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -153,10 +153,10 @@ void EffectView::init(void) // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index de05590c..745886da 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -114,8 +114,8 @@ void PluginActionMenu::menuRemove(int id) VisActionMenu::VisActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Visualizations"), parent, name) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -163,26 +163,26 @@ LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Loop"), parent, name) { mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); + 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song"); + 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist"); + 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random"); + 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -239,17 +239,17 @@ TDEAction *playpause(TQObject *parent, const char *name) TDEAction *effects(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name); + return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name); } TDEAction *equalizer(TQObject *parent, const char *name) { - return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name); + return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name); } TDEAction *back(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Back"), "media-skip-backward", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name); + return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQT_SLOT(back()), parent, name); } TDEAction *stop(TQObject *parent, const char *name) @@ -333,15 +333,15 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p) KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); TDEActionCollection* actions = new TDEActionCollection(helpmenu); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu); - NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu); - NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu); - NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu); - NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu); + KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu); + NoatunStdAction::playlist(contextMenu)->plug(contextMenu); + NoatunStdAction::effects(contextMenu)->plug(contextMenu); + NoatunStdAction::equalizer(napp)->plug(contextMenu); + NoatunStdAction::visualizations(napp)->plug(contextMenu); napp->pluginActionMenu()->plug(contextMenu); return contextMenu; diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 9ed882c5..a0d1bbcc 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) ); + int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); if (index != -1) showPage(index); show(); @@ -65,7 +65,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent())); + TQFrame *page=static_cast<TQFrame*>(parent()); (new TQHBoxLayout(page))->addWidget(this); } |