diff options
Diffstat (limited to 'noatun/library')
35 files changed, 161 insertions, 161 deletions
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 185c98bc..2924e1bc 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -28,8 +28,8 @@ * General options *****************************************************************/ -General::General(TQObject *tqparent) - : CModule(i18n("General"), i18n("General Options"), "configure", tqparent) +General::General(TQObject *parent) + : CModule(i18n("General"), i18n("General Options"), "configure", parent) { mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList->setChecked(napp->loopList()); diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 9a592075..c5e18027 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -24,7 +24,7 @@ class General : public CModule Q_OBJECT TQ_OBJECT public: - General(TQObject *tqparent=0); + General(TQObject *parent=0); virtual void save(); private slots: diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index 1644f724..4fbc0a19 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -1,14 +1,14 @@ #include <noatun/controls.h> -L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : - TQSlider(tqparent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(o,tqparent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) + Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + const char *member, TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index efb456ac..7836e61b 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -65,8 +65,8 @@ void DownloadItem::dequeue() -Downloader::Downloader(TQObject *tqparent) - : TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0) +Downloader::Downloader(TQObject *parent) + : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) { mStarted=false; mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index cc64331d..6815a90a 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -28,8 +28,8 @@ using namespace Arts; class EffectConfigWidget : public TQWidget { public: - EffectConfigWidget(Effect *e, TQWidget *tqparent=0) - : TQWidget(tqparent), mEf(e) + EffectConfigWidget(Effect *e, TQWidget *parent=0) + : TQWidget(parent), mEf(e) {} virtual ~EffectConfigWidget() diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index fe25abcb..cd9e7d93 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -44,8 +44,8 @@ class EffectListItem : public TQListViewItem { public: - EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e) - : TQListViewItem(tqparent, after, e->title()), mEffect(e) + EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e) + : TQListViewItem(parent, after, e->title()), mEffect(e) { } @@ -55,8 +55,8 @@ private: Effect *mEffect; }; -EffectList::EffectList(TQWidget *tqparent) - : KListView(tqparent) +EffectList::EffectList(TQWidget *parent) + : KListView(parent) { } @@ -85,9 +85,9 @@ void EffectView::show() namespace { -TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *tqparent, const char *name = 0) +TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0) { - TQToolButton *button = new TQToolButton(tqparent, name); + TQToolButton *button = new TQToolButton(parent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index c0946d89..3b371921 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -77,7 +77,7 @@ class EffectList : public KListView Q_OBJECT TQ_OBJECT public: - EffectList(TQWidget *tqparent); + EffectList(TQWidget *parent); virtual bool acceptDrag(TQDropEvent *) const; virtual TQDragObject *dragObject() const; }; diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 06693797..36863a0c 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -79,13 +79,13 @@ namespace VolumeControls else { #define ERROR { fd=-1; return; } - int devtqmask, rectqmask, i_recsrc, stereodevs; + int devmask, recmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR - if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR - if (!devtqmask) ERROR + if (!devmask) ERROR #undef ERROR } @@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } Noatun::Session *Engine::session() const { return &d->session; } -Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false) +Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false) { d=new EnginePrivate; // Connect to aRts diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 7758f35c..7a55d6f7 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -30,8 +30,8 @@ //////////////////////////////////////////////// // PresetList -PresetList::PresetList(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +PresetList::PresetList(TQWidget *parent, const char *name) + : KListView(parent, name) { setItemsRenameable(true); setRenameable(0, true); @@ -61,8 +61,8 @@ void PresetList::rename(TQListViewItem *item, int c) //////////////////////////////////////////////// // EqualizerLevel -EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band) - : TQWidget(tqparent), mBand(band) +EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) + : TQWidget(parent), mBand(band) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, 0, "EqualizerLevel::tqlayout"); diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index d902f49b..1f881742 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -19,7 +19,7 @@ class EqualizerLevel : public TQWidget Q_OBJECT TQ_OBJECT public: - EqualizerLevel(TQWidget *tqparent, VBand band); + EqualizerLevel(TQWidget *parent, VBand band); public slots: void changed(); @@ -39,7 +39,7 @@ class PresetList : public KListView Q_OBJECT TQ_OBJECT public: - PresetList(TQWidget *tqparent, const char *name=0); + PresetList(TQWidget *parent, const char *name=0); public: void rename(TQListViewItem *item, int c); diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index 8dba7fc6..0370b048 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -4,8 +4,8 @@ #include <tqheader.h> -MimeTypeTree::MimeTypeTree(TQWidget *tqparent) - : KListView(tqparent) +MimeTypeTree::MimeTypeTree(TQWidget *parent) + : KListView(parent) { KMimeType::List list=KMimeType::allMimeTypes(); TQDict<TQListViewItem> map; @@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *tqparent) void MimeTypeTree::sel(TQListViewItem *item) { - TQListViewItem *p=item->tqparent(); + TQListViewItem *p=item->parent(); if (!p) return; TQString major=p->text(0); TQString minor=item->text(0); diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index b3f7ccb7..818f63c7 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -21,7 +21,7 @@ class MimeTypeTree : public KListView Q_OBJECT TQ_OBJECT public: - MimeTypeTree(TQWidget *tqparent); + MimeTypeTree(TQWidget *parent); private: TQListViewItem *addMajor(const TQString &name); diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 02564048..fad688fa 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -25,10 +25,10 @@ class KDE_EXPORT L33tSlider : public TQSlider Q_OBJECT TQ_OBJECT public: - L33tSlider(TQWidget * tqparent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget * tqparent, const char * name=0); + Qt::Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -60,7 +60,7 @@ Q_OBJECT TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* tqparent, const char* name ); + const char *member, TQObject* parent, 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 7d711c26..3fffc772 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -75,7 +75,7 @@ Q_OBJECT }; public: - Downloader(TQObject *tqparent=0); + Downloader(TQObject *parent=0); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index 3108ae84..19e28dde 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *tqparent=0); + Engine(TQObject *parent=0); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index 406f4f1b..ef65b648 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -42,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *tqparent=0); + Player(TQObject *parent=0); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index d1baa25d..6c390e77 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -332,7 +332,7 @@ Q_OBJECT TQ_OBJECT friend class PlaylistItemData; public: - Playlist(TQObject *tqparent, const char *name); + Playlist(TQObject *parent, 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 d127ab9f..a79c05aa 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -409,7 +409,7 @@ Q_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *tqparent=0); + NoatunListener(TQObject *parent=0); virtual ~NoatunListener(); signals: @@ -433,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *tqparent=0); + ExitNotifier(int pid, TQObject *parent=0); virtual ~ExitNotifier(); private: @@ -456,7 +456,7 @@ class BoolNotifier : public TQObject Q_OBJECT TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index a290e51c..fe29fdf1 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -64,10 +64,10 @@ public: * arguments are short and long descriptions * for this module, respectively * - * tqparent is the object that is this modules virtual-tqparent. + * parent is the object that is this modules virtual-parent. * When that is deleted, this also will go away, automagically. **/ - CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 94253d4a..c267aedd 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -34,7 +34,7 @@ class ScrollingLabel : public TQWidget TQ_OBJECT public: - ScrollingLabel(const TQString &initialText,TQWidget *tqparent, + ScrollingLabel(const TQString &initialText,TQWidget *parent, const char * name = 0); virtual ~ScrollingLabel(); diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index f7413e70..b0e30098 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -22,7 +22,7 @@ class PlayAction : public KAction Q_OBJECT TQ_OBJECT public: - PlayAction(TQObject *tqparent, const char *name); + PlayAction(TQObject *parent, const char *name); private slots: void playing(); void notplaying(); @@ -36,7 +36,7 @@ class PlaylistAction : public KToggleAction Q_OBJECT TQ_OBJECT public: - PlaylistAction(TQObject *tqparent, const char *name); + PlaylistAction(TQObject *parent, const char *name); private slots: void shown(); void hidden(); @@ -51,7 +51,7 @@ class PluginActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - PluginActionMenu(TQObject *tqparent, const char *name); + PluginActionMenu(TQObject *parent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -85,7 +85,7 @@ class VisActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - VisActionMenu(TQObject *tqparent, const char *name); + VisActionMenu(TQObject *parent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); @@ -103,7 +103,7 @@ class LoopActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - LoopActionMenu(TQObject *tqparent, const char *name); + LoopActionMenu(TQObject *parent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -121,48 +121,48 @@ private: /** * @return pointer to a KAction which opens the effects dialog on activation */ -KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which opens the equalizer dialog on activation */ -KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which goes back one track on activation */ -KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which stops playback on activation */ -KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which starts/pauses playback on activation */ -KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which advances one track on activation */ -KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KToggleAction which shows/hides the playlist */ -KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * play action */ -KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -172,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 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 a364dba0..ac85b9ed 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -15,12 +15,12 @@ class StereoButtonAction : public KAction Q_OBJECT TQ_OBJECT public: - 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 ); + 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 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index 217a8640..bed8f8ac 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -20,8 +20,8 @@ Q_OBJECT static VideoFrame *whose; public: - 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(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); + VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -29,7 +29,7 @@ public: **/ static VideoFrame *playing(); - TQPopupMenu *popupMenu(TQWidget *tqparent); + TQPopupMenu *popupMenu(TQWidget *parent); TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 851b846b..d37adefb 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -21,8 +21,8 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// -PlayAction::PlayAction(TQObject *tqparent, const char *name) - : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name) +PlayAction::PlayAction(TQObject *parent, const char *name) + : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) { connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); @@ -46,8 +46,8 @@ void PlayAction::notplaying() } ///////////////////////////////////////////////////// -PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name) - : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name) +PlaylistAction::PlaylistAction(TQObject *parent, const char *name) + : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) { setCheckedState(i18n("Hide Playlist")); connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); @@ -67,8 +67,8 @@ void PlaylistAction::hidden() //////////////////////////////////////////////////// -PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name) - : KActionMenu(i18n("&Actions"), tqparent, name) +PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Actions"), parent, name) { // kdDebug(66666) << k_funcinfo << "called" << endl; setEnabled(false); @@ -111,8 +111,8 @@ void PluginActionMenu::menuRemove(int id) //////////////////////////////////////////////////// -VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name) - : KActionMenu(i18n("&Visualizations"), tqparent, name) +VisActionMenu::VisActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Visualizations"), parent, name) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); @@ -159,8 +159,8 @@ void VisActionMenu::toggleVisPlugin(int id) //////////////////////////////////////////////////// -LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name) - : KActionMenu(i18n("&Loop"), tqparent, name) +LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Loop"), parent, name) { mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); @@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected() //////////////////////////////////////////////////// -KAction *playpause(TQObject *tqparent, const char *name) +KAction *playpause(TQObject *parent, const char *name) { - return new PlayAction(tqparent, name); + return new PlayAction(parent, name); } -KAction *effects(TQObject *tqparent, const char *name) +KAction *effects(TQObject *parent, const char *name) { - return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name); + return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name); } -KAction *equalizer(TQObject *tqparent, const char *name) +KAction *equalizer(TQObject *parent, const char *name) { - return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name); + return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name); } -KAction *back(TQObject *tqparent, const char *name) +KAction *back(TQObject *parent, const char *name) { - return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name); + return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name); } -KAction *stop(TQObject *tqparent, const char *name) +KAction *stop(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -265,14 +265,14 @@ KAction *stop(TQObject *tqparent, const char *name) return action; } -KAction *forward(TQObject *tqparent, const char *name) +KAction *forward(TQObject *parent, const char *name) { - return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name); + return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name); } -KAction *play(TQObject *tqparent, const char *name) +KAction *play(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); @@ -283,9 +283,9 @@ KAction *play(TQObject *tqparent, const char *name) return action; } -KAction *pause(TQObject *tqparent, const char *name) +KAction *pause(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -296,9 +296,9 @@ KAction *pause(TQObject *tqparent, const char *name) return action; } -LoopActionMenu *loop(TQObject *tqparent, const char *name) +LoopActionMenu *loop(TQObject *parent, const char *name) { - return new LoopActionMenu(tqparent, name); + return new LoopActionMenu(parent, name); } PluginActionMenu *actions() @@ -307,14 +307,14 @@ PluginActionMenu *actions() return napp->pluginActionMenu(); } -VisActionMenu *visualizations(TQObject *tqparent, const char *name) +VisActionMenu *visualizations(TQObject *parent, const char *name) { - return new VisActionMenu(tqparent, name); + return new VisActionMenu(parent, name); } -KToggleAction *playlist(TQObject *tqparent, const char *name) +KToggleAction *playlist(TQObject *parent, const char *name) { - return new PlaylistAction(tqparent, name); + return new PlaylistAction(parent, name); } KPopupMenu *ContextMenu::mContextMenu = 0; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 47e2d92a..b1ea94d5 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -177,8 +177,8 @@ Tags::~Tags() } -Control::Control(TagsGetter *tqparent) - : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent) +Control::Control(TagsGetter *parent) + : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent) { // todo (void)I18N_NOOP("Rescan All Tags"); @@ -212,14 +212,14 @@ Control::Control(TagsGetter *tqparent) connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); - slider->setValue(tqparent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int))); + slider->setValue(parent->interval()); + connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); } - connect(onPlay, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); - onPlay->setChecked(tqparent->loadAuto()); + onPlay->setChecked(parent->loadAuto()); } diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h index bd66ab3f..cf336c7d 100644 --- a/noatun/library/noatuntags/tagsgetter.h +++ b/noatun/library/noatuntags/tagsgetter.h @@ -50,7 +50,7 @@ class Control : public CModule Q_OBJECT TQ_OBJECT public: - Control(TagsGetter* tqparent); + Control(TagsGetter* parent); }; diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index accdfd47..0b90952c 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -14,7 +14,7 @@ enum ArtsPOS { posIdle=0, posPlaying, posPaused }; -Player::Player(TQObject *tqparent) : TQObject(tqparent, "Player"), +Player::Player(TQObject *parent) : TQObject(parent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 33e5c1f0..7cc28337 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const -Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name) +Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) { napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 033ccace..02c2f743 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid) // if this is a fork, do a cutesy arts thingy to get a remote // stack, otherwise, get it from localhost :) { - int tqparent=pid ? pid : getppid(); + int parent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); + parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); TQCString appids[2]; - appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit(); appids[1]="noatun"; TQCString &appid=appids[0]; @@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid) if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to tqparent noatun" << endl; + kdDebug(66666) << "Error communicating to parent noatun" << endl; } else { @@ -473,7 +473,7 @@ void StereoScope::setSamples(int len) -NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent) +NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent) { } NoatunListener::~NoatunListener() @@ -495,7 +495,7 @@ void NoatunListenerNotif::message() } -ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent) +ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) { mNotif=new NoatunListenerNotif(this); @@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparen if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to tqparent noatun" << endl; + kdDebug(66666) << "Error communicating to parent noatun" << endl; } else { @@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier() delete mNotif; } -BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent) - : TQObject(tqparent) +BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) + : TQObject(parent) { connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); mValue=value; diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index fb57f39b..dd30111e 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -203,34 +203,34 @@ void Plugins::reopen() for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { - PluginListView *tqparent; + PluginListView *parent; bool exclusive = false; if((*i).type == "userinterface") { - tqparent = interfaceList; + parent = interfaceList; } else if((*i).type == "playlist") { - tqparent = playlistList; + parent = playlistList; exclusive = true; } else if((*i).type == "sm" || (*i).type=="hidden") { - tqparent = 0; + parent = 0; } else if ((*i).type == "visualization") { - tqparent = visList; + parent = visList; } else { - tqparent = otherList; + parent = otherList; } - if(tqparent) + if(parent) { - PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, tqparent); + PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, parent); item->setText(0, (*i).name); item->setText(1, (*i).comment); item->setText(2, (*i).author); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 04e301ff..98c05453 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -8,9 +8,9 @@ //#include <tqlabel.h> #include "cmodule.h" -NoatunPreferences::NoatunPreferences(TQWidget *tqparent) +NoatunPreferences::NoatunPreferences(TQWidget *parent) : KDialogBase(TreeList, i18n("Preferences - Noatun"), - Ok|Apply|Cancel|Help, Ok, tqparent, "NoatunPreferences", false, true) + Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true) { resize(640, 480); // KDE is required to support 800x600 min. setShowIconsInTreeList(true); @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->tqparent())) ); + int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) ); if (index != -1) showPage(index); show(); @@ -65,7 +65,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(tqparent())); + TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent())); (new TQHBoxLayout(page))->addWidget(this); } @@ -78,7 +78,7 @@ CModule::~CModule() void CModule::ownerDeleted() { - TQObject *p=tqparent(); + TQObject *p=parent(); delete this; p->deleteLater(); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 682c4f6a..4484c872 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -55,10 +55,10 @@ class ScrollingLabel::Private ScrollingLabel::ScrollingLabel ( const TQString & initialText, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget(tqparent, name) + : TQWidget(parent, name) { d = new Private; diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp index 7d5d3936..e8df0046 100644 --- a/noatun/library/stereobuttonaction.cpp +++ b/noatun/library/stereobuttonaction.cpp @@ -3,28 +3,28 @@ namespace NoatunStdAction { -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name ) - : KAction(text, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name ) + : KAction(text, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KAction(text, accel, receiver, slot, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) + : KAction(text, accel, receiver, slot, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) + : KAction(text, pix, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name ) + : KAction(text, pix, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, receiver, slot, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) + : KAction(text, pix, accel, receiver, slot, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, receiver, slot, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) + : KAction(text, pix, accel, receiver, slot, parent, name) {} void StereoButtonAction::disable(void) diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h index 947ccff5..21f9528d 100644 --- a/noatun/library/titleproxy.h +++ b/noatun/library/titleproxy.h @@ -115,8 +115,8 @@ namespace TitleProxy TQ_OBJECT public: - Server( TQ_UINT16 port, TQObject* tqparent ) - : TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {}; + Server( TQ_UINT16 port, TQObject* parent ) + : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {}; signals: void connected( int socket ); diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index e009b044..f2428bc4 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -24,8 +24,8 @@ struct VideoFrame::Private }; -VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f) - : KVideoWidget(clientParent, tqparent, name, f) +VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f) + : KVideoWidget(clientParent, parent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const ch frames.append(this); } -VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f) - : KVideoWidget(tqparent, name, f) +VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) + : KVideoWidget(parent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing() return whose; } -TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent) +TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent) { - TQPopupMenu *view = new TQPopupMenu(tqparent); + TQPopupMenu *view = new TQPopupMenu(parent); action( "half_size" )->plug( view ); action( "normal_size" )->plug( view ); action( "double_size" )->plug( view ); |