diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 90363652674deb94cd07057428b24fcb1735dbce (patch) | |
tree | 35013223cb731f194f8584cc1c06a023c3c75c85 /noatun-plugins | |
parent | 627b091fad9df13695f249588e8a58f524eda0fa (diff) | |
download | tdeaddons-90363652674deb94cd07057428b24fcb1735dbce.tar.gz tdeaddons-90363652674deb94cd07057428b24fcb1735dbce.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'noatun-plugins')
41 files changed, 159 insertions, 159 deletions
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 1109b6f..6f5ff6c 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -165,8 +165,8 @@ void Wakeup::slotVolumeChange() /////////////////////////////////////////////////////////////////// // Prefs CModule /////////////////////////////////////////////////////////////////// -WakeupPrefs::WakeupPrefs( TQObject *tqparent ) : - CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", tqparent ) +WakeupPrefs::WakeupPrefs( TQObject *parent ) : + CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent ) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQGridLayout *grid = new TQGridLayout (tqlayout,8,4); diff --git a/noatun-plugins/alarm/wakeup.h b/noatun-plugins/alarm/wakeup.h index 96628dc..367f537 100644 --- a/noatun-plugins/alarm/wakeup.h +++ b/noatun-plugins/alarm/wakeup.h @@ -64,7 +64,7 @@ class WakeupPrefs : public CModule TQ_OBJECT public: - WakeupPrefs( TQObject *tqparent ); + WakeupPrefs( TQObject *parent ); virtual void save(); virtual void load(); public slots: diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 339b484..0c98af7 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -29,14 +29,14 @@ #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * tqparent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) : CModule ( i18n("AlsaPlayer"), i18n("AlsaPlayer Interface Settings"), "appearance", - tqparent + parent ) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index e3c12c1..282f50d 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -26,8 +26,8 @@ #include <noatun/player.h> #include "seeker.h" -Seeker::Seeker(TQWidget * tqparent, const char * name) - : L33tSlider(0, 1000, 10, 0,Qt::Horizontal, tqparent, name) +Seeker::Seeker(TQWidget * parent, const char * name) + : L33tSlider(0, 1000, 10, 0,Qt::Horizontal, parent, name) { connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index 9eb67ed..833250d 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -32,7 +32,7 @@ class Seeker : public L33tSlider public: - Seeker(TQWidget * tqparent, const char * name = 0); + Seeker(TQWidget * parent, const char * name = 0); virtual ~Seeker(); protected slots: diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 4d8f157..0af4ddb 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -29,14 +29,14 @@ #include "configmodule.h" #include "configmodule.moc" -CharlatanConfigModule::CharlatanConfigModule(TQObject * tqparent) +CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) : CModule ( i18n("Charlatan"), i18n("Charlatan Interface Settings"), "appearance", - tqparent + parent ) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index fc55f36..e486ad4 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -27,8 +27,8 @@ #include "seeker.h" #include "seeker.moc" -Seeker::Seeker(TQWidget * tqparent) - : TQSlider(0, 60, 10, 0,Qt::Horizontal, tqparent), +Seeker::Seeker(TQWidget * parent) + : TQSlider(0, 60, 10, 0,Qt::Horizontal, parent), adjusting_(false) { delayedUpdateTimer_ = new TQTimer(this); diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h index 98b071a..40e553e 100644 --- a/noatun-plugins/charlatan/seeker.h +++ b/noatun-plugins/charlatan/seeker.h @@ -34,7 +34,7 @@ class Seeker : public TQSlider public: - Seeker(TQWidget * tqparent); + Seeker(TQWidget * parent); virtual ~Seeker(); protected slots: diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index 2647203..375fc4b 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -34,8 +34,8 @@ #define ID_STATUS_MSG 1 -DubApp::DubApp(TQWidget* tqparent, const char* name) - : KMainWindow(tqparent, name) +DubApp::DubApp(TQWidget* parent, const char* name) + : KMainWindow(parent, name) { kdDebug(90010) << "cons dubapp" << endl; config=kapp->config(); diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index 9b4f4b7..69bfe74 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -38,7 +38,7 @@ class DubApp : public KMainWindow public: /** construtor of DubApp, calls all init functions to create the application. */ - DubApp(TQWidget* tqparent, const char* name="Dub Playlist"); + DubApp(TQWidget* parent, const char* name="Dub Playlist"); ~DubApp(); void initActions(); diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index b227016..581bbf2 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -25,8 +25,8 @@ #include "dubconfigmodule.h" -DubConfigModule::DubConfigModule(TQObject* tqparent) - : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", tqparent) +DubConfigModule::DubConfigModule(TQObject* parent) + : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", parent) , playMode(oneDir) , playOrder(normal) { diff --git a/noatun-plugins/dub/dub/dubconfigmodule.h b/noatun-plugins/dub/dub/dubconfigmodule.h index d2545cd..6da3c4c 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.h +++ b/noatun-plugins/dub/dub/dubconfigmodule.h @@ -19,7 +19,7 @@ public: enum PlayOrder { normal, shuffle, repeat, single }; enum PlayMode { allFiles, oneDir, recursiveDir }; - DubConfigModule(TQObject *tqparent); + DubConfigModule(TQObject *parent); ~DubConfigModule(); diff --git a/noatun-plugins/dub/dub/dubview.cpp b/noatun-plugins/dub/dub/dubview.cpp index 1522918..50f4607 100644 --- a/noatun-plugins/dub/dub/dubview.cpp +++ b/noatun-plugins/dub/dub/dubview.cpp @@ -26,12 +26,12 @@ #include "dub.h" #include "fileselectorwidget.h" -//DubView::DubView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +//DubView::DubView(TQWidget *parent, const char *name) : TQWidget(parent, name) //{ // setBackgroundMode(PaletteBase); //} -DubView::DubView(TQWidget *tqparent) : FileSelectorWidget(tqparent) +DubView::DubView(TQWidget *parent) : FileSelectorWidget(parent) { kdDebug(90010) << "dub view cons" << endl; setBackgroundMode(PaletteBase); diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h index a83d7cb..be0c7e2 100644 --- a/noatun-plugins/dub/dub/dubview.h +++ b/noatun-plugins/dub/dub/dubview.h @@ -34,7 +34,7 @@ class DubView : public FileSelectorWidget TQ_OBJECT public: /** Constructor for the main view */ - DubView(TQWidget *tqparent = 0); + DubView(TQWidget *parent = 0); /** Destructor for the main view */ ~DubView(); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index f809629..c6d7d18 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -36,8 +36,8 @@ #include "fileselectorwidget.h" -FileSelectorWidget::FileSelectorWidget(TQWidget *tqparent) - : TQWidget(tqparent, "file selector widget") +FileSelectorWidget::FileSelectorWidget(TQWidget *parent) + : TQWidget(parent, "file selector widget") { // widgets and tqlayout diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h index 516e3ce..6cb612b 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -39,7 +39,7 @@ class FileSelectorWidget : public TQWidget friend class DubPlayListItem; public: - FileSelectorWidget(TQWidget *tqparent); + FileSelectorWidget(TQWidget *parent); ~FileSelectorWidget(); KDirOperator* dirOperator() {return dir;} diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 7e92f48..12793b4 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -60,8 +60,8 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor } - TQBitmap tqmask(width, height); - TQPainter p(&tqmask); + TQBitmap mask(width, height); + TQPainter p(&mask); // TQt::color0 = transparent // TQt::color1 = opaque @@ -71,7 +71,7 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor p.fillRect(0, height-i-block, width, block, TQt::color1); i += block + unblock; } - setMask(tqmask); + setMask(mask); units = block+unblock; show(); @@ -184,8 +184,8 @@ void FFRS::changed() #include <tqhbox.h> #include <tqlabel.h> -FFRSPrefs::FFRSPrefs( TQObject *tqparent ) - : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",tqparent) +FFRSPrefs::FFRSPrefs( TQObject *parent ) + : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this); diff --git a/noatun-plugins/ffrs/ffrs.h b/noatun-plugins/ffrs/ffrs.h index c19e86c..070ba6f 100644 --- a/noatun-plugins/ffrs/ffrs.h +++ b/noatun-plugins/ffrs/ffrs.h @@ -58,7 +58,7 @@ Q_OBJECT TQ_OBJECT public: - FFRSPrefs( TQObject *tqparent ); + FFRSPrefs( TQObject *parent ); virtual void save(); int width(); diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp index ac958e3..629466d 100644 --- a/noatun-plugins/lyrics/historymanager.cpp +++ b/noatun-plugins/lyrics/historymanager.cpp @@ -4,7 +4,7 @@ *** TODO: Add more complex support (like in Konqueror) Maybe use Konqueror's History Manager */ -HistoryManager::HistoryManager(TQObject *tqparent) : TQObject(tqparent) { +HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) { } HistoryManager::~HistoryManager() { diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h index 7444f5b..66b68b7 100644 --- a/noatun-plugins/lyrics/historymanager.h +++ b/noatun-plugins/lyrics/historymanager.h @@ -9,7 +9,7 @@ class HistoryManager : public TQObject { Q_OBJECT TQ_OBJECT public: - HistoryManager(TQObject *tqparent = NULL); + HistoryManager(TQObject *parent = NULL); ~HistoryManager(); KURL back(); KURL forward(); diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index ae6952b..624eb48 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -13,20 +13,20 @@ class CreatorItem : public TQListViewItem { public: - CreatorItem(TQListView *tqparent, const TQString &title) - : TQListViewItem(tqparent, title) + CreatorItem(TQListView *parent, const TQString &title) + : TQListViewItem(parent, title) {} }; class TreeItem : public TQListViewItem { public: - TreeItem(TreeItem *tqparent, TreeItem *after, CreatorItem *creator) - : TQListViewItem(tqparent, after, creator->text(0)) + TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator) + : TQListViewItem(parent, after, creator->text(0)) { RendererList *list; - if (tqparent) - list=static_cast<RendererList*>(tqparent->mRenderer); + if (parent) + list=static_cast<RendererList*>(parent->mRenderer); else list=nex->rendererList(); @@ -42,8 +42,8 @@ public: list->unlock(); } - TreeItem(TQListView *tqparent, TreeItem *after, const TQString &title) - : TQListViewItem(tqparent, after, title) + TreeItem(TQListView *parent, TreeItem *after, const TQString &title) + : TQListViewItem(parent, after, title) { mRenderer=nex->rendererList(); setExpandable(true); @@ -52,8 +52,8 @@ public: ~TreeItem() { RendererList *list; - if (tqparent()) - list=static_cast<RendererList*>(static_cast<TreeItem*>(tqparent())->mRenderer); + if (parent()) + list=static_cast<RendererList*>(static_cast<TreeItem*>(parent())->mRenderer); else return; @@ -149,9 +149,9 @@ void Control::addCreator(const TQString &title) new CreatorItem(mCreatorsList, title); } -void Control::dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter) +void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter) { -// if ((e->source() == mCreatorsList) && tqparent) +// if ((e->source() == mCreatorsList) && parent) { CreatorItem *i=static_cast<CreatorItem*>(mCreatorsList->currentItem()); if (!i) @@ -159,7 +159,7 @@ void Control::dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem std::cerr << "no creatoritem" << std::endl; } - new TreeItem(static_cast<TreeItem*>(tqparent), static_cast<TreeItem*>(pafter), i); + new TreeItem(static_cast<TreeItem*>(parent), static_cast<TreeItem*>(pafter), i); } } diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index a96e137..834d7df 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -29,7 +29,7 @@ public slots: void open(const KURL &file); protected slots: - void dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter); + void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter); void currentChanged(TQListViewItem *item); private: diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index e7e4332..76870ff 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -56,9 +56,9 @@ int Thread::threadRun(void *v) return t->run(); } -NexCheckBox::NexCheckBox(TQWidget *tqparent, +NexCheckBox::NexCheckBox(TQWidget *parent, const TQString &name, bool *v) - : TQCheckBox(name, tqparent) + : TQCheckBox(name, parent) { value=v; setChecked(*v); @@ -71,8 +71,8 @@ void NexCheckBox::change(bool b) -NexColorButton::NexColorButton(TQWidget *tqparent, Pixel *color) - : KColorButton(tqparent) +NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) + : KColorButton(parent) { c=color; TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); @@ -401,13 +401,13 @@ void RendererList::load(const TQDomElement &e) -TQWidget *RendererList::configure(TQWidget *tqparent) +TQWidget *RendererList::configure(TQWidget *parent) { - return new RendererListConfigurator(this, tqparent); + return new RendererListConfigurator(this, parent); } -RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *tqparent) - : TQWidget(tqparent), mList(l) +RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent) + : TQWidget(parent), mList(l) { (new TQVBoxLayout(this))->setAutoAdd(true); mErase=new TQCheckBox(i18n("&Erase between frames"), this); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index 8340b67..3a447f1 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -77,7 +77,7 @@ class Spacer : public TQWidget Q_OBJECT TQ_OBJECT public: - Spacer(TQWidget *tqparent) : TQWidget(tqparent) + Spacer(TQWidget *parent) : TQWidget(parent) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); @@ -226,7 +226,7 @@ class NexCheckBox : public TQCheckBox Q_OBJECT TQ_OBJECT public: - NexCheckBox(TQWidget *tqparent, const TQString &, bool *v); + NexCheckBox(TQWidget *parent, const TQString &, bool *v); private slots: void change(bool b); @@ -241,7 +241,7 @@ class NexColorButton : public KColorButton Q_OBJECT TQ_OBJECT public: - NexColorButton(TQWidget *tqparent, Pixel *color); + NexColorButton(TQWidget *parent, Pixel *color); private slots: void change(const TQColor &c); @@ -274,7 +274,7 @@ class RendererListConfigurator : public TQWidget Q_OBJECT TQ_OBJECT public: - RendererListConfigurator(RendererList *l, TQWidget *tqparent); + RendererListConfigurator(RendererList *l, TQWidget *parent); ~RendererListConfigurator(); public slots: @@ -303,7 +303,7 @@ public: bool clearAfter() const { return mClearAfter; } void setClearAfter(bool b) { mClearAfter=b; } - virtual TQWidget *configure(TQWidget *tqparent); + virtual TQWidget *configure(TQWidget *parent); virtual void save(TQDomElement &e); diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp index d760619..119096b 100644 --- a/noatun-plugins/nexscope/regionwidget.cpp +++ b/noatun-plugins/nexscope/regionwidget.cpp @@ -1,23 +1,23 @@ #include "regionwidget.h" -RegionWidget::RegionWidget(TQWidget *tqparent) +RegionWidget::RegionWidget(TQWidget *parent) { } -RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *tqparent) +RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent) { } RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, - TQWidget *tqparent) + TQWidget *parent) { } RegionWidget::RegionWidget(const TQRect ®ion, const TQSize &viewsize, - TQWidget *tqparent) + TQWidget *parent) { } diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h index ee975ee..e02bf85 100644 --- a/noatun-plugins/nexscope/regionwidget.h +++ b/noatun-plugins/nexscope/regionwidget.h @@ -14,11 +14,11 @@ class RegionWidget : public TQFrame Q_OBJECT TQ_OBJECT public: - RegionWidget(TQWidget *tqparent); - RegionWidget(const TQSize &viewsize, TQWidget *tqparent); + RegionWidget(TQWidget *parent); + RegionWidget(const TQSize &viewsize, TQWidget *parent); RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, - TQWidget *tqparent); - RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *tqparent); + TQWidget *parent); + RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *parent); ~RegionWidget(); diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index 37db147..538fa43 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -15,9 +15,9 @@ structQt::HorizontalPair : public Renderer pair=true; } - TQWidget *configure(TQWidget *tqparent) + TQWidget *configure(TQWidget *parent) { - TQWidget *config=new TQWidget(tqparent); + TQWidget *config=new TQWidget(parent); (new TQVBoxLayout(config))->setAutoAdd(true); new NexColorButton(config, &color); diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index d97c21f..a43f0a2 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -28,8 +28,8 @@ #include <tqtabwidget.h> #include <tqheader.h> -SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique) - : TQWidget(tqparent) +SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; mIgnore = true; @@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique) connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); - TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's tqparent")); + TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent")); connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); @@ -176,14 +176,14 @@ class QueryGroupItem : public KListViewItem QueryGroup *mItem; public: - QueryGroupItem(QueryGroupItem *tqparent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(tqparent, after) + QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0) + : KListViewItem(parent, after) { init(group); } - QueryGroupItem(KListView *tqparent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(tqparent, after) + QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0) + : KListViewItem(parent, after) { init(group); } @@ -198,8 +198,8 @@ public: setText(2, item()->presentation()); } - QueryGroupItem *tqparent() - { return static_cast<QueryGroupItem*>(KListViewItem::tqparent()); } + QueryGroupItem *parent() + { return static_cast<QueryGroupItem*>(KListViewItem::parent()); } KListView *listView() { return static_cast<KListView*>(KListViewItem::listView()); } @@ -218,8 +218,8 @@ private: { if (QueryGroup *after = group->nextSibling()) { - if (tqparent()) - new QueryGroupItem(tqparent(), after, this); + if (parent()) + new QueryGroupItem(parent(), after, this); else new QueryGroupItem(listView(), after, this); } @@ -413,7 +413,7 @@ void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem QueryGroupItem *afterNow = static_cast<QueryGroupItem*>(_afterNow); QueryGroup *after, *under; - under = item->tqparent() ? item->tqparent()->item() : 0; + under = item->parent() ? item->parent()->item() : 0; after = afterNow ? afterNow->item() : 0; item->item()->move(¤tQuery()->query, under, after); @@ -436,8 +436,8 @@ void SchemaConfig::addSibling() // now match the action in the tree QueryGroupItem *created; - if (item->tqparent()) - created = new QueryGroupItem(item->tqparent(), g, item); + if (item->parent()) + created = new QueryGroupItem(item->parent(), g, item); else created = new QueryGroupItem(item->listView(), g, item); @@ -500,8 +500,8 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery() } -SliceConfig::SliceConfig(TQWidget *tqparent, Oblique *oblique) - : TQWidget(tqparent) +SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; (new TQVBoxLayout(this, 11, 7))->setAutoAdd(true); @@ -539,16 +539,16 @@ class SliceListItem : public KListViewItem { Slice *mSlice; public: - SliceListItem(KListView *tqparent, Slice *slice) - : KListViewItem(tqparent, slice->name()), mSlice(slice) + SliceListItem(KListView *parent, Slice *slice) + : KListViewItem(parent, slice->name()), mSlice(slice) { } /** * new item **/ - SliceListItem(KListView *tqparent) - : KListViewItem(tqparent, i18n("New Slice")), mSlice(0) + SliceListItem(KListView *parent) + : KListViewItem(parent, i18n("New Slice")), mSlice(0) { } diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h index 39bc7a9..45570ed 100644 --- a/noatun-plugins/oblique/cmodule.h +++ b/noatun-plugins/oblique/cmodule.h @@ -45,7 +45,7 @@ Q_OBJECT TQMap<TQString, QueryItem> mQueries; public: - SchemaConfig(TQWidget *tqparent, Oblique *oblique); + SchemaConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } @@ -93,7 +93,7 @@ Q_OBJECT TQValueList<Slice*> mRemovedItems; public: - SliceConfig(TQWidget *tqparent, Oblique *oblique); + SliceConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); @@ -116,7 +116,7 @@ Q_OBJECT SliceConfig *slice; public: - Configure(Oblique *tqparent); + Configure(Oblique *parent); virtual void reopen(); virtual void save(); diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index a65bf96..efc736d 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -7,8 +7,8 @@ #include "tree.h" -FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, File file) - : KPopupMenu(tqparent) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) + : KPopupMenu(parent) { if (file) mFiles.append(file); @@ -39,8 +39,8 @@ static void addTo(TQValueList<File> &files, TreeItem *item) } } -FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *items) - : KPopupMenu(tqparent) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) + : KPopupMenu(parent) { addTo(mFiles, items); @@ -92,8 +92,8 @@ void FileMenu::toggleInSlice(Slice *slice) SliceListAction::SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, - const TQValueList<File> &files, TQObject *tqparent, const char *name - ) : KActionMenu(text, tqparent, name) + const TQValueList<File> &files, TQObject *parent, const char *name + ) : KActionMenu(text, parent, name) { mFiles = files; mOblique = oblique; @@ -153,8 +153,8 @@ void SliceListAction::hit(int index) SchemaListAction::SchemaListAction( const TQString &text, TQObject *reciever, const char *slot, - TQObject *tqparent, const char *name - ) : KActionMenu(text, tqparent, name) + TQObject *parent, const char *name + ) : KActionMenu(text, parent, name) { mTree = 0; if (reciever) @@ -197,8 +197,8 @@ void SchemaListAction::hit(int index) -ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent) - : KPropertiesDialog(makeItems(files), tqparent), mFiles(files) +ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent) + : KPropertiesDialog(makeItems(files), parent), mFiles(files) { connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 1c12fa7..e6adbac 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -21,11 +21,11 @@ Q_OBJECT TQValueList<File> mFiles; public: - FileMenu(TQWidget *tqparent, Oblique *oblique, File file); + FileMenu(TQWidget *parent, Oblique *oblique, File file); /** * @recursively uses everything under @p files **/ - FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *files); + FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files); private slots: void removeFromList(); @@ -45,7 +45,7 @@ public: SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, - const TQValueList<File> &files = TQValueList<File>(), TQObject *tqparent=0, const char *name=0 + const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0 ); signals: @@ -68,7 +68,7 @@ public: SchemaListAction( const TQString &text, TQObject *reciever, const char *slot, - TQObject *tqparent, const char *name + TQObject *parent, const char *name ); void setTree(Tree *tree) { mTree = tree; } @@ -89,7 +89,7 @@ Q_OBJECT TQValueList<File> mFiles; public: - ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent); + ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent); private: static KFileItemList makeItems(const TQValueList<File> &files); diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index dd73d66..d53437e 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -283,10 +283,10 @@ Query &Query::operator =(const Query ©) if (© == this) return *this; delete mGroupFirst; mGroupFirst=0; - if (const QueryGroup *tqparent = copy.firstChild()) + if (const QueryGroup *parent = copy.firstChild()) { - mGroupFirst = new QueryGroup(*tqparent); - deepCopy(tqparent->firstChild(), mGroupFirst); + mGroupFirst = new QueryGroup(*parent); + deepCopy(parent->firstChild(), mGroupFirst); } return *this; } @@ -438,17 +438,17 @@ void Query::dump() -void Query::loadGroup(TQDomElement element, QueryGroup *tqparent) +void Query::loadGroup(TQDomElement element, QueryGroup *parent) { TQDomNode node = element.firstChild(); QueryGroup *group = new QueryGroup; - if (tqparent) + if (parent) { - if (QueryGroup *last = tqparent->lastChild()) + if (QueryGroup *last = parent->lastChild()) last->setNextSibling(group); else - tqparent->setFirstChild(group); + parent->setFirstChild(group); } else { @@ -500,11 +500,11 @@ void Query::loadGroup(TQDomElement element, QueryGroup *tqparent) } } -void Query::saveGroup(TQDomElement &tqparent, QueryGroup *group) +void Query::saveGroup(TQDomElement &parent, QueryGroup *group) { - TQDomDocument doc = tqparent.ownerDocument(); + TQDomDocument doc = parent.ownerDocument(); TQDomElement element = doc.createElement("group"); - tqparent.appendChild(element); + parent.appendChild(element); TQDomElement childe; TQDomText childtext; diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h index 60478ff..15ff361 100644 --- a/noatun-plugins/oblique/query.h +++ b/noatun-plugins/oblique/query.h @@ -99,7 +99,7 @@ private: **/ TQString fuzzify(const TQString &str) const; /** - * @returns the previous or tqparent of this item (slow) + * @returns the previous or parent of this item (slow) **/ QueryGroup *previous(Query *query); QueryGroup *previous(QueryGroup *startWith); @@ -160,8 +160,8 @@ public: TQString dbname(Base *base); private: - void loadGroup(TQDomElement element, QueryGroup *tqparent=0); - void saveGroup(TQDomElement &tqparent, QueryGroup *group); + void loadGroup(TQDomElement element, QueryGroup *parent=0); + void saveGroup(TQDomElement &parent, QueryGroup *group); void deepCopy(const QueryGroup *from, QueryGroup *toParent); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index fdf210e..7f3415c 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -76,7 +76,7 @@ static void treeItemSort(TreeItem **begin, TreeItem **end) static void treeItemSort(TreeItem *first) { - const int count = first->tqparent() ? first->tqparent()->childCount() : first->listView()->childCount(); + const int count = first->parent() ? first->parent()->childCount() : first->listView()->childCount(); if (count < 2) return; Query *q = first->tree()->query(); @@ -149,28 +149,28 @@ inline static void sortify(T *item) } -TreeItem::TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false) +TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) + : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { if (mFile = file) - tqparent->mPlayableItemCount++; + parent->mPlayableItemCount++; } - sortify(tqparent); + sortify(parent); } -TreeItem::TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false) +TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) + : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { if (mFile = file) - tqparent->tree()->mPlayableItemCount++; + parent->tree()->mPlayableItemCount++; } - sortify(tqparent); + sortify(parent); } TreeItem::~TreeItem() @@ -180,7 +180,7 @@ TreeItem::~TreeItem() tree()->mPlayableItemCount--; } - // I have to remove my tqchildren, because they need their tqparent + // I have to remove my tqchildren, because they need their parent // in tact for the below code while (TreeItem *c = firstChild()) delete c; @@ -297,7 +297,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w } TQColorGroup newcg(cg); - if (tqparent() && tqparent()->isOpen() && !tqparent()->mUserOpened) + if (parent() && parent()->isOpen() && !parent()->mUserOpened) { // slow, but not often used TQColor text = newcg.text(); @@ -338,8 +338,8 @@ void TreeItem::autoExpand() void TreeItem::forceAutoExpand() { - if (tqparent()) - tqparent()->forceAutoExpand(); + if (parent()) + parent()->forceAutoExpand(); if (!mUserOpened) tree()->addAutoExpanded(this); @@ -419,7 +419,7 @@ TreeItem *TreeItem::next() { if (upYours->nextSibling()) return upYours->nextSibling(); - upYours = upYours->tqparent(); + upYours = upYours->parent(); } while (upYours); } return 0; @@ -431,8 +431,8 @@ TreeItem *TreeItem::next() -Tree::Tree(Oblique *oblique, TQWidget *tqparent) - : KListView(tqparent), mOblique(oblique), mAutoExpanding(0) +Tree::Tree(Oblique *oblique, TQWidget *parent) + : KListView(parent), mOblique(oblique), mAutoExpanding(0) { mCurrent = 0; lastMenu =0; @@ -503,16 +503,16 @@ void Tree::clear() KListView::clear(); } -void Tree::movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme) +void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) { TQPtrList<TQListViewItem> items = selectedItems(true); for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i) { - if ((*i)->tqparent() != tqparent) + if ((*i)->parent() != parent) return; } - KListView::movableDropEvent(tqparent, afterme); + KListView::movableDropEvent(parent, afterme); } @@ -790,7 +790,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte else if (fix) { item = fix; - if (fix->tqparent() != childOf) + if (fix->parent() != childOf) moveItem(fix, childOf, 0); item->setText(0, presentation); } diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index bdc557d..c8e545e 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -23,15 +23,15 @@ class TreeItem : public KListViewItem bool mHidden:1; public: - TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p=0); - TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0); ~TreeItem(); QueryGroup *group() { return mGroup; } const QueryGroup *group() const { return mGroup; } void setGroup(QueryGroup *group) { mGroup = group; } - TreeItem *tqparent() { return static_cast<TreeItem*>(KListViewItem::tqparent()); } + TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); } Tree *tree(); TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); } TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); } @@ -51,7 +51,7 @@ public: /** * get the next item that is playable logically. - * that is, if it has a File, and its tqparent hasn't a + * that is, if it has a File, and its parent hasn't a * File **/ TreeItem *nextPlayable(); @@ -104,7 +104,7 @@ Q_OBJECT Loader *mLoader; public: - Tree(Oblique *oblique, TQWidget *tqparent=0); + Tree(Oblique *oblique, TQWidget *parent=0); ~Tree(); TreeItem *firstChild(); TreeItem *find(File item); @@ -130,7 +130,7 @@ public: protected: virtual TQDragObject *dragObject(); - void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme); + void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); public slots: void insert(TreeItem *replace, File file); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 91d07c9..5f32b4d 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -20,8 +20,8 @@ class TabWidget : public KTabWidget { public: - TabWidget(TQWidget *tqparent) - : KTabWidget(tqparent) + TabWidget(TQWidget *parent) + : KTabWidget(parent) { } public: @@ -241,8 +241,8 @@ void View::use(Slice *s) -LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name) - : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, tqparent, name) +LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name) + : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name) { setAutoSized(true); } diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index 4277d06..b9d2a09 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -62,7 +62,7 @@ class LineEditAction : public KWidgetAction Q_OBJECT TQ_OBJECT public: - LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name); + LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); } KLineEdit *lineEdit() { return widget(); } diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 296a541..e6c2930 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -30,8 +30,8 @@ #include "cmodule.h" #include "synaescope.h" -SynaePrefs::SynaePrefs(TQObject *tqparent) - : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", tqparent) +SynaePrefs::SynaePrefs(TQObject *parent) + : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent) { // kdDebug(66666) << k_funcinfo << endl; xRes = new TQSpinBox(320, 1024, 16, this); diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h index 8a39a67..f3f6447 100644 --- a/noatun-plugins/synaescope/cmodule.h +++ b/noatun-plugins/synaescope/cmodule.h @@ -30,7 +30,7 @@ class SynaePrefs : public CModule TQ_OBJECT public: - SynaePrefs(TQObject *tqparent); + SynaePrefs(TQObject *parent); virtual void save(); virtual void reopen(); diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp index 570bdb6..eed8362 100644 --- a/noatun-plugins/synaescope/ui.cpp +++ b/noatun-plugins/synaescope/ui.cpp @@ -330,14 +330,14 @@ void Interface::setupPalette() #undef MAX } -//Visible tqmask +//Visible mask #define ALL 1 #define BUTTONBAR 2 #define TRACKBAR 4 #define DIALBAR 8 #define VOLUMEBAR 16 -//Active tqmask +//Active mask //#define ALL 1 #define PLAYING 2 #define PAUSED 4 diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp index 2c09991..e260d18 100644 --- a/noatun-plugins/tippercanoe/ui.cpp +++ b/noatun-plugins/tippercanoe/ui.cpp @@ -243,14 +243,14 @@ void Interface::setupPalette() #undef MAX } -//Visible tqmask +//Visible mask #define ALL 1 #define BUTTONBAR 2 #define TRACKBAR 4 #define DIALBAR 8 #define VOLUMEBAR 16 -//Active tqmask +//Active mask //#define ALL 1 #define PLAYING 2 #define PAUSED 4 |