summaryrefslogtreecommitdiffstats
path: root/juk/systemtray.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /juk/systemtray.h
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'juk/systemtray.h')
-rw-r--r--juk/systemtray.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/juk/systemtray.h b/juk/systemtray.h
index 05b3c6dc..0dcb9676 100644
--- a/juk/systemtray.h
+++ b/juk/systemtray.h
@@ -38,8 +38,9 @@ class FileHandle;
class PassiveInfo : public KPassivePopup
{
Q_OBJECT
+ TQ_OBJECT
public:
- PassiveInfo(TQWidget *parent = 0, const char *name = 0);
+ PassiveInfo(TQWidget *tqparent = 0, const char *name = 0);
public slots:
void setTimeout(int delay);
@@ -64,9 +65,10 @@ private:
class SystemTray : public KSystemTray
{
Q_OBJECT
+ TQ_OBJECT
public:
- SystemTray(TQWidget *parent = 0, const char *name = 0);
+ SystemTray(TQWidget *tqparent = 0, const char *name = 0);
virtual ~SystemTray();
signals:
@@ -78,7 +80,7 @@ private:
virtual void wheelEvent(TQWheelEvent *e);
void createPopup();
- void setToolTip(const TQString &tip = TQString::null, const TQPixmap &cover = TQPixmap());
+ void setToolTip(const TQString &tip = TQString(), const TQPixmap &cover = TQPixmap());
void mousePressEvent(TQMouseEvent *e);
TQPixmap createPixmap(const TQString &pixName);
@@ -86,15 +88,15 @@ private:
// (because the JuK icon is on the left side of the screen.
bool buttonsToLeft() const;
- void createButtonBox(TQWidget *parent);
+ void createButtonBox(TQWidget *tqparent);
- // Creates the widget layout for the popup, returning the TQVBox that
+ // Creates the widget tqlayout for the popup, returning the TQVBox that
// holds the text labels. Uses buttonsToLeft() to figure out which
// order to create them in. @p file is used to grab the cover.
- TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file);
+ TQVBox *createPopupLayout(TQWidget *tqparent, const FileHandle &file);
- void addSeparatorLine(TQWidget *parent);
- void addCoverButton(TQWidget *parent, const TQPixmap &cover);
+ void addSeparatorLine(TQWidget *tqparent);
+ void addCoverButton(TQWidget *tqparent, const TQPixmap &cover);
// Interpolates from start color to end color. If @p step == 0, then
// m_startColor is returned, while @p step == @steps returns