diff --git a/src/gstplayer.h b/src/gstplayer.h index be6cf71..fc9b4e4 100644 --- a/src/gstplayer.h +++ b/src/gstplayer.h @@ -38,7 +38,7 @@ struct GstProgressEvent : public TQEvent { class KGStreamerPlayer : public TQApplication { Q_OBJECT - TQ_OBJECT + public: KGStreamerPlayer (int argc, char ** argv); ~KGStreamerPlayer (); diff --git a/src/kmplayer.h b/src/kmplayer.h index d513515..ba2bf87 100644 --- a/src/kmplayer.h +++ b/src/kmplayer.h @@ -58,7 +58,7 @@ namespace KMPlayer { class KMPlayerApp : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: KMPlayerApp (TQWidget* parent=0, const char* name=0); diff --git a/src/kmplayer_koffice_part.h b/src/kmplayer_koffice_part.h index 639f8ea..0c02984 100644 --- a/src/kmplayer_koffice_part.h +++ b/src/kmplayer_koffice_part.h @@ -49,7 +49,7 @@ class KOfficeMPlayer; class KOfficeMPlayerView : public KoView { Q_OBJECT - TQ_OBJECT + public: KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* parent, const char* name = 0 ); ~KOfficeMPlayerView (); @@ -61,7 +61,7 @@ private: class KOfficeMPlayer : public KoDocument { Q_OBJECT - TQ_OBJECT + public: KOfficeMPlayer (TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false); ~KOfficeMPlayer (); diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h index f78899e..418607d 100644 --- a/src/kmplayer_part.h +++ b/src/kmplayer_part.h @@ -34,7 +34,7 @@ class JSCommandEntry; */ class KMPLAYER_NO_EXPORT KMPlayerHRefSource : public KMPlayer::Source { Q_OBJECT - TQ_OBJECT + public: KMPlayerHRefSource (KMPlayer::PartBase * player); virtual ~KMPlayerHRefSource (); @@ -63,7 +63,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerBrowserExtension : public KParts::BrowserExtension { Q_OBJECT - TQ_OBJECT + public: KMPlayerBrowserExtension(KMPlayerPart *parent); KDE_NO_CDTOR_EXPORT ~KMPlayerBrowserExtension () {} @@ -82,7 +82,7 @@ public slots: */ class KMPLAYER_NO_EXPORT KMPlayerLiveConnectExtension : public KParts::LiveConnectExtension { Q_OBJECT - TQ_OBJECT + public: KMPlayerLiveConnectExtension (KMPlayerPart * parent); ~KMPlayerLiveConnectExtension (); @@ -123,7 +123,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerPart : public KMPlayer::PartBase { Q_OBJECT - TQ_OBJECT + friend struct GroupPredicate; public: enum Features { diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h index 0629c60..a6d0370 100644 --- a/src/kmplayer_smil.h +++ b/src/kmplayer_smil.h @@ -199,7 +199,7 @@ public: class KMPLAYER_NO_EXPORT ImageRuntime : public TQObject,public MediaTypeRuntime { Q_OBJECT - TQ_OBJECT + public: ImageRuntime (NodePtr e); ~ImageRuntime (); diff --git a/src/kmplayerappsource.h b/src/kmplayerappsource.h index b9fb163..ec9fcda 100644 --- a/src/kmplayerappsource.h +++ b/src/kmplayerappsource.h @@ -45,7 +45,7 @@ class TVChannel; */ class KMPLAYER_NO_EXPORT KMPlayerMenuSource : public KMPlayer::Source { Q_OBJECT - TQ_OBJECT + public: KMPlayerMenuSource (const TQString & n, KMPlayerApp * app, TQPopupMenu * m, const char * src); virtual ~KMPlayerMenuSource (); @@ -60,7 +60,7 @@ protected: */ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageDVD : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefSourcePageDVD (TQWidget * parent); ~KMPlayerPrefSourcePageDVD () {} @@ -74,7 +74,7 @@ public: */ class KMPLAYER_NO_EXPORT KMPlayerDVDSource : public KMPlayerMenuSource, public KMPlayer::PreferencesPage { Q_OBJECT - TQ_OBJECT + public: KMPlayerDVDSource (KMPlayerApp * app, TQPopupMenu * m); virtual ~KMPlayerDVDSource (); @@ -114,7 +114,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerDVDNavSource : public KMPlayerMenuSource { Q_OBJECT - TQ_OBJECT + public: KMPlayerDVDNavSource (KMPlayerApp * app, TQPopupMenu * m); virtual ~KMPlayerDVDNavSource (); @@ -134,7 +134,7 @@ public slots: */ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageVCD : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefSourcePageVCD (TQWidget * parent); ~KMPlayerPrefSourcePageVCD () {} @@ -148,7 +148,7 @@ public: */ class KMPLAYER_NO_EXPORT KMPlayerVCDSource : public KMPlayerMenuSource, public KMPlayer::PreferencesPage { Q_OBJECT - TQ_OBJECT + public: KMPlayerVCDSource (KMPlayerApp * app, TQPopupMenu * m); virtual ~KMPlayerVCDSource (); @@ -175,7 +175,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerAudioCDSource : public KMPlayerMenuSource { Q_OBJECT - TQ_OBJECT + public: KMPlayerAudioCDSource (KMPlayerApp * app, TQPopupMenu * m); virtual ~KMPlayerAudioCDSource (); @@ -195,7 +195,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerPipeSource : public KMPlayer::Source { Q_OBJECT - TQ_OBJECT + public: KMPlayerPipeSource (KMPlayerApp * app); virtual ~KMPlayerPipeSource (); diff --git a/src/kmplayerbroadcast.h b/src/kmplayerbroadcast.h index 0e756cd..eff7bf5 100644 --- a/src/kmplayerbroadcast.h +++ b/src/kmplayerbroadcast.h @@ -74,7 +74,7 @@ typedef std::vector FFServerSettingList; class KMPLAYER_NO_EXPORT KMPlayerPrefBroadcastPage : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefBroadcastPage (TQWidget * parent); KDE_NO_CDTOR_EXPORT ~KMPlayerPrefBroadcastPage () {} @@ -89,7 +89,7 @@ public: class KMPLAYER_NO_EXPORT KMPlayerPrefBroadcastFormatPage : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefBroadcastFormatPage (TQWidget * parent, FFServerSettingList &); KDE_NO_CDTOR_EXPORT ~KMPlayerPrefBroadcastFormatPage () {} @@ -155,7 +155,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerBroadcastConfig : public TQObject, public KMPlayer::PreferencesPage { Q_OBJECT - TQ_OBJECT + public: KMPlayerBroadcastConfig (KMPlayer::PartBase * player, KMPlayerFFServerConfig * fsc); KDE_NO_CDTOR_EXPORT ~KMPlayerBroadcastConfig (); diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h index c73801b..9888a71 100644 --- a/src/kmplayerconfig.h +++ b/src/kmplayerconfig.h @@ -95,7 +95,7 @@ public: */ class KMPLAYER_EXPORT Settings : public TQObject { Q_OBJECT - TQ_OBJECT + public: Settings (PartBase *, KConfig * part); ~Settings (); diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h index 140e553..4cd8df5 100644 --- a/src/kmplayercontrolpanel.h +++ b/src/kmplayercontrolpanel.h @@ -43,7 +43,7 @@ class View; */ class KMPLAYER_NO_EXPORT KMPlayerMenuButton : public TQPushButton { Q_OBJECT - TQ_OBJECT + public: KMPlayerMenuButton (TQWidget *, TQBoxLayout *, const char **, int = 0); KDE_NO_CDTOR_EXPORT ~KMPlayerMenuButton () {} @@ -58,7 +58,7 @@ protected: */ class KMPLAYER_EXPORT KMPlayerPopupMenu : public KPopupMenu { Q_OBJECT - TQ_OBJECT + public: KMPlayerPopupMenu (TQWidget *); KDE_NO_CDTOR_EXPORT ~KMPlayerPopupMenu () {} @@ -73,7 +73,7 @@ protected: */ class KMPLAYER_EXPORT VolumeBar : public TQWidget { Q_OBJECT - TQ_OBJECT + public: VolumeBar (TQWidget * parent, View * view); ~VolumeBar (); @@ -96,7 +96,7 @@ private: */ class KMPLAYER_EXPORT ControlPanel : public TQWidget { Q_OBJECT - TQ_OBJECT + public: enum MenuID { menu_config = 0, menu_player, menu_fullscreen, menu_volume, diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h index 2ab8450..2ff4dbd 100644 --- a/src/kmplayerpartbase.h +++ b/src/kmplayerpartbase.h @@ -67,7 +67,7 @@ class Settings; */ class KMPLAYER_EXPORT URLSource : public Source { Q_OBJECT -// TQ_OBJECT +// public: URLSource (PartBase * player, const KURL & url = KURL ()); virtual ~URLSource (); @@ -114,7 +114,7 @@ private: */ class KMPLAYER_EXPORT PartBase : public KMediaPlayer::Player { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: typedef TQMap ProcessMap; @@ -258,7 +258,7 @@ protected: class KMPLAYER_NO_EXPORT DataCache : public TQObject { Q_OBJECT -// TQ_OBJECT +// typedef TQMap DataMap; typedef TQMap PreserveMap; DataMap cache_map; @@ -277,7 +277,7 @@ signals: class KMPLAYER_NO_EXPORT RemoteObjectPrivate : public TQObject { Q_OBJECT -// TQ_OBJECT +// public: RemoteObjectPrivate (RemoteObject * r); ~RemoteObjectPrivate (); diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h index 8e9add1..7bc03c5 100644 --- a/src/kmplayerprocess.h +++ b/src/kmplayerprocess.h @@ -55,7 +55,7 @@ class Backend_stub; */ class KMPLAYER_EXPORT Process : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum State { NotRunning = 0, Ready, Buffering, Playing @@ -120,7 +120,7 @@ private: */ class MPlayerBase : public Process { Q_OBJECT - TQ_OBJECT + public: MPlayerBase (TQObject * parent, Settings * settings, const char * n); ~MPlayerBase (); @@ -146,7 +146,7 @@ class MPlayerPreferencesFrame; */ class KDE_EXPORT MPlayer : public MPlayerBase { Q_OBJECT - TQ_OBJECT + public: MPlayer (TQObject * parent, Settings * settings); ~MPlayer (); @@ -237,7 +237,7 @@ protected: */ class MEncoder : public MPlayerBase, public Recorder { Q_OBJECT - TQ_OBJECT + public: MEncoder (TQObject * parent, Settings * settings); ~MEncoder (); @@ -253,7 +253,7 @@ public slots: class KMPLAYER_NO_EXPORT MPlayerDumpstream : public MPlayerBase, public Recorder { Q_OBJECT - TQ_OBJECT + public: MPlayerDumpstream (TQObject * parent, Settings * settings); ~MPlayerDumpstream (); @@ -271,7 +271,7 @@ class XMLPreferencesFrame; */ class KMPLAYER_EXPORT CallbackProcess : public Process { Q_OBJECT - TQ_OBJECT + friend class Callback; public: CallbackProcess (TQObject * parent, Settings * settings, const char * n, const TQString & menu); @@ -378,7 +378,7 @@ private: */ class KMPLAYER_NO_EXPORT Xine : public CallbackProcess, public Recorder { Q_OBJECT - TQ_OBJECT + public: Xine (TQObject * parent, Settings * settings); ~Xine (); @@ -391,7 +391,7 @@ public slots: */ class KMPLAYER_NO_EXPORT GStreamer : public CallbackProcess { Q_OBJECT - TQ_OBJECT + public: GStreamer (TQObject * parent, Settings * settings); ~GStreamer (); @@ -404,7 +404,7 @@ public slots: */ class KMPLAYER_EXPORT FFMpeg : public Process, public Recorder { Q_OBJECT - TQ_OBJECT + public: FFMpeg (TQObject * parent, Settings * settings); ~FFMpeg (); @@ -423,7 +423,7 @@ private slots: class KMPLAYER_NO_EXPORT NpStream : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Reason { NoReason = -1, @@ -458,7 +458,7 @@ private slots: class KMPLAYER_NO_EXPORT NpPlayer : public Process { Q_OBJECT - TQ_OBJECT + public: NpPlayer (TQObject * parent, Settings * settings, const TQString & srv); ~NpPlayer (); diff --git a/src/kmplayersource.h b/src/kmplayersource.h index 191cfce..cf765ce 100644 --- a/src/kmplayersource.h +++ b/src/kmplayersource.h @@ -41,7 +41,7 @@ class PartBase; */ class KMPLAYER_EXPORT Source : public TQObject, public PlayListNotify { Q_OBJECT - TQ_OBJECT + public: Source (const TQString & name, PartBase * player, const char * src); virtual ~Source (); diff --git a/src/kmplayertvsource.h b/src/kmplayertvsource.h index af1a868..da42c21 100644 --- a/src/kmplayertvsource.h +++ b/src/kmplayertvsource.h @@ -49,7 +49,7 @@ class KConfig; class KMPLAYER_NO_EXPORT TVDevicePage : public TQFrame { Q_OBJECT - TQ_OBJECT + public: TVDevicePage (TQWidget *parent, KMPlayer::NodePtr dev); KDE_NO_CDTOR_EXPORT ~TVDevicePage () {} @@ -69,7 +69,7 @@ private slots: class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageTV : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefSourcePageTV (TQWidget *parent, KMPlayerTVSource *); KDE_NO_CDTOR_EXPORT ~KMPlayerPrefSourcePageTV () {} @@ -147,7 +147,7 @@ public: */ class KMPLAYER_NO_EXPORT TVDeviceScannerSource : public KMPlayer::Source { Q_OBJECT - TQ_OBJECT + public: TVDeviceScannerSource (KMPlayerTVSource * src); KDE_NO_CDTOR_EXPORT ~TVDeviceScannerSource () {}; @@ -179,7 +179,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerTVSource : public KMPlayerMenuSource, public KMPlayer::PreferencesPage { Q_OBJECT - TQ_OBJECT + public: KMPlayerTVSource (KMPlayerApp * app, TQPopupMenu * m); virtual ~KMPlayerTVSource (); diff --git a/src/kmplayervdr.h b/src/kmplayervdr.h index 636fed3..6cddfb0 100644 --- a/src/kmplayervdr.h +++ b/src/kmplayervdr.h @@ -50,7 +50,7 @@ class KListView; */ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageVDR : public TQFrame { Q_OBJECT - TQ_OBJECT + public: KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player); ~KMPlayerPrefSourcePageVDR (); @@ -70,7 +70,7 @@ private: */ class KMPLAYER_NO_EXPORT KMPlayerVDRSource : public KMPlayer::Source, public KMPlayer::PreferencesPage { Q_OBJECT - TQ_OBJECT + public: KMPlayerVDRSource (KMPlayerApp * app); virtual ~KMPlayerVDRSource (); @@ -161,7 +161,7 @@ private: class XVideo : public KMPlayer::CallbackProcess { Q_OBJECT - TQ_OBJECT + public: XVideo (TQObject * parent, KMPlayer::Settings * settings); ~XVideo (); diff --git a/src/kmplayerview.h b/src/kmplayerview.h index 696ad48..06ca60e 100644 --- a/src/kmplayerview.h +++ b/src/kmplayerview.h @@ -90,7 +90,7 @@ private: */ class KMPLAYER_EXPORT View : public KMediaPlayer::View { Q_OBJECT - TQ_OBJECT + public: enum ControlPanelMode { CP_Hide, CP_AutoHide, CP_Show, CP_Only /* no video widget */ @@ -210,7 +210,7 @@ private: */ class KMPLAYER_EXPORT Viewer : public QXEmbed { Q_OBJECT - TQ_OBJECT + public: Viewer(TQWidget *parent, View * view); ~Viewer(); diff --git a/src/playlistview.h b/src/playlistview.h index 70924bb..3fbb3ba 100644 --- a/src/playlistview.h +++ b/src/playlistview.h @@ -77,7 +77,7 @@ public: */ class KMPLAYER_EXPORT PlayListView : public KListView { Q_OBJECT - TQ_OBJECT + public: enum Flags { AllowDrops = 0x01, AllowDrag = 0x02, diff --git a/src/pref.h b/src/pref.h index b4e9384..4fac066 100644 --- a/src/pref.h +++ b/src/pref.h @@ -68,7 +68,7 @@ class FontSetting; class KMPLAYER_NO_EXPORT Preferences : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: Preferences(PartBase *, Settings *); @@ -101,7 +101,7 @@ public slots: class KMPLAYER_NO_EXPORT PrefGeneralPageGeneral : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefGeneralPageGeneral(TQWidget *parent, Settings *); ~PrefGeneralPageGeneral() {} @@ -124,7 +124,7 @@ public: class KMPLAYER_NO_EXPORT PrefGeneralPageLooks : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefGeneralPageLooks (TQWidget *parent, Settings *); ~PrefGeneralPageLooks () {} @@ -145,7 +145,7 @@ private: class KMPLAYER_NO_EXPORT PrefSourcePageURL : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefSourcePageURL (TQWidget *parent); ~PrefSourcePageURL () {} @@ -169,7 +169,7 @@ private slots: class KMPLAYER_NO_EXPORT PrefRecordPage : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefRecordPage (TQWidget *parent, PartBase *, RecorderPage *, int len); ~PrefRecordPage () {} @@ -198,7 +198,7 @@ private: class KMPLAYER_NO_EXPORT RecorderPage : public TQFrame { Q_OBJECT - TQ_OBJECT + public: RecorderPage (TQWidget *parent, PartBase *); virtual ~RecorderPage () {}; @@ -213,7 +213,7 @@ protected: class KMPLAYER_NO_EXPORT PrefMEncoderPage : public RecorderPage { Q_OBJECT - TQ_OBJECT + public: PrefMEncoderPage (TQWidget *parent, PartBase *); ~PrefMEncoderPage () {} @@ -252,7 +252,7 @@ public: class KMPLAYER_NO_EXPORT PrefFFMpegPage : public RecorderPage { Q_OBJECT - TQ_OBJECT + public: PrefFFMpegPage (TQWidget *parent, PartBase *); ~PrefFFMpegPage () {} @@ -270,7 +270,7 @@ private: class KMPLAYER_NO_EXPORT PrefGeneralPageOutput : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefGeneralPageOutput (TQWidget *parent, OutputDriver * ad, OutputDriver * vd); ~PrefGeneralPageOutput() {} @@ -282,7 +282,7 @@ public: class KMPLAYER_NO_EXPORT PrefOPPageGeneral : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefOPPageGeneral(TQWidget *parent = 0); ~PrefOPPageGeneral() {} @@ -291,7 +291,7 @@ public: class KMPLAYER_NO_EXPORT PrefOPPagePostProc : public TQFrame { Q_OBJECT - TQ_OBJECT + public: PrefOPPagePostProc(TQWidget *parent = 0); ~PrefOPPagePostProc() {} diff --git a/src/viewarea.h b/src/viewarea.h index ee3930a..7de38d8 100644 --- a/src/viewarea.h +++ b/src/viewarea.h @@ -34,7 +34,7 @@ class ViewAreaPrivate; */ class KMPLAYER_EXPORT ViewArea : public TQWidget { Q_OBJECT - TQ_OBJECT + public: ViewArea (TQWidget * parent, View * view); ~ViewArea (); diff --git a/src/xineplayer.h b/src/xineplayer.h index 0a40fc4..e9aec41 100644 --- a/src/xineplayer.h +++ b/src/xineplayer.h @@ -51,7 +51,7 @@ struct XineProgressEvent : public TQEvent { class KXinePlayer : public TQApplication { Q_OBJECT - TQ_OBJECT + public: KXinePlayer (int argc, char ** argv); ~KXinePlayer (); diff --git a/src/xvplayer.h b/src/xvplayer.h index ece8475..3dbc975 100644 --- a/src/xvplayer.h +++ b/src/xvplayer.h @@ -26,7 +26,7 @@ class KXVideoPlayer : public TQApplication { Q_OBJECT - TQ_OBJECT + public: KXVideoPlayer (int argc, char ** argv); ~KXVideoPlayer ();