diff options
Diffstat (limited to 'noatun/library/noatun')
-rw-r--r-- | noatun/library/noatun/app.h | 5 | ||||
-rw-r--r-- | noatun/library/noatun/controls.h | 12 | ||||
-rw-r--r-- | noatun/library/noatun/downloader.h | 5 | ||||
-rw-r--r-- | noatun/library/noatun/effects.h | 3 | ||||
-rw-r--r-- | noatun/library/noatun/engine.h | 5 | ||||
-rw-r--r-- | noatun/library/noatun/equalizer.h | 3 | ||||
-rw-r--r-- | noatun/library/noatun/player.h | 5 | ||||
-rw-r--r-- | noatun/library/noatun/playlist.h | 5 | ||||
-rw-r--r-- | noatun/library/noatun/plugin.h | 12 | ||||
-rw-r--r-- | noatun/library/noatun/pref.h | 8 | ||||
-rw-r--r-- | noatun/library/noatun/scrollinglabel.h | 9 | ||||
-rw-r--r-- | noatun/library/noatun/stdaction.h | 37 | ||||
-rw-r--r-- | noatun/library/noatun/stereobuttonaction.h | 13 | ||||
-rw-r--r-- | noatun/library/noatun/vequalizer.h | 8 | ||||
-rw-r--r-- | noatun/library/noatun/video.h | 7 |
15 files changed, 80 insertions, 57 deletions
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index 0b8af3ee..8e8b0e1b 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -31,6 +31,7 @@ namespace NoatunStdAction class KDE_EXPORT NoatunApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT friend class Playlist; public: @@ -71,8 +72,8 @@ public: TQCString version() const; - virtual void commitData(QSessionManager &); - virtual void saveState(QSessionManager &); + virtual void commitData(TQSessionManager &); + virtual void saveState(TQSessionManager &); /** * The three startup modes how noatun should behave when it is diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 4c11aac7..02564048 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -20,14 +20,15 @@ class TQLabel; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT L33tSlider : public QSlider +class KDE_EXPORT L33tSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * tqparent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, TQWidget * parent, const char * name=0); + Qt::Orientation, TQWidget * tqparent, const char * name=0); bool currentlyPressed() const; signals: @@ -56,9 +57,10 @@ private: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ); + const char *member, TQObject* tqparent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index a4c08ad7..7d711c26 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -63,9 +63,10 @@ private: /** * download playlistitems, in a queue based fasion **/ -class Downloader : public QObject +class Downloader : public TQObject { Q_OBJECT + TQ_OBJECT struct QueueItem { DownloadItem *notifier; @@ -74,7 +75,7 @@ Q_OBJECT }; public: - Downloader(TQObject *parent=0); + Downloader(TQObject *tqparent=0); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h index 4c014a93..0480729d 100644 --- a/noatun/library/noatun/effects.h +++ b/noatun/library/noatun/effects.h @@ -94,9 +94,10 @@ private: * Noatuns effect stack * @author Charles Samuels **/ -class Effects : public QObject +class Effects : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effect; public: Effects(); diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index b47eb087..3108ae84 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -30,12 +30,13 @@ class NoatunApp; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class KDE_EXPORT Engine : public QObject +class KDE_EXPORT Engine : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *parent=0); + Engine(TQObject *tqparent=0); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h index d048d21d..744958b3 100644 --- a/noatun/library/noatun/equalizer.h +++ b/noatun/library/noatun/equalizer.h @@ -99,13 +99,14 @@ private: * @author Charles Samuels * @version 2.3 **/ -class Equalizer : public QObject +class Equalizer : public TQObject { friend class Band; friend class Preset; friend class Engine; Q_OBJECT + TQ_OBJECT public: Equalizer(); ~Equalizer(); diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index a61c2335..406f4f1b 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -19,9 +19,10 @@ class KLibrary; * @author Charles Samuels * @version 2.4 **/ -class KDE_EXPORT Player : public QObject +class KDE_EXPORT Player : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effects; friend class PlaylistItemData; friend class PlaylistNotifier; @@ -41,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *parent=0); + Player(TQObject *tqparent=0); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 013d63a4..d1baa25d 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -326,12 +326,13 @@ private: * when you can call a Player method, unless, of course, you * ARE the playlist. **/ -class Playlist : public QObject +class Playlist : public TQObject { Q_OBJECT + TQ_OBJECT friend class PlaylistItemData; public: - Playlist(TQObject *parent, const char *name); + Playlist(TQObject *tqparent, const char *name); /** * on playlist unload, your playlist must * have current()==0 and emit playCurrent diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 2bd8c994..d127ab9f 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -402,13 +402,14 @@ class NoatunListenerNotif; * * So far only used for ExitNotifier. **/ -class NoatunListener : public QObject +class NoatunListener : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *parent=0); + NoatunListener(TQObject *tqparent=0); virtual ~NoatunListener(); signals: @@ -432,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *parent=0); + ExitNotifier(int pid, TQObject *tqparent=0); virtual ~ExitNotifier(); private: @@ -450,11 +451,12 @@ private: * * When noatunOk is false, then noatun has exited somehow. **/ -class BoolNotifier : public QObject +class BoolNotifier : public TQObject { Q_OBJECT + TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 5a7d056e..a290e51c 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -13,6 +13,7 @@ class CModule; class NoatunPreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class CModule; public: @@ -53,19 +54,20 @@ private: * Create your GUI in constructor, reimplement reopen() and save() and * you're all set. **/ -class KDE_EXPORT CModule : public QWidget +class KDE_EXPORT CModule : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * arguments are short and long descriptions * for this module, respectively * - * parent is the object that is this modules virtual-parent. + * tqparent is the object that is this modules virtual-tqparent. * When that is deleted, this also will go away, automagically. **/ - CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 231d3158..94253d4a 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -28,12 +28,13 @@ * A clever label that scrolls its contents as soon as there is not enough * space to show everything at once. **/ -class ScrollingLabel : public QWidget +class ScrollingLabel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ScrollingLabel(const TQString &initialText,TQWidget *parent, + ScrollingLabel(const TQString &initialText,TQWidget *tqparent, const char * name = 0); virtual ~ScrollingLabel(); @@ -43,8 +44,8 @@ class ScrollingLabel : public QWidget **/ virtual void setText(const TQString &text, int time = -1); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * @return the label's text. diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index bfa34164..f7413e70 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -20,8 +20,9 @@ namespace NoatunStdAction class PlayAction : public KAction { Q_OBJECT + TQ_OBJECT public: - PlayAction(TQObject *parent, const char *name); + PlayAction(TQObject *tqparent, const char *name); private slots: void playing(); void notplaying(); @@ -33,8 +34,9 @@ private slots: class PlaylistAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - PlaylistAction(TQObject *parent, const char *name); + PlaylistAction(TQObject *tqparent, const char *name); private slots: void shown(); void hidden(); @@ -47,8 +49,9 @@ private slots: class PluginActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - PluginActionMenu(TQObject *parent, const char *name); + PluginActionMenu(TQObject *tqparent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -80,8 +83,9 @@ private: class VisActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - VisActionMenu(TQObject *parent, const char *name); + VisActionMenu(TQObject *tqparent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); @@ -97,8 +101,9 @@ private: class LoopActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - LoopActionMenu(TQObject *parent, const char *name); + LoopActionMenu(TQObject *tqparent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -116,48 +121,48 @@ private: /** * @return pointer to a KAction which opens the effects dialog on activation */ -KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which opens the equalizer dialog on activation */ -KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which goes back one track on activation */ -KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which stops playback on activation */ -KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which starts/pauses playback on activation */ -KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which advances one track on activation */ -KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KToggleAction which shows/hides the playlist */ -KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); /** * play action */ -KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -167,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index d6d6edb9..a364dba0 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -13,13 +13,14 @@ namespace NoatunStdAction class StereoButtonAction : public KAction { Q_OBJECT + TQ_OBJECT public: - StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index d5ee7ecf..5e494472 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -4,7 +4,7 @@ * This file is hereby licensed under the GNU General Public License version * 2 or later at your option. * - * This file is licensed under the Qt Public License version 1 with the + * This file is licensed under the TQt Public License version 1 with the * condition that the licensed will be governed under the Laws of California * (USA) instead of Norway. Disputes will be settled in Santa Clara county * courts. @@ -36,8 +36,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NOATUN_VEQUALIZER_H -#define NOATUN_VEQUALIZER_H +#ifndef NOATUN_VETQUALIZER_H +#define NOATUN_VETQUALIZER_H #include <tqptrlist.h> #include <tqobject.h> @@ -137,6 +137,7 @@ public: class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT struct Private; Private *d; friend class VBand; @@ -176,6 +177,7 @@ class VPreset; class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT friend class VBand; friend class VPreset; friend class Engine; diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index a659401e..217a8640 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -12,6 +12,7 @@ class TQPopupMenu; class VideoFrame : public KVideoWidget { Q_OBJECT + TQ_OBJECT struct Private; VideoFrame::Private *d; @@ -19,8 +20,8 @@ Q_OBJECT static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); - VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); + VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0); + VideoFrame(TQWidget *tqparent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -28,7 +29,7 @@ public: **/ static VideoFrame *playing(); - TQPopupMenu *popupMenu(TQWidget *parent); + TQPopupMenu *popupMenu(TQWidget *tqparent); TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: |