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

1 files changed, 14 insertions, 14 deletions

diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 81f066ea..4867c7ec 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -35,14 +35,14 @@ using namespace ActionCollection;
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const char *name) :
-    TQHBox(parent, name),
+StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent, const char *name) :
+    TQHBox(tqparent, name),
     PlaylistObserver(playlist),
     m_showTimeRemaining(false)
 {
     TQFrame *trackAndPlaylist = new TQFrame(this);
     trackAndPlaylist->setFrameStyle(Box | Sunken);
-    trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
     // Make sure that we have enough of a margin to suffice for the borders,
     // hence the "lineWidth() * 2"
@@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
 
     m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel");
     trackAndPlaylistLayout->addWidget(m_playlistLabel);
-    m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     m_playlistLabel->setTextFormat(PlainText);
-    m_playlistLabel->setAlignment(AlignLeft | AlignVCenter);
+    m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter);
 
     m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel");
     trackAndPlaylistLayout->addWidget(m_trackLabel);
-    m_trackLabel->setAlignment(AlignRight | AlignVCenter);
-    m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter);
+    m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     m_trackLabel->setTextFormat(PlainText);
 
     trackAndPlaylistLayout->addSpacing(5);
 
     m_itemTimeLabel = new TQLabel(this);
     TQFontMetrics fontMetrics(font());
-    m_itemTimeLabel->setAlignment(AlignCenter);
+    m_itemTimeLabel->tqsetAlignment(AlignCenter);
     m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width());
-    m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
     m_itemTimeLabel->setFrameStyle(Box | Sunken);
     m_itemTimeLabel->installEventFilter(this);
 
@@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
 
     TQHBox *jumpBox = new TQHBox(this);
     jumpBox->setFrameStyle(Box | Sunken);
-    jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
+    jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
 
     TQPushButton *jumpButton = new TQPushButton(jumpBox);
     jumpButton->setPixmap(SmallIcon("up"));
@@ -103,7 +103,7 @@ void StatusLabel::updateCurrent()
         FileHandle file = playlist()->currentFile();
 
         TQString mid =  file.tag()->artist().isEmpty() || file.tag()->title().isEmpty()
-            ? TQString::null : TQString(" - ");
+            ? TQString() : TQString(" - ");
 
         TQString text = file.tag()->artist() + mid + file.tag()->title();
 
@@ -175,11 +175,11 @@ bool StatusLabel::eventFilter(TQObject *o, TQEvent *e)
     if(!o || !e)
         return false;
 
-    TQMouseEvent *mouseEvent = static_cast<TQMouseEvent *>(e);
+    TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(e);
     if(e->type() == TQEvent::MouseButtonRelease &&
-       mouseEvent->button() == LeftButton)
+       mouseEvent->button() == Qt::LeftButton)
     {
-        if(o == m_itemTimeLabel) {
+        if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_itemTimeLabel)) {
             m_showTimeRemaining = !m_showTimeRemaining;
             updateTime();
         }