TQt4 port kmplayer

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1238840 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 45 insertions, 41 deletions

diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h
index 69f93e7..6234a37 100644
--- a/src/kmplayercontrolpanel.h
+++ b/src/kmplayercontrolpanel.h
@@ -23,15 +23,15 @@
 #include <config.h>
 #endif 
 
-#include <qwidget.h>
-#include <qpushbutton.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
 
 #include <kpopupmenu.h>
 
-class QSlider;
-//class QPushButton;
-class QBoxLayout;
-class QStringList;
+class TQSlider;
+//class TQPushButton;
+class TQBoxLayout;
+class TQStringList;
 class KPopupMenu;
 
 namespace KMPlayer {
@@ -41,15 +41,16 @@ class View;
 /*
  * A button from the controlpanel
  */
-class KMPLAYER_NO_EXPORT KMPlayerMenuButton : public QPushButton {
+class KMPLAYER_NO_EXPORT KMPlayerMenuButton : public TQPushButton {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMPlayerMenuButton (QWidget *, QBoxLayout *, const char **, int = 0);
+    KMPlayerMenuButton (TQWidget *, TQBoxLayout *, const char **, int = 0);
     KDE_NO_CDTOR_EXPORT ~KMPlayerMenuButton () {}
 signals:
     void mouseEntered ();
 protected:
-    void enterEvent (QEvent *);
+    void enterEvent (TQEvent *);
 };
 
 /*
@@ -57,32 +58,34 @@ protected:
  */
 class KMPLAYER_EXPORT KMPlayerPopupMenu : public KPopupMenu {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KMPlayerPopupMenu (QWidget *);
+    KMPlayerPopupMenu (TQWidget *);
     KDE_NO_CDTOR_EXPORT ~KMPlayerPopupMenu () {}
 signals:
     void mouseLeft ();
 protected:
-    void leaveEvent (QEvent *);
+    void leaveEvent (TQEvent *);
 };
 
 /*
  * The volume bar from the controlpanel
  */
-class KMPLAYER_EXPORT VolumeBar : public QWidget {
+class KMPLAYER_EXPORT VolumeBar : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    VolumeBar (QWidget * parent, View * view);
+    VolumeBar (TQWidget * tqparent, View * view);
     ~VolumeBar ();
     KDE_NO_EXPORT int value () const { return m_value; }
     void setValue (int v);
 signals:
     void volumeChanged (int); // 0 - 100
 protected:
-    void wheelEvent (QWheelEvent * e);
-    void paintEvent (QPaintEvent *);
-    void mousePressEvent (QMouseEvent * e);
-    void mouseMoveEvent (QMouseEvent * e);
+    void wheelEvent (TQWheelEvent * e);
+    void paintEvent (TQPaintEvent *);
+    void mousePressEvent (TQMouseEvent * e);
+    void mouseMoveEvent (TQMouseEvent * e);
 private:
     View * m_view;
     int m_value;
@@ -91,8 +94,9 @@ private:
 /*
  * The controlpanel GUI
  */
-class KMPLAYER_EXPORT ControlPanel : public QWidget {
+class KMPLAYER_EXPORT ControlPanel : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum MenuID {
         menu_config = 0, menu_player, menu_fullscreen, menu_volume, 
@@ -107,7 +111,7 @@ public:
         button_red, button_green, button_yellow, button_blue,
         button_last
     };
-    ControlPanel (QWidget * parent, View * view);
+    ControlPanel (TQWidget * tqparent, View * view);
     KDE_NO_CDTOR_EXPORT ~ControlPanel () {}
     void showPositionSlider (bool show);
     void enableSeekButtons (bool enable);
@@ -115,27 +119,27 @@ public:
     void setPlaying (bool play);
     void setRecording (bool record);
     void setAutoControls (bool b);
-    void setPalette (const QPalette &);
+    void setPalette (const TQPalette &);
     int preferedHeight ();
     KDE_NO_EXPORT bool autoControls () const { return m_auto_controls; }
-    KDE_NO_EXPORT QSlider * positionSlider () const { return m_posSlider; }
-    KDE_NO_EXPORT QSlider * contrastSlider () const { return m_contrastSlider; }
-    KDE_NO_EXPORT QSlider * brightnessSlider () const { return m_brightnessSlider; }
-    KDE_NO_EXPORT QSlider * hueSlider () const { return m_hueSlider; }
-    KDE_NO_EXPORT QSlider * saturationSlider () const { return m_saturationSlider; }
-    QPushButton * button (Button b) const { return m_buttons [(int) b]; }
-    KDE_NO_EXPORT QPushButton * broadcastButton () const { return m_buttons[button_broadcast]; }
+    KDE_NO_EXPORT TQSlider * positionSlider () const { return m_posSlider; }
+    KDE_NO_EXPORT TQSlider * contrastSlider () const { return m_contrastSlider; }
+    KDE_NO_EXPORT TQSlider * brightnessSlider () const { return m_brightnessSlider; }
+    KDE_NO_EXPORT TQSlider * hueSlider () const { return m_hueSlider; }
+    KDE_NO_EXPORT TQSlider * saturationSlider () const { return m_saturationSlider; }
+    TQPushButton * button (Button b) const { return m_buttons [(int) b]; }
+    KDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; }
     KDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; }
     KDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; }
     KDE_NO_EXPORT KPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; }
-    KDE_NO_EXPORT QPopupMenu * zoomMenu () const { return m_zoomMenu; }
-    KDE_NO_EXPORT QPopupMenu * playerMenu () const { return m_playerMenu; }
-    KDE_NO_EXPORT QPopupMenu * colorMenu () const { return m_colorMenu; }
-    KDE_NO_EXPORT QPopupMenu * audioMenu () const { return m_audioMenu; }
-    KDE_NO_EXPORT QPopupMenu * subtitleMenu () const { return m_subtitleMenu; }
+    KDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; }
+    KDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; }
+    KDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; }
+    KDE_NO_EXPORT TQPopupMenu * audioMenu () const { return m_audioMenu; }
+    KDE_NO_EXPORT TQPopupMenu * subtitleMenu () const { return m_subtitleMenu; }
     KDE_NO_EXPORT View * view () const { return m_view; }
 public slots:
-    void setLanguages (const QStringList & al, const QStringList & sl);
+    void setLanguages (const TQStringList & al, const TQStringList & sl);
     void selectSubtitle (int id);
     void selectAudioLanguage (int id);
     void showPopupMenu ();
@@ -143,7 +147,7 @@ public slots:
     void setPlayingProgress (int position, int length);
     void setLoadingProgress (int pos);
 protected:
-    void timerEvent (QTimerEvent * e);
+    void timerEvent (TQTimerEvent * e);
     void setupPositionSlider (bool show);
 private slots:
     void buttonMouseEntered ();
@@ -156,13 +160,13 @@ private:
     int m_popdown_timer;
     int m_button_monitored;
     View * m_view;
-    QBoxLayout * m_buttonbox;
-    QSlider * m_posSlider;
-    QSlider * m_contrastSlider;
-    QSlider * m_brightnessSlider;
-    QSlider * m_hueSlider;
-    QSlider * m_saturationSlider;
-    QPushButton * m_buttons [button_last];
+    TQBoxLayout * m_buttonbox;
+    TQSlider * m_posSlider;
+    TQSlider * m_contrastSlider;
+    TQSlider * m_brightnessSlider;
+    TQSlider * m_hueSlider;
+    TQSlider * m_saturationSlider;
+    TQPushButton * m_buttons [button_last];
     VolumeBar * m_volume;
     KMPlayerPopupMenu * m_popupMenu;
     KMPlayerPopupMenu * m_bookmarkMenu;