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, 5 insertions, 5 deletions

diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp
index 407ffea2..ee70ebda 100644
--- a/juk/trackpickerdialog.cpp
+++ b/juk/trackpickerdialog.cpp
@@ -25,13 +25,13 @@
 #include "trackpickerdialog.h"
 #include "trackpickerdialogbase.h"
 
-#define NUMBER(x) (x == 0 ? TQString::null : TQString::number(x))
+#define NUMBER(x) (x == 0 ? TQString() : TQString::number(x))
 
 class TrackPickerItem : public KListViewItem
 {
 public:
-    TrackPickerItem(KListView *parent, const KTRMResult &result) :
-        KListViewItem(parent, parent->lastChild(),
+    TrackPickerItem(KListView *tqparent, const KTRMResult &result) :
+        KListViewItem(tqparent, tqparent->lastChild(),
                       result.title(), result.artist(), result.album(),
                       NUMBER(result.track()), NUMBER(result.year())),
         m_result(result) {}
@@ -47,8 +47,8 @@ private:
 
 TrackPickerDialog::TrackPickerDialog(const TQString &name,
                                      const KTRMResultList &results,
-                                     TQWidget *parent) :
-    KDialogBase(parent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true)
+                                     TQWidget *tqparent) :
+    KDialogBase(tqparent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true)
 {
     m_base = new TrackPickerDialogBase(this);
     setMainWidget(m_base);