diff options
Diffstat (limited to 'noatun/modules/systray')
-rw-r--r-- | noatun/modules/systray/cmodule.cpp | 6 | ||||
-rw-r--r-- | noatun/modules/systray/cmodule.h | 2 | ||||
-rw-r--r-- | noatun/modules/systray/kitsystemtray.cpp | 4 | ||||
-rw-r--r-- | noatun/modules/systray/kitsystemtray.h | 2 | ||||
-rw-r--r-- | noatun/modules/systray/noatunui.cpp | 2 | ||||
-rw-r--r-- | noatun/modules/systray/systray.cpp | 32 | ||||
-rw-r--r-- | noatun/modules/systray/systray.h | 2 |
7 files changed, 25 insertions, 25 deletions
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index 189d1539..e9e33d16 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -58,9 +58,9 @@ YHModule::YHModule(TQObject *_parent) mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl); mWidget->cmbModifier->setCurrentItem(YHConfig::None); - connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool))); - connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int))); - connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int))); + connect(mWidget->chkUsePopup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUsePopupToggled(bool))); + connect(mWidget->cmbModifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotModifierActivated(int))); + connect(mWidget->grpMwheel, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMwheelClicked(int))); reopen(); } diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h index 10196423..dd8784d3 100644 --- a/noatun/modules/systray/cmodule.h +++ b/noatun/modules/systray/cmodule.h @@ -33,7 +33,7 @@ class YHConfigWidget; class YHModule : public CModule { -Q_OBJECT +TQ_OBJECT public: YHModule(TQObject *_parent); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 963a9c69..358efb59 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -67,10 +67,10 @@ void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { - case Qt::LeftButton: + case TQt::LeftButton: napp->toggleInterfaces(); break; - case Qt::MidButton: + case TQt::MidButton: if (YHConfig::self()->middleMouseAction() == YHConfig::HideShowPlaylist) napp->playlist()->toggleList(); else // play or pause diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 13a8b518..709a8f07 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -36,7 +36,7 @@ class TQPixmap; class KitSystemTray : public KSystemTray { -Q_OBJECT +TQ_OBJECT public: diff --git a/noatun/modules/systray/noatunui.cpp b/noatun/modules/systray/noatunui.cpp index 76f9af25..3beac24e 100644 --- a/noatun/modules/systray/noatunui.cpp +++ b/noatun/modules/systray/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new NoatunSystray(); } diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index da0590ce..ee3024ec 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -58,7 +58,7 @@ #include <kurl.h> #include <tdeio/netaccess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <netwm.h> #include <tdeglobalsettings.h> @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); + KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -124,11 +124,11 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), showingTrayStatus = false; mBlinkTimer = new TQTimer(this); - connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); + connect(mBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBlinkTimer())); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); //napp->player()->handleButtons(); } @@ -145,8 +145,8 @@ NoatunSystray::~NoatunSystray() void NoatunSystray::init() { - YHModule *cmod = new YHModule(TQT_TQOBJECT(this)); - connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); + YHModule *cmod = new YHModule(this); + connect(cmod, TQ_SIGNAL(saved()), this, TQ_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -334,7 +334,7 @@ void NoatunSystray::updateCover() if(src.load(cover)) { if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH) - tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQ_ScaleMin); + tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin); else tmpimg = src; @@ -364,7 +364,7 @@ void NoatunSystray::setTipText(const TQString& text) YHConfig *c = YHConfig::self(); if(c->passivePopup()) - TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup())); + TQTimer::singleShot(0, this, TQ_SLOT(showPassivePopup())); if(c->tip()) TQToolTip::add(mTray, tipText); @@ -405,11 +405,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); TQFrame *line = new TQFrame(box); line->setFrameShape(TQFrame::VLine); @@ -429,11 +429,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); } mPassivePopup->setView(box); } diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index 80592b07..3adc59cf 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -40,7 +40,7 @@ class PassivePopup; class NoatunSystray : public TDEMainWindow, public Plugin { -Q_OBJECT +TQ_OBJECT public: NoatunSystray(); |