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

2 files changed, 30 insertions, 28 deletions

diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index f35fddc7..877e5846 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -30,58 +30,58 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
     if ( !s_accel )
     {
         s_accel = new KGlobalAccel( this, "noatunglobalaccel" );
-        s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString::null,
+        s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(),
                          CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P,
                          player, TQT_SLOT( playpause() ));
-        s_accel->insert( "Stop", i18n("Stop Playing"), TQString::null,
+        s_accel->insert( "Stop", i18n("Stop Playing"), TQString(),
                          CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S,
                          player, TQT_SLOT( stop() ));
-        s_accel->insert( "Back", i18n("Back"), TQString::null,
+        s_accel->insert( "Back", i18n("Back"), TQString(),
                          CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left,
                          player, TQT_SLOT( back() ));
-        s_accel->insert( "Forward", i18n("Forward"), TQString::null,
+        s_accel->insert( "Forward", i18n("Forward"), TQString(),
                          CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right,
                          player, TQT_SLOT( forward() ));
-        s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString::null,
+        s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(),
                          CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L,
                          player, TQT_SLOT( toggleListView() ));
-        s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString::null,
+        s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(),
                          CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O,
-                         napp, TQT_SLOT( fileOpen() ));
-        s_accel->insert( "Effects", i18n("Effects Configuration"), TQString::null,
+                         TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() ));
+        s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(),
                          CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E,
-                         napp, TQT_SLOT( effectView() ));
-        s_accel->insert( "Preferences", i18n("Preferences"), TQString::null,
+                         TQT_TQOBJECT(napp), TQT_SLOT( effectView() ));
+        s_accel->insert( "Preferences", i18n("Preferences"), TQString(),
                          CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F,
-                         napp, TQT_SLOT( preferences() ));
-        s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString::null,
+                         TQT_TQOBJECT(napp), TQT_SLOT( preferences() ));
+        s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(),
                          CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up,
                          this, TQT_SLOT( slotVolumeUp() ));
-        s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString::null,
+        s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(),
                          CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down,
                          this, TQT_SLOT( slotVolumeDown() ));
-        s_accel->insert( "Mute", i18n("Mute"), TQString::null,
+        s_accel->insert( "Mute", i18n("Mute"), TQString(),
                          CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M,
                          this, TQT_SLOT( slotMute() ));
-        s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString::null,
+        s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(),
                          CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right,
                          this, TQT_SLOT( slotForward() ));
-        s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString::null,
+        s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(),
                          CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left,
                          this, TQT_SLOT( slotBackward() ));
-        s_accel->insert( "NextSection", i18n("Next Section"), TQString::null,
+        s_accel->insert( "NextSection", i18n("Next Section"), TQString(),
                          0, 0,
                          this, TQT_SLOT( slotNextSection() ));
-        s_accel->insert( "PrevSection", i18n("Previous Section"), TQString::null,
+        s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(),
                          0, 0,
                          this, TQT_SLOT( slotPrevSection() ));
-        s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString::null,
+        s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(),
                          CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C,
                          this, TQT_SLOT( slotCopyTitle() ));
 
-        s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString::null,
+        s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(),
                          CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W,
-                         napp, TQT_SLOT( toggleInterfaces() ));
+                         TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() ));
 
         s_accel->readSettings();
         s_accel->updateConnections();
@@ -116,12 +116,12 @@ void Keyz::slotVolumeDown()
 
 void Keyz::slotForward()
 {
-    napp->player()->skipTo( QMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds
+    napp->player()->skipTo( TQMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds
 }
 
 void Keyz::slotBackward()
 {
-    napp->player()->skipTo( QMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds
+    napp->player()->skipTo( TQMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds
 }
 
 void Keyz::slotNextSection()
@@ -170,13 +170,13 @@ void Keyz::slotMute()
 
 ///////////////////////////////////////////////////////////////////
 
-KeyzPrefs::KeyzPrefs( TQObject *parent ) :
+KeyzPrefs::KeyzPrefs( TQObject *tqparent ) :
     CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
-             parent )
+             tqparent )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
     m_chooser = new KKeyChooser( Keyz::accel(), this );
-    layout->addWidget( m_chooser );
+    tqlayout->addWidget( m_chooser );
 }
 
 void KeyzPrefs::save()
diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h
index e6682531..b21e44f8 100644
--- a/noatun/modules/keyz/keyz.h
+++ b/noatun/modules/keyz/keyz.h
@@ -7,6 +7,7 @@
 class Keyz : public TQObject, public Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
     NOATUNPLUGIND
 
 public:
@@ -35,9 +36,10 @@ private:
 class KeyzPrefs : public CModule
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KeyzPrefs( TQObject *parent );
+    KeyzPrefs( TQObject *tqparent );
     virtual void save();
 
 private: