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

diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index c8d24a5a..46455c37 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -28,44 +28,44 @@
 const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
     { "PlayPause",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_P,               KKey::QtWIN+Qt::ALT+Qt::Key_P },
-        { Qt::Key_MediaPlay,                        Qt::Key_MediaPlay } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_P,               KKey::QtWIN+TQt::ALT+TQt::Key_P },
+        { TQt::Key_MediaPlay,                        TQt::Key_MediaPlay } } },
     { "Stop",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_S,               KKey::QtWIN+Qt::ALT+Qt::Key_S },
-        { Qt::Key_MediaStop,                        Qt::Key_MediaStop } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_S,               KKey::QtWIN+TQt::ALT+TQt::Key_S },
+        { TQt::Key_MediaStop,                        TQt::Key_MediaStop } } },
     { "Back",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_Left,            KKey::QtWIN+Qt::ALT+Qt::Key_Left },
-        { Qt::Key_MediaPrev,                        Qt::Key_MediaPrev } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_Left,            KKey::QtWIN+TQt::ALT+TQt::Key_Left },
+        { TQt::Key_MediaPrev,                        TQt::Key_MediaPrev } } },
     { "Forward",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_Right,           KKey::QtWIN+Qt::ALT+Qt::Key_Right },
-        { Qt::Key_MediaNext,                        Qt::Key_MediaNext } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_Right,           KKey::QtWIN+TQt::ALT+TQt::Key_Right },
+        { TQt::Key_MediaNext,                        TQt::Key_MediaNext } } },
     { "ForwardAlbum",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_Up,              KKey::QtWIN+Qt::ALT+Qt::Key_Up },
-        { Qt::CTRL+Qt::Key_MediaNext,               Qt::CTRL+Qt::Key_MediaNext } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_Up,              KKey::QtWIN+TQt::ALT+TQt::Key_Up },
+        { TQt::CTRL+TQt::Key_MediaNext,               TQt::CTRL+TQt::Key_MediaNext } } },
     { "SeekBack",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Left,  KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Left },
-        { Qt::SHIFT+Qt::Key_MediaPrev,              Qt::SHIFT+Qt::Key_MediaPrev } } },
+        { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left,  KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left },
+        { TQt::SHIFT+TQt::Key_MediaPrev,              TQt::SHIFT+TQt::Key_MediaPrev } } },
     { "SeekForward",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Right, KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Right },
-        { Qt::SHIFT+Qt::Key_MediaNext,              Qt::SHIFT+Qt::Key_MediaNext } } },
+        { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right },
+        { TQt::SHIFT+TQt::Key_MediaNext,              TQt::SHIFT+TQt::Key_MediaNext } } },
     { "VolumeUp",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Up,    KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Up },
-        { Qt::Key_VolumeUp,                         Qt::Key_VolumeUp } } },
+        { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up,    KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up },
+        { TQt::Key_VolumeUp,                         TQt::Key_VolumeUp } } },
     { "VolumeDown",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Down,  KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Down },
-        { Qt::Key_VolumeDown,                       Qt::Key_VolumeDown } } },
+        { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down,  KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down },
+        { TQt::Key_VolumeDown,                       TQt::Key_VolumeDown } } },
     { "Mute",
       { { KShortcut::null(),                        KShortcut::null() },
-        { Qt::CTRL+Qt::ALT+Qt::Key_M,               KKey::QtWIN+Qt::ALT+Qt::Key_M },
-        { Qt::Key_VolumeMute,                       Qt::Key_VolumeMute } } },
+        { TQt::CTRL+TQt::ALT+TQt::Key_M,               KKey::QtWIN+TQt::ALT+TQt::Key_M },
+        { TQt::Key_VolumeMute,                       TQt::Key_VolumeMute } } },
     { "ShowHide",
       { { KShortcut::null(),                        KShortcut::null() },
         { KShortcut::null(),                        KShortcut::null() },
@@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
 const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
 
 KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
-                     TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
+                     TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
 {
     // Read key group from configuration
 
@@ -172,11 +172,11 @@ void KeyDialog::slotDefault()
 }
 
 int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection,
-                         TQWidget *parent)
+                         TQWidget *tqparent)
 {
     // Create and show dialog - update connections if accepted
 
-    int retcode = KeyDialog(keys, actionCollection, parent).configure();
+    int retcode = KeyDialog(keys, actionCollection, tqparent).configure();
 
     if(retcode == Accepted)
         keys->updateConnections();
@@ -198,7 +198,7 @@ void KeyDialog::insert(KGlobalAccel *keys, const TQString &action, const TQStrin
             break;
         }
     }
-    keys->insert(action, label, TQString::null, def3, def4, objSlot, methodSlot);
+    keys->insert(action, label, TQString(), def3, def4, objSlot, methodSlot);
 }
 
 #include "keydialog.moc"