summaryrefslogtreecommitdiffstats
path: root/noatun/modules/systray/systray.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules/systray/systray.cpp')
-rw-r--r--noatun/modules/systray/systray.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 2493bdbc..57ce2105 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -72,7 +72,7 @@ const int COVER_MAXH = 128;
class PassivePopup : public KPassivePopup
{
public:
- PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {}
+ PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {}
protected:
virtual void enterEvent(TQEvent *)
@@ -91,7 +91,7 @@ protected:
NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
- mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
+ mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L)
{
//self = this;
hide();
@@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
removeCover(); // make sure any old temp cover is gone
- KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
- KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
+ 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());
NoatunStdAction::back(actionCollection(), "back");
NoatunStdAction::stop(actionCollection(), "stop");
NoatunStdAction::playpause(actionCollection(), "play");
@@ -117,11 +117,11 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
mTray = new KitSystemTray("tray", this);
mTray->show();
- trayBase = renderIcon(BASEICON, TQString::null);
- trayStatus = renderIcon(BASEICON, "player_stop");
+ trayBase = renderIcon(BASEICON, TQString());
+ traytqStatus = renderIcon(BASEICON, "player_stop");
mTray->changeTitle(*trayBase, i18n("Noatun"));
- showingTrayStatus = false;
+ showingTraytqStatus = false;
mBlinkTimer = new TQTimer(this);
connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer()));
@@ -138,14 +138,14 @@ NoatunSystray::~NoatunSystray()
//kdDebug(66666) << k_funcinfo << "Called." << endl;
removeCover();
delete trayBase;
- delete trayStatus;
+ delete traytqStatus;
napp->showInterfaces();
}
void NoatunSystray::init()
{
- YHModule *cmod = new YHModule(this);
+ YHModule *cmod = new YHModule(TQT_TQOBJECT(this));
connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings()));
slotLoadSettings();
}
@@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause()
if(!item.isProperty("title"))
{
// No metadata
- s = TQString("<nobr>%1</nobr>").arg(item.title());
+ s = TQString("<nobr>%1</nobr>").tqarg(item.title());
}
else
{
- s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title"));
+ s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title"));
if(item.isProperty("author"))
- s += TQString("<nobr>%1</nobr><br>").arg(item.property("author"));
+ s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author"));
if(item.isProperty("album"))
{
if(item.isProperty("date"))
- s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date"));
+ s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date"));
else
- s += TQString("<nobr>%1</nobr><br>").arg(item.property("album"));
+ s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album"));
}
}
@@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause()
setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \
"<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \
"<td valign=center><img src='%3'></td>" \
- "</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath));
+ "</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath));
}
else
{
- setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s));
+ setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s));
}
}
@@ -256,16 +256,16 @@ void NoatunSystray::slotStopped()
if(!napp->player()->current())
return;
changeTray("player_stop");
- setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
+ setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped")));
}
void NoatunSystray::changeTray(const TQString &pm)
{
- delete trayStatus;
- trayStatus = renderIcon(BASEICON, pm);
- if(showingTrayStatus)
+ delete traytqStatus;
+ traytqStatus = renderIcon(BASEICON, pm);
+ if(showingTraytqStatus)
slotBlinkTimer();
}
@@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer()
switch(YHConfig::self()->stateIconDisplay())
{
case (YHConfig::FlashingIcon):
- showingTrayStatus ^= true;
+ showingTraytqStatus ^= true;
break;
case (YHConfig::StaticIcon):
- showingTrayStatus = true;
+ showingTraytqStatus = true;
break;
case (YHConfig::NoIcon):
- showingTrayStatus = false;
+ showingTraytqStatus = false;
break;
}
- if(showingTrayStatus)
- mTray->setPixmap(*trayStatus);
+ if(showingTraytqStatus)
+ mTray->setPixmap(*traytqStatus);
else
mTray->setPixmap(*trayBase);
}
@@ -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, TQImage::ScaleMin);
+ tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQ_ScaleMin);
else
tmpimg = src;
@@ -383,7 +383,7 @@ void NoatunSystray::showPassivePopup()
if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped())
{
- TQVBox *widget = mPassivePopup->standardView(TQString::null, tipText, TQPixmap());
+ TQVBox *widget = mPassivePopup->standardView(TQString(), tipText, TQPixmap());
TQHBox *box = new TQHBox(mPassivePopup, "popupbox");
box->setSpacing(8);
@@ -439,7 +439,7 @@ void NoatunSystray::showPassivePopup()
}
else
{
- mPassivePopup->setView(TQString::null, tipText);
+ mPassivePopup->setView(TQString(), tipText);
}
mPassivePopup->setTimeout(YHConfig::self()->passivePopupTimeout()*1000);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 02:44:43 +0000